September 2020 - U-Boot

[PATCH] ARM: MediaTek: amend IC description for MediaTek MT8512
by mingming lee 14 Sep '20

14 Sep '20

From: Mingming Lee <Mingming.Lee(a)mediatek.com> The description for MT8512 has some mistake, so correct it. Signed-off-by: Mingming Lee <Mingming.Lee(a)mediatek.com> --- arch/arm/mach-mediatek/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 0042e57017..7f40ba9319 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -47,10 +47,10 @@ config TARGET_MT8512 select ARM64 select MT8512 help - The MediaTek MT8512 is a ARM64-based SoC with a quad-core Cortex-A53. + The MediaTek MT8512 is a ARM64-based SoC with a dual-core Cortex-A53. including UART, SPI, USB2.0 and OTG, SD and MMC cards, NAND, PWM, - Ethernet, IR TX/RX, I2C, I2S, S/PDIF, and built-in Wi-Fi / Bluetooth combo - chip and several DDR3 and DDR4 options. + IR RX, I2C, I2S, S/PDIF, and built-in Wi-Fi / Bluetooth digital + and several LPDDR3 and LPDDR4 options. config TARGET_MT8516 bool "MediaTek MT8516 SoC" -- 2.18.0

2 1

[PATCH v2] Fix data abort caused by mis-aligning FIT data
by Reuben Dowle 14 Sep '20

14 Sep '20

