August 2018 - U-Boot

[U-Boot] [PATCH] driver: net: fsl-mc: Memset MC reserve red memory before usage
by Prabhakar Kushwaha 25 Aug '18

25 Aug '18

It is not necessary for MC memory to be always clean. It may have garbage value causing indeterministic behavior during MC initialization and run. So memset memory reserved for MC before any usage. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- drivers/net/fsl-mc/mc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/fsl-mc/mc.c b/drivers/net/fsl-mc/mc.c index 940025a467..38afcf9222 100644 --- a/drivers/net/fsl-mc/mc.c +++ b/drivers/net/fsl-mc/mc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2017 NXP + * Copyright 2017-2018 NXP */ #include <common.h> #include <errno.h> @@ -810,6 +810,8 @@ u64 mc_get_dram_addr(void) { size_t mc_ram_size = mc_get_dram_block_size(); + memset((void *)gd->arch.resv_ram, 0, mc_ram_size); + return (gd->arch.resv_ram + mc_ram_size - 1) & MC_RAM_BASE_ADDR_ALIGNMENT_MASK; } -- 2.14.1

2 4

[U-Boot] [PATCH 1/2] board: advantech: dms-ba16: GBE MAC addr support in kernel bootargs
by Ken Lin 25 Aug '18

25 Aug '18

Add configurable support for loading the GBE MAC from the Q7 SPI-NOR and add it to the kernel bootargs. Signed-off-by: Ken Lin <yungching0725(a)gmail.com> --- board/advantech/dms-ba16/Kconfig | 3 +++ board/advantech/dms-ba16/dms-ba16.c | 19 +++++++++++++++++++ include/configs/advantech_dms-ba16.h | 13 +++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/board/advantech/dms-ba16/Kconfig b/board/advantech/dms-ba16/Kconfig index 040eb866b5..f5d9f61f13 100644 --- a/board/advantech/dms-ba16/Kconfig +++ b/board/advantech/dms-ba16/Kconfig @@ -28,4 +28,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "advantech_dms-ba16" +config QSPI_MACADDR + string "0xD0000" + endif diff --git a/board/advantech/dms-ba16/dms-ba16.c b/board/advantech/dms-ba16/dms-ba16.c index 09620435d3..bfc4e2319e 100644 --- a/board/advantech/dms-ba16/dms-ba16.c +++ b/board/advantech/dms-ba16/dms-ba16.c @@ -26,6 +26,8 @@ #include <i2c.h> #include <input.h> #include <pwm.h> +#include <spi.h> +#include <spi_flash.h> DECLARE_GLOBAL_DATA_PTR; #define NC_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ @@ -584,6 +586,21 @@ void pmic_init(void) } +int load_mac_addrs(void) +{ + struct spi_flash *flash; + char mac_addrs[31] = CONFIG_QSPI_MACADDR; + + flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); + + if (strcmp(mac_addrs, "") && !spi_flash_read(flash, simple_strtoul(mac_addrs, NULL, 16), sizeof(mac_addrs), mac_addrs)) { + env_set("fec_addr", mac_addrs); + } + + return 0; +} + int board_late_init(void) { #ifdef CONFIG_CMD_BMODE @@ -609,6 +626,8 @@ int board_late_init(void) pwm_enable(0); #endif + load_mac_addrs(); + #ifdef CONFIG_SATA setup_ba16_sata(); #endif diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 0c9de6125d..bffd9b50a9 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -15,8 +15,11 @@ #define CONFIG_MXC_UART_BASE UART4_BASE #define CONSOLE_DEV "ttymxc3" +#if defined(CONFIG_QSPI_MACADDR) +#define CONFIG_EXTRA_BOOTARGS "panic=10 ${macaddrs}" +#else #define CONFIG_EXTRA_BOOTARGS "panic=10" - +#endif #define CONFIG_BOOT_DIR "" #define CONFIG_LOADCMD "fatload" #define CONFIG_RFSPART "2" @@ -111,6 +114,12 @@ "sf write $loadaddr 0x400 $filesize; " \ "echo 'U-Boot upgraded. Please reset'; " \ "fi\0" \ + "safe_macaddrs=" \ + "if test -n ${fec_addr}; then " \ + "setenv macaddrs fec.macaddr=${fec_addr}; " \ + "else " \ + "setenv macaddrs; " \ + "fi;\0" \ "setargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/${rootdev} rw rootwait " CONFIG_EXTRA_BOOTARGS "\0" \ "loadbootscript=" \ @@ -129,7 +138,7 @@ "fi; " \ "fi;\0" \ "doboot=echo Booting from ${dev}:${devnum}:${partnum} ...; " \ - "run setargs; " \ + "run safe_macaddrs; run setargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ "bootm ${loadaddr} - ${fdt_addr}; " \ -- 2.17.1

