August 2020 - U-Boot

[PATCH] drivers: usb: Fix config indentation
by Ruben Di Battista 28 Aug '20

28 Aug '20

The indentation was messing up with the scripts/build-whitelist.sh that was marking SYS_USB_EVENT_POLL_VIA_INT_QUEUE (and probably also the other indented options) erroneously as ad-hoc configure option with the following error: ``` Error: You must add new CONFIG options using Kconfig The following new ad-hoc CONFIG options were detected: CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE ``` --- drivers/usb/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 756a4ec402..34881a12b8 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -113,14 +113,14 @@ choice ---help--- Enable a polling mechanism for USB keyboard. - config SYS_USB_EVENT_POLL - bool "Interrupt polling" +config SYS_USB_EVENT_POLL + bool "Interrupt polling" - config SYS_USB_EVENT_POLL_VIA_INT_QUEUE - bool "Poll via interrupt queue" +config SYS_USB_EVENT_POLL_VIA_INT_QUEUE + bool "Poll via interrupt queue" - config SYS_USB_EVENT_POLL_VIA_CONTROL_EP - bool "Poll via control EP" +config SYS_USB_EVENT_POLL_VIA_CONTROL_EP + bool "Poll via control EP" endchoice -- 2.28.0

2 1

Not able to boot SPL+U-boot.img through SPI NOR Flash on imx6 based board
by nvmurali 28 Aug '20

28 Aug '20

Hi, we have emmc,SD card and SPI NOR Flash(MX66L51235FZ2i-10g from Macronix) as boot devices on our board based on imx6 (MC imx6D7CVT08AE) processor. our requirement is to boot SPL + U-boot from the SPI NOR Flash and then load the linux kernel from emmc interface. we are able to boot the board (SPL + U-boot + Linux) through SD-card and emmc interface. we have flashed SPL at offset value of 0x400 in Flash address using following command: dd if=/boot/SPL of=/dev/mtd0 bs=1K seek=1 and flashed U-boot.img at offset value 0f 0x11400 using the following command: dd if=/boot/u-boot.img of=/dev/mtd0 bs=1K seek=69 After configuring the board boot settings to load from the SPI NOR Flash when we Power on the board we are getting following message: U-Boot SPL 2018.01-02296-g457cdd6-dirty (Aug 27 2020 - 10:22:07) >>spl:board_init_r() SPL: Unsupported Boot Device! Trying to boot from USB SDP SDP: initialize... After further debugging found that spl_ll_find_loader() function in file "u-boot\common\spl\spl.c" is unable to find the loader. spl_ll_find_loader() is returning "0" when the board is configured to boot from SPI NOR Flash. Following are the debug trace messages from the board when it is booted through SPI NOR Flash: U-Boot SPL 2018.01-02296-g457cdd6-dirty (Aug 27 2020 - 10:22:07) Entering spl_boot_device() bmode(sbmr2):570425345 Board boot order:8 spl_ll_find_loader() returning NULL boot_from_devices() : loader:0 SPL: Unsupported Boot Device! spl_boot_list[1]:12 inside boot_from_devices() : loader:9528148 Trying to boot from USB SDP spl_load_image():bootdev.boot_device:12 SDP: initialize... 1. please let us know why spl_ll_find_loader() function is returning "0" when board is configured to boot from SPI NOR Flash. (we are able to get the valid loader address when the board is configured to boot from SD-card and eMMC interface.) 2. Any specific configuration is required to get the valid loader address ? we have included following configuration in defconfig. CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPI_FLASH_MACRONIX=y 3. We are writing SPL at 0x400 offset in the SPI NOR Flash. is this the valid offset when the board is configured to boot from SPI NOR Flash? 4. we are writing u-boot.img at 0x11400 offset in the SPI NOR Flash. is this the valid offset when the board is configured to boot from SPI NOR Flash? Thanks & Regards Murali Krishna -- Sent from: http://u-boot.10912.n7.nabble.com/

1 0

[PATCH 1/1] efi_selftest: simplify Makefile
by Heinrich Schuchardt 28 Aug '20

28 Aug '20