Attempting to place device tree immediately after an image in memory can lead to mis-aligned data accesses if that image size is not divisible by the alignment requirements of the architecture. Data aborts caused by this were observed on a custom Marvel A388 based system, where the image was a uboot FIT file. The total size varies depending on the uboot device tree size, which does not always lead to correct alignment. The minimum alignment specified for ARM [1] and ARM64 [2] linux booting has been used [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… Signed-off-by: Reuben Dowle <reuben.dowle(a)4rf.com> --- common/spl/spl_fit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 365104f..a8bfd38 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -349,9 +349,12 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, /* * Use the address following the image as target address for the - * device tree. + * device tree. Load address is aligned to 8 bytes to match the required + * alignment specified for linux arm [1] and arm 64 [2] booting + * [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… + * [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… */ - image_info.load_addr = spl_image->load_addr + spl_image->size; + image_info.load_addr = ALIGN(spl_image->load_addr + spl_image->size, 8); /* Figure out which device tree the board wants to use */ node = spl_fit_get_image_node(fit, images, FIT_FDT_PROP, index++); -- 2.7.4

2 1

[PATCH] mtd: nand: Fix nand write error with bad block addresses above 32-bit
by Michal Simek 14 Sep '20

14 Sep '20

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Nand writes should skip the bad blocks with "nand write" command. In case of bad blocks with above 32-bit address, nand_block_isbad() returns false due to truncated bad block address. In below code segment, if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) offset is 64-bit and mtd->erasesize is 32-bit, hence the truncation is happening. Cast 'mtd->erasesize' with loff_t to fix this issue. Signed-off-by: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Was trying to find out fixed sha1 but maybe none really tested to have back blocks above 4GB. --- drivers/mtd/nand/raw/nand_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c index 5b74ef0dfdbf..00c3c6c41226 100644 --- a/drivers/mtd/nand/raw/nand_util.c +++ b/drivers/mtd/nand/raw/nand_util.c @@ -635,14 +635,14 @@ int nand_write_skip_bad(struct mtd_info *mtd, loff_t offset, size_t *length, } while (left_to_write > 0) { + loff_t block_start = offset & ~(loff_t)(mtd->erasesize - 1); size_t block_offset = offset & (mtd->erasesize - 1); size_t write_size, truncated_write_size; WATCHDOG_RESET(); - if (nand_block_isbad(mtd, offset & ~(mtd->erasesize - 1))) { - printf("Skip bad block 0x%08llx\n", - offset & ~(mtd->erasesize - 1)); + if (nand_block_isbad(mtd, block_start)) { + printf("Skip bad block 0x%08llx\n", block_start); offset += mtd->erasesize - block_offset; continue; } -- 2.28.0

2 1

[PATCH] env: Crash in 'env import' when using checksum and a specific size
by Pedro Aguilar 14 Sep '20

14 Sep '20

This patch adds a sanity check that avoids 'size' to overflow and crash when importing an environment that contains a checksum. Example with the wrong size that causes the crash: => env import -c 0x4100000 3 v1 This assumes that v1 has already been successfully exported with 'env export -c -s 0x100 0x4100000 v1' Signed-off-by: Pedro Aguilar <pedro.aguilar(a)vimar.com> --- cmd/nvedit.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index d188c6aa6b..9f145dd284 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1171,6 +1171,11 @@ static int do_env_import(struct cmd_tbl *cmdtp, int flag, uint32_t crc; env_t *ep = (env_t *)ptr; + if (size <= offsetof(env_t, data)) { + printf("## Error: Invalid size 0x%zX\n", size); + return 1; + } + size -= offsetof(env_t, data); memcpy(&crc, &ep->crc, sizeof(crc)); -- 2.25.1

2 1

[PATCH 1/1] bootm: update image OS image size when decompressing
by Heinrich Schuchardt 14 Sep '20

14 Sep '20

In bootm_load_os() the OS image is decompressed. In later stages of the boot process we need the decompressed size of the image. Update images->os.image_len after decompression. Passing the correct size is necessary if we want to check loaded EFI binararies for file truncation by comparing the loaded size to the header field SizeOfImage. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/bootm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/bootm.c b/common/bootm.c index 247b600d9c..b3377490b3 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -390,6 +390,8 @@ static int bootm_load_os(bootm_headers_t *images, int boot_progress) bootstage_error(BOOTSTAGE_ID_DECOMP_IMAGE); return err; } + /* We need the decompressed image size in the next steps */ + images->os.image_len = load_end - load; flush_cache(flush_start, ALIGN(load_end, ARCH_DMA_MINALIGN) - flush_start); -- 2.28.0

3 2

[PATCH v2] common: Kconfig: Add dependency for default variables strings
by Michal Simek 14 Sep '20

14 Sep '20

Kconfig provides several config options for setting up default variables but these are unused when variables are passed to U-Boot via file. That's why cover this dependency in Kconfig. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - remove autoboot - reported by Tom There are likely other Kconfig entries which should be fixed too. --- common/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index c58f08ba91bf..b1934b3a9c51 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -378,7 +378,7 @@ config USE_BOOTARGS config BOOTARGS string "Boot arguments" - depends on USE_BOOTARGS + depends on USE_BOOTARGS && !USE_DEFAULT_ENV_FILE help This can be used to pass arguments to the bootm command. The value of CONFIG_BOOTARGS goes into the environment value "bootargs". Note that @@ -395,7 +395,7 @@ config USE_BOOTCOMMAND config BOOTCOMMAND string "bootcmd value" - depends on USE_BOOTCOMMAND + depends on USE_BOOTCOMMAND && !USE_DEFAULT_ENV_FILE default "run distro_bootcmd" if DISTRO_DEFAULTS help This is the string of commands that will be used as bootcmd and if @@ -416,7 +416,7 @@ config USE_PREBOOT config PREBOOT string "preboot default value" - depends on USE_PREBOOT + depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE default "" help This is the default of "preboot" environment variable. -- 2.28.0

2 1

Question: Chromebook Flip C100p Uboot build and flash
by 张宁 14 Sep '20

14 Sep '20

Hi, Simon I find a guild in mainline uboot code, which updated by you. This guild is for chromebook_jerry, can it apply to Flip C100p (minnie)? If it can apply to minnie, my understanding are: Build u-boot-spl-dtb.bin and u-boot-dtb.img from mainline uboot, and replace jerry binary in the command line. Then flash it to minnie’s SPI flash with dediprog. when reboot minnie, I will get uboot command line interface, and can access it by uart port. Then boot mainline linux kernel, from external storage. And finally repartition internal emmc, and build a Linux OS to emmc. Are they right? BR. Ning.

1 0

[RFC] FPGA configuration as MTD using Device Tree
by Ulf Samuelsson 14 Sep '20

14 Sep '20

Hi, The FPGA support in u-boot looks a bit old-fashioned to me. I would like to have device-tree support and would like comments on my approach. ==================================================================== BACKGROUND Need to support loading 2 x Cyclone-10 LP FPGAs using Passive Serial. Raw binary files (RBF) are stored in boot flash, and u-boot will load both FPGAs before booting the OS. The OS should be able to update the FPGAs as well. The FPGAs must be independently configurable. Hardwarewise, I have an SPI bus with 4 chip selects. SPI MOSI, SCK, CS2 and CS3 are connected to the synchronous serial bus of the FPGA (DATA0, DCLK, the FPGA1.nCS0 and the FPGA2.nCS0) Intel normally connect FPGA nCS0 to ground but I connect this to the SPI CS. The advantage is that I can have several FPGAs which are programmed independent to each other. The FPGAs require three other signals (nCONFIG, nSTATUS and CONF_DONE). Each FPGA have their own set of those signals. ==================================================================== I have not found device-tree support for FPGAs in u-boot. Since the FPGAs are connected to the SPI, I thought adding them as MTD devices would result in a nice interface. ==================================================================== Example Device tree connected to a bit-bang SPI driver supporting multiple chip select. The MTD configuration supplies * Name of the FPGA (fpga property) * The size of the configuration data * Sideband signals for starting and checking configuration. &soft_mcspi { compatible = "mcspi-gpio"; pinctrl-names = "default"; pinctrl-0 = <&soft_mcspi1_pins>; status = "okay"; gpio-sck = <&gpio0 7 GPIO_ACTIVE_LOW>; gpio-miso = <&gpio1 8 GPIO_ACTIVE_HIGH>; gpio-mosi = <&gpio1 9 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpio0 12 GPIO_ACTIVE_LOW>, <&gpio0 13 GPIO_ACTIVE_LOW>, <&gpio0 17 GPIO_ACTIVE_LOW>, <&gpio0 16 GPIO_ACTIVE_LOW>; num-chipselects = <4>; #address-cells = <1>; #size-cells = <0>; ... sspy-fpga-cfg@3 { /* Intel Cyclone 10, 10CL025 */ #address-cells = <1>; #size-cells = <1>; compatible = "intel,cyclone10"; reg = <3>; /* Chip select 0 */ spi-max-frequency = <1000000>; fpga = "spyf"; config-size = <718569>; gpio-nconfig = <&gpio3 21 GPIO_ACTIVE_HIGH>; gpio-nstatus = <&gpio3 17 GPIO_ACTIVE_HIGH>; gpio-conf_done = <&gpio0 18 GPIO_ACTIVE_HIGH>; gpio-crc_error = <&gpio2 18 GPIO_ACTIVE_HIGH>; }; }; ==================================================================== With a Cyclone 10 MTD driver, is would appear in the "mtd list" command and configuring the fpga would be done using $ mtd write.raw spyf <ram-addr> The driver would have to implement dummy read and erase commands. An alternative would be to add flags which would be tested by the mtd command which would block the read and erase if the mtd device is an FPGA or simply test for that in the mtd command. What would be best? ==================================================================== The MTD driver would start configuration by toggling gpio-nconfig low and then wait for gpio-nstatus to go high. If OK, it would call the spi_xfer routine for the parent spi slave (soft-mcspi) When the spi write returns, the FPGA MTD driver would await the CONF_DONE signal before returning. ==================================================================== What do you guys think of such an approach? BR Ulf Samuelsson

3 4

[PATCH 0/7] riscv: Correctly handle IPIs already pending upon boot
by Sean Anderson 14 Sep '20

14 Sep '20

On the K210, the prior stage bootloader does not clear IPIs. This presents a problem, because U-Boot up until this point assumes (with one exception) that IPIs are cleared when it starts. This series attempts to fix this in a robust manner, and fix several concurrency bugs I noticed while fixing these other areas. Heinrich previously submitted a patch addressing part of this problem in [1]. [1] https://patchwork.ozlabs.org/project/uboot/patch/20200811035648.3284-1-xypr… Sean Anderson (7): Revert "riscv: Clear pending interrupts before enabling IPIs" riscv: Match memory barriers between send_ipi_many and handle_ipi riscv: Use NULL as a sentinel value for smp_call_function riscv: Clear pending IPIs on initialization riscv: Add fence to available_harts_lock riscv: Ensure gp is NULL or points to valid data riscv: Add some comments to start.S arch/riscv/cpu/cpu.c | 18 ++++++++++++++ arch/riscv/cpu/start.S | 47 +++++++++++++++++++++++++++++-------- arch/riscv/lib/interrupts.c | 3 ++- arch/riscv/lib/smp.c | 26 +++++++++++++++++--- 4 files changed, 80 insertions(+), 14 deletions(-) -- 2.28.0

5 44

[PATCH] for [BUG] rsa: crash in br_i32_decode() called from rsa_gen_key_prop() (Heinrich Schuchardt)
by REITHER Robert - Contractor 14 Sep '20

14 Sep '20

Fixes problem for unaligned 32bit big-endian access in lib/rsa/rsa-keyprop.c Exchanges br_i32_decode() with get_unaligned_be32(). This will keep the unaligned access for architectures capable and will do some byte-shift magic for the not so capable ones... robert.reither(a)external.thalesgroup.com --- u-boot-master-20200908/lib/rsa/rsa-keyprop.c 2020-09-07 20:17:33.000000000 +0200 +++ mycode/lib/rsa/rsa-keyprop.c 2020-09-08 18:10:59.122022000 +0200 @@ -15,6 +15,7 @@ #include <asm/byteorder.h> #include <crypto/internal/rsa.h> #include <u-boot/rsa-mod-exp.h> +#include <asm/unaligned.h> /** * br_dec16be() - Convert 16-bit big-endian integer to native @@ -23,7 +24,7 @@ */ static unsigned br_dec16be(const void *src) { - return be16_to_cpup(src); + return get_unaligned_be16(src); } /** @@ -33,7 +34,7 @@ static unsigned br_dec16be(const void *s */ static uint32_t br_dec32be(const void *src) { - return be32_to_cpup(src); + return get_unaligned_be32(src); } /**

2 1