October 2024 - U-Boot

[PATCH 0/6] efi: Start to chip away at the EFI workaround
by Simon Glass 24 Oct '24

24 Oct '24

At present there is a function, efi_set_bootdev(), which is used in various places to tell the EFI loader which device a file came from. With bootstd, this information is available in the bootflow. This little series provides a way for bootstd to provide the bootflow to the EFI loader, so that it is able to select the correct paths. For now only the EFI bootmeth is updated. Simon Glass (6): efi: Refactor device and image paths into a function efi: Make efi_run_image() static efi: Update efi_run_image() to accept image and device path efi: Add a version of efi_binary_run() with more parameters efi: Move the fallback code from efi_run_image() efi: Pass in the require parameters from EFI bootmeth boot/bootmeth_efi.c | 49 +------- include/efi_loader.h | 10 ++ lib/efi_loader/efi_bootbin.c | 210 ++++++++++++++++++++++++----------- 3 files changed, 159 insertions(+), 110 deletions(-) -- 2.34.1

3 8

[PATCH v1 1/1] efi_loader: Mark a function static
by Andy Shevchenko 24 Oct '24

24 Oct '24

efi_bootmgr_release_uridp_resource() is not used anywhere except the same file where it is defined. Mark it static. This helps avoiding the compiler warning: lib/efi_loader/efi_bootmgr.c:388:14: warning: no previous prototype for ‘efi_bootmgr_release_uridp_resource’ [-Wmissing-prototypes] Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- lib/efi_loader/efi_bootmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 589d3996b680..79144962cd73 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -385,7 +385,7 @@ err: * @ctx: event context * Return: status code */ -efi_status_t efi_bootmgr_release_uridp_resource(struct uridp_context *ctx) +static efi_status_t efi_bootmgr_release_uridp_resource(struct uridp_context *ctx) { efi_status_t ret = EFI_SUCCESS; -- 2.43.0.rc1.1336.g36b5255a03ac

4 7

[PATCH] mtd: spi-nor: Clear Winbond SR3 WPS bit on boot
by Marek Vasut 24 Oct '24

24 Oct '24

Some Winbond SPI NORs have special SR3 register which is used among other things to control whether non-standard "Individual Block/Sector Write Protection" (WPS bit) locking scheme is activated. This non-standard locking scheme is not supported by either U-Boot or Linux SPI NOR stack so make sure it is disabled, otherwise the SPI NOR may appear locked for no obvious reason. This SR3 WPS appears e.g. on W25Q16FW which has the same ID as W25Q16DW, but the W25Q16DW does not implement the SR3 WPS bit. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Hai Pham <hai.pham.ud(a)renesas.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Johann Neuhauser <jneuhauser(a)dh-electronics.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Cc: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> Cc: Vignesh R <vigneshr(a)ti.com> --- drivers/mtd/spi/spi-nor-core.c | 47 ++++++++++++++++++++++++++++++++++ include/linux/mtd/spi-nor.h | 5 ++++ 2 files changed, 52 insertions(+) diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 9a1801ba93d..68dee57258d 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -544,6 +544,24 @@ static int read_cr(struct spi_nor *nor) } #endif +/** + * read_sr3() - Read status register 3 unique to newer Winbond flashes + * @nor: pointer to a 'struct spi_nor' + */ +static int read_sr3(struct spi_nor *nor) +{ + int ret; + u8 val; + + ret = nor->read_reg(nor, SPINOR_OP_RDSR3, &val, 1); + if (ret < 0) { + dev_dbg(nor->dev, "error %d reading SR3\n", ret); + return ret; + } + + return val; +} + /* * Write status register 1 byte * Returns negative if error occurred. @@ -554,6 +572,17 @@ static int write_sr(struct spi_nor *nor, u8 val) return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1); } +/** + * write_sr3() - Write status register 3 unique to newer Winbond flashes + * @nor: pointer to a 'struct spi_nor' + * @val: value to be written into SR3 + */ +static int write_sr3(struct spi_nor *nor, u8 val) +{ + nor->cmd_buf[0] = val; + return nor->write_reg(nor, SPINOR_OP_WRSR3, nor->cmd_buf, 1); +} + /* * Set write enable latch with Write Enable command. * Returns negative if error occurred. @@ -3890,6 +3919,24 @@ static int spi_nor_init(struct spi_nor *nor) write_enable(nor); write_sr(nor, 0); spi_nor_wait_till_ready(nor); + + /* + * Some Winbond SPI NORs have special SR3 register which is + * used among other things to control whether non-standard + * "Individual Block/Sector Write Protection" (WPS bit) + * locking scheme is activated. This non-standard locking + * scheme is not supported by either U-Boot or Linux SPI + * NOR stack so make sure it is disabled, otherwise the + * SPI NOR may appear locked for no obvious reason. + */ + if (JEDEC_MFR(nor->info) == SNOR_MFR_WINBOND) { + err = read_sr3(nor); + if (err > 0 && err & SR3_WPS) { + write_enable(nor); + write_sr3(nor, err & ~SR3_WPS); + write_disable(nor); + } + } } if (nor->quad_enable) { diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index 2861b73edbc..ceb32e3906f 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -45,6 +45,8 @@ #define SPINOR_OP_WRSR 0x01 /* Write status register 1 byte */ #define SPINOR_OP_RDSR2 0x3f /* Read status register 2 */ #define SPINOR_OP_WRSR2 0x3e /* Write status register 2 */ +#define SPINOR_OP_RDSR3 0x15 /* Read status register 3 */ +#define SPINOR_OP_WRSR3 0x11 /* Write status register 3 */ #define SPINOR_OP_READ 0x03 /* Read data bytes (low frequency) */ #define SPINOR_OP_READ_FAST 0x0b /* Read data bytes (high frequency) */ #define SPINOR_OP_READ_1_1_2 0x3b /* Read data bytes (Dual Output SPI) */ @@ -185,6 +187,9 @@ /* Status Register 2 bits. */ #define SR2_QUAD_EN_BIT7 BIT(7) +/* Status Register 3 bits. */ +#define SR3_WPS BIT(2) + /* For Cypress flash. */ #define SPINOR_OP_RD_ANY_REG 0x65 /* Read any register */ #define SPINOR_OP_WR_ANY_REG 0x71 /* Write any register */ -- 2.43.0

