September 2019 - U-Boot

[U-Boot] Buffer overrun risk in UBI SPL for secure boot
by Joel Peshkin 09 Sep '19

09 Sep '19

It seems that, in the process of doing any sort of secure boot chain of trust, anything loading a UBI volume in preparation to authenticate it, will load a volume of unknown size into a buffer prior to checking the signature of that volume. Has anyone considered a solution for this? Should all implementations just carve out a buffer at the top of memory for ubispl_load_volume or should the ubispl_load data structure be amended to include a size? It would seem appropriate to include a size, but not clear how to do that without breaking compatibility with existing implementations.

2 3

[U-Boot] [PATCHv1 0/5] support remote system update on Intel Stratix10 SoC
by richard.gong＠linux.intel.com 09 Sep '19

09 Sep '19

From: Richard Gong <richard.gong(a)intel.com> The Intel Remote System Update (RSU) provides a way for users to update the QSPI configuration bitstream of a Intel Stratix10 SoC device with significantly reduced risk of corrupting the bitstream storage and bricking the system. The patchset adds RSU support which allows user to perform a complete set of RSU operations via provided console commands. The patches have reviewed by other colleagues at Intel. Richard Gong (5): arm: socfpga: stratix10: add RSU mailbox support arm: socfpga: stratix10: add RSU support for Stratix10 SoC arm: socfpga: stratix10: add environment variables for RSU support arm: socfpga: stratix10: add console commands for RSU support arm: socfpga: enable RSU build arch/arm/mach-socfpga/Makefile | 6 + arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 36 +- arch/arm/mach-socfpga/include/mach/rsu.h | 244 +++++ arch/arm/mach-socfpga/include/mach/rsu_ll.h | 71 ++ arch/arm/mach-socfpga/include/mach/rsu_misc.h | 46 + arch/arm/mach-socfpga/include/mach/rsu_s10.h | 46 + arch/arm/mach-socfpga/mailbox_s10.c | 45 + arch/arm/mach-socfpga/misc_s10.c | 9 + arch/arm/mach-socfpga/rsu.c | 569 ++++++++++++ arch/arm/mach-socfpga/rsu_ll_qspi.c | 1033 ++++++++++++++++++++++ arch/arm/mach-socfpga/rsu_misc.c | 527 +++++++++++ arch/arm/mach-socfpga/rsu_s10.c | 817 +++++++++++++++++ 12 files changed, 3439 insertions(+), 10 deletions(-) create mode 100644 arch/arm/mach-socfpga/include/mach/rsu.h create mode 100644 arch/arm/mach-socfpga/include/mach/rsu_ll.h create mode 100644 arch/arm/mach-socfpga/include/mach/rsu_misc.h create mode 100644 arch/arm/mach-socfpga/include/mach/rsu_s10.h create mode 100644 arch/arm/mach-socfpga/rsu.c create mode 100644 arch/arm/mach-socfpga/rsu_ll_qspi.c create mode 100644 arch/arm/mach-socfpga/rsu_misc.c create mode 100644 arch/arm/mach-socfpga/rsu_s10.c -- 2.7.4

1 5

[U-Boot] [PATCH] arm: ti: Add missing "=" from previous fix
by Tom Rini 09 Sep '19

09 Sep '19

While the original patch to fix a regression in distro boot for mmc on these platforms had the correct syntax, I broke the change while applying. Add back in the missing "=" here so that the syntax is correct. Reported-by: Andre Heider <a.heider(a)gmail.com> Fixes: 27e0f3bcf075 ("arm: ti: Fix regression in distro boot for mmc") Signed-off-by: Tom Rini <trini(a)konsulko.com> --- include/environment/ti/mmc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h index ef053766088b..bb4af0a3d54b 100644 --- a/include/environment/ti/mmc.h +++ b/include/environment/ti/mmc.h @@ -56,7 +56,7 @@ "bootz; " \ "fi;\0" \ "mmcboot=mmc dev ${mmcdev}; " \ - "devnum ${mmcdev}; " \ + "devnum=${mmcdev}; " \ "setenv devtype mmc; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ -- 2.7.4

1 1

