November 2022 - U-Boot

[PATCH v3 0/3] efi_loader: console and network dependency improvements
by Jan Kiszka 07 Nov '22

07 Nov '22

Update of previously sent patches "efi_loader: Improve console screen clearing and reset" "efi_loader: Let networking support depend on NETDEVICES" bundled into one series. Changes to earlier versions: - rebased console reset improvements over master - split up into overwrite protection and background color fix - addressed missing efi_net_set_dhcp_ack symbol - converted some #ifdefs to CONFIG_IS_ENABLED Jan Jan Kiszka (3): efi_loader: Avoid overwriting previous outputs on console screen clearing efi_loader: Set default console colors on efi_cout_clear_screen if needed efi_loader: Let networking support depend on NETDEVICES include/efi_loader.h | 10 +++++++--- lib/efi_loader/Kconfig | 1 - lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_console.c | 14 +++++++++++++- lib/efi_loader/efi_device_path.c | 8 +++----- lib/efi_loader/efi_setup.c | 10 +++++----- lib/efi_selftest/Makefile | 2 +- 7 files changed, 30 insertions(+), 17 deletions(-) -- 2.35.3

3 16

[RFC PATCH 0/2] video: ti: am335x: drop pre-driver-model code
by Dario Binacchi 07 Nov '22

07 Nov '22

The commit [1] also removed the code with driver model support, I preferred to start from a revert and apply the necessary changes in a second commit, rather than restore the removed modules. [1] 82f7b869f5d7a ("video: Drop CONFIG_AM335X_LCD") Dario Binacchi (2): Revert "video: Drop CONFIG_AM335X_LCD" video: ti: am335x: drop pre-driver-model code drivers/video/Kconfig | 2 + drivers/video/Makefile | 1 + drivers/video/ti/Kconfig | 8 + drivers/video/ti/Makefile | 6 + drivers/video/ti/tilcdc-panel.c | 172 +++++++++++++ drivers/video/ti/tilcdc-panel.h | 14 ++ drivers/video/ti/tilcdc.c | 426 ++++++++++++++++++++++++++++++++ drivers/video/ti/tilcdc.h | 38 +++ 8 files changed, 667 insertions(+) create mode 100644 drivers/video/ti/Kconfig create mode 100644 drivers/video/ti/Makefile create mode 100644 drivers/video/ti/tilcdc-panel.c create mode 100644 drivers/video/ti/tilcdc-panel.h create mode 100644 drivers/video/ti/tilcdc.c create mode 100644 drivers/video/ti/tilcdc.h -- 2.32.0

1 2

[PATCH 1/1] sandbox: fix function descriptions in os.h
by Heinrich Schuchardt 07 Nov '22

07 Nov '22

alarm(), read(), write(), ... are not system calls but POSIX functions. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/os.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/os.h b/include/os.h index 54874f5e0e..b62d8bbd66 100644 --- a/include/os.h +++ b/include/os.h @@ -24,7 +24,7 @@ struct sandbox_state; int os_printf(const char *format, ...); /** - * Access to the OS read() system call + * Access to the OS read() function * * @fd: File descriptor as returned by os_open() * @buf: Buffer to place data @@ -34,7 +34,7 @@ int os_printf(const char *format, ...); ssize_t os_read(int fd, void *buf, size_t count); /** - * Access to the OS write() system call + * Access to the OS write() function * * @fd: File descriptor as returned by os_open() * @buf: Buffer containing data to write @@ -44,7 +44,7 @@ ssize_t os_read(int fd, void *buf, size_t count); ssize_t os_write(int fd, const void *buf, size_t count); /** - * Access to the OS lseek() system call + * Access to the OS lseek() function * * @fd: File descriptor as returned by os_open() * @offset: File offset (based on whence) @@ -67,7 +67,7 @@ off_t os_lseek(int fd, off_t offset, int whence); int os_filesize(int fd); /** - * Access to the OS open() system call + * Access to the OS open() function * * @pathname: Pathname of file to open * @flags: Flags, like OS_O_RDONLY, OS_O_RDWR @@ -83,7 +83,7 @@ int os_open(const char *pathname, int flags); #define OS_O_TRUNC 01000 /** - * os_close() - access to the OS close() system call + * os_close() - access to the OS close() function * * @fd: File descriptor to close * Return: 0 on success, -1 on error @@ -91,7 +91,7 @@ int os_open(const char *pathname, int flags); int os_close(int fd); /** - * os_unlink() - access to the OS unlink() system call + * os_unlink() - access to the OS unlink() function * * @pathname: Path of file to delete * Return: 0 for success, other for error @@ -99,7 +99,7 @@ int os_close(int fd); int os_unlink(const char *pathname); /** - * os_exit() - access to the OS exit() system call + * os_exit() - access to the OS exit() function * * This exits with the supplied return code, which should be 0 to indicate * success. @@ -109,7 +109,7 @@ int os_unlink(const char *pathname); void os_exit(int exit_code) __attribute__((noreturn)); /** - * os_alarm() - access to the OS alarm() system call + * os_alarm() - access to the OS alarm() function */ unsigned int os_alarm(unsigned int seconds); -- 2.37.2

