January 2021 - U-Boot

[PULL] u-boot-sh/master
by Marek Vasut 01 Feb '21

01 Feb '21

The following changes since commit 472a716b8fdfd88a27cb675e4ea8e12cb4f79fc3: configs: Resync with savedefconfig (2021-01-29 13:56:04 -0500) are available in the Git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 8a73bef338d48095dfb8e805b643d7dd1f6b6d9b: mmc: tmio: sdhi: Configure internal DMA bus width (2021-01-31 14:08:45 +0100) ---------------------------------------------------------------- Biju Das (1): arm: dts: rmobile: r8a774a1: Synchronize DTs with Linux 5.10 Marek Vasut (1): mmc: tmio: sdhi: Configure internal DMA bus width arch/arm/dts/hihope-common.dtsi | 377 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/hihope-rev4.dtsi | 124 +++++++++++++++++++++++++++++ arch/arm/dts/hihope-rzg2-ex.dtsi | 92 +++++++++++++++++++++ arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts | 21 +++++ arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts | 27 +++++++ arch/arm/dts/r8a774a1-hihope-rzg2m.dts | 37 +++++++++ arch/arm/dts/r8a774a1-u-boot.dtsi | 55 +++++++++++++ drivers/mmc/renesas-sdhi.c | 3 + drivers/mmc/tmio-common.c | 3 + drivers/mmc/tmio-common.h | 2 + 10 files changed, 741 insertions(+) create mode 100644 arch/arm/dts/hihope-common.dtsi create mode 100644 arch/arm/dts/hihope-rev4.dtsi create mode 100644 arch/arm/dts/hihope-rzg2-ex.dtsi create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-ex.dts create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dts create mode 100644 arch/arm/dts/r8a774a1-hihope-rzg2m.dts create mode 100644 arch/arm/dts/r8a774a1-u-boot.dtsi

2 1

Please pull u-boot-dm
by Simon Glass 01 Feb '21

01 Feb '21

