July 2018 - U-Boot

[U-Boot] [PATCH v2 0/2] avb2.0: fix multiple compilation issues in sandbox
by Igor Opaniuk 26 Jul '18

26 Jul '18

This series of two patches fixes compilation issues when AVB 2.0 is enabled for the 'sandbox' architecture: 1. Since libavb library alone is highly portable, it introduce dedicated Kconfig symbol for AVB compiler-dependent operations, so it's possible to build libavb separately. 2. Add CONFIG_FASTBOOT dependency, as fastboot buffer is re-used in partition verification operations. 3. Use blk_dread()/blk_dwrite() in mmc_read()/mmc_write() AVB operation implementations. This fixes compilation issues when CONFIG_BLK is enabled. Changes for v2: - Updated eb81cae89f ("avb2.0: add proper dependencies") commit message (added more details). - Extended description of AVB_VERIFY Kconfig symbol. - Replaced CONFIG_LIBAVB to CONFIG_AVB_VERIFY in common/Makefile. Igor Opaniuk (2): avb2.0: add proper dependencies avb2.0: use block API in AVB ops cmd/Kconfig | 2 +- common/Kconfig | 10 ++++++++++ common/Makefile | 2 +- common/avb_verify.c | 9 +++++---- doc/README.avb2 | 1 + 5 files changed, 18 insertions(+), 6 deletions(-) -- 2.7.4

3 6

[U-Boot] [PATCH] mtdparts: fixed buffer overflow bug
by Kay Potthoff 26 Jul '18

26 Jul '18

In the case that there was no name defined for a partition the code assumes that name_len is 22 and therefore allocates exactly that space for a dummy name. But the function sprintf() first resolves "0x%08llx@0x%08llx" to a string that is longer than 22 bytes. This leads to a buffer overflow. The replacement function snprintf() limits the copied bytes to name_len and therefore avoids the buffer overflow. Signed-off-by: Kay Potthoff <Kay.Potthoff(a)microsys.de> --- cmd/mtdparts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/mtdparts.c b/cmd/mtdparts.c index 9bc977450cf8..d0cda1bea400 100644 --- a/cmd/mtdparts.c +++ b/cmd/mtdparts.c @@ -691,7 +691,7 @@ static int part_parse(const char *const partdef, const char **ret, struct part_i part->auto_name = 0; } else { /* auto generated name in form of size@offset */ - sprintf(part->name, "0x%08llx@0x%08llx", size, offset); + snprintf(part->name, name_len, "0x%08llx@0x%08llx", size, offset); part->auto_name = 1; } -- 2.17.0

2 1

[U-Boot] [PATCH] board: STiH410-B2260: Set SYS_BOOTM_LEN to 16M
by Patrice Chotard 26 Jul '18

26 Jul '18

With recent kernel v4.18-rcx, uImage becomes bigger than 8MB. Set SYS_BOOTM_LEN to 16MB, this fix the following error message: "Fix Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN" Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- include/configs/stih410-b2260.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index d8bf3b6580e3..9ce31f446311 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -7,6 +7,8 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include <linux/sizes.h> + /* ram memory-related information */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM_1 0x40000000 @@ -19,6 +21,7 @@ /* Environment */ #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR +#define CONFIG_SYS_BOOTM_LEN SZ_16M #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ -- 1.9.1

2 1

[U-Boot] [PATCH] mtd: remove stale comment in mtd_oob_ops structure
by Miquel Raynal 26 Jul '18

26 Jul '18

A comment in the kernel doc of the mtd_oob_ops structure tells that it is not possible to write more than one page with OOB. This was probably true at some time in the past but today it is entirely wrong. As one can see for instance in the nand_do_write_ops() helper available in the NAND core, this implementation called by mtd->_write_oob() simply loops over the pages until everything has been written. Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- include/linux/mtd/mtd.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 0c41140465..823e535b82 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -75,10 +75,6 @@ struct mtd_erase_region_info { * mode = MTD_OPS_PLACE_OOB or MTD_OPS_RAW) * @datbuf: data buffer - if NULL only oob data are read/written * @oobbuf: oob data buffer - * - * Note, it is allowed to read more than one OOB area at one go, but not write. - * The interface assumes that the OOB write requests program only one page's - * OOB area. */ struct mtd_oob_ops { unsigned int mode; -- 2.14.1

