March 2021 - U-Boot

[PATCH 1/1] linker_lists: document ll_entry_ref parameters
by Heinrich Schuchardt 29 Mar '21

29 Mar '21

Avoid 'make htmldocs' build warnings: ./include/linker_lists.h:224: warning: Function parameter or member '_type' not described in 'll_entry_ref' ./include/linker_lists.h:224: warning: Function parameter or member '_name' not described in 'll_entry_ref' ./include/linker_lists.h:224: warning: Function parameter or member '_list' not described in 'll_entry_ref' Fixes: 851144350b6f ("linker_lists: Allow use in data structures") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/linker_lists.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linker_lists.h b/include/linker_lists.h index 81a280a884..2fea54c834 100644 --- a/include/linker_lists.h +++ b/include/linker_lists.h @@ -219,6 +219,10 @@ * * This is like ll_entry_get(), but without the extra code, so it is suitable * for putting into data structures. + * + * @_type: C type of the list entry, e.g. 'struct foo' + * @_name: name of the entry + * @_list: name of the list */ #define ll_entry_ref(_type, _name, _list) \ ((_type *)&_u_boot_list_2_##_list##_2_##_name) -- 2.30.2

2 1

[RFC PATCH v3 0/2] arch: riscv: cpu: Add callback to init each core
by Green Wan 29 Mar '21

29 Mar '21

Add a callback interface, riscv_hart_early_init() to perform riscv CPU hart-dependent configuration for each hart. riscv_hart_early_init() is placed after stack of harts are initialized and before main boot hart is picked up. Several conditions should be aware of or avoided are listed: - cannot access gd At the moment, gd hasn't initialized yet. - all operations in riscv_hart_early_init() should only affect core itself For example, the operations for board level should be moved to mach_xxx() or board_init_xxx() functions instead. - Common resource need protection if multicore Since all harts might enter riscv_hart_early_init() in parallel, common resource need a mechanism to handle race condition. - A dummy implementation is added in ./arch/riscv/cpu/cpu.c The implementation is declared with '__weak' and can be overridden. Green Wan (2): arch: riscv: cpu: Add callback to init each core board: sifive: unmatched: clear feature disable CSR arch/riscv/cpu/cpu.c | 15 +++++++++++++++ arch/riscv/cpu/start.S | 14 ++++++++++++++ board/sifive/unmatched/spl.c | 16 ++++++++++++++++ 3 files changed, 45 insertions(+) -- 2.31.0

2 5

[RFC PATCH v2 1/2] arch: riscv: cpu: Add callback to init each core
by Green Wan 29 Mar '21

29 Mar '21

Add a callback riscv_hart_early_init() to ./arch/riscv/cpu/start.S to allow different riscv hart perform setup code for each hart as early as possible. Since all the harts enter the calback, they must be able to run the same setup. Signed-off-by: Green Wan <green.wan(a)sifive.com> --- arch/riscv/cpu/start.S | 5 +++++ arch/riscv/lib/spl.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 8589509e01..5c7d4da9e2 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -117,6 +117,11 @@ call_board_init_f_0: mv sp, a0 #endif +#if CONFIG_IS_ENABLED(RISCV_MMODE) +call_riscv_hart_early_init: + jal riscv_hart_early_init +#endif + #ifndef CONFIG_XIP /* * Pick hart to initialize global data and run U-Boot. The other harts diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index 8baee07bea..e5b1affbfc 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -14,6 +14,10 @@ DECLARE_GLOBAL_DATA_PTR; +__weak void riscv_hart_early_init(void) +{ +} + __weak int spl_board_init_f(void) { return 0; -- 2.31.0

3 8

[PATCH] test: Add udevice declaration to avoid build error
by Simon Glass 29 Mar '21

29 Mar '21

When including this file on a board other than sandbox (e.g by enabling UNIT_TEST and CMD_SETEXPR) an results. Fix it by declaring struct udevice first. Signed-off-by: Simon Glass <sjg(a)chromium.org> Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/dm/test.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dm/test.h b/include/dm/test.h index fe1cc2e278c..59c51d6b30c 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -6,6 +6,8 @@ #ifndef __DM_TEST_H #define __DM_TEST_H +struct udevice; + /** * struct dm_test_cdata - configuration data for test instance * -- 2.31.0.291.g576ba9dcdaf-goog