Hi Tom, https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/6139 The following changes since commit 472a716b8fdfd88a27cb675e4ea8e12cb4f79fc3: configs: Resync with savedefconfig (2021-01-29 13:56:04 -0500) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-30jan21 for you to fetch changes up to f84eda89e5970ef513fe64ba8e8d977788c44dca: disk: part: sandbox support in dev_print() (2021-01-30 14:25:42 -0700) ---------------------------------------------------------------- tpm fixes for coral binman fixes support for symbols in sub-sections support for additional cros_ec commands various minor fixes / tweaks ---------------------------------------------------------------- Dario Binacchi (1): dm: replace auto_alloc_size with auto Heinrich Schuchardt (6): x86: typo segement sandbox: fix sandbox_cmdline_cb_test_fdt() doc/sandbox: improve formatting of command line options sandbox: keep time offset when resetting sandbox: fill block device meta information disk: part: sandbox support in dev_print() Simon Glass (36): tpm: cr50: Check for valid locality tpm: cr50: Add a better description and more debug tpm: cr50: Rename driver to work with of-platdata x86: coral: Update an unused pin to reduce power x86: coral: Enable CONFIG_BOOTARGS_SUBST dtoc: binman: Drop Python 2 code patman: Correct lz4 compression parameters binman: Update the TODO list binman: Show the size when writing entries binman: Fix a few file comments binman: Support finding symbols in sub-sections binman: Support reading an image with entry args binman: Allow vblock to include devicetree blobs binman: Support alignment of files binman: Allow for skip_at_start when reading entries cros_ec: Add a function for the hello message cros_ec: Tidy up a few delays cros_ec: Add run-time check for input buffer overflow cros_ec: Add support for reading the SKU ID cros_ec: Support reading EC features cros_ec: Add documentation for cros_ec driver operations cros_ec: Add support for switches cros_ec: Show events in human-readable form cros_ec: Allow use with of-platdata cros_ec: Add vstore support spl: Tidy up SPL/TPL malloc sizes x86: coral: Support TPM and RTC in SPL i2c: desigware: Add an alias for Intel Apollo Lake sandbox: Disable I2C emulators in SPL dm: core: Don't inline dev_read...() calls with of-platdata clk: Add debugging for return values clk: x86: Correct the driver name dm: core: Add a comment about pinctrl_select_state() dm: core: Update ofnode_read_fmap_entry() to read hashes Add a symlink for ctype.h binman: Print a debug message when binman selects a node Stanislav Pinchuk (1): do not pass NULL pointer to libfdt Kconfig | 13 +- arch/sandbox/cpu/os.c | 25 ++++ arch/sandbox/cpu/start.c | 2 +- arch/sandbox/dts/sandbox.dtsi | 10 +- arch/sandbox/dts/test.dts | 10 ++ arch/sandbox/include/asm/test.h | 15 ++ arch/x86/cpu/i386/cpu.c | 2 +- arch/x86/cpu/start.S | 2 +- arch/x86/dts/chromebook_coral.dts | 21 ++- arch/x86/include/asm/arch-apollolake/iomap.h | 3 + cmd/cros_ec.c | 195 +++++++++++++++++++++++++- configs/chromebook_coral_defconfig | 1 + configs/sandbox_spl_defconfig | 1 - disk/part.c | 1 + doc/arch/sandbox.rst | 35 +++-- drivers/block/sandbox.c | 11 ++ drivers/clk/clk-uclass.c | 16 ++- drivers/clk/intel/clk_intel.c | 4 +- drivers/core/device.c | 9 ++ drivers/core/of_extra.c | 21 +-- drivers/i2c/Makefile | 2 + drivers/i2c/designware_i2c_pci.c | 2 + drivers/misc/cros_ec.c | 200 +++++++++++++++++++++++---- drivers/misc/cros_ec_lpc.c | 7 + drivers/misc/cros_ec_sandbox.c | 100 +++++++++++++- drivers/rtc/i2c_rtc_emul.c | 4 +- drivers/tpm/cr50_i2c.c | 42 ++++-- include/cros_ec.h | 142 +++++++++++++++++++ include/ctype.h | 1 + include/dm/device.h | 2 +- include/dm/read.h | 5 +- include/ec_commands.h | 45 +++++- include/os.h | 18 +++ lib/binman.c | 2 + test/dm/Makefile | 2 + test/dm/cros_ec.c | 178 ++++++++++++++++++++++++ test/dm/of_extra.c | 38 +++++ test/dm/of_platdata.c | 8 +- tools/binman/README | 3 +- tools/binman/control.py | 3 +- tools/binman/elf.py | 3 +- tools/binman/elf_test.py | 4 +- tools/binman/entry.py | 3 +- tools/binman/etype/blob.py | 4 + tools/binman/etype/files.py | 4 + tools/binman/etype/section.py | 66 +++++++-- tools/binman/etype/u_boot_spl_bss_pad.py | 1 - tools/binman/etype/u_boot_spl_nodtb.py | 2 +- tools/binman/etype/vblock.py | 15 +- tools/binman/fmap_util.py | 4 +- tools/binman/ftest.py | 110 ++++++++++++++- tools/binman/image.py | 62 +++++++-- tools/binman/state.py | 10 ++ tools/binman/test/084_files.dts | 2 +- tools/binman/test/187_symbols_sub.dts | 22 +++ tools/binman/test/188_image_entryarg.dts | 21 +++ tools/binman/test/189_vblock_content.dts | 31 +++++ tools/binman/test/190_files_align.dts | 12 ++ tools/binman/test/191_read_image_skip.dts | 23 +++ tools/dtoc/fdt.py | 15 +- tools/dtoc/test_fdt.py | 6 + tools/patman/tools.py | 3 +- 62 files changed, 1487 insertions(+), 137 deletions(-) create mode 120000 include/ctype.h create mode 100644 test/dm/cros_ec.c create mode 100644 test/dm/of_extra.c create mode 100644 tools/binman/test/187_symbols_sub.dts create mode 100644 tools/binman/test/188_image_entryarg.dts create mode 100644 tools/binman/test/189_vblock_content.dts create mode 100644 tools/binman/test/190_files_align.dts create mode 100644 tools/binman/test/191_read_image_skip.dts Regards, Simon

2 1

[PATCH 1/1] sandbox: mark os_abort() as __noreturn
by Heinrich Schuchardt 01 Feb '21

01 Feb '21

