November 2023 - U-Boot

[PATCH] acpi: move acpi_get_rsdp_addr() to acpi/acpi_table.h
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

Function acpi_get_rsdp_addr() is needed on all architectures which write ACPI tables. Move the definition from the x86 include to an architecture independent one. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/x86/include/asm/acpi_table.h | 9 --------- drivers/misc/qfw.c | 1 + include/acpi/acpi_table.h | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index 226753b65d..57e41654ce 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -64,15 +64,6 @@ int acpi_write_dbg2_pci_uart(struct acpi_ctx *ctx, struct udevice *dev, */ int acpi_create_gnvs(struct acpi_global_nvs *gnvs); -/** - * acpi_get_rsdp_addr() - get ACPI RSDP table address - * - * This routine returns the ACPI RSDP table address in the system memory. - * - * @return: ACPI RSDP table address - */ -ulong acpi_get_rsdp_addr(void); - /** * arch_read_sci_irq_select() - Read the system-control interrupt number * diff --git a/drivers/misc/qfw.c b/drivers/misc/qfw.c index 7c01bf23d5..e3b6b4cd74 100644 --- a/drivers/misc/qfw.c +++ b/drivers/misc/qfw.c @@ -7,6 +7,7 @@ #define LOG_CATEGORY UCLASS_QFW #include <common.h> +#include <acpi/acpi_table.h> #include <bootdev.h> #include <bootflow.h> #include <bootmeth.h> diff --git a/include/acpi/acpi_table.h b/include/acpi/acpi_table.h index 1f85de091d..a3b67259e6 100644 --- a/include/acpi/acpi_table.h +++ b/include/acpi/acpi_table.h @@ -920,6 +920,15 @@ void acpi_fill_header(struct acpi_table_header *header, char *signature); */ int acpi_fill_csrt(struct acpi_ctx *ctx); +/** + * acpi_get_rsdp_addr() - get ACPI RSDP table address + * + * This routine returns the ACPI RSDP table address in the system memory. + * + * @return: ACPI RSDP table address + */ +ulong acpi_get_rsdp_addr(void); + /** * write_acpi_tables() - Write out the ACPI tables * -- 2.40.1

3 6

[PATCH 0/7] fdt: Move towards using ofnode for devicetree fixups
by Simon Glass 13 Dec '23

13 Dec '23

When large quantities of fixups are needed, using the livetree is more efficient. In any case, the ofnode API is easier to use and read than the lower-level libfdt functions. This series tweaks the DT-fixup implementation a little, so that all of the non-ofnode fixups happen before the ofnode fixups. This should make it possible to whittle away at the former. This series is based on Sean's one here: https://patchwork.ozlabs.org/project/uboot/list/?series=380576&state=* Simon Glass (7): boot: Drop size parameter from image_setup_libfdt() fdt: Check for a valid fdt in oftree_ensure() fdt: Improve the comment for fdt_shrink_to_minimum() fdt: ppc: Drop extra size for ramdisk boot: Move adding initrd earlier in image_setup_libfdt() fdt: Drop the confusing casts in lmb_free() fdt: Move ft_verify_fdt() before the final fixups arch/mips/lib/bootm.c | 4 ++-- boot/fdt_support.c | 1 - boot/image-board.c | 2 +- boot/image-fdt.c | 27 ++++++++++++--------------- cmd/bootefi.c | 2 +- drivers/core/ofnode.c | 5 +++++ include/fdt_support.h | 24 ++++++++++++++++++++++-- include/image.h | 3 +-- lib/efi_loader/efi_dt_fixup.c | 2 +- 9 files changed, 45 insertions(+), 25 deletions(-) -- 2.42.0.869.gea05f2083d-goog

2 13

[PATCH v2 1/1] acpi: cannot have RSDT above 4 GiB
by Heinrich Schuchardt 13 Dec '23

13 Dec '23

The field RsdtAddress has only 32 bit. The RSDT table cannot be located beyond 4 GiB. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: Avoid superfluous 0 assignment. RSDP is already zeroed out. Use constants form linux/sizes.h --- lib/acpi/base.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/acpi/base.c b/lib/acpi/base.c index 2057bd2bef..26bf0cb8d3 100644 --- a/lib/acpi/base.c +++ b/lib/acpi/base.c @@ -12,6 +12,7 @@ #include <dm/acpi.h> #include <mapmem.h> #include <tables_csum.h> +#include <linux/sizes.h> void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt, struct acpi_xsdt *xsdt) @@ -21,10 +22,13 @@ void acpi_write_rsdp(struct acpi_rsdp *rsdp, struct acpi_rsdt *rsdt, memcpy(rsdp->signature, RSDP_SIG, 8); memcpy(rsdp->oem_id, OEM_ID, 6); - rsdp->length = sizeof(struct acpi_rsdp); - rsdp->rsdt_address = map_to_sysmem(rsdt); + if (rsdt) + rsdp->rsdt_address = map_to_sysmem(rsdt); + + if (xsdt) + rsdp->xsdt_address = map_to_sysmem(xsdt); - rsdp->xsdt_address = map_to_sysmem(xsdt); + rsdp->length = sizeof(struct acpi_rsdp); rsdp->revision = ACPI_RSDP_REV_ACPI_2_0; /* Calculate checksums */ @@ -68,11 +72,15 @@ static void acpi_write_xsdt(struct acpi_xsdt *xsdt) static int acpi_write_base(struct acpi_ctx *ctx, const struct acpi_writer *entry) { - /* We need at least an RSDP and an RSDT Table */ + /* We need at least an RSDP and an XSDT Table */ ctx->rsdp = ctx->current; acpi_inc_align(ctx, sizeof(struct acpi_rsdp)); - ctx->rsdt = ctx->current; - acpi_inc_align(ctx, sizeof(struct acpi_rsdt)); + if (map_to_sysmem(ctx->current) < SZ_4G - SZ_64K) { + ctx->rsdt = ctx->current; + acpi_inc_align(ctx, sizeof(struct acpi_rsdt)); + } else { + ctx->rsdt = 0; + } ctx->xsdt = ctx->current; acpi_inc_align(ctx, sizeof(struct acpi_xsdt)); @@ -80,7 +88,8 @@ static int acpi_write_base(struct acpi_ctx *ctx, memset(ctx->base, '\0', ctx->current - ctx->base); acpi_write_rsdp(ctx->rsdp, ctx->rsdt, ctx->xsdt); - acpi_write_rsdt(ctx->rsdt); + if (ctx->rsdt) + acpi_write_rsdt(ctx->rsdt); acpi_write_xsdt(ctx->xsdt); return 0; -- 2.40.1

2 2

[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 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

[PATCH v2 0/6] some LED patches
by Rasmus Villemoes 13 Dec '23

13 Dec '23

I wanted to add support for ti,lp5562, and found an old submission from Doug. While trying to modify that to work in current U-Boot, I found a problem with the "move label handling to core" patches. Patch 1 is a prerequisite for the ti,lp5562 driver, which turned out to be needed by Christian as well. Patch 2 is an attempt at (quick-)fixing the mentioned "move label handling to core" problem. The real fix consists of changing remaining drivers to not bind the same driver to the top node as to the child nodes, but I can't test those other drivers. Patch 3 introduces a helper which should allow removing some boilerplate in most individual drivers, and 4,5 apply that in the gpio and pwm drivers. Converting remaining drivers is trivial, but left out for now. Finally patch 6 is the reworked lp5562 driver. While I've changed it to match existing DT bindings (with the goal of making it work with our .dts that is known to work with the linux driver), most of the logic is unchanged from Doug's original patch, so he is still listed as author. Changes in v2: Interchange order of patches 1 and 2, add a few R-bs, and try to trim down the commit message in patch 2. Doug Zobel (1): led: add TI LP5562 LED driver Rasmus Villemoes (5): led-uclass: honour ->label field populated by driver's own .bind led-uclass: do not create fallback label for top-level node led: introduce led_bind_generic() led: led_gpio: use led_bind_generic() helper led: led_pwm: use led_bind_generic() helper doc/device-tree-bindings/leds/leds-lp5562.txt | 63 ++ drivers/led/Kconfig | 8 + drivers/led/Makefile | 1 + drivers/led/led-uclass.c | 22 +- drivers/led/led_gpio.c | 15 +- drivers/led/led_lp5562.c | 578 ++++++++++++++++++ drivers/led/led_pwm.c | 14 +- include/led.h | 8 + 8 files changed, 681 insertions(+), 28 deletions(-) create mode 100644 doc/device-tree-bindings/leds/leds-lp5562.txt create mode 100644 drivers/led/led_lp5562.c -- 2.40.1.1.g1c60b9335d

3 11

[PATCH 0/2] apalis/colibri imx6/imx6ull/imx7: Add fastboot supp
by Hiago De Franco 13 Dec '23

13 Dec '23

This patch series introduces Fastboot support on all Apalis iMX6, Colibri iMX6, Colibri iMX6ULL and Colibri iMX7 machines. It includes the necessary configurations in their respective defconfig files and implements logic in the boards files to determine whether SDP or Fastboot will be utilized. Hiago De Franco (2): apalis/colibri imx6/imx6ull/imx7: defconfig: Enable fastboot support board: apalis/colibri imx6/imx6ull/imx7: Add fastboot bootcmd support board/toradex/apalis_imx6/apalis_imx6.c | 13 ++++++++----- board/toradex/colibri-imx6ull/colibri-imx6ull.c | 13 ++++++++----- board/toradex/colibri_imx6/colibri_imx6.c | 13 ++++++++----- board/toradex/colibri_imx7/colibri_imx7.c | 14 +++++++++----- configs/apalis_imx6_defconfig | 3 +++ configs/colibri-imx6ull-emmc_defconfig | 3 +++ configs/colibri-imx6ull_defconfig | 3 +++ configs/colibri_imx6_defconfig | 3 +++ configs/colibri_imx7_defconfig | 3 +++ configs/colibri_imx7_emmc_defconfig | 4 ++-- 10 files changed, 50 insertions(+), 22 deletions(-) -- 2.42.0

2 5

[PATCH] imx7d-pico-pi-u-boot.dtsi: Fix aliases indentation
by Fabio Estevam 13 Dec '23

13 Dec '23

From: Fabio Estevam <festevam(a)denx.de> The aliases are currently indented using spaces. Fix it to use the standard tab indentation. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- arch/arm/dts/imx7d-pico-pi-u-boot.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi index 843b4583e53a..3a6294daff3b 100644 --- a/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi +++ b/arch/arm/dts/imx7d-pico-pi-u-boot.dtsi @@ -1,11 +1,11 @@ #include "imx7s-u-boot.dtsi" /{ - aliases { - mmc0 = &usdhc3; - usb0 = &usbotg1; - display0 = &lcdif; - }; + aliases { + mmc0 = &usdhc3; + usb0 = &usbotg1; + display0 = &lcdif; + }; }; &usbotg1 { -- 2.34.1

1 1