3 3

[PATCH] efi: arm,arm64: Fix relocations from not being loaded
by Patrick Zacharias 07 Nov '22

07 Nov '22

Prior to this commit, the relocations would not get loaded by the efi loader. This lead to none of the relocations being applied. Signed-off-by: Fighter19 <1475802+Fighter19(a)users.noreply.github.com> --- arch/arm/lib/elf_aarch64_efi.lds | 2 +- arch/arm/lib/elf_arm_efi.lds | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/lib/elf_aarch64_efi.lds b/arch/arm/lib/elf_aarch64_efi.lds index c0604dad46..1982864d17 100644 --- a/arch/arm/lib/elf_aarch64_efi.lds +++ b/arch/arm/lib/elf_aarch64_efi.lds @@ -46,12 +46,12 @@ SECTIONS *(COMMON) . = ALIGN(512); _bss_end = .; - _edata = .; } .rela.dyn : { *(.rela.dyn) } .rela.plt : { *(.rela.plt) } .rela.got : { *(.rela.got) } .rela.data : { *(.rela.data) *(.rela.data*) } + _edata = .; _data_size = . - _etext; . = ALIGN(4096); diff --git a/arch/arm/lib/elf_arm_efi.lds b/arch/arm/lib/elf_arm_efi.lds index 767ebda635..c1b58a8033 100644 --- a/arch/arm/lib/elf_arm_efi.lds +++ b/arch/arm/lib/elf_arm_efi.lds @@ -46,12 +46,12 @@ SECTIONS *(COMMON) . = ALIGN(512); _bss_end = .; - _edata = .; } .rel.dyn : { *(.rel.dyn) } .rel.plt : { *(.rel.plt) } .rel.got : { *(.rel.got) } .rel.data : { *(.rel.data) *(.rel.data*) } + _edata = .; _data_size = . - _etext; /DISCARD/ : { -- 2.25.1

2 6

Please pull u-boot-marvell/master
by Stefan Roese 07 Nov '22

07 Nov '22

Hi Tom, please pull this next batch of Marvell related patches: ---------------------------------------------------------------- - mvebu: Support for 98DX25xx/98DX35xx (AlleyCat5) (Chris) - Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb (Pali) - armada: dts: Add clock to armada-ap80x uart1 (Hamish) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=276&view=results Thanks, Stefan The following changes since commit 898bd53e6a930080cee7cd7b1a09120c4dfd9467: Merge https://source.denx.de/u-boot/custodians/u-boot-usb (2022-11-04 11:19:58 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 6cc8b5db40b4d5fc23086a5116bdf1f0a3d3265a: arm: mvebu: Add RD-AC5X board (2022-11-07 07:46:28 +0100) ---------------------------------------------------------------- Chris Packham (6): arm: mvebu: Don't use CONFIG_TIMER on ARM64 net: mvneta: Add support for AlleyCat5 usb: ehci: ehci-marvell: Support for marvell,ac5-ehci pinctrl: mvebu: Add AlleyCat5 support arm: mvebu: Support for 98DX25xx/98DX35xx SoC arm: mvebu: Add RD-AC5X board Hamish Martin (1): arm: armada: dts: Add clock to armada-ap80x uart1 Pali Rohár (1): Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb Kconfig | 2 +- Makefile | 4 +- arch/arm/Kconfig | 2 +- arch/arm/dts/Makefile | 3 +- arch/arm/dts/ac5-98dx25xx.dtsi | 277 +++++++++++++++++++++++++++ arch/arm/dts/ac5-98dx35xx-rd.dts | 129 +++++++++++++ arch/arm/dts/ac5-98dx35xx.dtsi | 17 ++ arch/arm/dts/armada-ap80x.dtsi | 2 +- arch/arm/mach-mvebu/Kconfig | 13 +- arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/alleycat5/Makefile | 8 + arch/arm/mach-mvebu/alleycat5/cpu.c | 124 ++++++++++++ arch/arm/mach-mvebu/alleycat5/soc.c | 298 +++++++++++++++++++++++++++++ arch/arm/mach-mvebu/alleycat5/soc.h | 7 + arch/arm/mach-mvebu/arm64-common.c | 5 + arch/arm/mach-mvebu/include/mach/cpu.h | 4 + board/Marvell/db-88f6820-gp/README | 6 +- board/Marvell/mvebu_alleycat-5/MAINTAINERS | 6 + board/Marvell/mvebu_alleycat-5/Makefile | 3 + board/Marvell/mvebu_alleycat-5/board.c | 13 ++ board/kobol/helios4/README | 6 +- board/solidrun/clearfog/README | 8 +- configs/mvebu_ac5_rd_defconfig | 81 ++++++++ doc/README.armada-secureboot | 4 +- doc/kwboot.1 | 12 +- drivers/net/Kconfig | 2 +- drivers/net/mvneta.c | 43 ++++- drivers/pinctrl/mvebu/Kconfig | 2 +- drivers/usb/host/Kconfig | 1 + drivers/usb/host/ehci-marvell.c | 53 ++++- include/configs/ds414.h | 2 +- include/configs/mvebu_alleycat-5.h | 42 ++++ 32 files changed, 1143 insertions(+), 37 deletions(-) create mode 100644 arch/arm/dts/ac5-98dx25xx.dtsi create mode 100644 arch/arm/dts/ac5-98dx35xx-rd.dts create mode 100644 arch/arm/dts/ac5-98dx35xx.dtsi create mode 100644 arch/arm/mach-mvebu/alleycat5/Makefile create mode 100644 arch/arm/mach-mvebu/alleycat5/cpu.c create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.c create mode 100644 arch/arm/mach-mvebu/alleycat5/soc.h create mode 100644 board/Marvell/mvebu_alleycat-5/MAINTAINERS create mode 100644 board/Marvell/mvebu_alleycat-5/Makefile create mode 100644 board/Marvell/mvebu_alleycat-5/board.c create mode 100644 configs/mvebu_ac5_rd_defconfig create mode 100644 include/configs/mvebu_alleycat-5.h

2 1

[PATCH] Clear previous CPU release address when reset
by Jit Loon Lim 07 Nov '22

07 Nov '22

From: Siew Chin Lim <elly.siew.chin.lim(a)intel.com> HSD #18013461252: CPU release address is stored in system manager boot scratch register.This patch fixes the CPU crash issue during cold reset in ATF boot flow for Diamond Mesa device. In Diamond Mesa device, boot scratch register will be cleared on POR only. In ATF boot flow, when a cold reset happen on Diamond Mesa device, the boot scratch register still contains previous CPU release address which point to ATF firmware. When primary and secondary core executions reaches lowlevel_init function, it will jump to previous CPU release address and causes crash. This patch will clear the previous CPU release address if the core is reset by cold reset, warm reset or watchdog reset. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim(a)intel.com> Signed-off-by: Jit Loon Lim <jit.loon.lim(a)intel.com> --- arch/arm/mach-socfpga/lowlevel_init_soc64.S | 51 +++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/arch/arm/mach-socfpga/lowlevel_init_soc64.S b/arch/arm/mach-socfpga/lowlevel_init_soc64.S index 875927cc4d..7b37b6eeef 100644 --- a/arch/arm/mach-socfpga/lowlevel_init_soc64.S +++ b/arch/arm/mach-socfpga/lowlevel_init_soc64.S @@ -14,6 +14,55 @@ ENTRY(lowlevel_init) #if defined(CONFIG_GICV2) || defined(CONFIG_GICV3) #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF) + + /* + * In ATF flow, need to clear the old CPU address when cold reset + * being triggered, but shouldn't clear CPU address if it is reset + * by CPU-ON, so that the core can correctly jump to ATF code after + * reset by CPU-ON. CPU-ON trigger the reset via mpumodrst. + * + * Hardware will set 1 to core*_irq in mpurststat register in + * reset manager if the core is reset by mpumodrst. + * + * The following code will check the mpurststat to identify if the + * core is reset by mpumodrst, and it will skip CPU address clearing + * if the core is reset by mpumodrst. At last, the code need to clear + * the core*_irq by set it to 1. So that it can reflect the correct + * and latest status in next reset. + */ + + /* Retrieve mpurststat register in reset manager */ + ldr x4, =SOCFPGA_RSTMGR_ADDRESS + ldr w5, [x4, #0x04] + + /* Set mask based on current core id */ + mrs x0, mpidr_el1 + and x1, x0, #0xF + ldr x2, =0x00000100 + lsl x2, x2, x1 + + /* Skip if core*_irq register is set */ + and x6, x5, x2 + cbnz x6, skip_clear_cpu_address + + /* + * Reach here means core*_irq is 0, means the core is + * reset by cold, warm or watchdog reset. + * Clear previous CPU release address + */ + ldr x4, =CPU_RELEASE_ADDR + str wzr, [x4] + b skip_clear_core_irq + +skip_clear_cpu_address: + /* Clear core*_irq register by writing 1 */ + ldr x4, =SOCFPGA_RSTMGR_ADDRESS + str w2, [x4, #0x04] + +skip_clear_core_irq: + /* Master CPU (CPU0) does not need to wait for atf */ + branch_if_master x0, x1, master_cpu + wait_for_atf: ldr x4, =CPU_RELEASE_ADDR ldr x5, [x4] @@ -21,6 +70,8 @@ wait_for_atf: br x5 slave_wait_atf: branch_if_slave x0, wait_for_atf + +master_cpu: #else branch_if_slave x0, 1f #endif -- 2.26.2

1 0

[PATCH v6 0/5] eficonfig: add UEFI Secure Boot key maintenance interface
by Masahisa Kojima 07 Nov '22

07 Nov '22

This series adds the UEFI Secure Boot key maintenance interface to the eficonfig command. User can enroll and delete the PK, KEK, db and dbx. Source code can be cloned with: $ git clone https://git.linaro.org/people/masahisa.kojima/u-boot.git -b kojima/eficonfig_sbkey_v6 Masahisa Kojima (5): eficonfig: refactor eficonfig_select_file_handler() eficonfig: expose append entry function eficonfig: refactor change boot order implementation eficonfig: add UEFI Secure Boot Key enrollment interface eficonfig: add "Show/Delete Signature Database" menu entry cmd/Makefile | 5 + cmd/eficonfig.c | 177 +++-- cmd/eficonfig_sbkey.c | 727 ++++++++++++++++++ include/efi_config.h | 10 + .../py/tests/test_eficonfig/test_eficonfig.py | 1 + 5 files changed, 835 insertions(+), 85 deletions(-) create mode 100644 cmd/eficonfig_sbkey.c -- 2.17.1

2 15

[PATCH 1/3] fpga: intel_pr: Change to use fdt_get_resource()
by Jit Loon Lim 07 Nov '22

07 Nov '22

From: Ley Foon Tan <ley.foon.tan(a)intel.com> HSD #1508201592: Change from fdtdec_get_addr() to fdt_get_resource(). fdtdec_get_addr() returns a 64-bit value, including base address and register size. Change to use fdt_get_resource() and get base address from struct fdt_resource. Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> Signed-off-by: Jit Loon Lim <jit.loon.lim(a)intel.com> --- drivers/fpga/intel_pr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/fpga/intel_pr.c b/drivers/fpga/intel_pr.c index b8f510fbd7..6637425452 100644 --- a/drivers/fpga/intel_pr.c +++ b/drivers/fpga/intel_pr.c @@ -34,6 +34,8 @@ static int intel_get_freeze_br_addr(fdt_addr_t *addr, unsigned int region) { int offset; char freeze_br[12]; + struct fdt_resource r; + int ret; snprintf(freeze_br, sizeof(freeze_br), "freeze_br%d", region); @@ -49,13 +51,15 @@ static int intel_get_freeze_br_addr(fdt_addr_t *addr, unsigned int region) return -ENODEV; } - *addr = fdtdec_get_addr(gd->fdt_blob, offset, "reg"); - if (*addr == FDT_ADDR_T_NONE) { + ret = fdt_get_resource(gd->fdt_blob, offset, "reg", 0, &r); + if (ret) { printf("%s has no 'reg' property!\n", freeze_br); - return -ENXIO; + return ret; } - return 0; + *addr = r.start; + + return ret; } static int intel_freeze_br_do_freeze(unsigned int region) -- 2.26.2

1 2

Pull request for efi-2023-01-rc1-4
by Heinrich Schuchardt 07 Nov '22

07 Nov '22

The following changes since commit 36bc9b6113ca96ca5c0d821195adede38395befd: Merge branch '2022-11-02-assorted-updates' (2022-11-03 08:29:10 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2023-01-rc1-4 for you to fetch changes up to 53def68df5ec10c9aaa46d3422c58fc85d0c93e6: efi_loader: AllocateAddress requires page address (2022-11-06 10:50:04 +0100) ---------------------------------------------------------------- Pull request for efi-2023-01-rc1-4 Documentation: * Provide a document about security issue handling. UEFI: * Let networking support depend on NETDEVICES. * Discover if no efi_system_partition is set. Other: * MAINTAINERS: add arch/arm/lib/*_efi.* to EFI_PAYLOAD. ---------------------------------------------------------------- AKASHI Takahiro (1): efi_loader: remove CONFIG_EFI_SETUP_EARLY Heinrich Schuchardt (4): doc: update sbi command example MAINTAINERS: add arch/arm/lib/*_efi.* to EFI_PAYLOAD efi_loader: discover if no efi_system_partition is set efi_loader: AllocateAddress requires page address Jan Kiszka (1): efi_loader: Let networking support depend on NETDEVICES Masahisa Kojima (1): test/py: efi_secboot: Remove unnecessary cert-to-efi-hash-list option Tom Rini (1): docs: Add a basic security document MAINTAINERS | 1 + common/board_r.c | 2 +- doc/develop/index.rst | 3 +- doc/develop/security.rst | 32 +++++++++++++++++++++ doc/usage/cmd/sbi.rst | 31 ++++++++++++-------- lib/efi_loader/Kconfig | 6 ---- lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_device_path.c | 6 ++-- lib/efi_loader/efi_disk.c | 6 ++-- lib/efi_loader/efi_memory.c | 2 ++ lib/efi_loader/efi_setup.c | 45 ++++++++---------------------- lib/efi_selftest/Makefile | 2 +- net/bootp.c | 4 ++- test/py/tests/test_efi_secboot/conftest.py | 8 +++--- 14 files changed, 85 insertions(+), 65 deletions(-) create mode 100644 doc/develop/security.rst

2 1

[PATCH RFC] Makefile: Rename u-boot-spl.kwb to u-boot-with-spl.kwb
by Pali Rohár 07 Nov '22

07 Nov '22

File name with pattern u-boot-spl* is used on all places except in kwb image for binary with SPL-only code. Combined binary with both SPL and proper U-Boot in other places has file name pattern u-boot-with-spl*. Make it consistent also for kwb image and rename u-boot-spl.kwb to u-boot-with-spl.kwb as this image contains both SPL and proper U-Boot code. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- This is just RFC patch, please let me know what do you think. --- Kconfig | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Kconfig b/Kconfig index 991b260182e8..5c64ca843eed 100644 --- a/Kconfig +++ b/Kconfig @@ -455,7 +455,7 @@ config BUILD_TARGET string "Build target special images" default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_ARRIA10 default "u-boot-with-spl.sfp" if TARGET_SOCFPGA_GEN5 - default "u-boot-spl.kwb" if ARCH_MVEBU && SPL + default "u-boot-with-spl.kwb" if ARCH_MVEBU && SPL default "u-boot-elf.srec" if RCAR_GEN3 default "u-boot.itb" if !BINMAN && SPL_LOAD_FIT && (ARCH_ROCKCHIP || \ ARCH_SUNXI || RISCV || ARCH_ZYNQMP) diff --git a/Makefile b/Makefile index 1a66f69a4b14..b1fbdbe7d726 100644 --- a/Makefile +++ b/Makefile @@ -1432,7 +1432,7 @@ KWD_CONFIG_FILE = $(shell \ MKIMAGEFLAGS_u-boot.kwb = -n $(KWD_CONFIG_FILE) \ -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) -MKIMAGEFLAGS_u-boot-spl.kwb = -n $(KWD_CONFIG_FILE) \ +MKIMAGEFLAGS_u-boot-with-spl.kwb = -n $(KWD_CONFIG_FILE) \ -T kwbimage -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_TEXT_BASE) \ $(if $(KEYDIR),-k $(KEYDIR)) @@ -1477,7 +1477,7 @@ u-boot.itb: u-boot-nodtb.bin \ $(BOARD_SIZE_CHECK) endif -u-boot-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE +u-boot-with-spl.kwb: u-boot.bin spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) u-boot.sha1: u-boot.bin -- 2.20.1

2 9