gcc -fanalyzer needs the information that a function does not return to provide accurate information. os_abort() does not return. Mark it accordingly. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/os.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/os.h b/include/os.h index e192e32d59..8de802cab0 100644 --- a/include/os.h +++ b/include/os.h @@ -341,7 +341,7 @@ void os_localtime(struct rtc_time *rt); /** * os_abort() - raise SIGABRT to exit sandbox (e.g. to debugger) */ -void os_abort(void); +void __noreturn os_abort(void); /** * os_mprotect_allow() - Remove write-protection on a region of memory -- 2.29.2

1 0

[PATCH v2] armv8: Handle EL2 Host mode
by Mark Kettenis 31 Jan '21

31 Jan '21

On implementations that support VHE, the layout of the CPTR_EL2 register depends on whether HCR_EL2.E2H is set. Check this bit and and set the aprropriate bits to enable access to the FP/SIMD registers. This allows U-Boot to run on systems that pass control to U-Boot in EL2 with EL2 Host mode enabled such as machine with Apple's M1 SoC. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> --- v2: rename label arch/arm/cpu/armv8/start.S | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 662449156b..979dcfef35 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -133,9 +133,15 @@ pie_fixup_done: #endif b 0f 2: set_vbar vbar_el2, x0 + mrs x0, hcr_el2 + tbnz x0, #34, el2_vhe /* HCR_EL2.E2H */ mov x0, #0x33ff msr cptr_el2, x0 /* Enable FP/SIMD */ b 0f +el2_vhe: + mov x0, #3 << 20 + msr cptr_el2, x0 /* Enable FP/SIMD */ + b 0f 1: set_vbar vbar_el1, x0 mov x0, #3 << 20 msr cpacr_el1, x0 /* Enable FP/SIMD */ -- 2.30.0

3 2

Pull request for UEFI sub-system for efi-2021-04-rc1-4
by Heinrich Schuchardt 31 Jan '21

31 Jan '21

