November 2022 - U-Boot

[PATCH] arm: armada: dts: Add clock to armada-ap80x uart1
by Hamish Martin 07 Nov '22

07 Nov '22

The uart1 node was missing the 'clock-frequency' property. This meant the driver for this device would fail at probe. The clock for uart1 is fed from the same source as uart0 and is a fixed 200MHz clock. This is confirmed via documentation for the CN9130 SoC and from the equivalent code in Linux at: <linux>/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi where uart0 and uart1 share a common 'clocks' definition. Signed-off-by: Hamish Martin <hamish.martin(a)alliedtelesis.co.nz> --- arch/arm/dts/armada-ap80x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/armada-ap80x.dtsi b/arch/arm/dts/armada-ap80x.dtsi index 8787a872d85e..ab3c32e0e586 100644 --- a/arch/arm/dts/armada-ap80x.dtsi +++ b/arch/arm/dts/armada-ap80x.dtsi @@ -181,7 +181,7 @@ reg-io-width = <1>; clocks = <&ap_syscon 3>; status = "disabled"; - + clock-frequency = <200000000>; }; watchdog: watchdog@610000 { -- 2.37.3

2 2

Running u-boot standalone hello_world on an image partition with qemu
by Lists Nick Betteridge 07 Nov '22

07 Nov '22

I'm developing on an ubuntu x86 machine, trying to run the u-boot hello_world standalone application which resides on an image |sd.img| which contains a partition I've compiled u-boot (|v2022.10|) with |qemu-x86_64_defconfig| I run qemu with "|qemu-system-x86_64 -m 1024 -nographic -bios u-boot.rom -drive format=raw,file=sd.img"| u-boot starts up, doesn't find a script, doesn't detect tftp, and awaits a command. If I type |"ext4ls ide 0:1|", I can clearly see hello_world.bin (|3932704 hello_world.bin|). When I do a |ext4load ide 0:1 0x40000 hello_world.bin| (in preparation for |go 40000 This is another test|), qemu/u-boot restarts. 0x40000 is the |CONFIG_STANDALONE_LOAD_ADDR| for x86. I have also tried making an image of hello_world |"mkimage -n "Hello stand alone" -A x86_64 -O u-boot -T standalone -C none -a 0x40000 -d hello_world.bin -v hello_world.img|" and tried to load the image into 0x40000 with the intention of using |bootm| in case of cache issues - qemu/u-boot still resets. Could anyone possibly point out the basic mistake I'm making? Thanks in advance

3 6

[PATCH v3 0/3] rockpi4: Add capsule update support
by Sughosh Ganu 07 Nov '22

07 Nov '22

Add capsule update support for the RockPi4B and RockPi4C boards. Support is being added for updating the idbloader.img and u-boot.itb firmware images on configurations with the firmware images stored on GPT partitioned uSD card device. Changes since V2: * Use rockchip in the commit message summary instead of rockpi * Use num_image_type_guids instead of ROCKPI4_UPDATABLE_IMAGES macro * Move the board specific code out of this file into evb_rk3399.c * Add a function rockchip_capsule_update_board_setup() for setting up the board specific part needed for capsule updates Sughosh Ganu (3): rockchip: capsule: Add functions for supporting capsule updates rockpi4: board: Add firmware image information for capsule updates rockpi4: capsule: Enable UEFI capsule update on RockPi4 boards arch/arm/include/asm/arch-rockchip/misc.h | 1 + arch/arm/mach-rockchip/Kconfig | 1 + arch/arm/mach-rockchip/board.c | 152 ++++++++++++++++++++++ board/rockchip/evb_rk3399/evb-rk3399.c | 55 +++++++- configs/rock-pi-4-rk3399_defconfig | 8 ++ configs/rock-pi-4c-rk3399_defconfig | 8 ++ include/configs/rk3399_common.h | 16 +++ 7 files changed, 240 insertions(+), 1 deletion(-) -- 2.34.1

3 12

[PULL] u-boot-usb/master
by Marek Vasut 06 Nov '22

06 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: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 04448899de702321c018d0c4be2f6cc1d2f06760: usb: storage: continue probe on "Invalid device" (2022-11-04 12:22:45 +0100) ---------------------------------------------------------------- Janne Grunau (1): usb: storage: continue probe on "Invalid device" Marek Vasut (1): usb: Add 1ms delay after first Get Descriptor request Samuel Holland (1): usb: ohci: Use a flexible array member for portstatus common/usb.c | 11 +++++++++++ common/usb_storage.c | 1 + configs/arbel_evb_defconfig | 1 - configs/at91sam9260ek_dataflash_cs0_defconfig | 1 - configs/at91sam9260ek_dataflash_cs1_defconfig | 1 - configs/at91sam9260ek_nandflash_defconfig | 1 - configs/at91sam9261ek_dataflash_cs0_defconfig | 1 - configs/at91sam9261ek_dataflash_cs3_defconfig | 1 - configs/at91sam9261ek_nandflash_defconfig | 1 - configs/at91sam9263ek_dataflash_cs0_defconfig | 1 - configs/at91sam9263ek_dataflash_defconfig | 1 - configs/at91sam9263ek_nandflash_defconfig | 1 - configs/at91sam9263ek_norflash_boot_defconfig | 1 - configs/at91sam9263ek_norflash_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g10ek_dataflash_cs3_defconfig | 1 - configs/at91sam9g10ek_nandflash_defconfig | 1 - configs/at91sam9g20ek_2mmc_defconfig | 1 - configs/at91sam9g20ek_2mmc_nandflash_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs0_defconfig | 1 - configs/at91sam9g20ek_dataflash_cs1_defconfig | 1 - configs/at91sam9g20ek_nandflash_defconfig | 1 - configs/at91sam9xeek_dataflash_cs0_defconfig | 1 - configs/at91sam9xeek_dataflash_cs1_defconfig | 1 - configs/at91sam9xeek_nandflash_defconfig | 1 - configs/axs103_defconfig | 1 - configs/chromebook_bob_defconfig | 1 - configs/chromebook_kevin_defconfig | 1 - configs/comtrend_ar5315u_ram_defconfig | 1 - configs/comtrend_ar5387un_ram_defconfig | 1 - configs/comtrend_ct5361_ram_defconfig | 1 - configs/comtrend_vr3032u_ram_defconfig | 1 - configs/comtrend_wap5813n_ram_defconfig | 1 - configs/da850evm_defconfig | 1 - configs/da850evm_direct_nor_defconfig | 1 - configs/da850evm_nand_defconfig | 1 - configs/devkit3250_defconfig | 1 - configs/elgin-rv1108_defconfig | 1 - configs/evb-rk3128_defconfig | 1 - configs/evb-rk3328_defconfig | 1 - configs/evb-rv1108_defconfig | 1 - configs/hsdk_4xd_defconfig | 1 - configs/hsdk_defconfig | 1 - configs/huawei_hg556a_ram_defconfig | 1 - configs/khadas-edge-captain-rk3399_defconfig | 1 - configs/khadas-edge-rk3399_defconfig | 1 - configs/khadas-edge-v-rk3399_defconfig | 1 - configs/nanopi-r2s-rk3328_defconfig | 1 - configs/netgear_dgnd3700v2_ram_defconfig | 1 - configs/omapl138_lcdk_defconfig | 1 - configs/pinebook-pro-rk3399_defconfig | 1 - configs/pm9261_defconfig | 1 - configs/pm9263_defconfig | 1 - configs/roc-cc-rk3328_defconfig | 1 - configs/rock-pi-e-rk3328_defconfig | 1 - configs/rock64-rk3328_defconfig | 1 - configs/rock960-rk3399_defconfig | 1 - configs/rockpro64-rk3399_defconfig | 1 - configs/sama5d3_xplained_mmc_defconfig | 1 - configs/sama5d3_xplained_nandflash_defconfig | 1 - configs/sfr_nb4-ser_ram_defconfig | 1 - configs/smartweb_defconfig | 1 - configs/socrates_defconfig | 1 - configs/stih410-b2260_defconfig | 1 - configs/taurus_defconfig | 1 - configs/vexpress_aemv8a_juno_defconfig | 1 - doc/README.generic_usb_ohci | 4 ---- drivers/usb/host/Kconfig | 5 ----- drivers/usb/host/ohci.h | 10 +--------- 69 files changed, 13 insertions(+), 82 deletions(-)

2 1

[PULL] u-boot-mips
by Daniel Schwierzeck 06 Nov '22

06 Nov '22

Hi Tom, please pull the Kconfig migration for CONFIG_SYS_MIPS_TIMER_FREQ as well as the mtmips bugfix for the incorrectly converted default value for CONFIG_SPL_PAD_TO. Gitlab: https://source.denx.de/u-boot/custodians/u-boot-mips/-/pipelines/14002 The following changes since commit cca41ed3d63f462ca044e0d2d30a34d4917fc6c5: Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-watchdog (2022-11-02 09:10:30 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-mips.git/ tags/mips-pull-2022-11-03 for you to fetch changes up to 8450b97bf4464ab8b9c1b33b5a9150ae80c6136e: mips: mtmips: spl/Kconfig: Set CONFIG_SPL_PAD_TO to 0x0 for ARCH_MTMIPS (2022-11-02 21:54:26 +0100) ---------------------------------------------------------------- - MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig - MIPS: mtmips: fix incorrectly converted default value for CONFIG_SPL_PAD_TO ---------------------------------------------------------------- Daniel Schwierzeck (4): MIPS: remove deprecated TARGET_VCT option MIPS: remove CONFIG_SYS_MHZ MIPS: mscc: remove unused CPU_CLOCK_RATE MIPS: convert CONFIG_SYS_MIPS_TIMER_FREQ to Kconfig Stefan Roese (1): mips: mtmips: spl/Kconfig: Set CONFIG_SPL_PAD_TO to 0x0 for ARCH_MTMIPS arch/mips/Kconfig | 26 ++++++++++++++++++-------- arch/mips/mach-jz47xx/include/mach/jz4780.h | 2 +- arch/mips/mach-jz47xx/jz4780/pll.c | 6 +----- board/imgtec/ci20/ci20.c | 4 ---- common/spl/Kconfig | 1 + configs/ap121_defconfig | 1 + configs/ap143_defconfig | 1 + configs/ap152_defconfig | 1 + configs/bcm968380gerg_ram_defconfig | 1 + configs/boston32r2_defconfig | 1 + configs/boston32r2el_defconfig | 1 + configs/boston32r6_defconfig | 1 + configs/boston32r6el_defconfig | 1 + configs/boston64r2_defconfig | 1 + configs/boston64r2el_defconfig | 1 + configs/boston64r6_defconfig | 1 + configs/boston64r6el_defconfig | 1 + configs/ci20_mmc_defconfig | 1 + configs/comtrend_ar5315u_ram_defconfig | 1 + configs/comtrend_ar5387un_ram_defconfig | 1 + configs/comtrend_ct5361_ram_defconfig | 1 + configs/comtrend_vr3032u_ram_defconfig | 1 + configs/comtrend_wap5813n_ram_defconfig | 1 + configs/gardena-smart-gateway-mt7688_defconfig | 1 + configs/huawei_hg556a_ram_defconfig | 1 + configs/imgtec_xilfpga_defconfig | 1 + configs/linkit-smart-7688_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/mscc_jr2_defconfig | 1 + configs/mscc_luton_defconfig | 1 + configs/mscc_ocelot_defconfig | 1 + configs/mscc_serval_defconfig | 1 + configs/mscc_servalt_defconfig | 1 + configs/mt7620_mt7530_rfb_defconfig | 1 + configs/mt7620_rfb_defconfig | 1 + configs/mt7621_nand_rfb_defconfig | 1 + configs/mt7621_rfb_defconfig | 1 + configs/mt7628_rfb_defconfig | 1 + configs/netgear_cg3100d_ram_defconfig | 1 + configs/netgear_dgnd3700v2_ram_defconfig | 1 + configs/pic32mzdask_defconfig | 1 + configs/sagem_f@st1704_ram_defconfig | 1 + configs/sfr_nb4-ser_ram_defconfig | 1 + configs/tplink_wdr4300_defconfig | 1 + configs/vocore2_defconfig | 1 + include/configs/ap121.h | 3 --- include/configs/ap143.h | 3 --- include/configs/ap152.h | 3 --- include/configs/bmips_bcm3380.h | 3 --- include/configs/bmips_bcm6318.h | 3 --- include/configs/bmips_bcm63268.h | 3 --- include/configs/bmips_bcm6328.h | 3 --- include/configs/bmips_bcm6338.h | 3 --- include/configs/bmips_bcm6348.h | 3 --- include/configs/bmips_bcm6358.h | 3 --- include/configs/bmips_bcm6362.h | 3 --- include/configs/bmips_bcm6368.h | 3 --- include/configs/bmips_bcm6838.h | 3 --- include/configs/boston.h | 1 - include/configs/ci20.h | 4 ---- include/configs/gardena-smart-gateway-mt7688.h | 3 --- include/configs/imgtec_xilfpga.h | 2 -- include/configs/linkit-smart-7688.h | 3 --- include/configs/malta.h | 2 -- include/configs/mt7620.h | 2 -- include/configs/mt7621.h | 2 -- include/configs/mt7628.h | 2 -- include/configs/pic32mzdask.h | 2 -- include/configs/tplink_wdr4300.h | 3 --- include/configs/vcoreiii.h | 7 ------- include/configs/vocore2.h | 3 --- scripts/config_whitelist.txt | 2 -- 75 files changed, 64 insertions(+), 95 deletions(-)

2 1

[PATCH 1/1] MAINTAINERS: add arch/arm/lib/*_efi.* to EFI_PAYLOAD
by Heinrich Schuchardt 06 Nov '22

06 Nov '22

The files arch/arm/lib/*_efi.* are only relevant for the UEFI sub-system. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1cf99c1393..8d3d528650 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -879,6 +879,7 @@ M: Heinrich Schuchardt <xypron.glpk(a)gmx.de> M: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-efi.git +F: arch/arm/lib/*_efi.* F: doc/api/efi.rst F: doc/develop/uefi/* F: doc/mkeficapsule.1 -- 2.37.2

2 1

[PATCH 1/1] efi_loader: AllocateAddress requires page address
by Heinrich Schuchardt 06 Nov '22

06 Nov '22

AllocatePages() can be called with Type=AllocateAddress. Such a call can only succeed if *Memory points to the address of an unallocated page range. A call with *Memory being an address that is not page aligned must not succeed. The UEFI specification requires returning EFI_OUT_OF_RESOURCES if the requested pages cannot be allocated. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index e048a545e4..a17b426d11 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -483,6 +483,8 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type, return EFI_OUT_OF_RESOURCES; break; case EFI_ALLOCATE_ADDRESS: + if (*memory & EFI_PAGE_MASK) + return EFI_NOT_FOUND; /* Exact address, reserve it. The addr is already in *memory. */ ret = efi_check_allocated(*memory, false); if (ret != EFI_SUCCESS) -- 2.37.2

1 0

[BUG] efi_check_allocated() only checks start address
by Heinrich Schuchardt 06 Nov '22

06 Nov '22

AllocatePages() and FreePages() call efi_check_allocated() to check if a memory address is allocated or not. The function should consider the number of pages in the request and either check if the full range is deallocated or the full range is allocated. https://source.denx.de/u-boot/custodians/u-boot-efi/-/issues/7 Best regards Heinrich

1 0

Re: Remove WARN_ONCE for unaligned UEFI region?
by Heinrich Schuchardt 06 Nov '22

06 Nov '22

On 11/5/22 22:54, Ard Biesheuvel wrote: > (cc Heinrich and Ilias) > > On Sat, 5 Nov 2022 at 21:27, Linus Torvalds > <torvalds(a)linux-foundation.org> wrote: >> >> On Sat, Nov 5, 2022 at 1:18 PM Ard Biesheuvel <ardb(a)kernel.org> wrote: >>> >>> Yeah just rip it out. In the beginning, we tended to make these >>> warnings noisy so people will actually notice. >> >> Rip it out entirely, or replace ith pr_warn_once()? >> > > A warning that can only trigger on 16k or 64k page size kernels > clearly doesn't have a lot of coverage, so either we just drop it, or > we make the warning use SZ_64K and not PAGE_SIZE. > > And if we keep the warning, it should be separate from the if(): when > the regions are misaligned, we have to use RWX mappings because an > adjacent region that gets covered by the same mapping might require > it. > > Maybe I'll just whip up a patch myself. > >>> I'd still like to see a memory map (boot with efi=debug) so we can get >>> this reported and fixed in uboot. We need that so 16k and 64k pages >>> boot doesn't cause surprises with overlapping mappings. >> >> Here's the dmesg attached with efi=debug for your viewing pleasure. >> > > Thanks. > > I've cc'ed the u-boot EFI maintainers, who take EFI spec compliance > very seriously, so I'm sure we'll get this fixed quickly. It seems the thread https://lore.kernel.org/linux-efi/CAHk-=whPRmHQ=KV9B3_jeOG4ydj8gkMwQKnde7BJ… refers to: arch/arm64/kernel/efi.c:28: if (WARN_ONCE(!PAGE_ALIGNED(md->phys_addr), Function create_mapping_protection() checks UEFI Permission Attributes of pages. This is the related requirement in the UEFI 2.9 specification: <cite> The ARM architecture allows mapping pages at a variety of granularities, including 4KiB and 64KiB. If a 64KiB physical page contains any 4KiB page with any of the following types listed below, then all 4KiB pages in the 64KiB page must use identical ARM Memory Page Attributes (as described in Map EFI Cacheability Attributes to AArch64 Memory Types ): - EfiRuntimeServicesCode - EfiRuntimeServicesData - EfiReserved - EfiACPIMemoryNVS </cite> The specification only refers to EFI cacheability attributes but not to UEFI Permission Attributes. Should the specification be updated in this regard? The next steps to take are: 1) clarify the ARM hardware requirements for UEFI Permission Attributes 2) update the UEFI specification to make it clear if UEFI Permission Attributes have to follow the 64 KiB rule. 3) update the UEFI Self-Certification Test (SCT) to check the rules. 4) update U-Boot to respect 64 KiB requirements when allocating new pages. We already have commit 7a82c3051c8 ("efi_loader: Align runtime section to 64kb") in U-Boot but that neither covers runtime data nor allocation of memory (AllocatePages(), AllocatedPool()). The warning in question indicates that Linux currently is not able to establish secure page attributes. I see no reason to remove it. cc: U-Boot mailing list cc: Edhaya Chandran (regarding UEFI SCT) Best regards Heinrich

1 0

[PATCH] riscv: Fix detecting FPU support in standard extension
by Yu Chien Peter Lin 05 Nov '22

05 Nov '22

We should check the string until it hits underscore, in case it searches for the letters in the custom extension. For example, "rv64imac_xandes" will be treated as D extension support since there is a "d" in "andes", resulting illegal instruction caused by initializing FCSR. Signed-off-by: Yu Chien Peter Lin <peterlin(a)andestech.com> --- arch/riscv/cpu/cpu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/arch/riscv/cpu/cpu.c b/arch/riscv/cpu/cpu.c index 52ab02519f..dc949c1306 100644 --- a/arch/riscv/cpu/cpu.c +++ b/arch/riscv/cpu/cpu.c @@ -36,6 +36,7 @@ static inline bool supports_extension(char ext) #ifdef CONFIG_CPU struct udevice *dev; char desc[32]; + int i; uclass_find_first_device(UCLASS_CPU, &dev); if (!dev) { @@ -43,9 +44,16 @@ static inline bool supports_extension(char ext) return false; } if (!cpu_get_desc(dev, desc, sizeof(desc))) { - /* skip the first 4 characters (rv32|rv64) */ - if (strchr(desc + 4, ext)) - return true; + /* + * skip the first 4 characters (rv32|rv64) and + * check until underscore + */ + for (i = 4; i < sizeof(desc); i++) { + if (!(desc[i] - '_')) + break; + if (desc[i] == ext) + return true; + } } return false; -- 2.34.1

3 2