4 20

[PATCH 0/2] doc: include file-system API into HTML docs
by Heinrich Schuchardt 24 Oct '24

24 Oct '24

* Describe the fields of struct fs_dir_stream. * Update fs_readdir() and fs_opendir() description. * Fix Sphinx errors. * Add include/fs.h to the API documentation. Heinrich Schuchardt (2): fs: improve API documentation doc: include file-system API into HTML docs doc/api/fs.rst | 7 +++++ doc/api/index.rst | 1 + include/fs.h | 66 +++++++++++++++++++++++++++++------------------ 3 files changed, 49 insertions(+), 25 deletions(-) create mode 100644 doc/api/fs.rst -- 2.45.2

1 2

[PATCH v2 0/3] image: android: misc fixes when using on Qualcomm platforms
by Neil Armstrong 24 Oct '24

24 Oct '24

When trying to use the Android boot image with header version 2 on recent Qualcomm platforms, we get into some troubles. First the kernel in-place address can be > 32bit, then since we use the Android mkbootimg, it uses the default load address which isn't big enough to uncompress the kernel. Finally, the ramdisk also uses a default load address, and it should be taken in account like for the kernel address. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Changes in v2: - Fix patch 2 prefix - Fix patch 3 commit msg - Fix patch 3 behavior when using boot image header version > 2, use the original ramdisk_ptr - Link to v1: https://lore.kernel.org/r/20241016-topic-fastboot-fixes-mkbootimg-v1-0-94fd… --- Neil Armstrong (3): image: android: use ulong for kernel address image: android: do not boot XIP when kernel is compressed image: android: handle ramdisk default address boot/image-android.c | 62 +++++++++++++++++++++++++++++++++++++------------ include/android_image.h | 2 +- 2 files changed, 48 insertions(+), 16 deletions(-) --- base-commit: d5cab0d6adc26ec1bbd45c2fed101184d04454ae change-id: 20241016-topic-fastboot-fixes-mkbootimg-8d73ab93db3d Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

3 8

[PATCH v2 0/2] dfu: sf: fix flash probe when DM_SPI_FLASH is enabled
by Neil Armstrong 24 Oct '24

24 Oct '24

With DM_SPI_FLASH is enabled, the code uses the legacy SPI FLASH code leading to probable errors since it doesn't use speed and mode provided by DT. This adds the DM functions as dummy inline functions to add both legacy and DM support in DFU sf code avoiding using #if/#else conditionals. Signed-off-by: Neil Armstrong <neil.armstrong(a)linaro.org> --- Changes in v2: - switch to if(IS_ENABLED()) - add SPI FLASH DM functions as dummy inline functions - Link to v1: https://lore.kernel.org/r/20240917-uboot-topic-dfu-sf-dt-v1-1-8cf38451eea4@… --- Neil Armstrong (2): spi: add DM_SPI_FLASH compatibility inline functions dfu: sf: rely on DT for spi speed and mode drivers/dfu/dfu_sf.c | 16 +++++++++++++++- include/spi_flash.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) --- base-commit: 19dbc09405d3503ce3efef3c2e4b4f0f1a03372d change-id: 20240917-uboot-topic-dfu-sf-dt-8ae62e5c7d79 Best regards, -- Neil Armstrong <neil.armstrong(a)linaro.org>