[U-Boot] [PULL] u-boot-mmc mmc-9-6-2019
by Peng Fan 09 Sep '19

09 Sep '19

Hi Tom, Please pull u-boot-mmc tag mmc-9-6-2019. -------------------------------------------------------- Bug fixes to mmc_spi Add Aspeed SD driver Fix dw_mmc timeout calculation Fix timeout values passed to mmc_wait_dat0 sdhci dt caps/mask update -------------------------------------------------------- CI: https://travis-ci.org/MrVan/u-boot/builds/581484942 Note: there is a failure in this build that MAINTAINER check failed, Because there is a patch in this pull request touched aspeed defconfig but there is no MAINTAINER for this file. Thanks, Peng. The following changes since commit 448f11f7503995746a7b71e5e3b3a831c4651be9: Merge tag 'arc-for-2019.10-rc4' of https://gitlab.denx.de/u-boot/custodians/u-boot-arc (2019-09-03 12:40:50 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-mmc.git tags/mmc-9-6-2019 for you to fetch changes up to cd45d6f3955c919b7f10793014db3dbcfd7df3bb: mmc: sdhci: Add support for dt caps & caps mask (2019-09-06 10:40:13 +0800) ---------------------------------------------------------------- Andy Yan (1): dm: mmc: remove unused U_BOOT_DRIVER(mmc) Bin Meng (1): dm: mmc_spi: Fix NULL pointer dereference in mmc_spi_bind() Eddie James (4): clk: aspeed: Add support for SD clock mmc: Add Aspeed SD controller driver configs: AST2500 EVB: Enable SD controller ARM: dts: ast2500: Add SDHCI nodes Kever Yang (1): mmc: dw_mmc: fix timeout calculate method Sam Protsenko (2): mmc: Fix timeout values passed to mmc_wait_dat0() mmc: Rename timeout parameters for clarification T Karthik Reddy (2): dm: core: Add functions to read 64-bit dt properties mmc: sdhci: Add support for dt caps & caps mask arch/arm/dts/ast2500-evb.dts | 14 ++++++++++++++ arch/arm/dts/ast2500-u-boot.dtsi | 16 ++++++++++++++++ arch/arm/include/asm/arch-aspeed/scu_ast2500.h | 3 +++ arch/arm/include/asm/gpio.h | 3 ++- configs/evb-ast2500_defconfig | 8 ++++++++ drivers/clk/aspeed/clk_ast2500.c | 27 +++++++++++++++++++++++++++ drivers/core/ofnode.c | 2 +- drivers/core/read.c | 10 ++++++++++ drivers/mmc/Kconfig | 11 +++++++++++ drivers/mmc/Makefile | 1 + drivers/mmc/aspeed_sdhci.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/dw_mmc.c | 5 +++-- drivers/mmc/mmc-uclass.c | 12 ++++-------- drivers/mmc/mmc.c | 24 ++++++++++++------------ drivers/mmc/mmc_spi.c | 35 ++++++++++++++++++++--------------- drivers/mmc/mmc_write.c | 8 ++++---- drivers/mmc/omap_hsmmc.c | 6 +++--- drivers/mmc/renesas-sdhi.c | 7 ++++--- drivers/mmc/sdhci.c | 23 ++++++++++++++--------- drivers/pinctrl/aspeed/pinctrl_ast2500.c | 2 ++ include/dm/ofnode.h | 2 +- include/dm/read.h | 33 +++++++++++++++++++++++++++++++++ include/mmc.h | 12 ++++++------ 23 files changed, 289 insertions(+), 65 deletions(-) create mode 100644 drivers/mmc/aspeed_sdhci.c

2 1

[U-Boot] [PATCH v2] rpi4: enable dram bank initialization
by matthias.bgg＠kernel.org 09 Sep '19

09 Sep '19

