August 2020 - U-Boot

[PATCH 0/3] Configure J721E Main R5FSS1 to Split-mode & env
by Suman Anna 15 Sep '20

15 Sep '20

Hi Lokesh, The following series all deal with the different R5F clusters on J721E SoCs. The first 2 patches change the default mode for the Main R5FSS1 cluster on J721E SoCs from LockStep-mode to Split-mode, and updates the env variable 'rproc_fw_binaries' to include this new core. The last patch is a cleanup patch of the rproc env variables used by R5 SPL. R5 SPL boots the MCU R5FSS0 Core0 and Main R5FSS0 Core0, and uses some env variables for the fs_loader functionality. These are neither used nor are needed from the A72 U-Boot. I have tested using both the older SYSFW and the newer SYSFW with the appropriate kernel changes. All patches are based on the latest master. regards Suman Suman Anna (3): arm: dts: k3-j721e-main: Configure MAIN R5FSS1 for Split-mode configs: j721e_evm: Add Main R5FSS1 Core1 to default rproc boot list env: ti: j721e-evm: Limit scope of rproc env variables used by R5 SPL arch/arm/dts/k3-j721e-main.dtsi | 2 +- include/configs/j721e_evm.h | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) -- 2.28.0

2 4

[PATCH 0/5] J7200: Add HyperFlash boot support
by Vignesh Raghavendra 15 Sep '20

15 Sep '20

Add support to boot from HyperFlash on J7200 SoC Vignesh Raghavendra (5): arm: mach-k3: Add HyperFlash boot mode support board: ti: j721e: Add support for HyperFlash detection ARM: dts: k3-j7200-r5-common-proc-board: Enable HyperFlash configs: j7200_evm_*_defconfig: Enable HyperFlash boot related configs configs: j721e_evm.h: Add U-Boot image address for HyperFlash boot .../k3-j7200-common-proc-board-u-boot.dtsi | 28 +++++++++++++ .../arm/dts/k3-j7200-r5-common-proc-board.dts | 40 +++++++++++++++++++ arch/arm/mach-k3/include/mach/j721e_spl.h | 1 + board/ti/j721e/evm.c | 7 ++++ configs/j7200_evm_a72_defconfig | 3 ++ configs/j7200_evm_r5_defconfig | 13 ++++++ include/configs/j721e_evm.h | 2 + 7 files changed, 94 insertions(+) -- 2.28.0

2 6

[RFC PATCH 1/2] efi: arm: do not overlap non ram memory on efi allocation
by Maxim Uvarov 15 Sep '20

15 Sep '20

This commit fixes qemu boot of armv7 where reserving memory for fdt is failed due to reserving region outside of the system RAM. => bdinfo boot_params = 0x00000000 DRAM bank = 0x00000000 -> start = 0x40000000 -> size = 0x40000000 memstart = 0x40000000 memsize = 0x40000000 flashstart = 0x04000000 flashsize = 0x04000000 flashoffset = 0x00000000 baudrate = 115200 bps relocaddr = 0x7ff57000 reloc off = 0x1ff57000 Build = 32-bit current eth = virtio-net#32 ethaddr = 52:52:52:52:52:52 IP addr = <NULL> fdt_blob = 0x7ef35f20 new_fdt = 0x7ef35f20 fdt_size = 0x00001fa0 ERROR: reserving fdt memory region failed (addr=7fe00000 size=200000) lmb_dump_all: memory.cnt = 0x1 memory.size = 0x0 memory.reg[0x0].base = 0x40000000 .size = 0x40000000 reserved.cnt = 0x2 reserved.size = 0x0 reserved.reg[0x0].base = 0xe100000 .size = 0xf00000 reserved.reg[0x1].base = 0x7ef34d04 .size = 0x10cb2fc arch_number = 0x00000000 TLB addr = 0x7fff0000 irq_sp = 0x7ef35f10 sp start = 0x7ef35f00 Early malloc usage: 1fc / 400 => efidebug memmap Type Start End Attributes ================ ================ ================ ========== RESERVED 000000000e100000-000000000f000000 WB <---- outside of RAM CONVENTIONAL 0000000040000000-0000000047f00000 WB ACPI RECLAIM MEM 0000000047f00000-0000000047f05000 WB CONVENTIONAL 0000000047f05000-000000007d475000 WB RESERVED 000000007d475000-000000007d477000 WB CONVENTIONAL 000000007d477000-000000007df17000 WB LOADER DATA 000000007df17000-000000007df18000 WB Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> --- I'm really not sure that this is correct way to fix. Current code state is that uboot fails to boot kernel on armv7 if memory was reserved at 0xe100000. I.e. in current code it does not work. Qemu target has memory started at 0x40000000 and this chunk is outside that memory. Flag overlap_only_ram had very confusing naming, I corrected it in separate path. This patch fixes booting with removing region from efi memmap. I send this as RFC for now. BR, Maxim. lib/efi_loader/efi_memory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 7be756e370..637c6c67ed 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -360,11 +360,15 @@ static efi_status_t efi_add_memory_map_pg(u64 start, u64 pages, efi_status_t efi_add_memory_map(u64 start, u64 size, int memory_type) { u64 pages; + bool overlap_only_ram = false; pages = efi_size_in_pages(size + (start & EFI_PAGE_MASK)); start &= ~EFI_PAGE_MASK; - - return efi_add_memory_map_pg(start, pages, memory_type, false); +#if defined(CONFIG_ARM) + overlap_only_ram = true; +#endif + return efi_add_memory_map_pg(start, pages, memory_type, + overlap_only_ram); } /** -- 2.17.1

