July 2022 - U-Boot

[PATCH 0/4] fix missed migration from SPL_<OPTION>_SUPPORT to SPL_<OPTION>
by Quentin Schulz 04 Aug '22

04 Aug '22

From: Quentin Schulz <quentin.schulz(a)theobroma-systems.com> I guess this is the result of an unfortunate race in the merging of commits using the "old" name and their renaming. Only the first commit has been tested (I'll need it in some upcoming patches). Owners/maintainers of mx7ulp_com or imx8mp_rsb3720a1 should test those changes as I'm unable to do so. Cheers, Quentin Quentin Schulz (4): gpio: fix incorrect depends on for SPL_GPIO_HOG mx7ulp_com: fix incorrect select for SPL options imx: imx8mp_rsb3720a1: fix incorrect ifdef check on SPL_MMC vpl: fix reference in comment to non-existing SPL_SERIAL_SUPPORT arch/arm/mach-imx/mx7ulp/Kconfig | 6 +++--- board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c | 4 ++-- common/spl/Kconfig | 3 +-- drivers/gpio/Kconfig | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) -- 2.36.1

3 10

[PATCH 1/1] cmd: undefined return value of do_extension_apply()
by Heinrich Schuchardt 04 Aug '22

04 Aug '22

If 'extension apply all' is executed and no extension is found, the return value of do_extension_apply() is undefined. Return CMD_RET_FAILURE in this case. Fixes: 2f84e9cf06d3 ("cmd: add support for a new "extension" command") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/extension_board.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/extension_board.c b/cmd/extension_board.c index bbb4812ff8..f94abd612d 100644 --- a/cmd/extension_board.c +++ b/cmd/extension_board.c @@ -111,6 +111,7 @@ static int do_extension_apply(struct cmd_tbl *cmdtp, int flag, return CMD_RET_USAGE; if (strcmp(argv[1], "all") == 0) { + ret = CMD_RET_FAILURE; list_for_each_entry(extension, &extension_list, list) { ret = extension_apply(extension); if (ret != CMD_RET_SUCCESS) -- 2.36.1

3 2

[PATCH v2] spl: mmc: Use correct MMC device when loading image
by Harald Seiler 04 Aug '22

04 Aug '22

When attempting to load images from multiple MMC devices in sequence, spl_mmc_load() chooses the wrong device from the second attempt onwards. The reason is that MMC initialization is only done on its first call and spl_mmc_load() will then continue using this same device for all future calls. Fix this by checking the devnum of the "cached" device struct against the one which is requested. If they match, use the cached one but if they do not match, initialize the new device. This fixes specifying multiple MMC devices in the SPL's boot order to fall back when U-Boot Proper is corrupted or missing on the first attempted MMC device. Fixes: e1eb6ada4e38 ("spl: Make image loader infrastructure more universal") Signed-off-by: Harald Seiler <hws(a)denx.de> --- Notes: Changes in v2: - Make it work with CONFIG_SPL_BLK as well common/spl/spl_mmc.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index e1a7d25bd0..1c12f69d96 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -361,6 +361,17 @@ int __weak spl_mmc_emmc_boot_partition(struct mmc *mmc) return default_spl_mmc_emmc_boot_partition(mmc); } +static int spl_mmc_get_mmc_devnum(struct mmc *mmc) +{ + struct blk_desc *block_dev; +#if !CONFIG_IS_ENABLED(BLK) + block_dev = &mmc->block_dev; +#else + block_dev = dev_get_uclass_plat(mmc->dev); +#endif + return block_dev->devnum; +} + int spl_mmc_load(struct spl_image_info *spl_image, struct spl_boot_device *bootdev, const char *filename, @@ -371,9 +382,11 @@ int spl_mmc_load(struct spl_image_info *spl_image, u32 boot_mode; int err = 0; __maybe_unused int part = 0; + int mmc_dev; - /* Perform peripheral init only once */ - if (!mmc) { + /* Perform peripheral init only once for an mmc device */ + mmc_dev = spl_mmc_get_device_index(bootdev->boot_device); + if (!mmc || spl_mmc_get_mmc_devnum(mmc) != mmc_dev) { err = spl_mmc_find_device(&mmc, bootdev->boot_device); if (err) return err; -- 2.36.1

2 1

[PATCH] cmd: fix do_adc_single()
by Vyacheslav Bocharov 04 Aug '22

04 Aug '22

The source code contains an error: - argv[2] contains <channel> arg, variable for env_set is in argv[3] - number of args is 4 Revert 54d24d72601321f4470c4edf31c6b29adae424a7 cmd: simplify do_adc_single() Fixes 9de612ae4ded53f742f5f99929c06d0839471ced cmd: adc: Add support for storing ADC result in env variable --- cmd/adc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/adc.c b/cmd/adc.c index 195efa8661..1c5d3e10a3 100644 --- a/cmd/adc.c +++ b/cmd/adc.c @@ -71,6 +71,7 @@ static int do_adc_info(struct cmd_tbl *cmdtp, int flag, int argc, static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { + char *varname = NULL; struct udevice *dev; unsigned int data; int ret, uV, val; @@ -78,6 +79,9 @@ static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc, if (argc < 3) return CMD_RET_USAGE; + if (argc >= 4) + varname = argv[3]; + ret = adc_channel_single_shot(argv[1], simple_strtol(argv[2], NULL, 0), &data); if (ret) { @@ -95,7 +99,8 @@ static int do_adc_single(struct cmd_tbl *cmdtp, int flag, int argc, printf("%u\n", data); } - env_set_ulong(argv[2], val); + if (varname) + env_set_ulong(varname, val); return CMD_RET_SUCCESS; } @@ -160,5 +165,5 @@ static char adc_help_text[] = U_BOOT_CMD_WITH_SUBCMDS(adc, "ADC sub-system", adc_help_text, U_BOOT_SUBCMD_MKENT(list, 1, 1, do_adc_list), U_BOOT_SUBCMD_MKENT(info, 2, 1, do_adc_info), - U_BOOT_SUBCMD_MKENT(single, 3, 1, do_adc_single), + U_BOOT_SUBCMD_MKENT(single, 4, 1, do_adc_single), U_BOOT_SUBCMD_MKENT(scan, 3, 1, do_adc_scan)); -- 2.30.2

3 2

[PATCH 1/4] arm: mach-k3: Add support for device type detection
by Andrew Davis 04 Aug '22

04 Aug '22

K3 SoCs are available in a number of device types such as GP, HS-FS, EMU, etc. Like OMAP SoCs we can detect this at runtime and should print this out as part of the SoC information line. We add this as part of the common.c file as it will be used to also modify our security state early in the device boot. Signed-off-by: Andrew Davis <afd(a)ti.com> --- arch/arm/mach-k3/common.c | 51 +++++++++++++++++++++++- arch/arm/mach-k3/common.h | 10 +++++ arch/arm/mach-k3/include/mach/hardware.h | 10 +++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 70f6444e79..ac14975694 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -396,7 +396,54 @@ void reset_cpu(void) } #endif +enum k3_device_type get_device_type(void) +{ + u32 sys_status = readl(K3_SEC_MGR_SYS_STATUS); + + u32 sys_dev_type = (sys_status & SYS_STATUS_DEV_TYPE_MASK) >> + SYS_STATUS_DEV_TYPE_SHIFT; + + u32 sys_sub_type = (sys_status & SYS_STATUS_SUB_TYPE_MASK) >> + SYS_STATUS_SUB_TYPE_SHIFT; + + switch (sys_dev_type) { + case SYS_STATUS_DEV_TYPE_GP: + return K3_DEVICE_TYPE_GP; + case SYS_STATUS_DEV_TYPE_TEST: + return K3_DEVICE_TYPE_TEST; + case SYS_STATUS_DEV_TYPE_EMU: + return K3_DEVICE_TYPE_EMU; + case SYS_STATUS_DEV_TYPE_HS: + if (sys_sub_type == SYS_STATUS_SUB_TYPE_VAL_FS) + return K3_DEVICE_TYPE_HS_FS; + else + return K3_DEVICE_TYPE_HS_SE; + default: + return K3_DEVICE_TYPE_BAD; + } +} + #if defined(CONFIG_DISPLAY_CPUINFO) +static const char *get_device_type_name(void) +{ + enum k3_device_type type = get_device_type(); + + switch (type) { + case K3_DEVICE_TYPE_GP: + return "GP"; + case K3_DEVICE_TYPE_TEST: + return "TEST"; + case K3_DEVICE_TYPE_EMU: + return "EMU"; + case K3_DEVICE_TYPE_HS_FS: + return "HS-FS"; + case K3_DEVICE_TYPE_HS_SE: + return "HS-SE"; + default: + return "BAD"; + } +} + int print_cpuinfo(void) { struct udevice *soc; @@ -418,9 +465,11 @@ int print_cpuinfo(void) ret = soc_get_revision(soc, name, 64); if (!ret) { - printf("%s\n", name); + printf("%s ", name); } + printf("%s\n", get_device_type_name()); + return 0; } #endif diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h index e81b70d7c3..8f38fcef7f 100644 --- a/arch/arm/mach-k3/common.h +++ b/arch/arm/mach-k3/common.h @@ -18,6 +18,15 @@ struct fwl_data { u16 regions; }; +enum k3_device_type { + K3_DEVICE_TYPE_BAD, + K3_DEVICE_TYPE_GP, + K3_DEVICE_TYPE_TEST, + K3_DEVICE_TYPE_EMU, + K3_DEVICE_TYPE_HS_FS, + K3_DEVICE_TYPE_HS_SE, +}; + void setup_k3_mpu_regions(void); int early_console_init(void); void disable_linefill_optimization(void); @@ -27,4 +36,5 @@ void k3_sysfw_print_ver(void); void spl_enable_dcache(void); void mmr_unlock(phys_addr_t base, u32 partition); bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data); +enum k3_device_type get_device_type(void); void ti_secure_image_post_process(void **p_image, size_t *p_size); diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h index 7c6928d5da..73dc2d2d98 100644 --- a/arch/arm/mach-k3/include/mach/hardware.h +++ b/arch/arm/mach-k3/include/mach/hardware.h @@ -32,6 +32,16 @@ #define JTAG_ID_VARIANT_MASK (0xf << 28) #define JTAG_ID_PARTNO_SHIFT 12 #define JTAG_ID_PARTNO_MASK (0xffff << 12) +#define K3_SEC_MGR_SYS_STATUS 0x44234100 +#define SYS_STATUS_DEV_TYPE_SHIFT 0 +#define SYS_STATUS_DEV_TYPE_MASK (0xf) +#define SYS_STATUS_DEV_TYPE_GP 0x3 +#define SYS_STATUS_DEV_TYPE_TEST 0x5 +#define SYS_STATUS_DEV_TYPE_EMU 0x9 +#define SYS_STATUS_DEV_TYPE_HS 0xa +#define SYS_STATUS_SUB_TYPE_SHIFT 8 +#define SYS_STATUS_SUB_TYPE_MASK (0xf << 8) +#define SYS_STATUS_SUB_TYPE_VAL_FS 0xa #define K3_ROM_BOOT_HEADER_MAGIC "EXTBOOT" -- 2.36.1

2 11

[PATCH] drivers: xen: events: fix build issues with disabled Xen HVC
by Dmytro Firsov 04 Aug '22

04 Aug '22

Some setups do not use Xen hypervisor console for logging, e.g. they use emulated PL011 hardware or shared peripherals (real UART). In such cases Xen HVC will be disabled on a build time and will cause issues in current driver implementation. This commit fixes build issues in Xen event channel driver, caused by absense of console event channel, that is not available when console config is disabled. Now console related code will be removed when Xen HVC is turned off. Signed-off-by: Dmytro Firsov <dmytro_firsov(a)epam.com> --- drivers/xen/events.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 5e90a65846..532216fece 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -23,7 +23,9 @@ #include <xen/events.h> #include <xen/hvm.h> +#if CONFIG_IS_ENABLED(XEN_SERIAL) extern u32 console_evtchn; +#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ #define NR_EVS 1024 @@ -51,8 +53,11 @@ void unbind_all_ports(void) struct vcpu_info *vcpu_info = &s->vcpu_info[cpu]; for (i = 0; i < NR_EVS; i++) { +#if CONFIG_IS_ENABLED(XEN_SERIAL) if (i == console_evtchn) continue; +#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ + if (test_and_clear_bit(i, bound_ports)) { printf("port %d still bound!\n", i); unbind_evtchn(i); -- 2.25.1

3 7

[PATCH] pwm: aspeed: Select SYSCON to get parent detail.
by Billy Tsai 04 Aug '22

04 Aug '22

To work correctly, this driver depends on SYSCON to get the base address from the parent dts node. Signed-off-by: Billy Tsai <billy_tsai(a)aspeedtech.com> --- drivers/pwm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index cb54e67fae..cf66293eeb 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -12,6 +12,7 @@ config DM_PWM config PWM_ASPEED bool "Enable support for the Aspeed PWM" depends on DM_PWM + select SYSCON help This PWM is found on Ast2600 SoCs. It supports a programmable period and duty cycle. It provides 16 channels which can be independently -- 2.25.1

3 2

[PATCH] riscv: cpu: set gp before board_init_f_init_reserve
by Nikita Shubin 03 Aug '22

03 Aug '22

From: Nikita Shubin <n.shubin(a)yadro.com> Restore global pointer before board_init_f_init_reserve call, as "a0" can be set in harts_early_init call and we end up with invalid global pointer. Signed-off-by: Nikita Shubin <n.shubin(a)yadro.com> --- arch/riscv/cpu/start.S | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/riscv/cpu/start.S b/arch/riscv/cpu/start.S index 76850ec9be..623de57551 100644 --- a/arch/riscv/cpu/start.S +++ b/arch/riscv/cpu/start.S @@ -142,6 +142,7 @@ call_harts_early_init: bnez tp, secondary_hart_loop #endif + mv a0, s0 jal board_init_f_init_reserve SREG s1, GD_FIRMWARE_FDT_ADDR(gp) -- 2.35.1

2 3

[PATCH] dm: rtc: Avoid a race in the rtc_reset test
by Simon Glass 02 Aug '22

02 Aug '22

Since resetting the RTC on sandbox causes it to read the base time from the system, we cannot rely on this being unchanged since it was last read. Allow for a one-second delay. Fixes: https://source.denx.de/u-boot/u-boot/-/issues/4 Reported-by: Bin Meng <bmeng.cn(a)gmail.com> Reported-by: Tom Rini <trini(a)konsulko.com> Suggested-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- test/dm/rtc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/dm/rtc.c b/test/dm/rtc.c index c7f9f8f0ce7..403bf5c640a 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -245,16 +245,21 @@ static int dm_test_rtc_reset(struct unit_test_state *uts) ut_assertok(dm_rtc_get(dev, &now)); ut_assertok(i2c_emul_find(dev, &emul)); - ut_assert(emul != NULL); + ut_assertnonnull(emul); old_base_time = sandbox_i2c_rtc_get_set_base_time(emul, 0); ut_asserteq(0, sandbox_i2c_rtc_get_set_base_time(emul, -1)); - /* Resetting the RTC should put he base time back to normal */ + /* + * Resetting the RTC should put the base time back to normal. Allow for + * a one-second adjustment in case the time flips over while this + * test process is pre-empted, since reset_time() in i2c_rtc_emul.c + * reads the time from the OS. + */ ut_assertok(dm_rtc_reset(dev)); base_time = sandbox_i2c_rtc_get_set_base_time(emul, -1); - ut_asserteq(old_base_time, base_time); + ut_assert(base_time - old_base_time <= 1); return 0; } -- 2.37.1.455.g008518b4e5-goog

3 8

Build with CONFIG_TOOLS_LIBCRYPTO disabled is broken
by Alexander Dahl 02 Aug '22

02 Aug '22

Hei hei, once again I tried building U-Boot with CONFIG_TOOLS_LIBCRYPTO disabled and with no libssl-dev installed on the build machine. It does not work. Even porting the patch disabling the build with kwbimage (see links below) does not help anymore, because since commit 6e052d1cbafb ("mkimage: add public key for image pre-load stage") there's a new hard dependency on host openssl in tools/image-host.c and the corresponding kconfig symbol CONFIG_TOOLS_FIT can not be disabled through menuconfig. Just read those discussions again, but not sure what can be done to proceed here? Can I help somehow? (Board to be built here is based on at91 sama5d27 SoC, no fit image required.) Greets Alex Link: https://patchwork.ozlabs.org/project/uboot/patch/ 20220111153120.1276641-1-marex(a)denx.de/ Link: https://patchwork.ozlabs.org/project/uboot/patch/20211021093304.25399-1-pal…

3 3