1 1

[U-Boot] [PATCH] ftgmac100: Add DM support to the current driver
by Cédric Le Goater 24 Aug '18

24 Aug '18

The conversion is inspired by the FTMAC100 driver and the driver was tested on QEMU with an Aspeed SoC machine. Some extra changes required by the Aspeed SoCs will be proposed in a subsequent patch. Signed-off-by: Cédric Le Goater <clg(a)kaod.org> --- drivers/net/ftgmac100.c | 351 +++++++++++++++++++++++++++++++--------- drivers/net/Kconfig | 6 + 2 files changed, 282 insertions(+), 75 deletions(-) diff --git a/drivers/net/ftgmac100.c b/drivers/net/ftgmac100.c index c996f5f4a167..e33c87ca02fa 100644 --- a/drivers/net/ftgmac100.c +++ b/drivers/net/ftgmac100.c @@ -16,8 +16,13 @@ #include <asm/io.h> #include <asm/dma-mapping.h> #include <linux/mii.h> +#include <phy.h> #include "ftgmac100.h" +#ifdef CONFIG_DM_ETH +#include <dm.h> +DECLARE_GLOBAL_DATA_PTR; +#endif #define ETH_ZLEN 60 #define CFG_XBUF_SIZE 1536 @@ -36,15 +41,18 @@ struct ftgmac100_data { int tx_index; int rx_index; int phy_addr; + + const char *name; + phys_addr_t iobase; }; /* * struct mii_bus functions */ -static int ftgmac100_mdiobus_read(struct eth_device *dev, int phy_addr, - int regnum) +static int ftgmac100_mdiobus_read(struct ftgmac100_data *priv, int phy_addr, + int regnum) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; int phycr; int i; @@ -76,10 +84,10 @@ static int ftgmac100_mdiobus_read(struct eth_device *dev, int phy_addr, return -1; } -static int ftgmac100_mdiobus_write(struct eth_device *dev, int phy_addr, - int regnum, u16 value) +static int ftgmac100_mdiobus_write(struct ftgmac100_data *priv, int phy_addr, + int regnum, u16 value) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; int phycr; int data; int i; @@ -114,9 +122,10 @@ static int ftgmac100_mdiobus_write(struct eth_device *dev, int phy_addr, return -1; } -int ftgmac100_phy_read(struct eth_device *dev, int addr, int reg, u16 *value) +int ftgmac100_phy_read(struct ftgmac100_data *priv, int addr, int reg, + u16 *value) { - *value = ftgmac100_mdiobus_read(dev , addr, reg); + *value = ftgmac100_mdiobus_read(priv, addr, reg); if (*value == -1) return -1; @@ -124,31 +133,31 @@ int ftgmac100_phy_read(struct eth_device *dev, int addr, int reg, u16 *value) return 0; } -int ftgmac100_phy_write(struct eth_device *dev, int addr, int reg, u16 value) +int ftgmac100_phy_write(struct ftgmac100_data *priv, int addr, int reg, + u16 value) { - if (ftgmac100_mdiobus_write(dev, addr, reg, value) == -1) + if (ftgmac100_mdiobus_write(priv, addr, reg, value) == -1) return -1; return 0; } -static int ftgmac100_phy_reset(struct eth_device *dev) +static int ftgmac100_phy_reset(struct ftgmac100_data *priv) { - struct ftgmac100_data *priv = dev->priv; int i; u16 status, adv; adv = ADVERTISE_CSMA | ADVERTISE_ALL; - ftgmac100_phy_write(dev, priv->phy_addr, MII_ADVERTISE, adv); + ftgmac100_phy_write(priv, priv->phy_addr, MII_ADVERTISE, adv); - printf("%s: Starting autonegotiation...\n", dev->name); + printf("%s: Starting autonegotiation...\n", priv->name); - ftgmac100_phy_write(dev, priv->phy_addr, - MII_BMCR, (BMCR_ANENABLE | BMCR_ANRESTART)); + ftgmac100_phy_write(priv, priv->phy_addr, + MII_BMCR, (BMCR_ANENABLE | BMCR_ANRESTART)); for (i = 0; i < 100000 / 100; i++) { - ftgmac100_phy_read(dev, priv->phy_addr, MII_BMSR, &status); + ftgmac100_phy_read(priv, priv->phy_addr, MII_BMSR, &status); if (status & BMSR_ANEGCOMPLETE) break; @@ -156,29 +165,30 @@ static int ftgmac100_phy_reset(struct eth_device *dev) } if (status & BMSR_ANEGCOMPLETE) { - printf("%s: Autonegotiation complete\n", dev->name); + printf("%s: Autonegotiation complete\n", priv->name); } else { printf("%s: Autonegotiation timed out (status=0x%04x)\n", - dev->name, status); + priv->name, status); return 0; } return 1; } -static int ftgmac100_phy_init(struct eth_device *dev) +static int ftgmac100_phy_init(struct ftgmac100_data *priv) { - struct ftgmac100_data *priv = dev->priv; - int phy_addr; - u16 phy_id, status, adv, lpa, stat_ge; + u16 phy_id, status, adv, lpa; int media, speed, duplex; int i; +#ifdef CONFIG_FTGMAC100_EGIGA + unsigned short stat_ge; +#endif /* Check if the PHY is up to snuff... */ - for (phy_addr = 0; phy_addr < CONFIG_PHY_MAX_ADDR; phy_addr++) { + for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { - ftgmac100_phy_read(dev, phy_addr, MII_PHYSID1, &phy_id); + ftgmac100_phy_read(priv, phy_addr, MII_PHYSID1, &phy_id); /* * When it is unable to found PHY, @@ -186,26 +196,26 @@ static int ftgmac100_phy_init(struct eth_device *dev) */ if (phy_id != 0xffff && phy_id != 0x0) { printf("%s: found PHY at 0x%02x\n", - dev->name, phy_addr); + priv->name, phy_addr); priv->phy_addr = phy_addr; break; } } if (phy_id == 0xffff || phy_id == 0x0) { - printf("%s: no PHY present\n", dev->name); + printf("%s: no PHY present\n", priv->name); return 0; } - ftgmac100_phy_read(dev, priv->phy_addr, MII_BMSR, &status); + ftgmac100_phy_read(priv, priv->phy_addr, MII_BMSR, &status); if (!(status & BMSR_LSTATUS)) { /* Try to re-negotiate if we don't have link already. */ - ftgmac100_phy_reset(dev); + ftgmac100_phy_reset(priv); for (i = 0; i < 100000 / 100; i++) { - ftgmac100_phy_read(dev, priv->phy_addr, - MII_BMSR, &status); + ftgmac100_phy_read(priv, priv->phy_addr, + MII_BMSR, &status); if (status & BMSR_LSTATUS) break; udelay(100); @@ -213,14 +223,14 @@ static int ftgmac100_phy_init(struct eth_device *dev) } if (!(status & BMSR_LSTATUS)) { - printf("%s: link down\n", dev->name); + printf("%s: link down\n", priv->name); return 0; } #ifdef CONFIG_FTGMAC100_EGIGA /* 1000 Base-T Status Register */ - ftgmac100_phy_read(dev, priv->phy_addr, - MII_STAT1000, &stat_ge); + ftgmac100_phy_read(priv, priv->phy_addr, + MII_STAT1000, &stat_ge); speed = (stat_ge & (LPA_1000FULL | LPA_1000HALF) ? 1 : 0); @@ -230,39 +240,39 @@ static int ftgmac100_phy_init(struct eth_device *dev) if (speed) { /* Speed is 1000 */ printf("%s: link up, 1000bps %s-duplex\n", - dev->name, duplex ? "full" : "half"); + priv->name, duplex ? "full" : "half"); return 0; } #endif - ftgmac100_phy_read(dev, priv->phy_addr, MII_ADVERTISE, &adv); - ftgmac100_phy_read(dev, priv->phy_addr, MII_LPA, &lpa); + ftgmac100_phy_read(priv, priv->phy_addr, MII_ADVERTISE, &adv); + ftgmac100_phy_read(priv, priv->phy_addr, MII_LPA, &lpa); media = mii_nway_result(lpa & adv); speed = (media & (ADVERTISE_100FULL | ADVERTISE_100HALF) ? 1 : 0); duplex = (media & ADVERTISE_FULL) ? 1 : 0; printf("%s: link up, %sMbps %s-duplex\n", - dev->name, speed ? "100" : "10", duplex ? "full" : "half"); + priv->name, speed ? "100" : "10", duplex ? "full" : "half"); return 1; } -static int ftgmac100_update_link_speed(struct eth_device *dev) +static int ftgmac100_update_link_speed(struct ftgmac100_data *priv) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; - struct ftgmac100_data *priv = dev->priv; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; unsigned short stat_fe; - unsigned short stat_ge; unsigned int maccr; #ifdef CONFIG_FTGMAC100_EGIGA + unsigned short stat_ge; + /* 1000 Base-T Status Register */ - ftgmac100_phy_read(dev, priv->phy_addr, MII_STAT1000, &stat_ge); + ftgmac100_phy_read(priv, priv->phy_addr, MII_STAT1000, &stat_ge); #endif - ftgmac100_phy_read(dev, priv->phy_addr, MII_BMSR, &stat_fe); + ftgmac100_phy_read(priv, priv->phy_addr, MII_BMSR, &stat_fe); if (!(stat_fe & BMSR_LSTATUS)) /* link status up? */ return 0; @@ -315,9 +325,9 @@ static int ftgmac100_update_link_speed(struct eth_device *dev) /* * Reset MAC */ -static void ftgmac100_reset(struct eth_device *dev) +static void ftgmac100_reset(struct ftgmac100_data *priv) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; debug("%s()\n", __func__); @@ -330,10 +340,10 @@ static void ftgmac100_reset(struct eth_device *dev) /* * Set MAC address */ -static void ftgmac100_set_mac(struct eth_device *dev, - const unsigned char *mac) +static void ftgmac100_set_mac(struct ftgmac100_data *priv, + const unsigned char *mac) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; unsigned int maddr = mac[0] << 8 | mac[1]; unsigned int laddr = mac[2] << 24 | mac[3] << 16 | mac[4] << 8 | mac[5]; @@ -343,29 +353,22 @@ static void ftgmac100_set_mac(struct eth_device *dev, writel(laddr, &ftgmac100->mac_ladr); } -static void ftgmac100_set_mac_from_env(struct eth_device *dev) -{ - eth_env_get_enetaddr("ethaddr", dev->enetaddr); - - ftgmac100_set_mac(dev, dev->enetaddr); -} - /* * disable transmitter, receiver */ -static void ftgmac100_halt(struct eth_device *dev) +static void _ftgmac100_halt(struct ftgmac100_data *priv) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; debug("%s()\n", __func__); writel(0, &ftgmac100->maccr); } -static int ftgmac100_init(struct eth_device *dev, bd_t *bd) +static int _ftgmac100_init(struct ftgmac100_data *priv, + unsigned char enetaddr[6]) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; - struct ftgmac100_data *priv = dev->priv; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; struct ftgmac100_txdes *txdes; struct ftgmac100_rxdes *rxdes; unsigned int maccr; @@ -374,6 +377,8 @@ static int ftgmac100_init(struct eth_device *dev, bd_t *bd) debug("%s()\n", __func__); + ftgmac100_reset(priv); + if (!priv->txdes) { txdes = dma_alloc_coherent( sizeof(*txdes) * PKTBUFSTX, &priv->txdes_dma); @@ -395,7 +400,7 @@ static int ftgmac100_init(struct eth_device *dev, bd_t *bd) rxdes = priv->rxdes; /* set the ethernet address */ - ftgmac100_set_mac_from_env(dev); + ftgmac100_set_mac(priv, enetaddr); /* disable all interrupts */ writel(0, &ftgmac100->ier); @@ -453,20 +458,33 @@ static int ftgmac100_init(struct eth_device *dev, bd_t *bd) writel(maccr, &ftgmac100->maccr); - if (!ftgmac100_phy_init(dev)) { - if (!ftgmac100_update_link_speed(dev)) + if (!ftgmac100_phy_init(priv)) { + if (!ftgmac100_update_link_speed(priv)) return -1; } return 0; } +/* + * Free receiving buffer + */ +static int _ftgmac100_free_pkt(struct ftgmac100_data *priv) +{ + struct ftgmac100_rxdes *curr_des; + + curr_des = &priv->rxdes[priv->rx_index]; + /* release buffer to DMA */ + curr_des->rxdes0 &= ~FTGMAC100_RXDES0_RXPKT_RDY; + priv->rx_index = (priv->rx_index + 1) % PKTBUFSRX; + return 0; +} + /* * Get a data block via Ethernet */ -static int ftgmac100_recv(struct eth_device *dev) +static int __ftgmac100_recv(struct ftgmac100_data *priv) { - struct ftgmac100_data *priv = dev->priv; struct ftgmac100_rxdes *curr_des; unsigned short rxlen; @@ -486,7 +504,7 @@ static int ftgmac100_recv(struct eth_device *dev) rxlen = FTGMAC100_RXDES0_VDBC(curr_des->rxdes0); debug("%s(): RX buffer %d, %x received\n", - __func__, priv->rx_index, rxlen); + __func__, priv->rx_index, rxlen); /* invalidate d-cache */ dma_map_single((void *)curr_des->rxdes2, rxlen, DMA_FROM_DEVICE); @@ -505,10 +523,10 @@ static int ftgmac100_recv(struct eth_device *dev) /* * Send a data block via Ethernet */ -static int ftgmac100_send(struct eth_device *dev, void *packet, int length) +static int _ftgmac100_send(struct ftgmac100_data *priv, void *packet, + int length) { - struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)dev->iobase; - struct ftgmac100_data *priv = dev->priv; + struct ftgmac100 *ftgmac100 = (struct ftgmac100 *)priv->iobase; struct ftgmac100_txdes *curr_des = &priv->txdes[priv->tx_index]; if (curr_des->txdes0 & FTGMAC100_TXDES0_TXDMA_OWN) { @@ -526,9 +544,9 @@ static int ftgmac100_send(struct eth_device *dev, void *packet, int length) /* only one descriptor on TXBUF */ curr_des->txdes0 &= FTGMAC100_TXDES0_EDOTR; curr_des->txdes0 |= FTGMAC100_TXDES0_FTS | - FTGMAC100_TXDES0_LTS | - FTGMAC100_TXDES0_TXBUF_SIZE(length) | - FTGMAC100_TXDES0_TXDMA_OWN ; + FTGMAC100_TXDES0_LTS | + FTGMAC100_TXDES0_TXBUF_SIZE(length) | + FTGMAC100_TXDES0_TXDMA_OWN; /* start transmit */ writel(1, &ftgmac100->txpd); @@ -540,6 +558,59 @@ static int ftgmac100_send(struct eth_device *dev, void *packet, int length) return 0; } +#ifndef CONFIG_DM_ETH +/* + * disable transmitter, receiver + */ +static void ftgmac100_halt(struct eth_device *dev) +{ + struct ftgmac100_data *priv = dev->priv; + + return _ftgmac100_halt(priv); +} + +static int ftgmac100_init(struct eth_device *dev, bd_t *bd) +{ + struct ftgmac100_data *priv = dev->priv; + + return _ftgmac100_init(priv, dev->enetaddr); +} + +static int _ftgmac100_recv(struct ftgmac100_data *priv) +{ + struct ftgmac100_rxdes *curr_des; + unsigned short len; + + curr_des = &priv->rxdes[priv->rx_index]; + len = __ftgmac100_recv(priv); + if (len) { + /* pass the packet up to the protocol layers. */ + net_process_received_packet((void *)curr_des->rxdes2, len); + _ftgmac100_free_pkt(priv); + } + return len ? 1 : 0; +} + +/* + * Get a data block via Ethernet + */ +static int ftgmac100_recv(struct eth_device *dev) +{ + struct ftgmac100_data *priv = dev->priv; + + return _ftgmac100_recv(priv); +} + +/* + * Send a data block via Ethernet + */ +static int ftgmac100_send(struct eth_device *dev, void *packet, int length) +{ + struct ftgmac100_data *priv = dev->priv; + + return _ftgmac100_send(priv, packet, length); +} + int ftgmac100_initialize(bd_t *bd) { struct eth_device *dev; @@ -571,8 +642,6 @@ int ftgmac100_initialize(bd_t *bd) eth_register(dev); - ftgmac100_reset(dev); - return 1; free_dev: @@ -580,3 +649,135 @@ free_dev: out: return 0; } +#endif + +#ifdef CONFIG_DM_ETH +static int ftgmac100_start(struct udevice *dev) +{ + struct eth_pdata *plat = dev_get_platdata(dev); + struct ftgmac100_data *priv = dev_get_priv(dev); + + return _ftgmac100_init(priv, plat->enetaddr); +} + +static void ftgmac100_stop(struct udevice *dev) +{ + struct ftgmac100_data *priv = dev_get_priv(dev); + + _ftgmac100_halt(priv); +} + +static int ftgmac100_send(struct udevice *dev, void *packet, int length) +{ + struct ftgmac100_data *priv = dev_get_priv(dev); + int ret; + + ret = _ftgmac100_send(priv, packet, length); + return ret ? 0 : -ETIMEDOUT; +} + +static int ftgmac100_recv(struct udevice *dev, int flags, uchar **packetp) +{ + struct ftgmac100_data *priv = dev_get_priv(dev); + struct ftgmac100_rxdes *curr_des; + int len; + + curr_des = &priv->rxdes[priv->rx_index]; + len = __ftgmac100_recv(priv); + if (len) + *packetp = (uchar *)(unsigned long)curr_des->rxdes2; + + return len ? len : -EAGAIN; +} + +static int ftgmac100_free_pkt(struct udevice *dev, uchar *packet, int length) +{ + struct ftgmac100_data *priv = dev_get_priv(dev); + + _ftgmac100_free_pkt(priv); + return 0; +} + +static const char *dtbmacaddr(u32 ifno) +{ + int node, len; + char enet[16]; + const char *mac; + const char *path; + + if (!gd->fdt_blob) { + printf("%s: don't have a valid gd->fdt_blob!\n", __func__); + return NULL; + } + node = fdt_path_offset(gd->fdt_blob, "/aliases"); + if (node < 0) + return NULL; + + sprintf(enet, "ethernet%d", ifno); + path = fdt_getprop(gd->fdt_blob, node, enet, NULL); + if (!path) { + printf("no alias for %s\n", enet); + return NULL; + } + node = fdt_path_offset(gd->fdt_blob, path); + mac = fdt_getprop(gd->fdt_blob, node, "mac-address", &len); + if (mac && is_valid_ethaddr((u8 *)mac)) + return mac; + + return NULL; +} + +static int ftgmac100_ofdata_to_platdata(struct udevice *dev) +{ + struct ftgmac100_data *priv = dev_get_priv(dev); + struct eth_pdata *pdata = dev_get_platdata(dev); + const char *mac; + + pdata->iobase = devfdt_get_addr(dev); + priv->iobase = pdata->iobase; + mac = dtbmacaddr(0); + if (mac) + memcpy(pdata->enetaddr, mac, 6); + + return 0; +} + +static int ftgmac100_probe(struct udevice *dev) +{ + struct ftgmac100_data *priv = dev_get_priv(dev); + + priv->name = dev->name; + return 0; +} + +static int ftgmac100_bind(struct udevice *dev) +{ + return device_set_name(dev, dev->name); +} + +static const struct eth_ops ftgmac100_ops = { + .start = ftgmac100_start, + .send = ftgmac100_send, + .recv = ftgmac100_recv, + .stop = ftgmac100_stop, + .free_pkt = ftgmac100_free_pkt, +}; + +static const struct udevice_id ftgmac100_ids[] = { + { .compatible = "faraday,ftgmac100" }, + { } +}; + +U_BOOT_DRIVER(ftgmac100) = { + .name = "ftgmac100", + .id = UCLASS_ETH, + .of_match = ftgmac100_ids, + .bind = ftgmac100_bind, + .ofdata_to_platdata = ftgmac100_ofdata_to_platdata, + .probe = ftgmac100_probe, + .ops = &ftgmac100_ops, + .priv_auto_alloc_size = sizeof(struct ftgmac100_data), + .platdata_auto_alloc_size = sizeof(struct eth_pdata), + .flags = DM_FLAG_ALLOC_PRIV_DMA, +}; +#endif diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 5441da47d13e..ec6778db4132 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -186,6 +186,12 @@ config FTMAC100 help This MAC is present in Andestech SoCs. +config FTGMAC100 + bool "Ftgmac100 Ethernet Support" + help + This driver supports the Faraday's FTGMAC100 Gigabit SoC + Ethernet. + config MVGBE bool "Marvell Orion5x/Kirkwood network interface support" depends on KIRKWOOD || ORION5X -- 2.17.1

