January 2018 - U-Boot

[U-Boot] [PATCH 0/3] mips: bmips: add BCM6362 SoC support
by Álvaro Fernández Rojas 17 Mar '18

17 Mar '18

BCM6362 is a dual core BCM63xx SoC. Álvaro Fernández Rojas (3): dm: cpu: bmips: add BCM6362 support MIPS: add support for Broadcom MIPS BCM6362 SoC family MIPS: add BMIPS Netgear DGND3700v2 board arch/mips/dts/Makefile | 1 + arch/mips/dts/brcm,bcm6362.dtsi | 186 +++++++++++++++++++++ arch/mips/dts/netgear,dgnd3700v2.dts | 121 ++++++++++++++ arch/mips/mach-bmips/Kconfig | 24 +++ board/netgear/dgnd3700v2/Kconfig | 12 ++ board/netgear/dgnd3700v2/MAINTAINERS | 6 + board/netgear/dgnd3700v2/Makefile | 5 + board/netgear/dgnd3700v2/dgnd3700v2.c | 30 ++++ configs/netgear_dgnd3700v2_ram_defconfig | 46 +++++ drivers/cpu/bmips_cpu.c | 51 ++++++ include/configs/bmips_bcm6362.h | 25 +++ include/configs/netgear_dgnd3700v2.h | 16 ++ include/dt-bindings/clock/bcm6362-clock.h | 33 ++++ .../power-domain/bcm6362-power-domain.h | 25 +++ include/dt-bindings/reset/bcm6362-reset.h | 28 ++++ 15 files changed, 609 insertions(+) create mode 100644 arch/mips/dts/brcm,bcm6362.dtsi create mode 100644 arch/mips/dts/netgear,dgnd3700v2.dts create mode 100644 board/netgear/dgnd3700v2/Kconfig create mode 100644 board/netgear/dgnd3700v2/MAINTAINERS create mode 100644 board/netgear/dgnd3700v2/Makefile create mode 100644 board/netgear/dgnd3700v2/dgnd3700v2.c create mode 100644 configs/netgear_dgnd3700v2_ram_defconfig create mode 100644 include/configs/bmips_bcm6362.h create mode 100644 include/configs/netgear_dgnd3700v2.h create mode 100644 include/dt-bindings/clock/bcm6362-clock.h create mode 100644 include/dt-bindings/power-domain/bcm6362-power-domain.h create mode 100644 include/dt-bindings/reset/bcm6362-reset.h -- 2.11.0

2 9

[U-Boot] [PATCH v2 0/2] common/memsize.c: restore content of the base address
by Patrick Delaunay 14 Mar '18

14 Mar '18