From: Matthias Brugger <mbrugger(a)suse.com> When booting through the efi stub, the memory map get's created by reading the dram bank information. Depending on the version of the RPi4 this information changes. Read the device tree to initialize the dram bank data structure. This way the kernel is able to access the whole range of available memory. Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> --- This patch is based on basic RPi4 support implemented by series: https://www.mail-archive.com/u-boot@lists.denx.de/msg335667.html which is part of v2019.10-rc4 To actually work correctly we need the series that fixes the libftd: https://patchwork.ozlabs.org/cover/1158304/ Changes in v2: - don't call dram_init_banksize if OF_BOARD is not used board/raspberrypi/rpi/rpi.c | 10 ++++++++++ configs/rpi_4_defconfig | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index fa57d50c95..9e0abdda31 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -312,6 +312,16 @@ int dram_init(void) return 0; } +#ifdef CONFIG_OF_BOARD +#ifdef CONFIG_BCM2711 +int dram_init_banksize(void) +{ + return fdtdec_decode_ram_size(gd->fdt_blob, NULL, 0, NULL, + (phys_size_t *)&gd->ram_size, gd->bd); +} +#endif +#endif + static void set_fdtfile(void) { const char *fdtfile; diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index da8c960a2a..c639ac93de 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_4=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=2 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_OF_BOARD=y CONFIG_OF_BOARD_SETUP=y -- 2.22.0

1 0

[U-Boot] Regression after "distro: not taint environment variables if possible"
by Nuno Gonçalves 09 Sep '19

09 Sep '19

Hi, I found out that my Beaglebone didn't boot after: https://github.com/u-boot/u-boot/commit/13dd6665ed18f72380ca596931d609bc108… I digged out the reason that this patch makes devnum a local variable, and it ends up shadowed by other code that sets devnum as a env variable. For example to boot on the beaglebone I had to remove the setenv as in the patch below. This only fixes for my board. Many other will likely have regressions. Fixing it for all boards in a reliable way I think is very complex, unless the strategy is to wait for board maintainers to fix it as they need it, but I wonder how many latent bugs this will create for corner boot cases. Maybe this change is not worth it? Thanks, Nuno diff --git a/include/environment/ti/mmc.h b/include/environment/ti/mmc.h index 785fc15345..bb4af0a3d5 100644 --- a/include/environment/ti/mmc.h +++ b/include/environment/ti/mmc.h @@ -56,7 +56,7 @@ "bootz; " \ "fi;\0" \ "mmcboot=mmc dev ${mmcdev}; " \ - "setenv devnum ${mmcdev}; " \ + "devnum=${mmcdev}; " \ "setenv devtype mmc; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \

3 3

Re: [U-Boot] [PATCH v4 2/4] USB: host: Add the USB3 host driver
by Sherry Sun 09 Sep '19

09 Sep '19

