October 2023 - U-Boot

[PATCH v12 0/8] tpm: Support boot measurements
by Eddie James 19 Oct '23

19 Oct '23

This series adds support for measuring the boot images more generically than the existing EFI support. Several EFI functions have been moved to the TPM layer. The series includes optional measurement from the bootm command. A new test case has been added for the bootm measurement to test the new path, and the sandbox TPM2 driver has been updated to support this use case. Changes since v11: - Rebase on next. Sorry for the delay (been on leave). Changes since v10: - Fix commit message on efi_loader change - Drop python test change - Squash armv7 fix from Ilias Changes since v9: - Rebase and add Ilias' fixes (thanks!) Changes since v8: - Fix a sandbox driver off-by-one error in checking the property type. - Fix log parsing again - any data corruption seen while replaying the event log was failing the entire measurement. - Added an option to ignore the existing log and a configuration option for systems to select that for the bootm measurement. This would only be selected for systems that know that U-Boot is the first stage bootloader. This is necessary because the reserved memory region may persist through resets and so U-Boot attempts to append to the previous boot's log. Changes since v7: - Change name of tcg2_init_log and add more documentation - Add a check, when parsing the event log header, to ensure that the previous stage bootloader used all the active PCRs. - Change name of tcg2_log_find_end - Fix the greater than or equal to check to exit the log parsing - Make sure log_position is 0 if there is any error discovering the log - Return errors parsing the log if the data is corrupt so that we don't end up with half a log Changes since v6: - Added comment for bootm_measure - Fixed line length in bootm_measure - Added Linaro copyright for all the EFI moved code - Changed tcg2_init_log (and by extension, tcg2_measurement_init) to copy any discovered event log to the user's log if passed in. Changes since v5: - Re-ordered the patches to put the sandbox TPM driver patch second - Remove unused platform_get_eventlog in efi_tcg2.c - First look for tpm_event_log_* properties instead of linux,sml-* - Fix efi_tcg2.c compilation - Select SHA* configs - Remove the !SANDBOX dependency for EFI TCG2 - Only compile in the measurement u-boot command when CONFIG_MEASURED_BOOT is enabled Changes since v4: - Remove tcg2_measure_event function and check for NULL data in tcg2_measure_data - Use tpm_auto_startup - Fix efi_tcg2.c compilation for removing tcg2_pcr_read function - Change PCR indexes for initrd and dtb - Drop u8 casting in measurement test - Use bullets in documentation Changes since v3: - Reordered headers - Refactored more of EFI code into common code Removed digest_info structure and instead used the common alg_to_mask and alg_to_len Improved event log parsing in common code to get it equivalent to EFI Common code now extends PCR if previous bootloader stage couldn't No need to allocate memory in the common code, so EFI copies the discovered buffer like it did before Rename efi measure_event function Changes since v2: - Add documentation. - Changed reserved memory address to the top of the RAM for sandbox dts. - Add measure state to booti and bootz. - Skip measurement for EFI images that should be measured Changes since v1: - Refactor TPM layer functions to allow EFI system to use them, and remove duplicate EFI functions. - Add test case - Drop #ifdefs for bootm - Add devicetree measurement config option - Update sandbox TPM driver Eddie James (6): tpm: Fix spelling for tpmu_ha union tpm: sandbox: Update for needed TPM2 capabilities tpm: Support boot measurements bootm: Support boot measurement test: Add sandbox TPM boot measurement doc: Add measured boot documentation Ilias Apalodimas (2): efi_loader: fix EFI_ENTRY point on get_active_pcr_banks test: use a non system PCR for testing PCR extend arch/sandbox/dts/sandbox.dtsi | 13 + arch/sandbox/dts/test.dts | 13 + boot/Kconfig | 32 ++ boot/bootm.c | 74 +++ cmd/booti.c | 1 + cmd/bootm.c | 2 + cmd/bootz.c | 1 + configs/sandbox_defconfig | 1 + doc/usage/index.rst | 1 + doc/usage/measured_boot.rst | 23 + drivers/tpm/tpm2_tis_sandbox.c | 100 ++-- include/bootm.h | 11 + include/efi_tcg2.h | 44 -- include/image.h | 1 + include/test/suites.h | 1 + include/tpm-v2.h | 263 ++++++++++- lib/Kconfig | 4 + lib/efi_loader/Kconfig | 2 - lib/efi_loader/efi_tcg2.c | 823 ++++----------------------------- lib/tpm-v2.c | 814 ++++++++++++++++++++++++++++++++ test/boot/Makefile | 1 + test/boot/measurement.c | 66 +++ test/cmd_ut.c | 4 + test/py/tests/test_tpm2.py | 16 +- 24 files changed, 1482 insertions(+), 829 deletions(-) create mode 100644 doc/usage/measured_boot.rst create mode 100644 test/boot/measurement.c -- 2.39.3