The following changes since commit 472a716b8fdfd88a27cb675e4ea8e12cb4f79fc3: configs: Resync with savedefconfig (2021-01-29 13:56:04 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-04-rc1-4 for you to fetch changes up to 18dd984c56b339be74e390df80fd3dc21b7a9b58: efi_loader: add Linux magic to aarch64 crt0 (2021-01-29 20:22:40 +0100) ---------------------------------------------------------------- Pull request for UEFI sub-system for efi-2021-04-rc1-4 Bug fixes: * re-read the partition table after writing GPT * fix a problem booting ARMv7 boards with PSCI without UEFI * make aarch64 UEFI test programs compatible with GRUB linux command * correct the alignment check in the EFI_BLOCK_IO_PROTOCOL * check EFI_BLOCK_IO_PROTOCOL.Media->LastBlock in unit test ---------------------------------------------------------------- Gary Bisson (1): disk: part_efi: update partition table entries after write Heinrich Schuchardt (5): efi_selftest: test EFI_BLOCK_IO_PROTOCOL.Media->LastBlock efi_loader: correct block IO alignment check efi_loader: switch to non-secure mode later tools: add mkeficapsule to .gitignore efi_loader: add Linux magic to aarch64 crt0 arch/arm/lib/crt0_aarch64_efi.S | 3 ++- cmd/bootefi.c | 4 ++++ disk/part_efi.c | 3 +++ include/asm-generic/pe.h | 2 ++ lib/efi_loader/efi_disk.c | 10 ++++++---- lib/efi_loader/efi_setup.c | 4 ---- lib/efi_selftest/efi_selftest_block_device.c | 21 ++++++++++++++++++++- tools/.gitignore | 1 + 8 files changed, 38 insertions(+), 10 deletions(-)

2 1

[PATCH 0/7] Allow booting a 32-bit system with a top memory address beyond 4 GiB
by Bin Meng 31 Jan '21

31 Jan '21

When testing QEMU RISC-V 'virt' machine with a 2 GiB memory configuration, it was discovered gd->ram_top is assigned to value zero in setup_dest_addr(). While 2 GiB QEMU RISC-V 'virt' happens to work with U-Boot today, increasing more memory doesn't make a bootable system. There are various places in U-Boot that prevents such from working. While this is seen and tested on RISC-V, it's not RISC-V centric, but a generic issue that may affect all architectures. Bin Meng (7): riscv: Adjust board_get_usable_ram_top() for 32-bit global_data.h: Change ram_top type to phys_addr_t serial: sifive: Cast dev_read_addr() with uintptr_t fdtdec: Cast prior_stage_fdt_address with uintptr_t riscv: Change phys_addr_t and phys_size_t to 64-bit bdinfo: Rename function names to be clearer bdinfo: Change to use bdinfo_print_num_ll() where the number could be 64-bit arch/arm/lib/bdinfo.c | 16 +++++----- arch/m68k/lib/bdinfo.c | 2 +- arch/powerpc/lib/bdinfo.c | 4 +-- arch/riscv/cpu/fu540/dram.c | 7 ++--- arch/riscv/cpu/generic/dram.c | 7 ++--- arch/riscv/include/asm/types.h | 4 +-- cmd/bdinfo.c | 52 +++++++++++++++---------------- drivers/serial/serial_sifive.c | 2 +- include/asm-generic/global_data.h | 2 +- include/init.h | 3 +- lib/fdtdec.c | 2 +- 11 files changed, 50 insertions(+), 51 deletions(-) -- 2.25.1

2 15

[PATCH 0/8] spl: fit: Play nicely with OP-TEE and Linux
by Alexandru Gagniuc 31 Jan '21

31 Jan '21

This patch series is part of a larger effort to get linux to boot really fast alongside a secure OS. One piece of the puzzle is getting Linux and OP-TEE to boot straight from SPL. This is where the FIT image comes in. The "simple" fit code was mostly ready for this, although it was quite difficult to navigate. As I was figuring out the required changes, I realized I had also managed to do some major refactoring. In fact, of the eight changes, (6) are refactoring patches, and (2) are functional changes. I wish I could have written this with a negative line count. I have unfortunately failed at that, and this series will be adding 12 lines to u-boot. The takeaway is that the following type FIT can be loaded from SPL directly: images { optee@1 { type = "tee"; os = "tee"; ... }; kernel@1 { type = "kernel"; os = "linux"; ... }; fdt(a)devicetree.dtb { ... } fdt@bootargs { ... }; }; configurations { conf@quickboot { kernel = "optee@1"; fdt = "fdt(a)stm32mp157c-ev1.dtb", "fdt@bootargs"; loadables = "kernel@1"; }; }; This series is designed to apply to u-boot/next: * 8351a29d2d Merge tag 'dm-pull-14dec20' of git://git.denx.de/u-boot-dm into next Alexandru Gagniuc (8): spl: fit: Drop 'length' argument to board_spl_fit_post_load() spl: fit: Factor out FIT parsing and use a context struct spl: fit: Pass FIT context via a structure pointer spl: fit: Remove useless loop in spl_fit_get_image_name() spl: fit: Only look up FIT configuration node once image: Do not #if guard board_fit_config_name_match() prototype spl: fit: Replace #ifdef blocks with more readable constructs spl: fit: Load devicetree when a Linux payload is found arch/arm/mach-imx/spl.c | 5 +- common/spl/spl_fit.c | 260 +++++++++++++++++++++------------------- include/image.h | 3 - include/spl.h | 2 +- 4 files changed, 141 insertions(+), 129 deletions(-) -- 2.26.2

5 50

[PATCH] test/py: support pytest 6
by Stephen Warren 31 Jan '21

31 Jan '21

Two changes are needed to support pytest 6: 1) The main entry point no longer allows command-line arguments to be supplied. Instead, we must modify sys.argv before calling the entry point. pytest 5.1.2 (from the current requirements.txt) supports either modifying sys.argv, or passing arguments, so is compatible with this change. 2) The implementation of pytest_runtest_protocol() must call pytest_runtest_logstart() and pytest_runtest_logfinish(). This appears to be necessary even in pytest 5.1.2 judging by the default version of pytest_runtest_protocol(), but evidently some form of code reorganization in pytest only made this have a practical effect in the newer version. I'd previously been under the impression that 100% of the required work of pytest_runtest_protocol() was handled by the fact it called runtestprotocol() as its implementation. However, it appears that custom implementations do need to do a little more than this. Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> (point 2) Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- test/py/conftest.py | 5 ++++- test/py/test.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/py/conftest.py b/test/py/conftest.py index dc92c0be32ee..7cacfcec26ef 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -554,7 +554,10 @@ def pytest_runtest_protocol(item, nextitem): """ log.get_and_reset_warning() + ihook = item.ihook + ihook.pytest_runtest_logstart(nodeid=item.nodeid, location=item.location) reports = runtestprotocol(item, nextitem=nextitem) + ihook.pytest_runtest_logfinish(nodeid=item.nodeid, location=item.location) was_warning = log.get_and_reset_warning() # In pytest 3, runtestprotocol() may not call pytest_runtest_setup() if @@ -623,4 +626,4 @@ def pytest_runtest_protocol(item, nextitem): if failure_cleanup: console.cleanup_spawn() - return reports + return True # reports diff --git a/test/py/test.py b/test/py/test.py index bee88d96bc26..d5bea127ab47 100755 --- a/test/py/test.py +++ b/test/py/test.py @@ -14,7 +14,7 @@ from pkg_resources import load_entry_point # argv; py.test test_directory_name user-supplied-arguments args = [os.path.dirname(__file__) + '/tests'] -args.extend(sys.argv) +sys.argv[1:1] = args if __name__ == '__main__': - sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) + sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')()) -- 2.25.1

2 2

[PATCH 1/1] sandbox: keep time offset when resetting
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