Hi Marek, > > On 8/20/19 10:31 AM, Sherry Sun wrote: > > Hi Marek, > > > >> > >> On 8/19/19 8:10 AM, Sherry Sun wrote: > >>> Add the USB3 host driver for NXP imx8 platform, and the cadence IP > >>> is in it. The USB3 host driver support DM mode, it will probe USB3 > >>> host node in dts. > >>> > >>> Signed-off-by: Sherry Sun <sherry.sun(a)nxp.com> > >> > >> [...] > >> > >>> +static void xhci_imx8_get_reg_addr(struct udevice *dev) { > >>> + imx8_data.usb3_ctrl_base = > >>> + (void __iomem *)devfdt_get_addr_index(dev, 0); > >>> + imx8_data.usb3_core_base = > >>> + (void __iomem *)devfdt_get_addr_index(dev, 4); } > >> > >> Inline this. > >> > >> Also, look at drivers/mtd/renesas_rpc_hf.c to handle both 32bit and > >> 64bit DTs with multiple "reg" entries. > >> > > > > Actually, I don't think it's needed to change the way getting reg in dts. > > For two reasons: > > 1. This xhci-imx8 driver is only target on imx8 platform which all use 64bit > dts. > > 2. devfdt_get_addr_index() can handle both 32/64 bits dts too. > > By hard-coding this "4" offset, you assume the DT is using 64bit addressing, > that's wrong, so please fix it. The iMX8 does support aarch32, right ? So > someone might pass in 32bit DT and this would break. Sorry, maybe there are some misunderstandings in the code. There five reg elements in dts node, which are none_core_regs/ xhci_regs/ dev_regs/ phy_regs/ otg_regs. devfdt_get_addr_index(dev, 4) only want to get the fifth reg value, instead of meanning 64bit address. 586 usbotg3: usb3@5b110000 { 587 compatible = "cdns,usb3"; 588 reg = <0x0 0x5B110000 0x0 0x10000>, 589 <0x0 0x5B130000 0x0 0x10000>, 590 <0x0 0x5B140000 0x0 0x10000>, 591 <0x0 0x5B160000 0x0 0x40000>, 592 <0x0 0x5B120000 0x0 0x10000>; > > >> [...] > >> > >>> +static const struct udevice_id xhci_usb_ids[] = { > >>> + { .compatible = "cdns,usb3-host", }, > >> > >> https://lore.ker > >> > nel.org%2Fpatchwork%2Fpatch%2F1059917%2F&data=02%7C01%7Cshe > >> > rry.sun%40nxp.com%7C70e116ce152a4060dbd508d724987b54%7C686ea1d > >> > 3bc2b4c6fa92cd99c5c301635%7C0%7C0%7C637018109631327748&sd > >> > ata=GzX5KNQ8m0CCeBa9tPSV%2BOEwwuSsxDdAiJd1T6or8P0%3D&reser > >> ved=0 would suggest that > >> cdns,usb3-1.0.0 is the compatible. But I might be wrong. > > > > This patch has not been accepted by the kernel, right? > > So I think maybe we can do this change to synchronize with kernel > > after the cdns3 kernel patch been accepted. > > Or, we can start with at least reasonably OK DT compatible right away to > reasonably avoid ABI breakage. Sure, will change the compatible from "cdns,usb3" to "cdns,usb3-1.0.0". > > > And note that in uboot, one dts node can only bind with one driver, so > > we keep the cdns3 node for usb gadget driver, then add a usb host node > > for > > xhci-imx8 driver in *-uboot.dtsi. so here is no need to change the host driver > compatible. > > But the compatible in gadget driver should be changed later. > > We should try avoiding ABI breaks in DT. But the cdns3 usb gaget driver and host driver in different uclass need two dt nodes to bind with. And the compatible of the two node cannot be same. So for gadget driver, the compatible may use "cdns,usb3-1.0.0", for host driver, the compatible will use "cdns,usb3-1.0.0-host". What do you think about it? > > >>> + { } > >>> +}; > >>> + > >>> +U_BOOT_DRIVER(xhci_imx8) = { > >>> + .name = "xhci_imx8", > >>> + .id = UCLASS_USB, > >>> + .of_match = xhci_usb_ids, > >>> + .probe = xhci_imx8_probe, > >>> + .remove = xhci_imx8_remove, > >>> + .ops = &xhci_usb_ops, > >>> + .platdata_auto_alloc_size = sizeof(struct usb_platdata), > >>> + .priv_auto_alloc_size = sizeof(struct xhci_ctrl), > >>> + .flags = DM_FLAG_ALLOC_PRIV_DMA, > >> > >> I think you also need DM_FLAG_OS_PREPARE to trigger .remove before > >> booting Linux, but I might be wrong. Please check that. > > > > When use usb stop command to stop the usb host driver, > > device_remove(bus, DM_REMOVE_NORMAL) is called by usb_stop(), so > > normally we don’t need the DM_FLAG_OS_PREPARE flag. > > But considering some special circumstances, maybe add this flag is helpful. > > I'm not talking about "usb stop", I am talking about booting Linux. > That's when then .remove should be called to tear down the driver. Is it? I know what you mean. The only function of DM_FLAG_OS_PREPARE is to call .remove before booting kernel, to make sure the device is removed. But normally, the host device is removed every time after we use it. So even the flag is set, the .remove won't be called again before booting kernel because the device is checked to be removed already. Add the flag just make sure the device will be removed before booting kernel. Do you think so? Best regard Sherry sun

4 14

[U-Boot] [RFC] xz compression for U-Boot images
by Heinrich Schuchardt 09 Sep '19

09 Sep '19

Hello Tom, in one of you recent mails you highlighted the worrisome growth of the U-Boot images. The UEFI sub-system is just one part of it. Are you aware off any prior efforts to prepend U-Boot with a self-extractor? With xz a U-Boot image can be compressed by a factor of more than 2.5. The self-extractor would have to comprise RAM setup (if not handled by SPL), the decompression code, and the cache reset. Best regards Heinrich

