December 2023 - U-Boot

[PATCH 1/1] acpi: simplify acpi_write_ssdt()
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

* Converting to void * is superfluous when calling memset(). * acpi_fill_header() already fills oem_table_id. Fixes: d953137526cc ("x86: Move SSDT table to a writer function") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/acpi/ssdt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/acpi/ssdt.c b/lib/acpi/ssdt.c index 659c1aad40..b140b4b2ff 100644 --- a/lib/acpi/ssdt.c +++ b/lib/acpi/ssdt.c @@ -18,10 +18,9 @@ int acpi_write_ssdt(struct acpi_ctx *ctx, const struct acpi_writer *entry) int ret; ssdt = ctx->current; - memset((void *)ssdt, '\0', sizeof(struct acpi_table_header)); + memset(ssdt, '\0', sizeof(struct acpi_table_header)); acpi_fill_header(ssdt, "SSDT"); - memcpy(ssdt->oem_table_id, OEM_TABLE_ID, sizeof(ssdt->oem_table_id)); ssdt->revision = acpi_get_table_revision(ACPITAB_SSDT); ssdt->aslc_revision = 1; ssdt->length = sizeof(struct acpi_table_header); -- 2.40.1

2 2

[PATCH v2 0/2] acpi: consider XSDT in acpi_find_table()
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

The RSDT table is deprecated and does not exist on all systems. By preference scan XSDT for the table to find. If no XSDT table exists, try to use the RSDT table. Provide a unit test for acpi_find_table(). v2: Consider that map_sysmem(0, 0) != NULL. Add unit test. *** BLURB HERE *** Heinrich Schuchardt (2): acpi: consider XSDT in acpi_find_table() test: unit test for acpi_find_table() lib/acpi/acpi.c | 20 ++++++++--- test/dm/acpi.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 4 deletions(-) -- 2.40.1

3 7

[PATCH v4 0/2] cmd: acpi: fix acpi list command
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

The size of the ACPI table header is not a multiple of 8. We have to mark struct acpi_xsdt as packed to correctly access field Entry. Add a unit test for the offsets of field Entry in the RSDT and XSDT tables. ACPI tables may comprise either RSDT, XSDT, or both. The current code fails to check the presence of the RSDT table before accessing it. This leads to an exception if the RSDT table is not provided. The XSDT table takes precedence over the RSDT table. The return values of list_rsdt() and list_rsdp() are always zero and not checked. Remove the return values. Addresses in the XSDT table are 64-bit. Adjust the output accordingly. As the RSDT table has to be ignored if the XSDT command is present there is no need to compare the tables in a display command. Anyway the specification does not require that the sequence of addresses in the RSDT and XSDT table are the same. The FACS table header does not provide revision information. Correct the description of dump_hdr(). Adjust the ACPI test to match the changed output format of the 'acpi list' command. v4: deduplicate code in list_rsdt() v3: consider map_sysmem(0, 0) != NULL on the sandbox adjust signature of list_rsdt() and list_rsdp() v2: merge patch 2 and 3 remove leading zeros from address output Heinrich Schuchardt (2): acpi: fix struct acpi_xsdt cmd: acpi: fix acpi list command cmd/acpi.c | 64 +++++++++++++++++++++------------------ include/acpi/acpi_table.h | 2 +- test/dm/acpi.c | 28 +++++++++++------ 3 files changed, 54 insertions(+), 40 deletions(-) -- 2.40.1

2 5

[PATCH v2 0/3] binman: Add support for TI_DM entry
by Neha Malcom Francis 13 Dec '23

13 Dec '23

This series adds support for the TI_DM entry and moves all K3 platforms to using the same. With this feature introduced, if TI_DM argument is provided binman picks the pathname it provides; else, it defaults to picking up the ti-dm.bin file. This makes it flexible for users to build tispl.bin with custom DM binaries. Boot logs: https://gist.github.com/nehamalcom/37ce8a32e37ddf3e1afcc4c8bd941159 --- Changes from v1: https://lore.kernel.org/all/20231204112141.2036907-1-n-francis@ti.com/ - s/ti-linux-firmware/BINMAN_INDIRS in documentation (Andrew) - No change to boot logs since only doc change Neha Malcom Francis (3): binman: etype: dm: Add entry type for TI DM arm: dts: k3-*-binman: Move to using ti-dm entry type doc: board: ti: k3: Mention TI_DM argument Makefile | 1 + arch/arm/dts/k3-am625-sk-binman.dtsi | 4 ++-- .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 4 ++-- arch/arm/dts/k3-am62a-sk-binman.dtsi | 4 ++-- arch/arm/dts/k3-j7200-binman.dtsi | 4 ++-- arch/arm/dts/k3-j721e-binman.dtsi | 4 ++-- arch/arm/dts/k3-j721s2-binman.dtsi | 4 ++-- doc/board/ti/k3.rst | 7 ++++++ tools/binman/entries.rst | 14 ++++++++++++ tools/binman/etype/ti_dm.py | 22 +++++++++++++++++++ tools/binman/ftest.py | 7 ++++++ tools/binman/test/225_ti_dm.dts | 13 +++++++++++ 12 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 tools/binman/etype/ti_dm.py create mode 100644 tools/binman/test/225_ti_dm.dts -- 2.34.1