2 6

[PATCH] configs: orangepi-3b-rk3566_defconfig: Enable CONFIG_MULTI_DTB_FIT
by Jianfeng Liu 24 Oct '24

24 Oct '24

Orange Pi 3B uses board_fit_config_name_match in rk_board_late_init to decide which kernel dtb to load. To make it work with system using grub, we have to enable CONFIG_MULTI_DTB_FIT. Tested with opensuse using grub2, without CONFIG_MULTI_DTB_FIT grub will load rk3566-orangepi-3b.dtb in u-boot, which has no gmac ethernet enabled. Signed-off-by: Jianfeng Liu <liujianfeng1994(a)gmail.com> --- configs/orangepi-3b-rk3566_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/orangepi-3b-rk3566_defconfig b/configs/orangepi-3b-rk3566_defconfig index 2181c9caf58..e87849a9946 100644 --- a/configs/orangepi-3b-rk3566_defconfig +++ b/configs/orangepi-3b-rk3566_defconfig @@ -48,6 +48,7 @@ CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y # CONFIG_OF_UPSTREAM is not set CONFIG_OF_LIST="rk3566-orangepi-3b rk3566-orangepi-3b-v1.1 rk3566-orangepi-3b-v2.1" +CONFIG_MULTI_DTB_FIT=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y -- 2.43.0

2 2

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

23 Oct '24

Hi Tom, please pull the following watchdog related patches: ---------------------------------------------------------------- - watchdog: gpio_wdt: add support for stoppable devices (Rasmus) - watchdog: Add DaVinci's watchdog support (Bastien) - cyclic: disentangling cyclic API from schedule() (Rasmus) - watchdog: introduce separate SPL symbol for WDT_GPIO (Rasmus) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=378&view=results Thanks, Stefan The following changes since commit 392ff1449f7d30cc48fd4d17320d05882cd68f2e: Merge tag 'video-20241022' of https://source.denx.de/u-boot/custodians/u-boot-video (2024-10-22 14:11:20 -0600) 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 ed3410ee6049a7683718e8255575ad55ee1bdefd: watchdog: introduce separate SPL symbol for WDT_GPIO (2024-10-23 07:02:25 +0200) ---------------------------------------------------------------- Bastien Curutchet (1): drivers: watchdog: Add DaVinci's watchdog support Rasmus Villemoes (15): watchdog: gpio_wdt: add support for stoppable devices doc: cyclic: remove reference to WATCHDOG_RESET cyclic: introduce u-boot/schedule.h led: include cyclic.h in led_sw_blink.c m68k: asm/ptrace.h: include linux/types.h fs/cramfs: use schedule instead of cyclic_run as callback test: dm: wdt: replace cyclic_run() by schedule() cyclic: make cyclic_run static watchdog.h: change include of cyclic.h to u-boot/schedule.h lib/sha*: include u-boot/schedule.h instead of cyclic.h i2c: rzg2l: include u-boot/schedule.h ddr: altera: include u-boot/schedule.h boot: cedit: include u-boot/schedule.h global_data.h: remove unnecesary include of cyclic.h watchdog: introduce separate SPL symbol for WDT_GPIO arch/m68k/include/asm/ptrace.h | 2 + boot/cedit.c | 1 + common/cyclic.c | 3 +- doc/develop/cyclic.rst | 10 +-- drivers/ddr/altera/sdram_n5x.c | 1 + drivers/ddr/altera/sdram_soc64.c | 1 + drivers/i2c/rz_riic.c | 1 + drivers/led/led_sw_blink.c | 1 + drivers/watchdog/Kconfig | 16 +++++ drivers/watchdog/Makefile | 3 +- drivers/watchdog/davinci_wdt.c | 131 ++++++++++++++++++++++++++++++++++++++ drivers/watchdog/gpio_wdt.c | 27 +++++++- fs/cramfs/uncompress.c | 4 +- include/asm-generic/global_data.h | 1 - include/cyclic.h | 24 +------ include/u-boot/schedule.h | 24 +++++++ include/watchdog.h | 2 +- lib/sha1.c | 2 +- lib/sha256.c | 2 +- lib/sha512.c | 2 +- test/dm/wdt.c | 14 ++-- 21 files changed, 225 insertions(+), 47 deletions(-) create mode 100644 drivers/watchdog/davinci_wdt.c create mode 100644 include/u-boot/schedule.h

2 1

[PATCH] lmb: Remove lmb_alloc_flags()
by Ilias Apalodimas 23 Oct '24