2 3

[PATCH] efi: change usage syntax
by Maxim Uvarov 15 Sep '20

15 Sep '20

syntax was changed from "," to ":". Account this also in the documentation. Fixes: 2b3fbcb59f efi_loader: use ':' as separator for setenv -i Signed-off-by: Maxim Uvarov <maxim.uvarov(a)linaro.org> --- cmd/nvedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index d188c6aa6b..d03accead9 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -1472,7 +1472,7 @@ static char env_help_text[] = "env select [target] - select environment target\n" #endif #if defined(CONFIG_CMD_NVEDIT_EFI) - "env set -e [-nv][-bs][-rt][-at][-a][-i addr,size][-v] name [arg ...]\n" + "env set -e [-nv][-bs][-rt][-at][-a][-i addr:size][-v] name [arg ...]\n" " - set UEFI variable; unset if '-i' or 'arg' not specified\n" #endif "env set [-f] name [arg ...]\n"; -- 2.17.1

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

[PATCH] pci: layerscape: Fix spurious writes and panic
by Michael Walle 14 Sep '20

14 Sep '20

The fdt_fixup_pcie_ls() scans all PCI devices and assumes that all PCI root devices are layerscape PCIe controllers. Unfortunately, this is not true for the LS1028A. There is one additional static PCI root complex (this contains the networking devices) which has nothing to do with the layerscape PCIe controllers. On recent U-Boot versions this results in the following panic: "Synchronous Abort" handler, esr 0x96000044 elr: 000000009602fa04 lr : 000000009602f9f4 (reloc) elr: 00000000fbd73a04 lr : 00000000fbd739f4 x0 : 0080000002000101 x1 : 0000000000000000 x2 : 00000000fbde9000 x3 : 0000000000000001 x4 : 0000000000000000 x5 : 0000000000000030 x6 : 00000000fbdbd460 x7 : 00000000fbb3d3a0 x8 : 0000000000000002 x9 : 000000000000000c x10: 00000000ffffffe8 x11: 0000000000000006 x12: 000000000001869f x13: 0000000000000a2c x14: 00000000fbb3d2cc x15: 00000000ffffffff x16: 0000000000010000 x17: 0000000000000000 x18: 00000000fbb3fda0 x19: 0000000000000800 x20: 0000000000000000 x21: 00000001f0000000 x22: 0000000000000800 x23: 0000000000000009 x24: 00000000fbdc3c1b x25: 00000000fbdc28e5 x26: 00000000fbdcc008 x27: 00000000fbdc16e2 x28: 000000000f000000 x29: 00000000fbb3d3a0 Code: 394072a1 f94006a0 34000041 5ac00a94 (b8336814) Resetting CPU ... This bug already existed in former versions, but the spurious write was never trapped, because the destination address was a valid address (by pure luck). Make sure the PCI root is actually one of the expected PCIe layerscape controllers by matching its compatible string. Signed-off-by: Michael Walle <michael(a)walle.cc> --- drivers/pci/pcie_layerscape_fixup.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 94de4edaf4..76706487e2 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -187,6 +187,12 @@ static void fdt_fixup_pcie_ls(void *blob) pci_find_next_device(&dev)) { for (bus = dev; device_is_on_pci_bus(bus);) bus = bus->parent; + + /* Only do the fixups for layerscape PCIe controllers */ + if (!device_is_compatible(bus, "fsl,ls-pcie") && + !device_is_compatible(bus, CONFIG_FSL_PCIE_COMPAT)) + continue; + pcie_rc = dev_get_priv(bus); streamid = pcie_next_streamid(pcie_rc->stream_id_cur, -- 2.20.1

3 3

[PATCH] serial: uartlite: Add support to work with any endianness
by Michal Simek 14 Sep '20

14 Sep '20

From: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> This endinness changes are taken from linux uartlite driver. Reset TX fifo in control register and check TX fifo empty flag in lower byte of the status register to detect if it is a little endian system. Based on this check, program the registers with le32 or be32 through out the driver. Signed-off-by: T Karthik Reddy <t.karthik.reddy(a)xilinx.com> Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/serial/serial_xuartlite.c | 74 ++++++++++++++++++++++++++----- 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index 5116d13751de..e16642504b16 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -32,17 +32,64 @@ struct uartlite { struct uartlite_platdata { struct uartlite *regs; + const struct uartlite_reg_ops *reg_ops; }; +struct uartlite_reg_ops { + u32 (*in)(void __iomem *addr); + void (*out)(u32 val, void __iomem *addr); +}; + +static u32 uartlite_inle32(void __iomem *addr) +{ + return in_le32(addr); +} + +static void uartlite_outle32(u32 val, void __iomem *addr) +{ + out_le32(addr, val); +} + +static const struct uartlite_reg_ops uartlite_le = { + .in = uartlite_inle32, + .out = uartlite_outle32, +}; + +static u32 uartlite_inbe32(void __iomem *addr) +{ + return in_be32(addr); +} + +static void uartlite_outbe32(u32 val, void __iomem *addr) +{ + out_be32(addr, val); +} + +static const struct uartlite_reg_ops uartlite_be = { + .in = uartlite_inbe32, + .out = uartlite_outbe32, +}; + +static u32 uart_in32(void __iomem *addr, struct uartlite_platdata *plat) +{ + return plat->reg_ops->in(addr); +} + +static void uart_out32(void __iomem *addr, u32 val, + struct uartlite_platdata *plat) +{ + plat->reg_ops->out(val, addr); +} + static int uartlite_serial_putc(struct udevice *dev, const char ch) { struct uartlite_platdata *plat = dev_get_platdata(dev); struct uartlite *regs = plat->regs; - if (in_be32(&regs->status) & SR_TX_FIFO_FULL) + if (uart_in32(&regs->status, plat) & SR_TX_FIFO_FULL) return -EAGAIN; - out_be32(&regs->tx_fifo, ch & 0xff); + uart_out32(&regs->tx_fifo, ch & 0xff, plat); return 0; } @@ -52,10 +99,10 @@ static int uartlite_serial_getc(struct udevice *dev) struct uartlite_platdata *plat = dev_get_platdata(dev); struct uartlite *regs = plat->regs; - if (!(in_be32(&regs->status) & SR_RX_FIFO_VALID_DATA)) + if (!(uart_in32(&regs->status, plat) & SR_RX_FIFO_VALID_DATA)) return -EAGAIN; - return in_be32(&regs->rx_fifo) & 0xff; + return uart_in32(&regs->rx_fifo, plat) & 0xff; } static int uartlite_serial_pending(struct udevice *dev, bool input) @@ -64,19 +111,26 @@ static int uartlite_serial_pending(struct udevice *dev, bool input) struct uartlite *regs = plat->regs; if (input) - return in_be32(&regs->status) & SR_RX_FIFO_VALID_DATA; + return uart_in32(&regs->status, plat) & SR_RX_FIFO_VALID_DATA; - return !(in_be32(&regs->status) & SR_TX_FIFO_EMPTY); + return !(uart_in32(&regs->status, plat) & SR_TX_FIFO_EMPTY); } static int uartlite_serial_probe(struct udevice *dev) { struct uartlite_platdata *plat = dev_get_platdata(dev); struct uartlite *regs = plat->regs; - - out_be32(&regs->control, 0); - out_be32(&regs->control, ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX); - in_be32(&regs->control); + int ret; + + plat->reg_ops = &uartlite_be; + ret = uart_in32(&regs->control, plat); + uart_out32(&regs->control, 0, plat); + uart_out32(&regs->control, + ULITE_CONTROL_RST_RX | ULITE_CONTROL_RST_TX, plat); + ret = uart_in32(&regs->status, plat); + /* Endianness detection */ + if ((ret & SR_TX_FIFO_EMPTY) != SR_TX_FIFO_EMPTY) + plat->reg_ops = &uartlite_le; return 0; } -- 2.28.0

2 1