3 10

[PATCH v2] bootstd: Fix a memory leak in the efi manager bootflow
by Ilias Apalodimas 13 Dec '23

13 Dec '23

efi_get_var() allocates memory which has to be freed after the value of the variable is consumed. Free the memory properly Fixes: f2bfa0cb1794 ("bootstd: Make efi_mgr bootmeth work for non-sandbox setups") Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- Apologies for the quick resend but the previous patches wasn't compiling due to the missing #include <malloc.h> Changes since v1 - Add #include <malloc.h> since it's needed for free() boot/bootmeth_efi_mgr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c index e6c42d41fb80..6428c096d7f8 100644 --- a/boot/bootmeth_efi_mgr.c +++ b/boot/bootmeth_efi_mgr.c @@ -16,6 +16,7 @@ #include <dm.h> #include <efi_loader.h> #include <efi_variable.h> +#include <malloc.h> /** * struct efi_mgr_priv - private info for the efi-mgr driver @@ -65,6 +66,7 @@ static int efi_mgr_read_bootflow(struct udevice *dev, struct bootflow *bflow) bootorder = efi_get_var(u"BootOrder", &efi_global_variable_guid, &size); if (bootorder) { + free(bootorder); bflow->state = BOOTFLOWST_READY; return 0; } -- 2.40.1

4 3

[PATCH 1/1] cmd: check argc for acpi dump
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