The UEFI Self Certification Test (SCT) checks the SetTime() service with the following steps: * set date * reset * check date matches To be compliant the sandbox should keep the offset to the host RTC during resets. The implementation uses the environment variable UBOOT_SB_TIME_OFFSET to persist the offset. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/cpu/os.c | 25 +++++++++++++++++++++++++ doc/arch/sandbox.rst | 7 +++++++ drivers/rtc/i2c_rtc_emul.c | 4 +++- include/os.h | 18 ++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index b56fa04a34..87fce57a36 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -32,6 +32,9 @@ #include <os.h> #include <rtc_def.h> +/* Environment variable for time offset */ +#define ENV_TIME_OFFSET "UBOOT_SB_TIME_OFFSET" + /* Operating System Interface */ struct os_mem_hdr { @@ -793,6 +796,28 @@ int os_spl_to_uboot(const char *fname) return os_jump_to_file(fname); } +long os_get_time_offset(void) +{ + const char *offset; + + offset = getenv(ENV_TIME_OFFSET); + if (offset) + return strtol(offset, NULL, 0); + return 0; +} + +void os_set_time_offset(long offset) +{ + char buf[21]; + int ret; + + snprintf(buf, sizeof(buf), "%ld", offset); + ret = setenv(ENV_TIME_OFFSET, buf, true); + if (ret) + printf("Could not set environment variable %s\n", + ENV_TIME_OFFSET); +} + void os_localtime(struct rtc_time *rt) { time_t t = time(NULL); diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index 4674c420ac..ee720c5a09 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -131,6 +131,13 @@ available options. Some of these are described below: * -i - Go to interactive mode after executing the commands specified by -c. +Environment Variables +--------------------- + +UBOOT_SB_TIME_OFFSET + This environment variable stores the offset of the emulated real time clock + to the host's real time clock in seconds. The offset defaults to zero. + Memory Emulation ---------------- diff --git a/drivers/rtc/i2c_rtc_emul.c b/drivers/rtc/i2c_rtc_emul.c index 7f78ff83cb..ef6f6a8e1d 100644 --- a/drivers/rtc/i2c_rtc_emul.c +++ b/drivers/rtc/i2c_rtc_emul.c @@ -57,6 +57,7 @@ long sandbox_i2c_rtc_set_offset(struct udevice *dev, bool use_system_time, plat->use_system_time = use_system_time; if (offset != -1) plat->offset = offset; + os_set_time_offset(plat->offset); return old_offset; } @@ -80,7 +81,7 @@ static void reset_time(struct udevice *dev) os_localtime(&now); plat->base_time = rtc_mktime(&now); - plat->offset = 0; + plat->offset = os_get_time_offset(); plat->use_system_time = true; } @@ -115,6 +116,7 @@ static int sandbox_i2c_rtc_set(struct udevice *dev, const struct rtc_time *time) now = plat->base_time; } plat->offset = rtc_mktime(time) - now; + os_set_time_offset(plat->offset); return 0; } diff --git a/include/os.h b/include/os.h index 0913b47b3a..e192e32d59 100644 --- a/include/os.h +++ b/include/os.h @@ -424,4 +424,22 @@ int os_setup_signal_handlers(void); */ void os_signal_action(int sig, unsigned long pc); +/** + * os_get_time_offset() - get time offset + * + * Get the time offset from environment variable UBOOT_SB_TIME_OFFSET. + * + * Return: offset in seconds + */ +long os_get_time_offset(void); + +/** + * os_set_time_offset() - set time offset + * + * Save the time offset in environment variable UBOOT_SB_TIME_OFFSET. + * + * @offset: offset in seconds + */ +void os_set_time_offset(long offset); + #endif -- 2.29.2

2 4

[PATCH] do not pass NULL pointer to libfdt
by Stanislav Pinchuk 30 Jan '21

30 Jan '21

Re-send because of line-wraps. Without this patch, u-boot just hangs if the fdt pointer is not initialized. The diagnostic subsystems are not yet initialized, so all you get is a blind hang. Signed-off-by: Stanislav.Pinchuk(a)kaspersky.com --- include/dm/read.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dm/read.h b/include/dm/read.h index c875e11a13..d3fd27da8a 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -1007,7 +1007,7 @@ static inline u64 dev_translate_dma_address(const struct udevice *dev, static inline int dev_read_alias_highest_id(const char *stem) { - if (!CONFIG_IS_ENABLED(OF_LIBFDT)) + if (!CONFIG_IS_ENABLED(OF_LIBFDT) || !gd->fdt_blob) return -1; return fdtdec_get_alias_highest_id(gd->fdt_blob, stem); } -- 2.25.1

2 1