I detect a issue in get_ram_size() function when maxsize is available; in this case, the base address is not restored. Please, check if these 2 patch don't introduce regression on your board because this code is really sensible. Issue detected on my board (not yet up-streamed) with - DDR base = 0xC0000000 - expected detected size = maxsize = 0x40000000 The loop is completely executed so the size is correctly detected, but content of memory at address 0xC0000000 is not restored: I sill have 0xC0000000 = 0x0 at the end of the function. In the correction (patch 2 of the serie), I restore this content when no error is detected (for the last return). NB: I also add a comment for the previous return to avoid regression for the case size<max_size because for this case, the higher bit of address are not used and the higher addresses are overlapped with the lower addresses (same physical content) => the original data at address 0x0 is already restore because *(base + size) and *base is physically the same physical address = ~(size-1) & logical address => address overlap detected with (val != ~cnt) *base was forced to 0 but content for *(base + size) already restore Test on Sandbox (v2018.01) -------------------------- I test the issue and the correction in sandbox by adding a debug command "test_ram_size" in cmd/mem.c which: 1/ fill memory buffer with random value 2/ use get_ram_size() on this buffer 3/ check buffer content modification static int do_test_ram_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { unsigned int seed = rand(); long *ptr = NULL; long size; unsigned int offset, expec, read; ptr = map_sysmem(MEM_TEST_BASE, MEM_TEST_SIZE); for (offset = 0; offset < MEM_TEST_SIZE / sizeof(long); offset ++) *(ptr + offset) = rand(); size = get_ram_size(ptr, MEM_TEST_SIZE); srand(seed); for (offset = 0; offset < MEM_TEST_SIZE / sizeof(long); offset ++) { expec = rand(); read = *(ptr + offset); if (read != expec) printf(" ERROR: %p <= %lx, %x, expected %x\n", ptr + offset, MEM_TEST_BASE + (offset * sizeof(long)), read, expec); } unmap_sysmem(ptr); printf("get_ram_size(%x,%x)=%lx\n", MEM_TEST_BASE, MEM_TEST_SIZE, size); return 0; } U_BOOT_CMD( test_ram_size, 1, 1, do_test_ram_size, "test memory", "" ); after the first patch: the error is detected at address 0x0, the value become 0x0 => test_ram_size ERROR: 00007f6b0018d008 <= 0, 0, expected 4080601 get_ram_size(0,100000)=100000 => test_ram_size ERROR: 00007f6b0018d008 <= 0, 0, expected 9a61a0f3 get_ram_size(0,100000)=100000 after the second patch, all the memory is correctly restored => test_ram_size get_ram_size(0,100000)=100000 Test on real ARM target ----------------------- My target is a ARMv7 Cortex A7 board not yet upstreamed with DDR. I also use the same test by patching SPL: + initialize the DDR controller + write random content in all the DDR + use get_ram_size(0xC0000000, 0x40000000) on all the possible DDR range + check content of the DDR Test 1, 1GB DDR (2 chipsx16bits => 32 bits access) @ 0xC0000000 => detected size is 0x40000000 (1GB) => test OK memory is restored (but test failed without patch 2) => the memory is correctly restored for last case (size=max_size) Test 2, I change the controller parameter to reduce the used bits for DDR (using one chip => 16 bits access and only 512MB) => detected size is 0x20000000 (overlap detected for 0xE0000000 address: same physical address 0x0 in DDR than 0xC0000000) => test OK memory is restored (test OK with or without patch 2) => the memory is already correctly restored for the overlap case (where I just add comment) Changes in v2: - Split patch in 2 part to more easily understood regression - Solve issue for overlap case: don't restore saved value (invalid) and add comment to avoid to have this issue again Patrick Delaunay (2): common/memsize.c: prepare get_ram_size update common/memsize.c: restore content of the base address common/memsize.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) -- 2.7.4

2 4

[U-Boot] [PATCH] net: sun8i_emac: Fix PHY initialization
by Samuel Holland 13 Mar '18

13 Mar '18

The previous code tried to update the PHY parameters without waiting for autonegotiation to complete. This caused wrong values to be written to the EMAC in sun8i_adjust_link(). As a result, any commands that called eth_start() before autonegotiation completed would find the network nonfunctional. Fix this by using the correct function to start up the PHY. Signed-off-by: Samuel Holland <samuel(a)sholland.org> --- drivers/net/sun8i_emac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 3ccc6b0bb6..be43472b1a 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -431,7 +431,7 @@ static int _sun8i_emac_eth_init(struct emac_eth_dev *priv, u8 *enetaddr) tx_descs_init(priv); /* PHY Start Up */ - genphy_parse_link(priv->phydev); + phy_startup(priv->phydev); sun8i_adjust_link(priv, priv->phydev); -- 2.13.6

3 2

[U-Boot] [RFC 1/1] dm: video: tegra124: incorrect logical condition
by Heinrich Schuchardt 07 Mar '18

07 Mar '18