2 1

[U-Boot] [PATCH] imx: Introduce CONFIG_SPL_FORCE_MMC_BOOT to force MMC boot on falcon mode
by Lukasz Majewski 09 Sep '19

09 Sep '19

This change tries to fix the following problem: - The board boots (to be more precise - ROM loads SPL) from a slow SPI-NOR memory. As a result the spl_boot_device() will return SPI-NOR as a boot device (which is correct). - The problem is that in 'falcon boot' the eMMC is used as a boot medium to load kernel from its partition. Calling spl_boot_device() will break things as it returns SPI-NOR device. To fix this issue the new CONFIG_SPL_FORCE_MMC_BOOT Kconfig flag is introduced to handle this special use case. By default it is not defined, so there is no change in the legacy code flow. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- This patch is a follow up of previous discussion/fix: https://patchwork.ozlabs.org/patch/796237/ Travis-CI: https://travis-ci.org/lmajewski/u-boot-dfu/builds/580272414 --- arch/arm/mach-imx/spl.c | 11 +++++++++++ common/spl/Kconfig | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 1f230aca3397..daa3d8f7ed94 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -178,7 +178,18 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name) /* called from spl_mmc to see type of boot mode for storage (RAW or FAT) */ u32 spl_boot_mode(const u32 boot_device) { +/* + * When CONFIG_SPL_FORCE_MMC_BOOT is defined the 'boot_device' is used + * unconditionally to decide about device to use for booting. + * This is crucial for falcon boot mode, when board boots up (i.e. ROM + * loads SPL) from slow SPI-NOR memory and afterwards the SPL's 'falcon' boot + * mode is used to load Linux OS from eMMC partition. + */ +#ifdef CONFIG_SPL_FORCE_MMC_BOOT + switch (boot_device) { +#else switch (spl_boot_device()) { +#endif /* for MMC return either RAW or FAT mode */ case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC2: diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f467eca2be72..3460beb62d59 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -607,6 +607,13 @@ config SPL_MMC_SUPPORT this option to build the drivers in drivers/mmc as part of an SPL build. +config SPL_FORCE_MMC_BOOT + bool "Force SPL's falcon boot from MMC" + depends on SPL_MMC_SUPPORT + default n + help + Force SPL's falcon boot to use MMC device for Linux kernel booting. + config SPL_MMC_TINY bool "Tiny MMC framework in SPL" depends on SPL_MMC_SUPPORT -- 2.11.0

3 11

[U-Boot] [PATCH] rpi4: enable dram bank initialization
by matthias.bgg＠kernel.org 09 Sep '19

09 Sep '19

From: Matthias Brugger <mbrugger(a)suse.com> When booting through the efi stub, the memory map get's created by reading the dram bank information. Depending on the version of the RPi4 this information changes. Read the device tree to initialize the dram bank data structure. This way the kernel is able to access the whole range of available memory. Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> --- This patch is based on basic RPi4 support implemented by series: https://www.mail-archive.com/u-boot@lists.denx.de/msg335667.html To actually work correctly we need the series that fixes the libftd: https://patchwork.ozlabs.org/cover/1158304/ board/raspberrypi/rpi/rpi.c | 8 ++++++++ configs/rpi_4_defconfig | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index fa57d50c95..eea8a69551 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -312,6 +312,14 @@ int dram_init(void) return 0; } +#ifdef CONFIG_BCM2711 +int dram_init_banksize(void) +{ + return fdtdec_decode_ram_size(gd->fdt_blob, NULL, 0, NULL, + (phys_size_t *)&gd->ram_size, gd->bd); +} +#endif + static void set_fdtfile(void) { const char *fdtfile; diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index da8c960a2a..c639ac93de 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -4,7 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x00080000 CONFIG_TARGET_RPI_4=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_NR_DRAM_BANKS=1 +CONFIG_NR_DRAM_BANKS=2 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_OF_BOARD=y CONFIG_OF_BOARD_SETUP=y -- 2.22.0

4 5