December 2023 - U-Boot

[PATCH 01/12] clk: renesas: Synchronize R-Car R8A77960 M3-W and R8A77961 M3-W+ clock tables with Linux 6.6.3
by Marek Vasut 03 Dec '23

03 Dec '23

Synchronize R-Car R8A77960 M3-W and R8A77961 M3-W+ clock tables with Linux 6.6.3, commit bd3a9e5771a8b332f466d06f7c130a69cab0d526 . Add ZG clock macro into rcar-gen3-cpg.h to cover the new clock type . Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- drivers/clk/renesas/r8a7796-cpg-mssr.c | 3 +++ drivers/clk/renesas/rcar-gen3-cpg.h | 1 + 2 files changed, 4 insertions(+) diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c index ea1f6d69062..d741d547ec8 100644 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c @@ -80,6 +80,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = { /* Core Clock Outputs */ DEF_GEN3_Z("z", R8A7796_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8), DEF_GEN3_Z("z2", R8A7796_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0), + DEF_GEN3_Z("zg", R8A7796_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24), DEF_FIXED("ztr", R8A7796_CLK_ZTR, CLK_PLL1_DIV2, 6, 1), DEF_FIXED("ztrd2", R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1), DEF_FIXED("zt", R8A7796_CLK_ZT, CLK_PLL1_DIV2, 4, 1), @@ -129,6 +130,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = { }; static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = { + DEF_MOD("3dge", 112, R8A7796_CLK_ZG), DEF_MOD("fdp1-0", 119, R8A7796_CLK_S0D1), DEF_MOD("tmu4", 121, R8A7796_CLK_S0D6), DEF_MOD("tmu3", 122, R8A7796_CLK_S3D2), @@ -235,6 +237,7 @@ static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = { DEF_MOD("rpc-if", 917, R8A7796_CLK_RPCD2), DEF_MOD("i2c6", 918, R8A7796_CLK_S0D6), DEF_MOD("i2c5", 919, R8A7796_CLK_S0D6), + DEF_MOD("adg", 922, R8A7796_CLK_S0D4), DEF_MOD("i2c-dvfs", 926, R8A7796_CLK_CP), DEF_MOD("i2c4", 927, R8A7796_CLK_S0D6), DEF_MOD("i2c3", 928, R8A7796_CLK_S0D6), diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h index 06318c81acd..370f26c4f0f 100644 --- a/drivers/clk/renesas/rcar-gen3-cpg.h +++ b/drivers/clk/renesas/rcar-gen3-cpg.h @@ -24,6 +24,7 @@ enum rcar_gen3_clk_types { CLK_TYPE_GEN3_R, CLK_TYPE_GEN3_MDSEL, /* Select parent/divider using mode pin */ CLK_TYPE_GEN3_Z, + CLK_TYPE_GEN3_ZG, CLK_TYPE_GEN3_OSC, /* OSC EXTAL predivider and fixed divider */ CLK_TYPE_GEN3_RCKSEL, /* Select parent/divider using RCKCR.CKSEL */ CLK_TYPE_GEN3_RPCSRC, -- 2.42.0

1 11

[PATCH] watchdog: Correct watchdog timeout print message
by Chanho Park 03 Dec '23

03 Dec '23

The wdt_start function takes timeout_ms as a parameter and starts the watchdog with this value. However, when you output the message, it shows the default timeout value for the watchdog device. So this patch fixes that part to output the correct timeout value. Before --> StarFive # wdt start 3000 WDT: Started watchdog@13070000 without servicing (60s timeout) After --> StarFive # wdt start 3000 WDT: Started watchdog@13070000 without servicing (3s timeout) Fixes: c2fd0ca1a822 ("watchdog: Integrate watchdog triggering into the cyclic framework") Signed-off-by: Chanho Park <chanho61.park(a)samsung.com> --- drivers/watchdog/wdt-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index ed329284decb..65a4bc1f90ed 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -141,7 +141,7 @@ int wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) printf("WDT: Started %s with%s servicing %s (%ds timeout)\n", dev->name, IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", - str, priv->timeout); + str, (u32)(timeout_ms / 1000)); } return ret; -- 2.39.2

3 4

[PATCH 0/7] efi: Partial attempt at a test for EFI bootmeth
by Simon Glass 02 Dec '23

02 Dec '23

The test coverage for the EFI bootmeth is incomplete since it does not actually boot the application. This series makes an attempt at this. However there are at least two problems: 1. The test does not set up the loaded image properly, so it isn't found by the app. 2. The test needs to use USB instead of mmc, so that usb_stop() is called Simon Glass (7): efi: Use puts() in cout so that console recording works efi: Show the vendor in helloworld efi: test: Create a disk image with and EFI app in it WIP: efi: Disable ANSI output WIP: efi: Add a test for the EFI bootmeth WIP: efi: Allow helloworld to exit boot services WIP: efi: debugging arch/sandbox/dts/test.dts | 10 ++++++- boot/bootflow.c | 2 ++ boot/bootmeth_efi.c | 1 + cmd/bootefi.c | 1 + include/efi_loader.h | 14 +++++++-- lib/efi_loader/efi_boottime.c | 5 ++++ lib/efi_loader/efi_console.c | 19 +++++------- lib/efi_loader/efi_setup.c | 2 +- lib/efi_loader/helloworld.c | 39 ++++++++++++++++++++++++- test/boot/bootflow.c | 55 ++++++++++++++++++++++++++++++++++- test/py/tests/test_ut.py | 32 ++++++++++++++++++++ 11 files changed, 163 insertions(+), 17 deletions(-) -- 2.43.0.rc1.413.gea7ed67945-goog

3 21

[PATCH 1/5] qe: Add <config.h> to linux/immap_qe.h
by Tom Rini 02 Dec '23

02 Dec '23

Given how we define QE_MURAM_SIZE today, this header needs to have <config.h> added to it. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- include/linux/immap_qe.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/immap_qe.h b/include/linux/immap_qe.h index 45307f51c103..a692f5dfb373 100644 --- a/include/linux/immap_qe.h +++ b/include/linux/immap_qe.h @@ -11,6 +11,8 @@ #ifndef __IMMAP_QE_H__ #define __IMMAP_QE_H__ +#include <config.h> + #ifdef CONFIG_MPC83xx #if defined(CONFIG_ARCH_MPC8360) #define QE_MURAM_SIZE 0xc000UL -- 2.34.1

2 15

[PATCH 1/2] nvme: Fix error code and log to indicate busy
by Moritz Fischer 02 Dec '23

02 Dec '23

Return -EBUSY if controller is found busy rather than -ENOMEM and update the error message accordingly. Fixes: 982388eaa991 ("nvme: Add NVM Express driver support") Signed-off-by: Moritz Fischer <moritzf(a)google.com> --- drivers/nvme/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index c39cd41aa3..ec45f831a3 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -835,8 +835,8 @@ int nvme_init(struct udevice *udev) ndev->udev = udev; INIT_LIST_HEAD(&ndev->namespaces); if (readl(&ndev->bar->csts) == -1) { - ret = -ENODEV; - printf("Error: %s: Out of memory!\n", udev->name); + ret = -EBUSY; + printf("Error: %s: Controller not ready!\n", udev->name); goto free_nvme; } -- 2.43.0.rc1.413.gea7ed67945-goog

2 3

How to use I2C in U-Boot SPL
by Thomas Thielemann 02 Dec '23

02 Dec '23

Hello U-Boot, I was able to use the I2C commands from within U-Boot to control my I2C device: Configured the Processor GPIOs for the I2C bus in device tree Enabled the I2C bus in device tree Added my device to the I2C bus in device tree Wrote my script into a U-Boot variable Run my script Now I want to do the same from within the U-Boot SPL. I extended int board_early_init_f(void) in board.c for my hardware. The debug output is printed at run time. But the I2C device is not found. How do I review whether the I2C bus is using the right GPIOs and whether my device is configured right? static int i2c_get_dev(uint bus_num, uint dev_num, struct udevice **i2c_dev) { int ret; if (!i2c_led_bus) { ret = uclass_get_device_by_seq(UCLASS_I2C, bus_num, &i2c_led_bus); if (ret) { printf("I2C bus %i not found (%d)\n", dev_num, ret); return -ENODEV; } } return i2c_get_chip(i2c_led_bus, dev_num, bus_num, i2c_dev); } #endif static int i2c_enable_leds(void) { log_info("i2c_enable_leds\n"); const uint bus_num = 1; // i2c bus const uint dev_num = 0x28; // i2c chip address const uint dev_addr = 0x00; // write all bytes in one junk from start const uint dev_addr_len = 1; int ret; const uint cmd_len = 29; // cmd_len is the number of bytes. uchar cmd[29] = { 0x40, 0x3c, // init 0x00, 0x00, 0x00, 0x00, 0x00, // unused 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, // set intensitiy to max 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // unused 0xff, 0x00, 0x00, // RGB LED 0xff, 0x00, 0x00 // RGB LED }; #if CONFIG_IS_ENABLED(DM_I2C) struct udevice *i2c_dev; struct dm_i2c_chip *i2c_chip; #endif #if CONFIG_IS_ENABLED(DM_I2C) ret = i2c_get_dev(bus_num, dev_num, &i2c_dev); if (!ret) ret = i2c_set_chip_offset_len(i2c_dev, dev_addr_len); if (ret) { log_err("Failed to write to 0x28 (%d)\n", ret); return ret; } i2c_chip = dev_get_parent_plat(i2c_dev); if (!i2c_chip) { log_err("Failed to write to 0x28 (%d)\n", ret); return ret; } #endif #if CONFIG_IS_ENABLED(DM_I2C) i2c_chip->flags &= ~DM_I2C_CHIP_WR_ADDRESS; ret = dm_i2c_write(i2c_dev, dev_addr, cmd, cmd_len); #else ret = i2c_write(dev_num, dev_addr, dev_addr_len, cmd, cmd_len); #endif if (ret) log_err("Failed to write to 0x28 (%d)\n", ret); return 0; } int board_early_init_f(void) { i2c_enable_leds(); return 0; } Regards, Thomas

2 1

[PATCH RESEND 1/2] nvme: Fix error code and log to indicate busy
by Moritz Fischer 02 Dec '23

02 Dec '23

Return -EBUSY if controller is found busy rather than -ENOMEM and update the error message accordingly. Fixes: 982388eaa991 ("nvme: Add NVM Express driver support") Signed-off-by: Moritz Fischer <moritzf(a)google.com> --- drivers/nvme/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c index c39cd41aa3..ec45f831a3 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c @@ -835,8 +835,8 @@ int nvme_init(struct udevice *udev) ndev->udev = udev; INIT_LIST_HEAD(&ndev->namespaces); if (readl(&ndev->bar->csts) == -1) { - ret = -ENODEV; - printf("Error: %s: Out of memory!\n", udev->name); + ret = -EBUSY; + printf("Error: %s: Controller not ready!\n", udev->name); goto free_nvme; } -- 2.43.0.rc2.451.g8631bc7472-goog

1 1

[PATCH v8 0/2] arm64: Add a build target for Flat Image Tree
by Simon Glass 01 Dec '23

01 Dec '23

Flat Image Tree (FIT) is a widely used file format for packaging a kernel and associated devicetree files[1]. It is not specific to any one bootloader, as it is supported by U-Boot, coreboot, Linuxboot, Tianocore and Barebox. This series adds support for building a FIT as part of the kernel build. This makes it easy to try out the kernel - just load the FIT onto your tftp server and it will run automatically on any supported arm64 board. The script is written in Python, since it is easy to build a FIT using the Python libfdt bindings. For now, no attempt is made to compress files in parallel, so building the 900-odd files takes a while, about 6 seconds with my testing. The series also includes a few minor clean-up patches. [1] https://github.com/open-source-firmware/flat-image-tree Changes in v8: - Drop compatible string in FDT node - Correct sorting of MAINTAINERS to before ARM64 PORT - Turn compress part of the make_fit.py comment in to a sentence - Add two blank lines before parse_args() and setup_fit() - Use 'image.fit: dtbs' instead of BUILD_DTBS var - Use '$(<D)/dts' instead of '$(dir $<)dts' - Add 'mkimage' details Documentation/process/changes.rst - Allow changing the compression used - Tweak cover letter since there is only one clean-up patch Changes in v7: - Drop the kbuild tag - Add Image as a dependency of image.fit - Drop kbuild tag - Add dependency on dtbs - Drop unnecessary path separator for dtbs - Rebase to -next Changes in v6: - Drop the unwanted .gz suffix Changes in v5: - Drop patch previously applied - Correct compression rule which was broken in v4 Changes in v4: - Use single quotes for UIMAGE_NAME Changes in v3: - Drop temporary file image.itk - Drop patch 'Use double quotes for image name' - Drop double quotes in use of UIMAGE_NAME - Drop unnecessary CONFIG_EFI_ZBOOT condition for help - Avoid hard-coding "arm64" for the DT architecture Changes in v2: - Drop patch previously applied - Add .gitignore file - Move fit rule to Makefile.lib using an intermediate file - Drop dependency on CONFIG_EFI_ZBOOT - Pick up .dtb files separately from the kernel - Correct pylint too-many-args warning for write_kernel() - Include the kernel image in the file count - Add a pointer to the FIT spec and mention of its wide industry usage - Mention the kernel version in the FIT description Simon Glass (2): arm64: Add BOOT_TARGETS variable arm64: boot: Support Flat Image Tree Documentation/process/changes.rst | 9 + MAINTAINERS | 7 + arch/arm64/Makefile | 11 +- arch/arm64/boot/.gitignore | 1 + arch/arm64/boot/Makefile | 9 +- scripts/Makefile.lib | 13 ++ scripts/make_fit.py | 291 ++++++++++++++++++++++++++++++ 7 files changed, 338 insertions(+), 3 deletions(-) create mode 100755 scripts/make_fit.py -- 2.43.0.rc2.451.g8631bc7472-goog

2 5

[PATCH 0/5] Add anti-rollback validation feature
by seanedmond＠linux.microsoft.com 01 Dec '23

01 Dec '23

From: Sean Edmond <seanedmond(a)microsoft.com> Adds Add anti-rollback version protection. Images with an anti-rollback counter value "rollback" declared in the kernel FDT will be compared against the current device anti-rollback counter value, and older images will not pass signature validation. If the image is newer, the device anti-rollback counter value will be updated. The "rollback" value is stored/retrieved using the newly added security driver. A "TPM backed" and "sandbox backed" security driver have been provided as examples. Adds new configs: - CONFIG_DM_ROLLBACK : enable security device support - CONFIG_ROLLBACK_SANDBOX : enables "rollback-sandbox" driver - CONFIG_ROLLBACK_TPM : Enables "rollback-tpm" driver - CONFIG_FIT_ROLLBACK_CHECK : enable enforcement of OS anti-rollback counter during image loading - CONFIG_FIT_ROLLBACK_CHECK_GRACE : adds a one unit grace version to OS anti-rollback protection changes in v2: - arbvn -> rollback_idx - rollback-tpm is a child of TPM device - tpm_rollback_counter_init() tries to read NV index, defines and writes 0 if it fails - tpm_rollback_counter_init() moved to tpm-v2.c - Use tpm_auto_start() - No error checking in rollback_idx_get()/rollback_idx_set() (intelligence is in fit_image_verify_rollback()) - assume "rollback" of 0 if FIT property not found - "grace period" -> "grace version" - drop "dm_" prefix in header - Fix for tpm2_nv_define_space() (add "auth" parameter) - Make NV index consistent across APIs (define/read/write/lock). IS THIS CORRECT?! - Add documentation Sean Edmond (1): dm: test: Add a test for security driver Stephen Carlson (4): drivers: security: Add security devices to driver model drivers: security: Add TPM2 implementation of security devices common: Add OS anti-rollback validation using security devices common: Add OS anti-rollback grace period MAINTAINERS | 9 ++ arch/sandbox/dts/test.dts | 8 ++ boot/Kconfig | 19 +++ boot/image-fit-sig.c | 94 +++++++++++++++ boot/image-fit.c | 23 ++++ configs/sandbox_defconfig | 3 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/security/Kconfig | 25 ++++ drivers/security/Makefile | 7 ++ drivers/security/sandbox_security.c | 65 +++++++++++ drivers/security/security-tpm.c | 173 ++++++++++++++++++++++++++++ drivers/security/security-uclass.c | 30 +++++ include/dm-security.h | 44 +++++++ include/dm/uclass-id.h | 1 + include/image.h | 4 + include/tpm-v2.h | 1 + test/dm/Makefile | 1 + test/dm/security.c | 78 +++++++++++++ 19 files changed, 588 insertions(+) create mode 100644 drivers/security/Kconfig create mode 100644 drivers/security/Makefile create mode 100644 drivers/security/sandbox_security.c create mode 100644 drivers/security/security-tpm.c create mode 100644 drivers/security/security-uclass.c create mode 100644 include/dm-security.h create mode 100644 test/dm/security.c -- 2.40.0

3 12

[PATCH] env: mmc: fix environment on hw boot partition 2
by Javier Viguera 01 Dec '23

01 Dec '23

SYS_MMC_ENV_PART is an integer option. If it is set to 2 to use the second hardware boot partition, the IS_ENABLED check fails as it expects a boolean, and then it does not get the correct hwpart. Signed-off-by: Javier Viguera <javier.viguera(a)digi.com> --- env/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/mmc.c b/env/mmc.c index cb14bbb58f13..df82969d4231 100644 --- a/env/mmc.c +++ b/env/mmc.c @@ -111,7 +111,7 @@ static inline s64 mmc_offset(struct mmc *mmc, int copy) int hwpart = 0; int err; - if (IS_ENABLED(CONFIG_SYS_MMC_ENV_PART)) + if (CONFIG_VAL(SYS_MMC_ENV_PART)) hwpart = mmc_get_env_part(mmc); #if defined(CONFIG_ENV_MMC_PARTITION)

2 1