1 0

[U-Boot] [PATCH] ARM: dts: am33xx: fix SLEWCTRL_FAST pinctrl binding
by Christian.Amann＠de.bosch.com 24 Aug '18

24 Aug '18

From: Christian Amann <Christian.Amann(a)de.bosch.com> Copy missing Kernel patch to make SLEWCTRL_SLOW available in device tree and to correct the value of SLEWCTRL_FAST. After this patch, the Kernel and U-boot device tree settings for SLEWCTRL have the same effect. Original Kernel patch message: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… " According to AM335x TRM, Document spruh73l, Revised February 2015, Section 9.2.2 Pad Control Registers, setting bit 6 of the pad control registers actually sets the SLEWCTRL value to slow rather than fast as the current macro indicates. Introduce a new macro, SLEWCTRL_SLOW, that sets the bit, and modify SLEWCTRL_FAST to 0 but keep it for completeness. Current users of the macro (i2c and mdio) are left unmodified as SLEWCTRL_FAST was the macro used and actual desired state. Tested on am335x-gp-evm with no difference in software performance seen. Signed-off-by: Dave Gerlach <d-gerlach(a)ti.com> Signed-off-by: Tony Lindgren <tony(a)atomide.com> " Signed-off-by: Christian Amann <Christian.Amann(a)de.bosch.com> --- include/dt-bindings/pinctrl/am33xx.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/dt-bindings/pinctrl/am33xx.h b/include/dt-bindings/pinctrl/am33xx.h index 2fbc804..226f772 100644 --- a/include/dt-bindings/pinctrl/am33xx.h +++ b/include/dt-bindings/pinctrl/am33xx.h @@ -13,7 +13,8 @@ #define PULL_DISABLE (1 << 3) #define INPUT_EN (1 << 5) -#define SLEWCTRL_FAST (1 << 6) +#define SLEWCTRL_SLOW (1 << 6) +#define SLEWCTRL_FAST 0 /* update macro depending on INPUT_EN and PULL_ENA */ #undef PIN_OUTPUT -- 2.7.4

