July 2022 - U-Boot

[PATCH] ARM: relocate: Fix Thumb code by using proper label type
by Andre Przywara 27 Jul '22

27 Jul '22

The generic ARM relocate_code function was using its own function entry point as a relocation base, and it was obtaining that address by using the "adr" instruction on that entry point label. However that label is not just an ordinary label, instead we explicitly mark it as a function start address. Normally that doesn't change much (other than for debugging), but when assembled in Thumb mode, newer versions of the GNU assembler prepare everything for this address being used as the argument to a "bx" call, so make sure bit 0 is set in there to mark this function as Thumb code. Of course this doesn't end up very well when we use this address for the ensuing memcpy operation. To avoid this problem, and to solve it in a robust way, add an extra label, which is not marked as a function entry, and use that for the adr instruction. This lets all assemblers generate the right immediate offset in the "adr" instruction. This fixes in particular ARMv7-M ports when using GNU binutils v2.37 or newer (commit d3e52e120b68 seems to trigger the change in behaviour). Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> Reported-by: Jesse Taube <mr.bossman075(a)gmail.com> --- arch/arm/lib/relocate.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index 14b7f61c1a..5102bfabde 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -78,7 +78,8 @@ ENDPROC(relocate_vectors) */ ENTRY(relocate_code) - adr r3, relocate_code +relocate_base: + adr r3, relocate_base ldr r1, _image_copy_start_ofs add r1, r3 /* r1 <- Run &__image_copy_start */ subs r4, r0, r1 /* r4 <- Run to copy offset */ -- 2.25.1

2 1

SiFive Unmatched (riscv64), hang scanning xhci_pci
by Alex 27 Jul '22

27 Jul '22

Somewhere between e7fb67df319cec410c20906bbf33936a6f7479b2 and 86feeab3dc71977afb70f595e42060ce324086d0 u-boot stopped booting on the SiFive unmatched. gcc version 11.2.0 (GCC) GNU ld (GNU Binutils) 2.36.1 First boot... U-Boot SPL 2022.10-rc1-00159-g86feeab3dc (Jul 26 2022 - 17:01:52 -0500) Trying to boot from MMC1 U-Boot 2022.10-rc1-00159-g86feeab3dc (Jul 26 2022 - 17:01:52 -0500) CPU: rv64imafdc Model: SiFive HiFive Unmatched A00 DRAM: 16 GiB Core: 34 devices, 21 uclasses, devicetree: separate MMC: spi@10050000:mmc@0: 0 Loading Environment from SPIFlash... SF: Detected is25wp256 with page size 256 Bytes, erase size 4 KiB, total 32 MiB *** Warning - bad CRC, using default environment EEPROM: SiFive PCB EEPROM format v1 Product ID: 0002 (HiFive Unmatched) PCB revision: 3 BOM revision: B BOM variant: 0 Serial number: SF105SZ212200269 Ethernet MAC address: 70:b3:d5:92:f7:bf CRC: c9ba1779 In: serial@10010000 Out: serial@10010000 Err: serial@10010000 Model: SiFive HiFive Unmatched A00 Net: eth0: ethernet@10090000 Hit any key to stop autoboot: 0 PCIE-0: Link up (Gen1-x8, Bus0) Device 0: unknown device starting USB... Bus xhci_pci: Register 4000840 NbrPorts 4 Starting the controller USB XHCI 1.00 scanning bus xhci_pci for devices... (hang) rebuild clean, rewrite to microsd, reboot. U-Boot 2022.10-rc1-00159-g86feeab3dc (Jul 26 2022 - 17:59:33 -0500) CPU: rv64imafdc Model: SiFive HiFive Unmatched A00 DRAM: 16 GiB Core: 34 devices, 21 uclasses, devicetree: separate MMC: spi@10050000:mmc@0: 0 Loading Environment from SPIFlash... SF: Detected is25wp256 with page size 256 Bytes, erase size 4 KiB, total 32 MiB *** Warning - bad CRC, using default environment EEPROM: SiFive PCB EEPROM format v1 Product ID: 0002 (HiFive Unmatched) PCB revision: 3 BOM revision: B BOM variant: 0 Serial number: SF105SZ212200269 Ethernet MAC address: 70:b3:d5:92:f7:bf CRC: c9ba1779 In: serial@10010000 Out: serial@10010000 Err: serial@10010000 Model: SiFive HiFive Unmatched A00 Net: eth0: ethernet@10090000 Hit any key to stop autoboot: 0 PCIE-0: Link up (Gen1-x8, Bus0) Device 0: unknown device starting USB... Bus xhci_pci: Register 4000840 NbrPorts 4 Starting the controller USB XHCI 1.00 scanning bus xhci_pci for devices... cannot reset port 3!? Disk �� not ready device 'usb_mass_storage.lun0' failed to unbind 5 USB Device(s) found device 'usb_mass_storage.lun0' failed to unbind scanning usb for storage devices... 1 Storage Device(s) found Device 0: Vendor: SanDisk Rev: 1012 Prod: Extreme SSD Type: Hard Disk Capacity: 238475.0 MB = 232.8 GB (488396800 x 512) ... is now current device Unhandled exception: Illegal instruction EPC: 0000000000000000 RA: 00000000fff76096 TVAL: 0000000000000000 EPC: ffffffff802a3000 RA: 0000000080219096 reloc adjusted Code: Unhandled exception: Load access fault EPC: 00000000fff5e20e RA: 00000000fff5e202 TVAL: fffffffffffffff0 EPC: 000000008020120e RA: 0000000080201202 reloc adjusted Code: a0ef 4775 8913 ff04 0a17 0006 0a13 202a (5583 0009) resetting ... System reset not supported on this platform ### ERROR ### Please RESET the board ###