CONFIG_EFI_LOADER cannot be selected for ARMv7-M CPUs. So don't check it in the Makefile. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index 85fe8e1216..06d66cfdd1 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -62,10 +62,6 @@ ifeq ($(CONFIG_BLK)$(CONFIG_DOS_PARTITION),yy) obj-y += efi_selftest_block_device.o endif -# TODO: As of v2019.10 the relocation code for the EFI application cannot -# be built on ARMv7-M. -ifeq ($(CONFIG_CPU_V7M),) - obj-y += \ efi_selftest_exception.o \ efi_selftest_loadimage.o \ @@ -99,5 +95,3 @@ $(obj)/efi_selftest_exception.o: $(obj)/efi_miniapp_file_image_exception.h $(obj)/efi_selftest_startimage_exit.o: $(obj)/efi_miniapp_file_image_exit.h $(obj)/efi_selftest_startimage_return.o: $(obj)/efi_miniapp_file_image_return.h - -endif -- 2.28.0

1 0

[PATCH v2] mmc: fsl_esdhc_imx: check the clock stable status after config the clock rate.
by haibo.chen＠nxp.com 28 Aug '20

28 Aug '20

From: Haibo Chen <haibo.chen(a)nxp.com> Currently, after config the clock rate, delay 10ms, this is quite a rough method. Check the clock stable status in the present status register is enough. Tested-by: Ji Luo <ji.luo(a)nxp.com> Signed-off-by: Haibo Chen <haibo.chen(a)nxp.com> --- drivers/mmc/fsl_esdhc_imx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c index 788677984b..8f7ac5b7a3 100644 --- a/drivers/mmc/fsl_esdhc_imx.c +++ b/drivers/mmc/fsl_esdhc_imx.c @@ -36,6 +36,7 @@ #include <dt-structs.h> #include <mapmem.h> #include <dm/ofnode.h> +#include <linux/iopoll.h> #if !CONFIG_IS_ENABLED(BLK) #include "mmc_private.h" @@ -631,6 +632,8 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) { struct fsl_esdhc *regs = priv->esdhc_regs; int div = 1; + u32 tmp; + int ret; #ifdef ARCH_MXC #ifdef CONFIG_MX53 /* For i.MX53 eSDHCv3, SYSCTL.SDCLKFS may not be set to 0. */ @@ -664,7 +667,9 @@ static void set_sysctl(struct fsl_esdhc_priv *priv, struct mmc *mmc, uint clock) esdhc_clrsetbits32(&regs->sysctl, SYSCTL_CLOCK_MASK, clk); - udelay(10000); + ret = readl_poll_timeout(&regs->prsstat, tmp, tmp & PRSSTAT_SDSTB, 100); + if (ret) + pr_warn("fsl_esdhc_imx: Internal clock never stabilised.\n"); #ifdef CONFIG_FSL_USDHC esdhc_setbits32(&regs->vendorspec, VENDORSPEC_PEREN | VENDORSPEC_CKEN); -- 2.17.1

2 1

[PATCH v2 4/6] mmc: atmel-sdhci: do not check clk_set_rate return value
by Eugen Hristev 28 Aug '20

28 Aug '20

clk_set_rate will return rate in case of success and zero in case of error, however it can also return -ev, but it's an ulong function. To avoid any issues, disregard the return value of this call. In case this call actually fails, nothing much we can do anyway, but we can at least try with the previous values (or DT assigned-clocks) Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- drivers/mmc/atmel_sdhci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index f03c0457e1..54b660c34a 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -79,9 +79,7 @@ static int atmel_sdhci_probe(struct udevice *dev) if (ret) return ret; - ret = clk_set_rate(&clk, ATMEL_SDHC_GCK_RATE); - if (ret) - return ret; + clk_set_rate(&clk, ATMEL_SDHC_GCK_RATE); max_clk = clk_get_rate(&clk); if (!max_clk) -- 2.25.1

2 4

[PATCH 1/1] efi_loader: check for image truncation
by Heinrich Schuchardt 28 Aug '20

28 Aug '20