2 1

[U-Boot] [PATCH] env: ubi: Add missing ENV_NAME
by Marek Vasut 24 Aug '18

24 Aug '18

Add missing environment name for UBI, to prevent this NULL in output: Loading Environment from <NULL>... and rather have a valid UBI there: Loading Environment from UBI... Signed-off-by: Marek Vasut <marex(a)denx.de> --- env/ubi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/env/ubi.c b/env/ubi.c index eb2346f3a1..1dfdf0a8c8 100644 --- a/env/ubi.c +++ b/env/ubi.c @@ -168,6 +168,7 @@ static int env_ubi_load(void) U_BOOT_ENV_LOCATION(ubi) = { .location = ENVL_UBI, + ENV_NAME("UBI") .load = env_ubi_load, .save = env_save_ptr(env_ubi_save), }; -- 2.17.1

2 1

[U-Boot] [PATCH] u-boot: align cache flushes in load_elf_image_shdr to line boundaries
by Neil Stainton 24 Aug '18

24 Aug '18

Prevent cache warning messages when using the 'bootelf' command on an Arm target. Round down each section start address and round up the respective section end to the nearest cache line. --- Currently when using bootelf to load an image on Arm, several warnings such as the following appear in the console: CACHE: Misaligned operation at range [87800000, 8783c5e0] CACHE: Misaligned operation at range [8783c5e0, 8784b3e0] Signed-off-by: Neil Stainton <nstainton at asl-control.co.uk> --- cmd/elf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/elf.c b/cmd/elf.c index eafea38..1199e5d 100644 --- a/cmd/elf.c +++ b/cmd/elf.c @@ -141,7 +141,9 @@ static unsigned long load_elf_image_shdr(unsigned long addr) memcpy((void *)(uintptr_t)shdr->sh_addr, (const void *)image, shdr->sh_size); } - flush_cache(shdr->sh_addr, shdr->sh_size); + flush_cache(rounddown(shdr->sh_addr, ARCH_DMA_MINALIGN), + roundup((shdr->sh_addr + shdr->sh_size), ARCH_DMA_MINALIGN) - + rounddown(shdr->sh_addr, ARCH_DMA_MINALIGN)); } return ehdr->e_entry; -- 2.7.4