1 0

[PATCH] boot: allow bootmeth-distro without CONFIG_NET
by John Keeping 26 Jul '22

26 Jul '22

Remove the dependency on CMD_PXE from BOOTMETH_DISTRO by introducing a new hidden kconfig symbol to control whether pxe_utils is compiled, allowing bootstd's distro method to be compiled without needing networking support enabled. Signed-off-by: John Keeping <john(a)metanate.com> --- boot/Kconfig | 7 ++++++- boot/Makefile | 3 +-- cmd/Kconfig | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index 17438b566d..24cebd6d20 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -294,6 +294,11 @@ endif # SPL endif # FIT +config PXE_UTILS + bool + help + Utilities for parsing PXE file formats. + config BOOTSTD bool "Standard boot support" default y @@ -345,7 +350,7 @@ config BOOTSTD_BOOTCOMMAND config BOOTMETH_DISTRO bool "Bootdev support for distro boot" - depends on CMD_PXE + select PXE_UTILS default y help Enables support for distro boot using bootdevs. This makes the diff --git a/boot/Makefile b/boot/Makefile index a70674259c..124065a03f 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -10,8 +10,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o -obj-$(CONFIG_CMD_PXE) += pxe_utils.o -obj-$(CONFIG_CMD_SYSBOOT) += pxe_utils.o +obj-$(CONFIG_PXE_UTILS) += pxe_utils.o endif diff --git a/cmd/Kconfig b/cmd/Kconfig index d5f842136c..d2cc7318e0 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1823,6 +1823,7 @@ config CMD_ETHSW config CMD_PXE bool "pxe" select MENU + select PXE_UTILS help Boot image via network using PXE protocol @@ -2004,6 +2005,7 @@ config CMD_SOUND config CMD_SYSBOOT bool "sysboot" select MENU + select PXE_UTILS help Boot image via local extlinux.conf file -- 2.37.1

2 1

[PATCH 1/1] dm: avoid NULL dereference in add_item()
by Heinrich Schuchardt 26 Jul '22

26 Jul '22

acpi_add_other_item() passes dev = NULL. Instead of dev->name write the string "other" to the debug log: ACPI: Writing ACPI tables at 1fd3000 0base: writing table '<NULL>' * other: Added type 3, 0000000011fd4000, size 240 1facs: writing table 'FACS' * other: Added type 3, 0000000011fd4240, size 40 5csrt: writing table 'CSRT' * other: Added type 3, 0000000011fd4280, size 30 Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/core/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/core/acpi.c b/drivers/core/acpi.c index 0df58dbc0d..8457733edb 100644 --- a/drivers/core/acpi.c +++ b/drivers/core/acpi.c @@ -159,8 +159,8 @@ static int add_item(struct acpi_ctx *ctx, struct udevice *dev, memcpy(item->buf, start, item->size); } item_count++; - log_debug("* %s: Added type %d, %p, size %x\n", dev->name, type, start, - item->size); + log_debug("* %s: Added type %d, %p, size %x\n", + dev ? dev->name : "other", type, start, item->size); return 0; } -- 2.36.1