2 1

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 26 Jul '18

26 Jul '18

The following changes since commit 323a73adc9a1bf2de43fe03bdd9c3038ce7c2784: mtd: nand: add new enum for storing ECC algorithm (2018-07-23 14:33:21 -0400) are available in the Git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to 64eeb1585428b71e29022e22d1aae86b65b9e052: ARM: dts: socfpga: Adjust NAND register layout on Arria10 (2018-07-25 00:13:32 +0200) ---------------------------------------------------------------- Ley Foon Tan (1): arm: socfpga: Fixes: Rename CONFIG_SPL_RESET_SUPPORT to CONFIG_SPL_DM_RESET Marek Vasut (3): ARM: socfpga: Assure correct CPACR configuration ARM: socfpga: Init missing security policies on A10 ARM: dts: socfpga: Adjust NAND register layout on Arria10 arch/arm/Kconfig | 2 +- arch/arm/dts/socfpga_arria10.dtsi | 4 ++-- arch/arm/mach-socfpga/board.c | 4 +++- arch/arm/mach-socfpga/misc_arria10.c | 13 +++++++++++++ 4 files changed, 19 insertions(+), 4 deletions(-)

2 1

[U-Boot] [PULL] u-boot-sh/master
by Marek Vasut 26 Jul '18

26 Jul '18

The following changes since commit 323a73adc9a1bf2de43fe03bdd9c3038ce7c2784: mtd: nand: add new enum for storing ECC algorithm (2018-07-23 14:33:21 -0400) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to a6759e3dfca217ba8cc518edcd4972671a97109a: ARM: rmobile: gen2: Enable ACTLR[0] (Enable invalidates of BTB) to facilitate CVE_2017-5715 WA in OS (2018-07-25 00:14:19 +0200) ---------------------------------------------------------------- Marek Vasut (1): ARM: rmobile: gen2: Enable ACTLR[0] (Enable invalidates of BTB) to facilitate CVE_2017-5715 WA in OS arch/arm/mach-rmobile/Kconfig.32 | 4 ++++ 1 file changed, 4 insertions(+)

2 1

[U-Boot] [PATCH 1/2] Revert "tegra: Introduce SRAM repair on tegra124"
by Stephen Warren 26 Jul '18

26 Jul '18