2 1

[U-Boot] [PATCH] ARM: display5: Remove "factory procedure" from display5 board config
by Lukasz Majewski 24 Aug '18

24 Aug '18

This code now is regarded as dead one and hence shall be removed. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- configs/display5_factory_defconfig | 2 +- include/configs/display5.h | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index edb37c3b2f..5962b642b2 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -15,7 +15,7 @@ CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run factory" +CONFIG_BOOTCOMMAND="echo SDP Display5 recovery" CONFIG_SUPPORT_RAW_INITRD=y CONFIG_MISC_INIT_R=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set diff --git a/include/configs/display5.h b/include/configs/display5.h index 60777da061..aba4b01d21 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -115,27 +115,6 @@ "name=rootfs2,size=512M,uuid=${uuid_gpt_rootfs2};" \ "name=data,size=-,uuid=${uuid_gpt_data}\0" -#define FACTORY_PROCEDURE \ - "echo '#######################';" \ - "echo '# Factory Boot #';" \ - "echo '#######################';" \ - "env default -a;" \ - "saveenv;" \ - "gpt write mmc ${mmcdev} ${partitions};" \ - "run tftp_sf_SPL;" \ - "run tftp_sf_uboot;" \ - TFTP_UPDATE_KERNEL \ - "run tftp_sf_fitImg_SWU;" \ - "run tftp_sf_initramfs_SWU;" \ - TFTP_UPDATE_ROOTFS \ - "echo '#######################';" \ - "echo '# END - OK #';" \ - "echo '#######################';" \ - "setenv bootcmd 'env default -a; saveenv; run falcon_setup; reset';" \ - "setenv boot_os 'n';" \ - "saveenv;" \ - "reset;" - #define SWUPDATE_RECOVERY_PROCEDURE \ "echo '#######################';" \ "echo '# RECOVERY SWUupdate #';" \ @@ -261,7 +240,6 @@ "bootdelay=1\0" \ "baudrate=115200\0" \ "bootcmd=" CONFIG_BOOTCOMMAND "\0" \ - "factory=" FACTORY_PROCEDURE "\0" \ "ethact=FEC\0" \ "ethaddr=00:11:B8:01:30:dc\0" \ "ipaddr=192.168.2.130\0" \ -- 2.11.0