Check in efi_load_pe() that the image size parameter is at least as large as the image size indicated in the optional PE header. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_image_loader.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 94f76ef6b8..e55ade3291 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -761,6 +761,29 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, goto err; } + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) { + IMAGE_NT_HEADERS64 *nt64 = (void *)nt; + + if ((size_t)opt->SizeOfImage > efi_size) { + log_err("Truncated Image\n"); + ret = EFI_LOAD_ERROR; + goto err; + } + } else if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) { + IMAGE_OPTIONAL_HEADER32 *opt = &nt->OptionalHeader; + + if ((size_t)opt->SizeOfImage > efi_size) { + log_err("Truncated Image\n"); + ret = EFI_LOAD_ERROR; + goto err; + } + } else { + log_err("Invalid optional header magic %x\n", + nt->OptionalHeader.Magic); + ret = EFI_LOAD_ERROR; + goto err; + } + /* Authenticate an image */ if (efi_image_authenticate(efi, efi_size)) { handle->auth_status = EFI_IMAGE_AUTH_PASSED; @@ -810,11 +833,6 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, rel_size = opt->DataDirectory[rel_idx].Size; rel = efi_reloc + opt->DataDirectory[rel_idx].VirtualAddress; virt_size = ALIGN(virt_size, opt->SectionAlignment); - } else { - log_err("Invalid optional header magic %x\n", - nt->OptionalHeader.Magic); - ret = EFI_LOAD_ERROR; - goto err; } /* Copy PE headers */ -- 2.28.0

2 1

[PATCH 1/1] efi_loader: remove duplicate image size check
by Heinrich Schuchardt 27 Aug '20

27 Aug '20

The image size is checked in efi_load_pe(). Avoid checking it twice. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index d49145fc76..dcd3eec894 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1883,10 +1883,6 @@ efi_status_t EFIAPI efi_load_image(bool boot_policy, if (ret != EFI_SUCCESS) goto error; } else { - if (!source_size) { - ret = EFI_LOAD_ERROR; - goto error; - } dest_buffer = source_buffer; } /* split file_path which contains both the device and file parts */ -- 2.28.0

1 0

[PATCH 1/1] efi_loader: error message if image not authenticated
by Heinrich Schuchardt 27 Aug '20

27 Aug '20