2 2

[PATCH 0/4] test: uncover NULL dereferences in logging
by Heinrich Schuchardt 26 Jul '22

26 Jul '22

Setting CONFIG_LOG_MAX_LEVEL=9 in sandbox_defconfig exposed to NULL dereferences and bugs in the log tests. log_debug() statements are only executed for CONFIG_LOG_MAX_LEVEL > 6. We should have a defconfig that exposes problems in these statements. Heinrich Schuchardt (4): dm: avoid NULL dereference in add_item() test: fix log tests dm: avoid NULL dereference in lists_bind_fdt() configs: sandbox_defconfig: CONFIG_LOG_MAX_LEVEL=9 configs/sandbox_defconfig | 2 ++ drivers/core/acpi.c | 4 ++-- drivers/core/lists.c | 7 ++++--- test/log/log_test.c | 11 +++++++---- 4 files changed, 15 insertions(+), 9 deletions(-) -- 2.36.1

2 10

[PATCH 1/1] dm: fix logic of lists_bind_fdt()
by Heinrich Schuchardt 26 Jul '22

26 Jul '22

If parameter drv of lists_bind_fdt() is specified, we shall bind only to this very driver and to no other. If the driver drv has an of_match property, we shall only bind to the driver if it matches the compatible string of the device. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/core/lists.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/core/lists.c b/drivers/core/lists.c index 93514a744d..c49695b24f 100644 --- a/drivers/core/lists.c +++ b/drivers/core/lists.c @@ -223,10 +223,14 @@ int lists_bind_fdt(struct udevice *parent, ofnode node, struct udevice **devp, compat); for (entry = driver; entry != driver + n_ents; entry++) { + if (drv) { + if (drv != entry) + continue; + if (!entry->of_match) + break; + } ret = driver_check_compatible(entry->of_match, &id, compat); - if ((drv) && (drv == entry)) - break; if (!ret) break; } -- 2.36.1

2 3

[PATCH] binman: Increase default fitImage data section resize step from 1k to 64k
by Marek Vasut 26 Jul '22

26 Jul '22

Currently the fitImage data area is resized in 1 kiB steps. This works when bundling smaller images below some 1 MiB, but when bundling large images into the fitImage, this make binman spend extreme amount of time and CPU just spinning in pylibfdt FdtSw.check_space() until the size grows enough for the large image to fit into the data area. Increase the default step to 64 kiB, which is a reasonable compromise -- the U-Boot blobs are somewhere in the 64kiB...1MiB range, DT blob are just short of 64 kiB, and so are the other blobs. This reduces binman runtime with 32 MiB blob from 2.3 minutes to 5 seconds. The following can be used to trigger the problem if rand.bin is some 32 MiB. " / { itb { fit { images { test { compression = "none"; description = "none"; type = "flat_dt"; blob { filename = "rand.bin"; type = "blob-ext"; }; }; }; }; }; configurations { binman_configuration: config { loadables = "test"; }; }; }; " Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/binman/etype/fit.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index 12306623af6..ad43fce18ec 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -658,6 +658,7 @@ class Entry_fit(Entry_section): # Build a new tree with all nodes and properties starting from the # entry node fsw = libfdt.FdtSw() + fsw.INC_SIZE = 65536 fsw.finish_reservemap() to_remove = [] loadables = [] -- 2.35.1

2 2

[PATCH v2] log: force DEBUG when LOG_DEBUG is activated
by Patrick Delaunay 26 Jul '22

26 Jul '22