23 Oct '24

lmb_alloc_flags() & lmb_alloc_base_flags() are just a wrappers for _lmb_alloc_base(). Since the only difference is the max address of the allowed allocation which _lmb_alloc_base() already supports with the LMB_ALLOC_ANYWHERE flag, remove one of them. Keep the lmb_alloc_base_flags() flags which also prints an error on failures and adjust efi_allocate_pages() to only use one of them. While at it clean up the duplicate function description from the header file. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- include/lmb.h | 26 -------------------------- lib/efi_loader/efi_memory.c | 3 ++- lib/lmb.c | 17 ----------------- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/include/lmb.h b/include/lmb.h index e46abf400c68..92464d6e1342 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -95,32 +95,6 @@ phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr); phys_addr_t lmb_alloc_addr(phys_addr_t base, phys_size_t size); phys_size_t lmb_get_free_size(phys_addr_t addr); -/** - * lmb_alloc_flags() - Allocate memory region with specified attributes - * @size: Size of the region requested - * @align: Alignment of the memory region requested - * @flags: Memory region attributes to be set - * - * Allocate a region of memory with the attributes specified through the - * parameter. - * - * Return: base address on success, 0 on error - */ -phys_addr_t lmb_alloc_flags(phys_size_t size, ulong align, uint flags); - -/** - * lmb_alloc_base_flags() - Allocate specified memory region with specified attributes - * @size: Size of the region requested - * @align: Alignment of the memory region requested - * @max_addr: Maximum address of the requested region - * @flags: Memory region attributes to be set - * - * Allocate a region of memory with the attributes specified through the - * parameter. The max_addr parameter is used to specify the maximum address - * below which the requested region should be allocated. - * - * Return: base address on success, 0 on error - */ phys_addr_t lmb_alloc_base_flags(phys_size_t size, ulong align, phys_addr_t max_addr, uint flags); diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 3d742fa19150..9f3f08769977 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -472,7 +472,8 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type, switch (type) { case EFI_ALLOCATE_ANY_PAGES: /* Any page */ - addr = (u64)lmb_alloc_flags(len, EFI_PAGE_SIZE, flags); + addr = (u64)lmb_alloc_base_flags(len, EFI_PAGE_SIZE, + LMB_ALLOC_ANYWHERE, flags); if (!addr) return EFI_OUT_OF_RESOURCES; break; diff --git a/lib/lmb.c b/lib/lmb.c index 69001ad57373..3a9edb1e565e 100644 --- a/lib/lmb.c +++ b/lib/lmb.c @@ -670,23 +670,6 @@ phys_addr_t lmb_alloc(phys_size_t size, ulong align) return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE); } -/** - * lmb_alloc_flags() - Allocate memory region with specified attributes - * @size: Size of the region requested - * @align: Alignment of the memory region requested - * @flags: Memory region attributes to be set - * - * Allocate a region of memory with the attributes specified through the - * parameter. - * - * Return: base address on success, 0 on error - */ -phys_addr_t lmb_alloc_flags(phys_size_t size, ulong align, uint flags) -{ - return _lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE, - flags); -} - phys_addr_t lmb_alloc_base(phys_size_t size, ulong align, phys_addr_t max_addr) { phys_addr_t alloc; -- 2.45.2

1 1

[PATCH] mips: mt7688: gardena-smart-gateway: Increase CONFIG_SYS_BOOTM_LEN
by Ezra Buehler 23 Oct '24

23 Oct '24

From: Ezra Buehler <ezra.buehler(a)husqvarnagroup.com> The default value of 0x800000 (8 MB) is somewhat limiting for us, as our compressed kernel may grow up to around 4 MB. By choosing the commonly used value of 0x2000000 (32 MB), we are definitely on the safe side. This rather large amount should be fine, as we have 128 MB of RAM. Signed-off-by: Ezra Buehler <ezra.buehler(a)husqvarnagroup.com> --- Are there drawbacks of choosing a hight value for CONFIG_SYS_BOOTM_LEN that I am missing here? If so, 0x1000000 is most likely enough too. Cheers, Ezra. configs/gardena-smart-gateway-mt7688_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig index b7f4a76ce6..2c69e91339 100644 --- a/configs/gardena-smart-gateway-mt7688_defconfig +++ b/configs/gardena-smart-gateway-mt7688_defconfig @@ -47,6 +47,7 @@ CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_NOR_SUPPORT=y CONFIG_HUSH_PARSER=y CONFIG_CMD_LICENSE=y +CONFIG_SYS_BOOTM_LEN=0x2000000 # CONFIG_CMD_ELF is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_MEMINFO=y -- 2.43.0

2 1