From: Stephen Warren <swarren(a)nvidia.com> This reverts commit 701b7b1d2cf657d435d2bd6caf43d0247d37220d. It will be immediately replaced by a different implementation that is more complete and runs are more targetted times. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- arch/arm/include/asm/arch-tegra124/flow.h | 12 ------------ arch/arm/mach-tegra/powergate.c | 20 +------------------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/arch/arm/include/asm/arch-tegra124/flow.h b/arch/arm/include/asm/arch-tegra124/flow.h index a54425692b57..2b330dc9e1dd 100644 --- a/arch/arm/include/asm/arch-tegra124/flow.h +++ b/arch/arm/include/asm/arch-tegra124/flow.h @@ -25,12 +25,6 @@ struct flow_ctlr { u32 cpu_pwr_csr; /* offset 0x38 */ u32 mpid; /* offset 0x3c */ u32 ram_repair; /* offset 0x40 */ - u32 flow_dbg_sel; /* offset 0x44 */ - u32 flow_dbg_cnt0; /* offset 0x48 */ - u32 flow_dbg_cnt1; /* offset 0x4c */ - u32 flow_dbg_qual; /* offset 0x50 */ - u32 flow_ctlr_spare; /* offset 0x54 */ - u32 ram_repair_cluster1;/* offset 0x58 */ }; /* HALT_COP_EVENTS_0, 0x04 */ @@ -48,10 +42,4 @@ struct flow_ctlr { #define CSR_WAIT_WFI_SHIFT 8 #define CSR_PWR_OFF_STS (1 << 16) -/* RAM_REPAIR, 0x40, 0x58 */ -enum { - RAM_REPAIR_REQ = 0x1 << 0, - RAM_REPAIR_STS = 0x1 << 1, -}; - #endif /* _TEGRA124_FLOW_H_ */ diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index d32d559f13ad..e45f0961b242 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c @@ -8,7 +8,7 @@ #include <asm/io.h> #include <asm/types.h> -#include <asm/arch/flow.h> + #include <asm/arch/powergate.h> #include <asm/arch/tegra.h> @@ -74,29 +74,11 @@ static int tegra_powergate_remove_clamping(enum tegra_powergate id) return 0; } -static void tegra_powergate_ram_repair(void) -{ -#ifdef CONFIG_TEGRA124 - struct flow_ctlr *flow = (struct flow_ctlr *)NV_PA_FLOW_BASE; - - /* Request RAM repair for cluster 0 and wait until complete */ - setbits_le32(&flow->ram_repair, RAM_REPAIR_REQ); - while (!(readl(&flow->ram_repair) & RAM_REPAIR_STS)) - ; - - /* Same for cluster 1 */ - setbits_le32(&flow->ram_repair_cluster1, RAM_REPAIR_REQ); - while (!(readl(&flow->ram_repair_cluster1) & RAM_REPAIR_STS)) - ; -#endif -} - int tegra_powergate_sequence_power_up(enum tegra_powergate id, enum periph_id periph) { int err; - tegra_powergate_ram_repair(); reset_set_enable(periph, 1); err = tegra_powergate_power_on(id); -- 2.17.1

2 3

[U-Boot] [UBOOT PATCH v2] net: zynq_gem: convert to use livetree
by Siva Durga Prasad Paladugu 26 Jul '18

26 Jul '18

This patch updates the zynq gem driver to support livetree. Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> --- Changes for v2: - Note that this patch is based on below two series. https://patchwork.ozlabs.org/cover/936370/ and https://patchwork.ozlabs.org/cover/936380/ --- drivers/net/zynq_gem.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 0f56cda..68d1c2f 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -178,7 +178,7 @@ struct zynq_gem_priv { struct zynq_gem_regs *iobase; phy_interface_t interface; struct phy_device *phydev; - int phy_of_handle; + ofnode phy_of_node; struct mii_dev *bus; struct clk clk; u32 max_speed; @@ -348,9 +348,7 @@ static int zynq_phy_init(struct udevice *dev) } priv->phydev->advertising = priv->phydev->supported; - - if (priv->phy_of_handle > 0) - priv->phydev->node = offset_to_ofnode(priv->phy_of_handle); + priv->phydev->node = priv->phy_of_node; return phy_config(priv->phydev); } @@ -693,21 +691,23 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) { struct eth_pdata *pdata = dev_get_platdata(dev); struct zynq_gem_priv *priv = dev_get_priv(dev); - int node = dev_of_offset(dev); + struct ofnode_phandle_args phandle_args; const char *phy_mode; - pdata->iobase = (phys_addr_t)devfdt_get_addr(dev); + pdata->iobase = (phys_addr_t)dev_read_addr(dev); priv->iobase = (struct zynq_gem_regs *)pdata->iobase; /* Hardcode for now */ priv->phyaddr = -1; - priv->phy_of_handle = fdtdec_lookup_phandle(gd->fdt_blob, node, - "phy-handle"); - if (priv->phy_of_handle > 0) - priv->phyaddr = fdtdec_get_int(gd->fdt_blob, - priv->phy_of_handle, "reg", -1); + if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, + &phandle_args)) { + debug("phy-handle does not exist %s\n", dev->name); + return -ENOENT; + } - phy_mode = fdt_getprop(gd->fdt_blob, node, "phy-mode", NULL); + priv->phyaddr = ofnode_read_u32_default(phandle_args.node, "reg", -1); + priv->phy_of_node = phandle_args.node; + phy_mode = dev_read_prop(dev, "phy-mode", NULL); if (phy_mode) pdata->phy_interface = phy_get_interface_by_name(phy_mode); if (pdata->phy_interface == -1) { @@ -716,10 +716,8 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev) } priv->interface = pdata->phy_interface; - priv->max_speed = fdtdec_get_uint(gd->fdt_blob, priv->phy_of_handle, - "max-speed", SPEED_1000); - priv->int_pcs = fdtdec_get_bool(gd->fdt_blob, node, - "is-internal-pcspma"); + priv->max_speed = dev_read_u32_default(dev, "max-speed", SPEED_1000); + priv->int_pcs = dev_read_bool(dev, "is-internal-pcspma"); printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase, priv->phyaddr, phy_string_for_interface(priv->interface)); -- 2.7.4

4 6

[U-Boot] [PATCH v2 0/5] net: phy: prevent uclass_eth device "node" field overwriting
by Grygorii Strashko 26 Jul '18

26 Jul '18

This series prevents the UCLASS_ETH device "node" field overwriting by some network drivers when Ethernet PHYs are linked to UCLASS_ETH device using "phy-handle" DT property and when Ethernet PHY driver needs to read some additional information from DT (like dp83867). It fixes following cases: - network drivers priv->phydev = phy_connect(priv->bus, priv->phyaddr, dev, priv->interface); <-- phydev is connected to dev which is UCLASS_ETH device if (priv->phy_of_handle > 0) dev_set_of_offset(priv->phydev->dev, priv->phy_of_handle); <-- phydev->dev->node is overwritten by phy-handle DT node - PHY driver in .config() callback int node = dev_of_offset(dev); <-- PHY driver uses overwritten dev->node const void *fdt = gd->fdt_blob; if (fdtdec_get_bool(fdt, node, "property")) ... As result, UCLASS_ETH device can't be used any more for DT accessing. It adds new field ofnode node to struct phy_device and updates TI CPSW and zynq_gem drivers to use it. zynq_gem.c, xilinx_phy.c changes only build tested. Changes in v2: - struct phy_device->node field initialization added to phy_device_create() Dependency: This series has dependency from https://patchwork.ozlabs.org/cover/936370/ due to possible merge conflicts PS: Not sure if any other Net drivers need to be updated, at least I've not found any. Grygorii Strashko (5): net: phy: add ofnode node to struct phy_device net: phy: dp83867: switch to use phy_get_ofnode() net: phy: xilinx: switch to use phy_get_ofnode() drivers: net: cpsw: fix phy dt node setting drivers: net: zynq_gem: fix phy dt node setting drivers/net/cpsw.c | 2 +- drivers/net/phy/phy.c | 4 ++++ drivers/net/phy/ti.c | 7 +++++-- drivers/net/phy/xilinx_phy.c | 10 ++++++---- drivers/net/zynq_gem.c | 2 +- include/phy.h | 13 +++++++++++++ 6 files changed, 30 insertions(+), 8 deletions(-) -- 2.10.5

2 11

[U-Boot] [PATCH 0/3] Prepare for net: phy: prevent uclass_eth device "node" field overwriting
by Joe Hershberger 26 Jul '18

26 Jul '18

Prepare for [1] so that it doesn't break the build for a bunch of boards. There are a number of reasons this series broke the build but none of them depend on changes in the series, so fix up those situations ahead of applying that series. [1] https://patchwork.ozlabs.org/cover/940104/ Joe Hershberger (3): arm: Prevent redefinition error in fsl-layerscape phy: Break include cycle net: phy: Clean up includes of common.h arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +- drivers/net/phy/atheros.c | 1 + drivers/net/phy/broadcom.c | 1 - drivers/net/phy/davicom.c | 1 + drivers/net/phy/generic_10g.c | 2 - drivers/net/phy/lxt.c | 1 + drivers/net/phy/marvell.c | 1 - drivers/net/phy/micrel_ksz8xxx.c | 1 - drivers/net/phy/micrel_ksz90x1.c | 2 - drivers/net/phy/natsemi.c | 1 + drivers/net/phy/phy.c | 2 - drivers/net/phy/realtek.c | 1 - drivers/net/phy/smsc.c | 1 + drivers/net/phy/teranetics.c | 1 - drivers/net/phy/vitesse.c | 1 + include/exports.h | 3 +- include/phy.h | 55 +--------------------------- include/phy_interface.h | 65 +++++++++++++++++++++++++++++++++ 18 files changed, 74 insertions(+), 68 deletions(-) create mode 100644 include/phy_interface.h -- 1.7.11.5

1 6