3 13

[PATCH v5 00/11] spl: Use common function for loading/parsing images
by Sean Anderson 19 Oct '23

19 Oct '23

This series adds support for loading all image types (Legacy, FIT (with and without LOAD_FIT_FULL), and i.MX) to the MMC, SPI, NOR, NET, FAT, and EXT load methods. It does this by introducing a helper function which handles the minutiae of invoking the proper parsing function, and reading the rest of the image. Hopefully, this will make it easier for load methods to support all image types that U-Boot supports, without having undocumented unsupported image types. I applied this to several loaders which were invoking spl_load_simple_fit and/or spl_parse_image_header, but I did not use it with others (e.g. DFU/RAM) which had complications in the mix. In order to meet size requirements for some boards, the first two patches of this series are general size-reduction changes. The ffs/fls change in particular should reduce code size across the board. The malloc change also has the potential to reduce code size. I've left it disabled by default, but maybe we can reverse that in the future. Here's some bloat-o-meter for j7200_evm_a72_defconfig with ext4 support enabed: add/remove: 2/1 grow/shrink: 1/5 up/down: 444/-584 (-140) Function old new delta spl_load - 216 +216 spl_simple_read - 184 +184 spl_fit_read 60 104 +44 file_fat_read 40 - -40 spl_nor_load_image 120 76 -44 spl_load_image_ext 364 296 -68 spl_load_image_fat 320 200 -120 spl_spi_load_image 304 176 -128 spl_mmc_load 716 532 -184 Total: Before=233618, After=233478, chg -0.06% For most boards with a few load methods, this series should break even. However, in the worst case this series will add around 100 bytes. I have only tested a few loaders. Please try booting your favorite board with NOR/SPI flash or SPI falcon mode. On sama5d27_wlsom1_ek_mmc_defconfig, 100 bytes is too much, so this series depends on [1] to fit everything in. CI run at [2]. [1] https://lore.kernel.org/u-boot/20230731223327.109865-1-sean.anderson@seco.c… [2] https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/17116 Changes in v5: - Make SHOW_ERRORS depend on LIBCOMMON - Load the header in spl_load as well - Don't bother trying to DMA-align the buffer, since we can't really fix it. - Convert NVMe to spl_load Changes in v4: - Fix format specifiers in debug prints - Reword/fix some of the doc comments for spl_load - Rebase on u-boot/master Changes in v3: - Fix using ffs instead of fls - Fix using not initializing bl_len when info->filename was NULL - Fix failing on success Changes in v2: - Use reverse-xmas-tree style for locals in spl_simple_read. This is not complete, since overhead depends on bl_mask. - Convert semihosting as well - Consolidate spi_load_image_os into spl_spi_load_image Sean Anderson (11): spl: Make SHOW_ERRORS depend on LIBCOMMON spl: Add generic spl_load function spl: Convert ext to use spl_load spl: Convert fat to spl_load spl: Convert mmc to spl_load spl: Convert net to spl_load spl: Convert NVMe to spl_load spl: Convert nor to spl_load spl: Convert semihosting to spl_load spl: Convert spi to spl_load spl: spi: Consolidate spi_load_image_os into spl_spi_load_image common/spl/Kconfig | 1 + common/spl/spl.c | 86 +++++++++++++++++++++++++- common/spl/spl_blk_fs.c | 68 ++++----------------- common/spl/spl_ext.c | 34 ++++++----- common/spl/spl_fat.c | 55 ++++++----------- common/spl/spl_mmc.c | 91 +++------------------------- common/spl/spl_net.c | 25 ++------ common/spl/spl_nor.c | 41 +++---------- common/spl/spl_semihosting.c | 43 +++++-------- common/spl/spl_spi.c | 113 +++++------------------------------ include/spl.h | 27 ++++++++- 11 files changed, 209 insertions(+), 375 deletions(-) -- 2.40.1