2 1

[PATCH v2] dm: test: Always include command.h for print_ut
by Sean Anderson 29 Mar '21

29 Mar '21

We need this header for U_BOOT_CMD, which is always present even without EFI. Fixes: 82c468a049 ("dm: test: Update Makefile conditions") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- Changes in v2: - Remove ifdef test/print_ut.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/print_ut.c b/test/print_ut.c index a456a449ef..5b0a46de9c 100644 --- a/test/print_ut.c +++ b/test/print_ut.c @@ -6,10 +6,8 @@ #define DEBUG #include <common.h> -#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD) #include <command.h> #include <efi_api.h> -#endif #include <display_options.h> #include <log.h> #include <version.h> -- 2.31.0

3 2

[PATCH] Support building on macOS/arm64
by Jessica Clarke 29 Mar '21

29 Mar '21

On Arm-based Macs, -no_pie is ignored and gives a linker warning. Moreover, the build falls over with: ld: Absolute addressing not allowed in arm64 code but used in '_image_type_ptr_aisimage' referencing '_image_type_aisimage' for dumpimage and mkimage, since we put data structs in text sections not data sections and so cannot have dynamic relocations. Instead, move the sections to __DATA and drop disabling PIE. Signed-off-by: Jessica Clarke <jrtc27(a)jrtc27.com> --- Makefile | 5 ----- tools/imagetool.h | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3ebb38b113..df3354d9f8 100644 --- a/Makefile +++ b/Makefile @@ -324,11 +324,6 @@ HOSTCC = $(call os_x_before, 10, 5, "cc", "gcc") KBUILD_HOSTCFLAGS += $(call os_x_before, 10, 4, "-traditional-cpp") KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress") -# since Lion (10.7) ASLR is on by default, but we use linker generated lists -# in some host tools which is a problem then ... so disable ASLR for these -# tools -KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 7, "", "-Xlinker -no_pie") - # macOS Mojave (10.14.X) # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple" KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "") diff --git a/tools/imagetool.h b/tools/imagetool.h index 8726792c8c..2801ea9e9f 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -273,14 +273,14 @@ int rockchip_copy_image(int fd, struct image_tool_params *mparams); #define INIT_SECTION(name) do { \ unsigned long name ## _len; \ - char *__cat(pstart_, name) = getsectdata("__TEXT", \ + char *__cat(pstart_, name) = getsectdata("__DATA", \ #name, &__cat(name, _len)); \ char *__cat(pstop_, name) = __cat(pstart_, name) + \ __cat(name, _len); \ __cat(__start_, name) = (void *)__cat(pstart_, name); \ __cat(__stop_, name) = (void *)__cat(pstop_, name); \ } while (0) -#define SECTION(name) __attribute__((section("__TEXT, " #name))) +#define SECTION(name) __attribute__((section("__DATA, " #name))) struct image_type_params **__start_image_type, **__stop_image_type; #else -- 2.31.0

2 2

[PATCH 1/1] efi_loader: improve documentation of enum efi_test_phase
by Heinrich Schuchardt 28 Mar '21

28 Mar '21