When CONFIG_LOG is activated, if LOG_DEBUG is defined in a file and DEBUG is not defined the trace with debug() macro are not displayed, because the parameter cond : _DEBUG = 0 is checked in debug_cond(). With this patch the define DEBUG, used to force the trace generated by debug() macro, is linked with the define LOG_DEBUG, used to force the trace generated by other macros (log_debug, dev_dbg, pr_debug). We only need to define LOG_DEBUG in a file to activate all the traces generated by any U-Boot debug macro, as it is described in /doc/develop/logging.rst Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- Changes in v2: - update logging.rst doc/develop/logging.rst | 19 +++++++------------ include/log.h | 3 +++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/doc/develop/logging.rst b/doc/develop/logging.rst index 51095b05ba9..704a6bf1d84 100644 --- a/doc/develop/logging.rst +++ b/doc/develop/logging.rst @@ -66,26 +66,21 @@ Sometimes it is useful to turn on logging just in one file. You can use this #define LOG_DEBUG to enable building in of all logging statements in a single file. Put it at -the top of the file, before any #includes. - -To actually get U-Boot to output this you need to also set the default logging -level - e.g. set CONFIG_LOG_DEFAULT_LEVEL to 7 (:c:data:`LOGL_DEBUG`) or more. -Otherwise debug output is suppressed and will not be generated. +the top of the file, before any #includes and any message in the file will be +written, regardless of the value of CONFIG_LOG_DEFAULT_LEVEL. Using DEBUG ----------- U-Boot has traditionally used a #define called DEBUG to enable debugging on a -file-by-file basis. The debug() macro compiles to a printf() statement if -DEBUG is enabled, and an empty statement if not. +file-by-file basis but LOG_DEBUG are intended to replace it with the logging +facilities; DEBUG is activated when LOG_DEBUG is activated. With logging enabled, debug() statements are interpreted as logging output -with a level of LOGL_DEBUG and a category of LOGC_NONE. +with a level of LOGL_DEBUG and a category of LOG_CATEGORY. -The logging facilities are intended to replace DEBUG, but if DEBUG is defined -at the top of a file, then it takes precedence. This means that debug() -statements will result in output to the console and this output will not be -logged. +With logging disabled, the debug() macro compiles to a printf() statement +if DEBUG is enabled and to an empty statement if not. Logging statements ------------------ diff --git a/include/log.h b/include/log.h index 8f35c10abb5..7abc70e4398 100644 --- a/include/log.h +++ b/include/log.h @@ -194,6 +194,9 @@ int _log_buffer(enum log_category_t cat, enum log_level_t level, #ifdef LOG_DEBUG #define _LOG_DEBUG LOGL_FORCE_DEBUG +#ifndef DEBUG +#define DEBUG +#endif #else #define _LOG_DEBUG 0 #endif -- 2.25.1

2 1

[PATCH 0/3] Test and docs for fdt command
by Simon Glass 26 Jul '22

26 Jul '22

This was required by Marek to provide a starting point for documentation and a test for a new subcommand. Simon Glass (3): addrmap: Support on sandbox fdt: Start a test for the fdt command doc: Make a start on docs for fdt command board/sandbox/sandbox.c | 9 +++ common/cli.c | 15 ++++ configs/sandbox_defconfig | 1 + doc/usage/cmd/fdt.rst | 69 ++++++++++++++++++ doc/usage/index.rst | 1 + include/addr_map.h | 2 + include/command.h | 10 +++ include/test/suites.h | 1 + lib/addr_map.c | 5 +- test/cmd/Makefile | 1 + test/cmd/addrmap.c | 5 +- test/cmd/fdt.c | 142 ++++++++++++++++++++++++++++++++++++++ test/cmd_ut.c | 6 ++ 13 files changed, 262 insertions(+), 5 deletions(-) create mode 100644 doc/usage/cmd/fdt.rst create mode 100644 test/cmd/fdt.c -- 2.37.0.144.g8ac04bfd2-goog

1 6

[PATCH] dm: fix mis-word in SPL_DM description
by Oleksandr Suvorov 26 Jul '22

26 Jul '22

Replace logically correct word in the description. Fixes: 91a91ff804d ("dm: Add Kconfig options for driver model SPL support") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> --- drivers/core/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 8eb0070d222..007dc6a1de3 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -18,7 +18,7 @@ config SPL_DM consider using CONFIG_SPL_SYS_MALLOC_SIMPLE. In that case you must provide CONFIG_SPL_SYS_MALLOC_F_LEN to set the size. In most cases driver model will only allocate a few uclasses - and devices in SPL, so 1KB should be enable. See + and devices in SPL, so 1KB should be enough. See CONFIG_SPL_SYS_MALLOC_F_LEN for more details on how to enable it. config TPL_DM -- 2.36.1

2 2