2 << 24 | A is always true. To use check against a bitmask we need &. Identified with cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- I do not have the hardware available. But the current coding is fishy. Please, clarify what should be coded here. --- drivers/video/tegra124/sor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/tegra124/sor.c b/drivers/video/tegra124/sor.c index 700ab25d46..4b3381fae2 100644 --- a/drivers/video/tegra124/sor.c +++ b/drivers/video/tegra124/sor.c @@ -669,7 +669,7 @@ static void tegra_dc_sor_config_panel(struct tegra_dc_sor_data *sor, tegra_sor_write_field(sor, CSTM, CSTM_ROTCLK_DEFAULT_MASK | CSTM_LVDS_EN_ENABLE, - 2 << CSTM_ROTCLK_SHIFT | + 2 << CSTM_ROTCLK_SHIFT & is_lvds ? CSTM_LVDS_EN_ENABLE : CSTM_LVDS_EN_DISABLE); -- 2.15.1

2 2

[U-Boot] [PATCH v10 00/27] dm: Generic MTD Subsystem, with SPI-NOR interface
by Jagan Teki 06 Mar '18

06 Mar '18

Compared to previous series’s [1], [2], [3] and [4] this patch set redefined most of the implementation suitable to fit into existing driver-model. MTD is generic subsystem for underlying flash devices like nand, parallel nor, spinor, dataflash etc. So to drive this theory with driver model(with an example of block layer) mtd is common device interaction for most of memory technology flashes like nand, parallel nor, spinor, dataflash etc, these are treated as interface types wrt u-boot driver model. Once the respective interface driver bind happen, the uclass driver will pass an 'interface type' to mtd layer to create device for it, for example once spinor ULASS_SPI_NOR driver bind happen, the uclass driver of spinor will pass MTD_IF_TYPE_SPI_NOR interface type to create mtd device for spinor devices. SPI-NOR: ======= Some of the SPI device drivers at drivers/spi not a real spi controllers, Unlike normal/generic SPI controllers they operates only with SPI-NOR flash devices. these were technically termed as SPI-NOR controllers, Ex: drivers/spi/fsl_qspi.c The problem with these were resides at drivers/spi is entire SPI layer becomes SPI-NOR flash oriented which is absolutely a wrong indication where SPI layer getting effected more with flash operations - So this SPI-NOR core will resolve this issue by separating all SPI-NOR flash operations from spi layer and creats a generic layer called SPI-NOR core which can be used to interact SPI-NOR to SPI driver interface layer and the SPI-NOR controller driver. ======================================= cmd/spinor.c ======================================= mtd-uclass.c ======================================= spi-nor-uclass.c ======================================= spi-nor.c ======================================= m25p80.c zynq_qspinor.c ======================================= spi-uclass.c ======================================= zynq_qspi.c ======================================= #####SPI NOR chip###### ======================================= Changes for v10: - Update Simon's R-B tag - Add mtd dm test case - implemented entire code wrt MTD, with interface type code size: ========== before: $ arm-linux-gnueabi-size u-boot text data bss dec hex filename 473712 15152 222568 711432 adb08 u-boot $ du -hs u-boot-dtb.img 488K u-boot-dtb.img after: $ arm-linux-gnueabi-size u-boot text data bss dec hex filename 470124 14352 222584 707060 ac9f4 u-boot $ du -hs u-boot-dtb.img 484K u-boot-dtb.img approximately 4KiB but DM_SPI_FLASH still there which can be removed once support added in SPL test log: ======== Zynq> spinor spinor - SPI-NOR Sub-system Usage: spinor list - show list of spinor devices spinor info - show current spinor device info spinor dev [devnum] - show or set current spinor device spinor erase offset len - erase 'len' bytes from 'offset' spinor write addr to len - write 'len' bytes to 'to' from 'addr' spinor read addr from len - read 'len' bytes from 'from' to 'addr' spinor protect lock/unlock sector len - protect/unprotect 'len' bytes starting at address 'sector' Zynq> spinor list flash@0: 0 spi-nor@e000d000: 1 Zynq> spinor dev 0 switch to dev #0, OK spinor0 is current device Zynq> spinor info bus: flash@0: 0 device: s25fl128s_64k page size: 256 B erase size: 64 KiB size: 16 MiB Zynq> spinor erase 0xE00000 0x100000 SPI-NOR: 1048576 bytes @ 0xe00000 Erased: OK Zynq> mw.b 0x100 0xcc 0x100000 Zynq> spinor write 0x100 0xE00000 0x100000 device 0 offset 0xe00000, size 0x100000 SPI-NOR: 1048576 bytes @ 0xe00000 Written: OK Zynq> spinor read 0x3000000 0xE00000 0x100000 device 0 offset 0xe00000, size 0x100000 SPI-NOR: 1048576 bytes @ 0xe00000 Read: OK Zynq> cmp.b 0x3000000 0x100 0x100000 Total of 1048576 byte(s) were the same Zynq> spinor dev 1 switch to dev #1, OK spinor1 is current device Zynq> spinor info bus: spi-nor@e000d000: 1 device: s25fl128s_64k page size: 256 B erase size: 64 KiB size: 16 MiB Zynq> spinor erase 0xE00000 0x100000 SPI-NOR: 1048576 bytes @ 0xe00000 Erased: OK Zynq> mw.b 0x100 0xbb 0x100000 Zynq> spinor write 0x100 0xE00000 0x100000 device 0 offset 0xe00000, size 0x100000 SPI-NOR: 1048576 bytes @ 0xe00000 Written: OK Zynq> spinor read 0x3000000 0xE00000 0x100000 device 0 offset 0xe00000, size 0x100000 SPI-NOR: 1048576 bytes @ 0xe00000 Read: OK Zynq> cmp.b 0x3000000 0x100 0x100000 Total of 1048576 byte(s) were the same WIP: === - to support non-dm code - to support spinor SPL Repo: ==== $ git clone git://git.denx.de/u-boot-spi.git $ cd u-boot-spi $ git checkout -b mtd-spinor-working origin/mtd-spinor-working [1] https://lists.denx.de/pipermail/u-boot/2016-October/271459.html [2] http://lists.denx.de/pipermail/u-boot/2016-March/249286.html [3] http://lists.denx.de/pipermail/u-boot/2016-February/245418.html [4] [PATCH RFC v8 00/16] SPI-NOR/MTD addition Jagan Teki (27): mtd: Add mtd core ops mtd: add mtd device create operations mtd: add SPI-NOR core support mtd: spi-nor: sync/modify sst write operations mtd: spi-nor: sync/modify lock operations mtd: spi-nor: Kconfig: Add MTD_SPI_NOR entry mtd: spi-nor: Kconfig: Add MTD_SPI_NOR_USE_4K_SECTORS mtd: spi-nor: Kconfig: Add SPI_NOR_MISC entry mtd: spi-nor: Kconfig: Add SPI_NOR_MACRONIX entry mtd: spi-nor: Kconfig: Add SPI_NOR_SPANSION entry mtd: spi-nor: Kconfig: Add SPI_NOR_STMICRO entry mtd: spi-nor: Kconfig: Add SPI_NOR_SST entry mtd: spi-nor: Kconfig: Add SPI_NOR_WINBOND entry mtd-uclass: use platdata_auto_alloc spi: Add spi_write_then_read mtd: spi-nor: Add m25p80 driver mtd: spi-nor: Kconfig: Add MTD_M25P80 entry mtd: spi-nor: Add zynq qspinor driver mtd: spi-nor: zynq_qspi: Kconfig: Add MTD_ZYNQ mtd: spi-nor: Add 4-byte addresswidth support cmd: add spinor cmd support cmd: spinor: sync/update protect command board_r: initialize spi_nor env: add spi-nor environment arm: dts: zynq: Add zynq-qspinor node dm: zynq: microzed: enable MTD/SPI-NOR framework test: dm: add tests for mtd devices Makefile | 1 + arch/arm/dts/zynq-7000.dtsi | 12 + arch/arm/dts/zynq-microzed.dts | 12 +- cmd/Kconfig | 5 + cmd/Makefile | 1 + cmd/nvedit.c | 1 + cmd/spinor.c | 326 ++++++++++++ common/board_r.c | 13 + configs/sandbox_defconfig | 8 +- configs/zynq_microzed_defconfig | 17 +- drivers/mtd/Kconfig | 2 + drivers/mtd/Makefile | 7 +- drivers/mtd/mtd-uclass.c | 203 +++++++- drivers/mtd/spi-nor/Kconfig | 89 ++++ drivers/mtd/spi-nor/Makefile | 15 + drivers/mtd/spi-nor/m25p80.c | 251 ++++++++++ drivers/mtd/spi-nor/spi-nor-ids.c | 184 +++++++ drivers/mtd/spi-nor/spi-nor-uclass.c | 160 ++++++ drivers/mtd/spi-nor/spi-nor.c | 940 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/zynq_qspinor.c | 622 +++++++++++++++++++++++ drivers/spi/spi-uclass.c | 24 + env/Kconfig | 27 + env/Makefile | 1 + env/env.c | 2 + env/spinor.c | 113 +++++ include/dm/uclass-id.h | 1 + include/environment.h | 1 + include/linux/mtd/mtd.h | 14 + include/linux/mtd/spi-nor.h | 223 +++++++++ include/mtd.h | 176 +++++++ include/spi.h | 20 + test/dm/Makefile | 1 + test/dm/mtd.c | 33 ++ 33 files changed, 3493 insertions(+), 12 deletions(-) create mode 100644 cmd/spinor.c create mode 100644 drivers/mtd/spi-nor/Kconfig create mode 100644 drivers/mtd/spi-nor/Makefile create mode 100644 drivers/mtd/spi-nor/m25p80.c create mode 100644 drivers/mtd/spi-nor/spi-nor-ids.c create mode 100644 drivers/mtd/spi-nor/spi-nor-uclass.c create mode 100644 drivers/mtd/spi-nor/spi-nor.c create mode 100644 drivers/mtd/spi-nor/zynq_qspinor.c create mode 100644 env/spinor.c create mode 100644 include/linux/mtd/spi-nor.h create mode 100644 test/dm/mtd.c -- 2.7.4

10 54

[U-Boot] [RESEND PATCH v2 1/7] net: tsec: Fix style violations
by Mario Six 05 Mar '18

05 Mar '18

Signed-off-by: Mario Six <mario.six(a)gdsys.cc> Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> --- v1 -> v2: None --- drivers/net/tsec.c | 72 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 18e7a83d0f..071595218e 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -74,11 +74,11 @@ static void tsec_configure_serdes(struct tsec_private *priv) * to the register offset used for external PHY accesses */ tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_ANA, TBIANA_SETTINGS); + 0, TBI_ANA, TBIANA_SETTINGS); tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_TBICON, TBICON_CLK_SELECT); + 0, TBI_TBICON, TBICON_CLK_SELECT); tsec_local_mdio_write(priv->phyregs_sgmii, in_be32(&priv->regs->tbipa), - 0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS); + 0, TBI_CR, CONFIG_TSEC_TBICR_SETTINGS); } #ifdef CONFIG_MCAST_TFTP @@ -116,7 +116,7 @@ static int tsec_mcast_addr(struct udevice *dev, const u8 *mcast_mac, int set) whichbit = (result >> 24) & 0x1f; /* the 5 LSB = which bit to set */ whichreg = result >> 29; /* the 3 MSB = which reg to set it in */ - value = 1 << (31-whichbit); + value = BIT(31 - whichbit); if (set) setbits_be32(&regs->hash.gaddr0 + whichreg, value); @@ -171,7 +171,6 @@ static void init_registers(struct tsec __iomem *regs) out_be32(&regs->attr, ATTR_INIT_SETTINGS); out_be32(&regs->attreli, ATTRELI_INIT_SETTINGS); - } /* @@ -222,8 +221,8 @@ static void adjust_link(struct tsec_private *priv, struct phy_device *phydev) out_be32(&regs->maccfg2, maccfg2); printf("Speed: %d, %s duplex%s\n", phydev->speed, - (phydev->duplex) ? "full" : "half", - (phydev->port == PORT_FIBRE) ? ", fiber mode" : ""); + (phydev->duplex) ? "full" : "half", + (phydev->port == PORT_FIBRE) ? ", fiber mode" : ""); } /* @@ -240,7 +239,7 @@ static int tsec_send(struct udevice *dev, void *packet, int length) { struct tsec_private *priv = (struct tsec_private *)dev->priv; struct tsec __iomem *regs = priv->regs; - uint16_t status; + u16 status; int result = 0; int i; @@ -287,7 +286,7 @@ static int tsec_recv(struct eth_device *dev) while (!(in_be16(&priv->rxbd[priv->rx_idx].status) & RXBD_EMPTY)) { int length = in_be16(&priv->rxbd[priv->rx_idx].length); - uint16_t status = in_be16(&priv->rxbd[priv->rx_idx].status); + u16 status = in_be16(&priv->rxbd[priv->rx_idx].status); uchar *packet = net_rx_packets[priv->rx_idx]; /* Send the packet up if there were no errors */ @@ -323,8 +322,8 @@ static int tsec_recv(struct udevice *dev, int flags, uchar **packetp) if (!(in_be16(&priv->rxbd[priv->rx_idx].status) & RXBD_EMPTY)) { int length = in_be16(&priv->rxbd[priv->rx_idx].length); - uint16_t status = in_be16(&priv->rxbd[priv->rx_idx].status); - uint32_t buf; + u16 status = in_be16(&priv->rxbd[priv->rx_idx].status); + u32 buf; /* Send the packet up if there were no errors */ if (!(status & RXBD_STATS)) { @@ -347,7 +346,7 @@ static int tsec_recv(struct udevice *dev, int flags, uchar **packetp) static int tsec_free_pkt(struct udevice *dev, uchar *packet, int length) { struct tsec_private *priv = (struct tsec_private *)dev->priv; - uint16_t status; + u16 status; out_be16(&priv->rxbd[priv->rx_idx].length, 0); @@ -427,7 +426,8 @@ void redundant_init(struct tsec_private *priv) clrbits_be32(&regs->dmactrl, DMACTRL_GRS | DMACTRL_GTS); do { - uint16_t status; + u16 status; + tsec_send(priv->dev, (void *)pkt, sizeof(pkt)); /* Wait for buffer to be received */ @@ -478,7 +478,7 @@ void redundant_init(struct tsec_private *priv) static void startup_tsec(struct tsec_private *priv) { struct tsec __iomem *regs = priv->regs; - uint16_t status; + u16 status; int i; /* reset the indices to zero */ @@ -532,7 +532,7 @@ static void startup_tsec(struct tsec_private *priv) * This allows U-Boot to find the first active controller. */ #ifndef CONFIG_DM_ETH -static int tsec_init(struct eth_device *dev, bd_t * bd) +static int tsec_init(struct eth_device *dev, bd_t *bd) #else static int tsec_init(struct udevice *dev) #endif @@ -616,22 +616,23 @@ static phy_interface_t tsec_get_interface(struct tsec_private *priv) } if (ecntrl & ECNTRL_REDUCED_MODE) { + phy_interface_t interface; + if (ecntrl & ECNTRL_REDUCED_MII_MODE) return PHY_INTERFACE_MODE_RMII; - else { - phy_interface_t interface = priv->interface; - - /* - * This isn't autodetected, so it must - * be set by the platform code. - */ - if ((interface == PHY_INTERFACE_MODE_RGMII_ID) || - (interface == PHY_INTERFACE_MODE_RGMII_TXID) || - (interface == PHY_INTERFACE_MODE_RGMII_RXID)) - return interface; - - return PHY_INTERFACE_MODE_RGMII; - } + + interface = priv->interface; + + /* + * This isn't autodetected, so it must + * be set by the platform code. + */ + if (interface == PHY_INTERFACE_MODE_RGMII_ID || + interface == PHY_INTERFACE_MODE_RGMII_TXID || + interface == PHY_INTERFACE_MODE_RGMII_RXID) + return interface; + + return PHY_INTERFACE_MODE_RGMII; } if (priv->flags & TSEC_GIGABIT) @@ -691,16 +692,16 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) int i; struct tsec_private *priv; - dev = (struct eth_device *)malloc(sizeof *dev); + dev = (struct eth_device *)malloc(sizeof(*dev)); - if (NULL == dev) + if (!dev) return 0; - memset(dev, 0, sizeof *dev); + memset(dev, 0, sizeof(*dev)); priv = (struct tsec_private *)malloc(sizeof(*priv)); - if (NULL == priv) + if (!priv) return 0; priv->regs = tsec_info->regs; @@ -747,10 +748,11 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info) int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num) { int i; - int ret, count = 0; + int count = 0; for (i = 0; i < num; i++) { - ret = tsec_initialize(bis, &tsecs[i]); + int ret = tsec_initialize(bis, &tsecs[i]); + if (ret > 0) count += ret; } -- 2.11.0