2 1

[U-Boot] [PATCH] dm: test: Fix typo in test-main comment
by Michal Simek 24 Aug '18

24 Aug '18

Trivial fix. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- test/dm/test-main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 4def795c7988..5d79ce641d7b 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -94,7 +94,7 @@ static int dm_do_test(struct unit_test_state *uts, struct unit_test *test, ut_assertok(dm_extended_scan_fdt(gd->fdt_blob, false)); /* - * Silence the console and rely on console reocrding to get + * Silence the console and rely on console recording to get * our output. */ console_record_reset(); -- 1.9.1

3 2

[U-Boot] [PATCH v4 0/5] Get socfpga gen5 SPL working again.
by Simon Goldschmidt 24 Aug '18

24 Aug '18

Socfpga gen5 SPL has been broken since moving to DM serial with v2018.07. Also, U-Boot console output has been broken since then. This series fixes this and makes some related small improvements. Changes in v4: - dropped already merged patches 1, 3 and 4 - enable the env relocatation for all socfpga, not for gen5 only - rename socfpga_init_bus_mapping() to socfpga_sdram_remap_zero() and move socfpga_bridges_reset(1) out of that function Changes in v3: - moved uart0's "u-boot,dm-pre-reloc;" from socfpga.dtsi to board specific dts files since this can change per board - added patches 5-7 to boot SPL and U-Boot from fpga OnChip RAM - dropped Patch 5/6 "serial: ns16550: fix debug uart putc called before init" (this needs a more generic fix) Changes in v2: - Improved comment on patch 1 - Removing gd->malloc_base assignment at the end of board_init_f() moved to an extra patch - don't change printf() to debug() in reset_manager_gen5.c socfpga_bridges_reset() (instead make debug uart handle this) - make ns16550 debug uart handle putc being called before init - removed the assignment of gd->malloc_limit from board_init() Simon Goldschmidt (5): arm: socfpga: fix device trees to work with DM serial arm: socfpga: fix U-Boot running from fpga OnChip RAM arm: socfpga: gen5: combine some init code for SPL and U-Boot arm: socfpga: fix SPL booting from fpga OnChip RAM malloc_simple: calloc: don't call memset if malloc failed arch/arm/dts/socfpga_arria5_socdk.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_dbm_soc1.dts | 5 +++ .../arm/dts/socfpga_cyclone5_de0_nano_soc.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_de10_nano.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_de1_soc.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_is1.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_socdk.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_sockit.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_socrates.dts | 5 +++ arch/arm/dts/socfpga_cyclone5_sr1500.dts | 2 + arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 5 +++ arch/arm/mach-socfpga/Kconfig | 12 ++++++ arch/arm/mach-socfpga/include/mach/misc.h | 4 ++ arch/arm/mach-socfpga/misc_gen5.c | 38 ++++++++++++------- arch/arm/mach-socfpga/spl_gen5.c | 34 +++-------------- common/malloc_simple.c | 3 +- include/configs/socfpga_common.h | 11 ++++++ 17 files changed, 111 insertions(+), 43 deletions(-) -- 2.17.1

3 21

[U-Boot] [PATCH] board: arm: bcmstb: Declare get_ticks in timer.h
by Thomas Fitzsimmons 24 Aug '18

24 Aug '18

In an earlier proposed patch, bcmstb.c implemented timer_read_counter, but it was updated to implement get_ticks instead. This patch updates the declaration in timer.h accordingly. Signed-off-by: Thomas Fitzsimmons <fitzsim(a)fitzsim.org> --- arch/arm/mach-bcmstb/include/mach/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-bcmstb/include/mach/timer.h b/arch/arm/mach-bcmstb/include/mach/timer.h index d05b4d6..039dd66 100644 --- a/arch/arm/mach-bcmstb/include/mach/timer.h +++ b/arch/arm/mach-bcmstb/include/mach/timer.h @@ -8,6 +8,6 @@ #ifndef _BCMSTB_TIMER_H #define _BCMSTB_TIMER_H -unsigned long timer_read_counter(void); +uint64_t get_ticks(void); #endif /* _BCMSTB_TIMER_H */ -- 1.8.3.1

2 1