6 35

[PULL] u-boot-riscv/master
by Leo Liang 19 Oct '23

19 Oct '23

Hi Tom, The following changes since commit 9a0cf3993f71043ba08c315572c54622de42d447: Merge branch '2023-10-17-spl-test-some-load-methods' (2023-10-18 08:28:00 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-riscv.git for you to fetch changes up to bc5a50452bd42029d6587e1596b44ff235655e90: riscv: Add Zbb support for building U-Boot (2023-10-19 17:29:50 +0800) CI result shows no issue: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/18215 ---------------------------------------------------------------- + riscv: Add Zbb support + riscv: Add preliminary RISC-V falcon mode support + riscv: Remove dram_init_banksize() + andes: rearrange PLICSW scheme + visionfive2: enable bootstage configs ---------------------------------------------------------------- Chanho Park (1): configs: visionfive2: enable bootstage configs Heinrich Schuchardt (1): riscv: remove dram_init_banksize() Mayuresh Chitale (1): riscv: binman: Fix compilation error Randolph (8): riscv: andes: Rearrange Andes PLICSW to single-bit-per-hart strategy spl: riscv: opensbi: change the default os_type as varible riscv: kconfig: introduce SPL_LOAD_FIT_OPENSBI_OS_BOOT symbol riscv: dts: binman: add condition for opensbi os boot Makefile: delete file *.itb when make clean spl: riscv: add os type for next booting stage andes: config: add riscv falcon mode for ae350 platform riscv: spl: andes: Move the DTB in front of kernel Yu Chien Peter Lin (1): riscv: Add Zbb support for building U-Boot Makefile | 2 +- arch/riscv/Kconfig | 99 +++++++++++++++++++++++++++++++ arch/riscv/Makefile | 5 +- arch/riscv/cpu/generic/dram.c | 16 ----- arch/riscv/dts/binman.dtsi | 38 ++++++++++-- arch/riscv/include/asm/string.h | 18 ++++++ arch/riscv/lib/Makefile | 3 + arch/riscv/lib/andes_plicsw.c | 24 ++++---- arch/riscv/lib/strcmp_zbb.S | 81 +++++++++++++++++++++++++ arch/riscv/lib/strlen_zbb.S | 101 ++++++++++++++++++++++++++++++++ arch/riscv/lib/strncmp_zbb.S | 94 +++++++++++++++++++++++++++++ board/AndesTech/ae350/ae350.c | 25 ++++++++ common/spl/spl_fit.c | 3 +- common/spl/spl_opensbi.c | 31 ++++++---- configs/ae350_rv32_falcon_defconfig | 60 +++++++++++++++++++ configs/ae350_rv32_falcon_xip_defconfig | 61 +++++++++++++++++++ configs/ae350_rv64_falcon_defconfig | 60 +++++++++++++++++++ configs/ae350_rv64_falcon_xip_defconfig | 61 +++++++++++++++++++ configs/starfive_visionfive2_defconfig | 2 + 19 files changed, 738 insertions(+), 46 deletions(-) create mode 100644 arch/riscv/lib/strcmp_zbb.S create mode 100644 arch/riscv/lib/strlen_zbb.S create mode 100644 arch/riscv/lib/strncmp_zbb.S create mode 100644 configs/ae350_rv32_falcon_defconfig create mode 100644 configs/ae350_rv32_falcon_xip_defconfig create mode 100644 configs/ae350_rv64_falcon_defconfig create mode 100644 configs/ae350_rv64_falcon_xip_defconfig Best regards, Leo

2 1

Please pull u-boot-watchdog/master
by Stefan Roese 19 Oct '23

19 Oct '23

Hi Tom, please pull the following watchdog related commits: ---------------------------------------------------------------- - sandbox: watchdog: Avoid an error on startup (Simon) - nuvoton: Fix reset/expire function error (Jim) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=320&view=results Thanks, Stefan The following changes since commit 9a0cf3993f71043ba08c315572c54622de42d447: Merge branch '2023-10-17-spl-test-some-load-methods' (2023-10-18 08:28:00 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-watchdog.git for you to fetch changes up to 127d03893bd51f855e1a277e31a8258105ace42a: wdt: nuvoton: Fix reset/expire function error (2023-10-19 07:51:12 +0200) ---------------------------------------------------------------- Jim Liu (1): wdt: nuvoton: Fix reset/expire function error Simon Glass (1): sandbox: watchdog: Avoid an error on startup arch/sandbox/dts/test.dts | 2 +- drivers/watchdog/npcm_wdt.c | 10 ++++++++-- test/dm/wdt.c | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-)

2 1

[PATCH v4 0/2] Add support for the Renesas RZ/G2L SMARC EVK
by Paul Barker 19 Oct '23

19 Oct '23

These patches finish off initial support for the RZ/G2L SMARC Evaluation board kit (EVK). All patches which have already been merged are dropped, this is just the re-worked SCIF patches. These patches have been tested on an RZ/G2L as well as on the qemu 'r2d' machine to confirm that the serial port issue observed by Marek in v3 is fixed. Paul Barker (2): serial: sh: Fix error handling serial: sh: Add RZ/G2L SCIF support arch/arm/mach-rmobile/Kconfig | 1 + drivers/serial/serial_sh.c | 31 +++++++++++++++++++++++++++++-- drivers/serial/serial_sh.h | 19 ++++++++++++++++++- 3 files changed, 48 insertions(+), 3 deletions(-) base-commit: 9a0cf3993f71043ba08c315572c54622de42d447 -- 2.39.2

1 2

[tiU23.04 PATCH] board: ti: common: board_detect: Fix EEPROM offset read for 1-byte
by Prasanth Babu Mantena 19 Oct '23

19 Oct '23

EEPROM detection logic in ti_i2c_eeprom_get() involves reading the total size followed by reading 1-byte size with an offset 1. This commit fixes the header matching issue in commit 9f393a2d7af8 ("board: ti: common: board_detect: Fix EEPROM read quirk for 2-byte"). In the previous commit, the value with one offset is being read into offset_test, but the pointer used to match was still ep. After reading with an offset 1, the second byte of the header is compared with the 1-byte data read from EEPROM. This is taken care by comparing proper first byte value from the header. Signed-off-by: Prasanth Babu Mantena <p-mantena(a)ti.com> Fixes: 9f393a2d7af8 (board: ti: common: board_detect: Fix EEPROM read quirk for 2-byte) --- board/ti/common/board_detect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/ti/common/board_detect.c b/board/ti/common/board_detect.c index 9a53884c98..17fe8f8069 100644 --- a/board/ti/common/board_detect.c +++ b/board/ti/common/board_detect.c @@ -128,7 +128,7 @@ static int __maybe_unused ti_i2c_eeprom_get(int bus_addr, int dev_addr, rc = dm_i2c_read(dev, 0x1, &offset_test, sizeof(offset_test)); - if (*((u32 *)ep) != (header & 0xFF)) + if (offset_test != ((header >> 8) & 0xFF)) one_byte_addressing = false; /* Corrupted data??? */ -- 2.39.0

1 0

[PATCH] sandbox: watchdog: Avoid an error on startup
by Simon Glass 19 Oct '23

19 Oct '23

For some time now running sandbox with -T produces an error: Core: 270 devices, 95 uclasses, devicetree: board WDT: Not starting wdt-gpio-toggle wdt_gpio wdt-gpio-level: Request for wdt gpio failed: -16 WDT: Not starting wdt@0 MMC: mmc2: 2 (SD), mmc1: 1 (SD), mmc0: 0 (SD) Use an unallocated GPIO to avoid this. Signed-off-by: Simon Glass <sjg(a)chromium.org> Fixes: 1fc45d6483d ("watchdog: add pulse support to gpio watchdog driver") --- arch/sandbox/dts/test.dts | 2 +- test/dm/wdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index f351d5cb84b..14ec17a3fef 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -935,7 +935,7 @@ }; wdt-gpio-toggle { - gpios = <&gpio_a 7 0>; + gpios = <&gpio_a 8 0>; compatible = "linux,wdt-gpio"; hw_margin_ms = <100>; hw_algo = "toggle"; diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 653d7b1c8b3..2bbebcdbf28 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -54,7 +54,7 @@ static int dm_test_wdt_gpio_toggle(struct unit_test_state *uts) */ struct udevice *wdt, *gpio; const u64 timeout = 42; - const int offset = 7; + const int offset = 8; int val; ut_assertok(uclass_get_device_by_name(UCLASS_WDT, @@ -115,7 +115,7 @@ static int dm_test_wdt_watchdog_reset(struct unit_test_state *uts) struct udevice *gpio_wdt, *sandbox_wdt; struct udevice *gpio; const u64 timeout = 42; - const int offset = 7; + const int offset = 8; uint reset_count; int val; -- 2.41.0.640.ga95def55d0-goog

2 2

[PATCH v3] wdt: nuvoton: Fix reset/expire function error
by Jim Liu 19 Oct '23

19 Oct '23

Fix npcm845 watchdog halt for reset function and expire function. Reset function is restart wdt. Signed-off-by: Jim Liu <JJLIU0(a)nuvoton.com> Changes for v3: - Modify start sentences - Remove empty line Changes for v2: - Add commit message - Fix no empty line problem - Remove dts --- drivers/watchdog/npcm_wdt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c index e56aa0ebe1..57b61215a2 100644 --- a/drivers/watchdog/npcm_wdt.c +++ b/drivers/watchdog/npcm_wdt.c @@ -69,15 +69,21 @@ static int npcm_wdt_stop(struct udevice *dev) static int npcm_wdt_reset(struct udevice *dev) { struct npcm_wdt_priv *priv = dev_get_priv(dev); + u32 val; - writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, priv->regs); + val = readl(priv->regs); + writel(val | NPCM_WTR, priv->regs); return 0; } static int npcm_wdt_expire_now(struct udevice *dev, ulong flags) { - return npcm_wdt_reset(dev); + struct npcm_wdt_priv *priv = dev_get_priv(dev); + + writel(NPCM_WTR | NPCM_WTRE | NPCM_WTE, priv->regs); + + return 0; } static int npcm_wdt_of_to_plat(struct udevice *dev) -- 2.25.1

2 2

[PATCH] ARM: zynq: Disable the config CONFIG_SPI_FLASH_USE_4K_SECTORS
by Michal Simek 19 Oct '23

19 Oct '23

From: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> Lock size for the flashes will be in terms of sector size, so disable the CONFIG_SPI_FLASH_USE_4K_SECTORS and read it from the flash itself. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- configs/xilinx_zynq_virt_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/xilinx_zynq_virt_defconfig b/configs/xilinx_zynq_virt_defconfig index 817fb4142d18..6145af62b511 100644 --- a/configs/xilinx_zynq_virt_defconfig +++ b/configs/xilinx_zynq_virt_defconfig @@ -126,6 +126,7 @@ CONFIG_SPI_FLASH_SPANSION=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_PHY_MARVELL=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y -- 2.36.1

1 1

[PATCH] arm64: zynqmp: Disable the lock option for mini qspi
by Michal Simek 19 Oct '23

19 Oct '23

From: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> As mini configs are required only for flashing the images, so disabling the lock config which will save nearly 6KB of memory. Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Depends on https://lore.kernel.org/all/20230928034940.2220-2-venkatesh.abbarapu@amd.co… --- configs/xilinx_zynqmp_mini_qspi_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/xilinx_zynqmp_mini_qspi_defconfig b/configs/xilinx_zynqmp_mini_qspi_defconfig index a1adfb9e5d14..4a74ca76a281 100644 --- a/configs/xilinx_zynqmp_mini_qspi_defconfig +++ b/configs/xilinx_zynqmp_mini_qspi_defconfig @@ -77,6 +77,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y # CONFIG_DM_MAILBOX is not set # CONFIG_MMC is not set # CONFIG_SPI_FLASH_SMART_HWCAPS is not set +# CONFIG_SPI_FLASH_LOCK is not set # CONFIG_SPI_FLASH_UNLOCK_ALL is not set CONFIG_SPI_FLASH_GIGADEVICE=y CONFIG_SPI_FLASH_ISSI=y -- 2.36.1

1 1