2 14

[U-Boot] [Patch] for drivers/net/phy/smsc.c to support SMSC LAN8741
by Arno Steffens 05 Mar '18

05 Mar '18

Hello, Be mild with me - my first patch to u-boot. Signed-off-by: Arno Steffens <star {at} gmx [dot] li> diff -Nur u-boot-2017.11/drivers/net/phy/smsc.c u-boot-2017.11_patched/drivers/net/phy/smsc.c --- u-boot-2017.11/drivers/net/phy/smsc.c 2017-11-14 02:08:06.000000000 +0100 +++ u-boot-2017.11_patched/drivers/net/phy/smsc.c 2018-01-24 12:17:39.326055469 +0100 @@ -83,6 +83,16 @@ .shutdown = &genphy_shutdown, }; +static struct phy_driver lan8741_driver = { + .name = "SMSC LAN8741", + .uid = 0x0007c120, + .mask = 0xffff0, + .features = PHY_BASIC_FEATURES, + .config = &genphy_config_aneg, + .startup = &genphy_startup, + .shutdown = &genphy_shutdown, +}; + static struct phy_driver lan8742_driver = { .name = "SMSC LAN8742", .uid = 0x0007c130, @@ -99,6 +109,7 @@ phy_register(&lan911x_driver); phy_register(&lan8700_driver); phy_register(&lan8740_driver); + phy_register(&lan8741_driver); phy_register(&lan8742_driver); return 0;

2 3

[U-Boot] [PATCH v1 0/6] Add support for DM_USB for TI's DRA7 platforms
by Jean-Jacques Hiblot 05 Mar '18

05 Mar '18

Supporting DM USB is required to support DM_ETH and USB network adapters with the same binary. This series adds support for DM_USB for the DRA7 family. It leverages the work done for the STi family. limitations: - only USB2 Host is supported. USB2 Device can be added later. - only DRA7 platforms, though it could be extended to other TI SOCs Jean-Jacques Hiblot (6): board: ti: dra7xx-evm: turn on USB clocks in late init stage syscon: dm: Add a new method to get a regmap from DTS phy: Add a new driver for OMAP's USB2 PHYs usb: omap5: Add glue logic to support DM for USB host configs: enable DM_USB for all the platforms of the DRA7 family dts: dra7x: enable host on USB2 for all the platforms of the DRA7 family arch/arm/dts/dra7-evm-common.dtsi | 7 ++ arch/arm/dts/dra72-evm-common.dtsi | 4 + arch/arm/dts/omap5-u-boot.dtsi | 4 + board/ti/dra7xx/evm.c | 19 ++++ configs/dra7xx_evm_defconfig | 2 + configs/dra7xx_hs_evm_defconfig | 2 + drivers/core/syscon-uclass.c | 23 +++++ drivers/phy/Kconfig | 8 ++ drivers/phy/Makefile | 2 + drivers/phy/omap-usb2-phy.c | 186 +++++++++++++++++++++++++++++++++++++ drivers/usb/host/Kconfig | 10 ++ drivers/usb/host/Makefile | 1 + drivers/usb/host/dwc3-omap-glue.c | 47 ++++++++++ include/syscon.h | 13 +++ 14 files changed, 328 insertions(+) create mode 100644 drivers/phy/omap-usb2-phy.c create mode 100644 drivers/usb/host/dwc3-omap-glue.c -- 1.9.1

3 11

[U-Boot] [PATCH] cmd: nvedit: add whitelist option for env import
by Quentin Schulz 02 Mar '18

02 Mar '18

While the `env export` can take as parameters variables to be exported, `env import` does not have such a mechanism of variable selection. Let's add a `-w` option that asks `env import` to look for the `whitelisted_vars` env variable for a space-separated list of variables that are whitelisted. Every env variable present in env at `addr` and in `whitelisted_vars` env variable will override the value of the variable in the current env. All the remaining variables are left untouched. One of its use case could be to load a secure environment from the signed U-Boot binary and load only a handful of variables from an other, unsecure, environment without completely losing control of U-Boot. Signed-off-by: Quentin Schulz <quentin.schulz(a)free-electrons.com> --- cmd/nvedit.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 7 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 4e79d03856..9f983b41a1 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -971,7 +971,7 @@ sep_err: #ifdef CONFIG_CMD_IMPORTENV /* - * env import [-d] [-t [-r] | -b | -c] addr [size] + * env import [-d] [-t [-r] | -b | -c] [-w] addr [size] * -d: delete existing environment before importing; * otherwise overwrite / append to existing definitions * -t: assume text format; either "size" must be given or the @@ -982,6 +982,10 @@ sep_err: * for line endings. Only effective in addition to -t. * -b: assume binary format ('\0' separated, "\0\0" terminated) * -c: assume checksum protected environment format + * -w: specify that whitelisting of variables should be used when + * importing environment. The space-separated list of variables + * that should override the ones in current environment is stored + * in `whitelisted_vars`. * addr: memory address to read from * size: length of input data; if missing, proper '\0' * termination is mandatory @@ -991,11 +995,16 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, { ulong addr; char *cmd, *ptr; + char **array = NULL; char sep = '\n'; int chk = 0; int fmt = 0; int del = 0; int crlf_is_lf = 0; + int wl = 0; + int wl_count = 0; + int ret; + unsigned int i; size_t size; cmd = *argv; @@ -1026,6 +1035,9 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, case 'd': del = 1; break; + case 'w': + wl = 1; + break; default: return CMD_RET_USAGE; } @@ -1082,14 +1094,59 @@ static int do_env_import(cmd_tbl_t *cmdtp, int flag, ptr = (char *)ep->data; } - if (himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR, - crlf_is_lf, 0, NULL) == 0) { + if(wl) { + char *str, *token, *tmp; + wl_count = 1; + + str = env_get("whitelisted_vars"); + if (!str) { + puts("## Error: whitelisted_vars is not set.\n"); + return CMD_RET_USAGE; + } + + tmp = malloc(sizeof(char) * (strlen(str) + 1)); + strcpy(tmp, str); + + token = strchr(tmp, ' '); + while (!token) { + wl_count++; + token = strchr(token + 1, ' '); + } + + strcpy(tmp, str); + + array = malloc(sizeof(char *) * wl_count); + wl_count = 0; + + token = strtok(tmp, " "); + while (token) { + array[wl_count] = malloc(sizeof(char) * + (strlen(token) + 1)); + strcpy(array[wl_count], token); + wl_count++; + token = strtok(NULL, " "); + } + + free(tmp); + } + + ret = himport_r(&env_htab, ptr, size, sep, del ? 0 : H_NOCLEAR, + crlf_is_lf, wl ? wl_count : 0, wl ? array : NULL); + if (!ret) { pr_err("Environment import failed: errno = %d\n", errno); - return 1; + ret = 1; + } else { + gd->flags |= GD_FLG_ENV_READY; + ret = 0; } - gd->flags |= GD_FLG_ENV_READY; - return 0; + if (wl) { + for (i = 0; i < wl_count; i++) + free(array[i]); + free(array); + } + + return ret; sep_err: printf("## %s: only one of \"-b\", \"-c\" or \"-t\" allowed\n", @@ -1212,7 +1269,7 @@ static char env_help_text[] = #endif #endif #if defined(CONFIG_CMD_IMPORTENV) - "env import [-d] [-t [-r] | -b | -c] addr [size] - import environment\n" + "env import [-d] [-t [-r] | -b | -c] [-w] addr [size] - import environment\n" #endif "env print [-a | name ...] - print environment\n" #if defined(CONFIG_CMD_RUN) -- 2.14.1

2 1

[U-Boot] [PATCH 1/3] fsl/pci: fix leading whitespace of PCI_LTSSM_L0
by Bao Xiaowei 27 Feb '18

27 Feb '18

Fix the whitespace of PCI_LTSSM_L0 in fsl_pci.h Signed-off-by: Bao Xiaowei <xiaowei.bao(a)nxp.com> --- arch/powerpc/include/asm/fsl_pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/fsl_pci.h b/arch/powerpc/include/asm/fsl_pci.h index cad341e72c..970f3a48d5 100644 --- a/arch/powerpc/include/asm/fsl_pci.h +++ b/arch/powerpc/include/asm/fsl_pci.h @@ -23,7 +23,7 @@ #define FSL_PROG_IF_AGENT 0x1 #define PCI_LTSSM 0x404 /* PCIe Link Training, Status State Machine */ -#define PCI_LTSSM_L0 0x16 /* L0 state */ +#define PCI_LTSSM_L0 0x16 /* L0 state */ int fsl_setup_hose(struct pci_controller *hose, unsigned long addr); int fsl_is_pci_agent(struct pci_controller *hose); -- 2.14.1

4 10