* Avoid a warning warning: "Incorrect use of kernel-doc format". * Remove duplicate text. * Clarify usage of EFI_SETTING_VIRTUAL_ADDRESS_MAP. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_selftest.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/efi_selftest.h b/include/efi_selftest.h index 07b619901c..94ceb14733 100644 --- a/include/efi_selftest.h +++ b/include/efi_selftest.h @@ -53,21 +53,25 @@ */ enum efi_test_phase { /** - * @EFI_EXECUTE_BEFORE_BOOTTIME_EXIT: - execute before ExitBootServices + * @EFI_EXECUTE_BEFORE_BOOTTIME_EXIT: * * Setup, execute, and teardown are executed before ExitBootServices(). */ EFI_EXECUTE_BEFORE_BOOTTIME_EXIT = 1, /** - * @EFI_SETUP_BEFORE_BOOTTIME_EXIT: - setup before ExitBootServices + * @EFI_SETUP_BEFORE_BOOTTIME_EXIT: * * Setup is executed before ExitBootServices() while execute, and * teardown are executed after ExitBootServices(). */ EFI_SETUP_BEFORE_BOOTTIME_EXIT, /** - * @EFI_SETTING_VIRTUAL_ADDRESS_MAP - calls SetVirtualAddressMap() - * Execute calls SetVirtualAddressMap(). + * @EFI_SETTING_VIRTUAL_ADDRESS_MAP: + * + * Execute calls SetVirtualAddressMap(). Setup is executed before + * ExitBootServices() while execute is executed after + * ExitBootServices(), and after the execute of tests marked as + * @EFI_SETUP_BEFORE_BOOTTIME_EXIT. Teardown is executed thereafter. */ EFI_SETTING_VIRTUAL_ADDRESS_MAP, }; -- 2.30.2

2 2

[PATCH 1/1] fs: fat: fix file_fat_detectfs()
by Heinrich Schuchardt 28 Mar '21

28 Mar '21

Up to now file_fat_detectfs() did not detect some interface types like EFI, HOST, VIRTIO. Avoid duplicate code by calling blk_get_if_type_name(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fat/fat.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index ccba268f61..363e981fb2 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -1147,41 +1147,9 @@ int file_fat_detectfs(void) return 1; } -#if defined(CONFIG_IDE) || \ - defined(CONFIG_SATA) || \ - defined(CONFIG_SCSI) || \ - defined(CONFIG_CMD_USB) || \ - defined(CONFIG_MMC) - printf("Interface: "); - switch (cur_dev->if_type) { - case IF_TYPE_IDE: - printf("IDE"); - break; - case IF_TYPE_SATA: - printf("SATA"); - break; - case IF_TYPE_SCSI: - printf("SCSI"); - break; - case IF_TYPE_ATAPI: - printf("ATAPI"); - break; - case IF_TYPE_USB: - printf("USB"); - break; - case IF_TYPE_DOC: - printf("DOC"); - break; - case IF_TYPE_MMC: - printf("MMC"); - break; - default: - printf("Unknown"); - } - - printf("\n Device %d: ", cur_dev->devnum); + printf("Interface: %s\n", blk_get_if_type_name(cur_dev->if_type)); + printf(" Device %d: ", cur_dev->devnum); dev_print(cur_dev); -#endif if (read_bootsectandvi(&bs, &volinfo, &fatsize)) { printf("\nNo valid FAT fs found\n"); -- 2.30.2

2 3

[PATCH 1/1] efi_loader: documentation codepage_437[]
by Heinrich Schuchardt 28 Mar '21

28 Mar '21

Variables cannot be documented via kernel-doc. Avoid 'make htmldocs' build warning ./include/charset.h:19: warning: cannot understand function prototype: 'const u16 codepage_437[128]; ' Fixes: 70616a1ed8c7 ("efi_loader: move codepage 437 table") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/charset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/charset.h b/include/charset.h index a911160f19..b93d023092 100644 --- a/include/charset.h +++ b/include/charset.h @@ -13,7 +13,7 @@ #define MAX_UTF8_PER_UTF16 3 -/** +/* * codepage_437 - Unicode to codepage 437 translation table */ extern const u16 codepage_437[128]; -- 2.30.2

1 0

[BUG] test/test-main.c does not compile on non-sandbox
by Heinrich Schuchardt 27 Mar '21

27 Mar '21

Hello Simon, commit c79705ea938e ("test: Move dm_test_init() into test-main.c") merged into origin/next breaks compiling qemu-riscv64_defconfig with CONFIG_UNIT_TEST=y: test/test-main.c:10:10: fatal error: asm/state.h: No such file or directory 10 | #include <asm/state.h> | ^~~~~~~~~~~~~ compilation terminated. Could you, please, provide a fix and set CONFIG_UNIT_TEST=y for some QEMU boards so that we avoid such errors in future. Please, also fix test/cmd/setexpr.c not compiling on non-sandbox leading to an additional build error. Best regards Heinrich

2 1