Currently if the bootefi command fails due to missing authentication, the user gets no feedback. Write a log message 'Image not authenticated' if LoadImage() fails due to missing authentication. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_image_loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index da50fc31f1..94f76ef6b8 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -762,10 +762,12 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, } /* Authenticate an image */ - if (efi_image_authenticate(efi, efi_size)) + if (efi_image_authenticate(efi, efi_size)) { handle->auth_status = EFI_IMAGE_AUTH_PASSED; - else + } else { handle->auth_status = EFI_IMAGE_AUTH_FAILED; + log_err("Image not authenticated\n"); + } /* Calculate upper virtual address boundary */ for (i = num_sections - 1; i >= 0; i--) { -- 2.28.0

1 0

[PATCH 1/1] efi: clean up efi command
by Heinrich Schuchardt 27 Aug '20

27 Aug '20

* Eliminate superfluous enum value EFI_TABLE_END. * Use correct variable type for the memory type. * Check validity of memory type. * Make efi_build_mem_table static. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- to be merged after efi_loader: consider no-map property of reserved memory https://lists.denx.de/pipermail/u-boot/2020-August/424672.html --- cmd/efi.c | 26 ++++++++++++++++++++++---- include/efi.h | 14 -------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/cmd/efi.c b/cmd/efi.c index b3a3bf8282..1558cb17eb 100644 --- a/cmd/efi.c +++ b/cmd/efi.c @@ -71,7 +71,19 @@ static int h_cmp_entry(const void *v1, const void *v2) return diff < 0 ? -1 : diff > 0 ? 1 : 0; } -void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs) +/** + * efi_build_mem_table() - make a sorted copy of the memory table + * + * @map: Pointer to EFI memory map table + * @size: Size of table in bytes + * @skip_bs: True to skip boot-time memory and merge it with conventional + * memory. This will significantly reduce the number of table + * entries. + * Return: pointer to the new table. It should be freed with free() by the + * caller. + */ +static void *efi_build_mem_table(struct efi_entry_memmap *map, int size, + bool skip_bs) { struct efi_mem_desc *desc, *end, *base, *dest, *prev; int count; @@ -92,7 +104,13 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs) end = (struct efi_mem_desc *)((ulong)base + count * map->desc_size); for (desc = base; desc < end; desc = efi_get_next_mem_desc(map, desc)) { bool merge = true; - int type = desc->type; + u32 type = desc->type; + + if (type >= EFI_MAX_MEMORY_TYPE) { + printf("Memory map contains invalid entry type %u\n", + type); + continue; + } if (skip_bs && is_boot_services(desc->type)) type = EFI_CONVENTIONAL_MEMORY; @@ -119,7 +137,7 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs) } /* Mark the end */ - dest->type = EFI_TABLE_END; + dest->type = EFI_MAX_MEMORY_TYPE; return base; } @@ -138,7 +156,7 @@ static void efi_print_mem_table(struct efi_entry_memmap *map, /* Keep track of all the different attributes we have seen */ attr_seen_count = 0; addr = 0; - for (upto = 0; desc->type != EFI_TABLE_END; + for (upto = 0; desc->type != EFI_MAX_MEMORY_TYPE; upto++, desc = efi_get_next_mem_desc(map, desc)) { const char *name; u64 size; diff --git a/include/efi.h b/include/efi.h index 50190021ef..e0026a9505 100644 --- a/include/efi.h +++ b/include/efi.h @@ -180,7 +180,6 @@ enum efi_mem_type { EFI_PERSISTENT_MEMORY_TYPE, EFI_MAX_MEMORY_TYPE, - EFI_TABLE_END, /* For efi_build_mem_table() */ /* Memory that shall not be mapped */ EFI_NO_MAP_MEMORY, @@ -484,17 +483,4 @@ void efi_putc(struct efi_priv *priv, const char ch); */ int efi_info_get(enum efi_entry_t type, void **datap, int *sizep); -/** - * efi_build_mem_table() - make a sorted copy of the memory table - * - * @map: Pointer to EFI memory map table - * @size: Size of table in bytes - * @skip_bs: True to skip boot-time memory and merge it with conventional - * memory. This will significantly reduce the number of table - * entries. - * @return pointer to the new table. It should be freed with free() by the - * caller - */ -void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs); - #endif /* _LINUX_EFI_H */ -- 2.28.0

1 0

RISCV64 - u-boot FDT control address unset on qemu-riscv64_defconfig ?
by Alexander von Gluck IV 27 Aug '20

27 Aug '20

Good morning! I was looking at booting Haiku's riscv64 EFI bootloader under qemu, and noticed several FDT errors: Device 0: QEMU VirtIO Block Device Type: Hard Disk Capacity: 428.0 MB = 0.4 GB (876544 x 512) ... is now current device Scanning virtio 0:1... ** Unable to read file / ** Failed to load '/' Found EFI removable media binary efi/boot/bootriscv64.efi libfdt fdt_check_header(): FDT_ERR_BADMAGIC Scanning disk virtio-blk#0... Found 2 disks No EFI system partition BootOrder not defined EFI boot manager: Cannot load any image 595112 bytes read in 4 ms (141.9 MiB/s) libfdt fdt_check_header(): FDT_ERR_BADMAGIC A quick look showed this default state: => fdt list No FDT memory address configured. Please configure the FDT address via "fdt addr <address>" command. Aborting! Tossing in the default fdtcontroladdr seemed to resolve the issue: => fdt addr ${fdtcontroladdr} => fdt list / { #address-cells = <0x00000002>; #size-cells = <0x00000002>; compatible = "riscv-virtio"; model = "riscv-virtio,qemu"; flash@20000000 { }; chosen { }; uart@10000000 { }; test@100000 { }; virtio_mmio@10008000 { }; virtio_mmio@10007000 { }; virtio_mmio@10006000 { }; virtio_mmio@10005000 { }; virtio_mmio@10004000 { }; virtio_mmio@10003000 { }; virtio_mmio@10002000 { }; virtio_mmio@10001000 { }; cpus { }; memory@80000000 { }; soc { }; }; Shouldn't ${fdtcontroladdr} be the default fdt address on bootup? Here's my qemu command: qemu-system-riscv64 -bios ~/Code/firmware/u-boot/riscv64/qemu/u-boot.bin -M virt -device virtio-blk-device,drive=hd -drive file=~/Code/haiku/generated.riscv64/haiku-mmc.image,format=raw,id=hd -m 1024

1 1