'acpi dump' without parameter results in a NULL dereference. Check the number of arguments. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/acpi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/acpi.c b/cmd/acpi.c index 89970417a0..0c14409242 100644 --- a/cmd/acpi.c +++ b/cmd/acpi.c @@ -160,6 +160,9 @@ static int do_acpi_dump(struct cmd_tbl *cmdtp, int flag, int argc, char sig[ACPI_NAME_LEN]; int ret; + if (argc < 2) + return CMD_RET_USAGE; + name = argv[1]; if (strlen(name) != ACPI_NAME_LEN) { printf("Table name '%s' must be four characters\n", name); -- 2.40.1

2 2

[PATCH 1/1] binman: elf: Using variable 'old_val' before assignment
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

old_val can only be assumed initialized in the finally block if it is assigned a value before the try statement. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- tools/binman/elf_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index e3dee79d06..b64134123c 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -249,8 +249,8 @@ class TestElf(unittest.TestCase): def testEmbedFail(self): """Test calling GetSymbolFileOffset() without elftools""" + old_val = elf.ELF_TOOLS try: - old_val = elf.ELF_TOOLS elf.ELF_TOOLS = False fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: @@ -290,8 +290,8 @@ class TestElf(unittest.TestCase): def test_read_segments_fail(self): """Test for read_loadable_segments() without elftools""" + old_val = elf.ELF_TOOLS try: - old_val = elf.ELF_TOOLS elf.ELF_TOOLS = False fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: @@ -327,8 +327,8 @@ class TestElf(unittest.TestCase): def test_get_file_offset_fail(self): """Test calling GetFileOffset() without elftools""" + old_val = elf.ELF_TOOLS try: - old_val = elf.ELF_TOOLS elf.ELF_TOOLS = False fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: @@ -351,8 +351,8 @@ class TestElf(unittest.TestCase): def test_get_symbol_from_address_fail(self): """Test calling GetSymbolFromAddress() without elftools""" + old_val = elf.ELF_TOOLS try: - old_val = elf.ELF_TOOLS elf.ELF_TOOLS = False fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: -- 2.40.1

2 3

[PATCH v2 0/2] test: Using variable 'old_dtb' before assignment
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

Avoid errors reported by 'make pylint_err. v2: mention pylint in commit messages Heinrich Schuchardt (2): test: fit: Using variable 'old_dtb' before assignment test: vboot: Using variable 'old_dtb' before assignment test/py/tests/test_fit.py | 6 +++--- test/py/tests/test_vboot.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.40.1

2 4

[PATCH v3 00/32] bootm: Refactoring to reduce reliance on CMDLINE (part A)
by Simon Glass 13 Dec '23

13 Dec '23

It would be useful to be able to boot an OS when CONFIG_CMDLINE is disabled. This could allow reduced code size. Standard boot provides a way to handle programmatic boot, without scripts, so such a feature is possible. The main impediment is the inability to use the booting features of U-Boot without a command line. So the solution is to avoid passing command arguments and the like to code in boot/ A similar process has taken place with filesystems, for example, where we have (somewhat) separate Kconfig options for the filesystem commands and the filesystems themselves. This series starts the process of refactoring the bootm logic so that it can be called from standard boot without using the command line. Mostly it removes the use of argc, argv and cmdtbl from the internal logic. Some limited tidy-up is included, but this is kept to smaller patches, rather than trying to remove all #ifdefs etc. Some function comments are added, however. A simple programmatic boot is provided as a starting point. This work will likely take many series, so this is just the start. Size growth with this series for firefly-rk3288 (Thumb2) is: arm: (for 1/1 boards) all +23.0 rodata -49.0 text +72.0 This should be removed by: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/11 but it is not included in this series as it is already large enough. No functional change is intended in this series. Changes in v3: - Add a panic if programmatic boot fails - Drop RFC tag Changes in v2: - Add new patch to adjust position of unmap_sysmem() in boot_get_kernel() - Add new patch to obtain command arguments - Fix 'boot_find_os' typo - Pass in the command name - Use the command table to provide the command name, instead of "bootm" Simon Glass (32): arm: x86: Drop discarding of command linker-lists README: Correct docs for CONFIG_SPL_BUILD mmc: env: Unify the U_BOOT_ENV_LOCATION conditions treewide: Tidy up semicolon after command macros bootstd: Add missing header file from bootdev.h bootm: Drop arguments from bootm_start() bootm: Simplify arguments for bootm_pre_load() bootm: Move boot_get_kernel() higher in the file image: Tidy up genimg_get_kernel_addr_fit() bootm: Reduce arguments to boot_get_kernel() image: Document error codes from fit_image_load() bootm: Adjust boot_get_kernel() to return an error bootm: Adjust position of unmap_sysmem() in boot_get_kernel() bootm: Use the error return from boot_get_kernel() bootstage: Drop BOOTSTAGE_ID_FIT_KERNEL_INFO bootm: Move error printing out of boot_get_kernel() bootm: Reduce arguments to bootm_find_os() bootm: Reduce arguments to boot_get_ramdisk() fdt: Allow use of fdt_support inside if() statements bootm: Drop #ifdef in bootm_find_images() bootm: Pass image buffer to boot_get_fdt() bootm: Reduce arguments to boot_get_fdt() bootm: Reduce arguments to boot_get_fpga() bootm: Reduce arguments to boot_get_loadables() bootm: Simplify Android ramdisk addr in bootm_find_images() bootm: efi: Drop special call to bootm_find_other() bootm: optee: Drop special call to bootm_find_other() bootm: Adjust the parameters of bootm_find_images() bootm: Add a function to check overlap bootm: Reduce arguments to bootm_find_other() bootstd: Introduce programmatic boot command: Introduce functions to obtain command arguments README | 26 +- arch/arm/cpu/u-boot.lds | 3 - arch/x86/cpu/u-boot-64.lds | 4 - arch/x86/cpu/u-boot-spl.lds | 4 - arch/x86/cpu/u-boot.lds | 4 - board/freescale/common/vid.c | 2 +- board/xilinx/common/fru.c | 2 +- board/xilinx/versal/cmds.c | 2 +- board/xilinx/zynqmp/cmds.c | 2 +- boot/Kconfig | 12 + boot/Makefile | 2 + boot/bootm.c | 577 +++++++++++++++++++---------------- boot/bootm_os.c | 16 - boot/image-board.c | 67 +--- boot/image-fdt.c | 39 +-- boot/prog_boot.c | 51 ++++ cmd/booti.c | 4 +- cmd/bootz.c | 4 +- cmd/btrfs.c | 2 +- cmd/disk.c | 4 +- cmd/eeprom.c | 2 +- cmd/ext2.c | 4 +- cmd/fs.c | 8 +- cmd/fuse.c | 2 +- cmd/mmc.c | 2 +- cmd/pinmux.c | 2 +- cmd/qfw.c | 2 +- common/main.c | 11 + drivers/misc/gsc.c | 6 +- env/mmc.c | 2 +- fs/fs.c | 4 +- include/bootdev.h | 1 + include/bootm.h | 26 +- include/bootstage.h | 1 - include/bootstd.h | 9 + include/command.h | 35 ++- include/fdt_support.h | 5 +- include/image.h | 127 ++++++-- test/cmd_ut.c | 2 +- 39 files changed, 615 insertions(+), 463 deletions(-) create mode 100644 boot/prog_boot.c -- 2.43.0.rc0.421.g78406f8d94-goog

3 39

[u-boot-gitdm PATCH 1/2] Use Google LLC for Google
by Simon Glass 13 Dec '23

13 Dec '23

The name changed a few years ago, so update it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- u-boot-config/domain-map | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/u-boot-config/domain-map b/u-boot-config/domain-map index f64147e..63cb60f 100644 --- a/u-boot-config/domain-map +++ b/u-boot-config/domain-map @@ -17,7 +17,7 @@ amcc.com AMCC amd.com AMD anagramm.de Anagramm GmbH analog.com Analog Devices -android.com Google, Inc. +android.com Google LLC arastra.com Arastra Inc areca.com.tw Areca argos-messtechnik.de Argos Meßtechnik GmbH @@ -129,7 +129,7 @@ ge.com General Electric gefanuc.com GE Fanuc gentoo.org Gentoo geomatys.fr Geomatys -google.com Google, Inc. +google.com Google LLC gvs.co.yu GVS hanscan.com Hanscan hansenpartnership.com Hansen Partnership @@ -421,22 +421,22 @@ beckyb(a)kernel.crashing.org NXP bflinux(a)yumbrad.com Radiient Technologies # Bernie Thompson <bhthompson(a)chromium.org> -bhthompson(a)google.com Google, Inc. +bhthompson(a)google.com Google LLC # Che-liang Chiou <clchiou(a)chromium.org> -clchiou(a)chromium.org Google, Inc. +clchiou(a)chromium.org Google LLC # Doug Anderson <dianders(a)chromium.org> -dianders(a)google.com Google, Inc. +dianders(a)google.com Google LLC # Dirk Behme <dirk.behme(a)googlemail.com> dirk.behme(a)googlemail.com Dirk Behme # Duncan Laurie <dlaurie(a)chromium.org> -dlaurie(a)google.com Google, Inc. +dlaurie(a)google.com Google LLC # Gabe Black <gabeblack(a)google.com> -gabeblack(a)chromium.org Google, Inc. +gabeblack(a)chromium.org Google LLC galak(a)kernel.crashing.org NXP @@ -450,7 +450,7 @@ gvb.uboot(a)gmail.com Custom IDEAS # => explicitly wants to be listed as "unknown" # Hung-Te Lin <hungte(a)chromium.org> -hungte(a)google.com Google, Inc. +hungte(a)google.com Google LLC # Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> iwamatsu(a)nigauri.org Nobuhiro Iwamatsu @@ -476,7 +476,7 @@ menon.nishanth(a)gmail.com Texas Instruments notasas(a)gmail.com Grazvydas Ignotas # Stefan Reinauer <reinauer(a)google.com> -reinauer(a)google.com Google, Inc. +reinauer(a)google.com Google LLC reinhard.thies(a)web.de Cameron @@ -484,22 +484,22 @@ reinhard.thies(a)web.de Cameron rgetz(a)blackfin.uclinux.org Analog Devices # Anton Staaf -robotboy(a)chromium.org Google, Inc. +robotboy(a)chromium.org Google LLC # Ron Madrid <ron_madrid(a)sbcglobal.net> ron_madrid(a)sbcglobal.net Sheldon Instruments # Sean Paul <seanpaul(a)chromium.org> -seanpaul(a)chromium.org Google, Inc. +seanpaul(a)chromium.org Google LLC # Luigi Semenzato <semenzato(a)chromium.org> -semenzato(a)google.com Google, Inc. +semenzato(a)google.com Google LLC # Shinya Kuribayashi <skuribay(a)ruby.dti.ne.jp> # => explicitly wants to be listed as "unknown" # Sonny Rao <sonnyrao(a)chromium.org> -sonnyrao(a)chromium.org Google, Inc. +sonnyrao(a)chromium.org Google LLC # Stelian Pop <stelian(a)popies.net> stelian(a)popies.net Stelian Pop @@ -517,22 +517,22 @@ smichak.uv(a)gmail.com Micha Kalfon vapier(a)gentoo.org Analog Devices # Vadim Bendebury <vbendeb(a)chromium.org> -vbendeb(a)chromium.org Google, Inc. +vbendeb(a)chromium.org Google LLC # Vincent Palatin <vpalatin(a)chromium.org> -vpalatin(a)chromium.org Google, Inc. +vpalatin(a)chromium.org Google LLC # Tom Wai-Hong Tam <waihong@chromiumng@chromium.org> -waihong(a)chromium.org Google, Inc. +waihong(a)chromium.org Google LLC # Bill Richardson <wfrichar(a)chromium.org> -wfrichar(a)google.com Google, Inc. +wfrichar(a)google.com Google LLC # Wolfgang Grandegger wg(a)grandegger.com DENX Software Engineering # Simon Glass -sjg(a)chromium.org Google, Inc. +sjg(a)chromium.org Google LLC # Louis Yung-Chieh Lo <yjlou(a)chromium.org> -# yjlou(a)google.com Google, Inc. +# yjlou(a)google.com Google LLC -- 2.43.0.rc2.451.g8631bc7472-goog

5 10