January 2022 - U-Boot

[PATCH] usb: gadget: ci: Avoid null pointer dereference
by Marek Vasut 28 Jan '22

28 Jan '22

The ci_req->hw_buf can be NULL, test whether it is and if so, avoid accessing it. Else, the system may crash. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Peter Chen <peter.chen(a)nxp.com> Cc: Li Jun <jun.li(a)nxp.com> Cc: Peng Fan <peng.fan(a)nxp.com> --- drivers/usb/gadget/ci_udc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/ci_udc.c b/drivers/usb/gadget/ci_udc.c index 226a9e6d671..542684c1c30 100644 --- a/drivers/usb/gadget/ci_udc.c +++ b/drivers/usb/gadget/ci_udc.c @@ -402,6 +402,9 @@ align: flush: hwaddr = (unsigned long)ci_req->hw_buf; + if (!hwaddr) + return 0; + aligned_used_len = roundup(req->length, ARCH_DMA_MINALIGN); flush_dcache_range(hwaddr, hwaddr + aligned_used_len); @@ -415,7 +418,7 @@ static void ci_debounce(struct ci_req *ci_req, int in) unsigned long hwaddr = (unsigned long)ci_req->hw_buf; uint32_t aligned_used_len; - if (in) + if (in || !hwaddr) return; aligned_used_len = roundup(req->actual, ARCH_DMA_MINALIGN); -- 2.34.1

1 0

[RFC PATCH v3 0/5] imx8m: move env_get_location for imx8mn and imx8mp at board level
by Tommaso Merciai 27 Jan '22

27 Jan '22

This series move env_get_location from soc to board level. As suggested by Michael <michael(a)amarulasolutions.com> make no sense to define an unique way for multiple board. One board can boot from emmc and having env on spi flash etc.. Anyways, this function is kept in imx8mn_evk, imx8mp_evk, phycore-imx8mp and imx8mn_beacon boards instead of being completely dropped. Tommaso Merciai (5): imx8m: drop env_get_location for imx8mn and imx8mp imx: imx8mn_evk: override env_get_location imx: imx8mp_evk: override env_get_location beacon: imx8mn: override env_get_location in imx8mn_beacon.c phytec: phycore_imx8mp: override env_get_location in phycore-imx8mp.c arch/arm/mach-imx/imx8m/soc.c | 39 -------------------- board/beacon/imx8mn/imx8mn_beacon.c | 35 +++++++++++++++++- board/freescale/imx8mn_evk/imx8mn_evk.c | 35 ++++++++++++++++++ board/freescale/imx8mp_evk/imx8mp_evk.c | 34 +++++++++++++++++ board/phytec/phycore_imx8mp/phycore-imx8mp.c | 33 +++++++++++++++++ 5 files changed, 136 insertions(+), 40 deletions(-) -- 2.25.1

4 21

[PATCH 0/8 v7] TPM cleanups and MMIO driver
by Ilias Apalodimas 27 Jan '22

27 Jan '22

Hi! This is the update for [1]. Changes since v6: - added a few missing @return in function documentation - switched TPM1_ defines to TPM_INFINEON_ Changes since v5: - Fixed 2 tpmv1.2 drivers. Some of the internal driver functions were conflicting with the new API Changes since v4: - renamed struct udevice *udev -> struct udevice *dev - added comments on struct tpm_tis_phy_ops - removed duplicate defines from tpm2_tis_spi driver (now in tpm_tis.h) - moved API function description for the .c to the .h file - added Reviewed-by tags from Simon and Heinrich Changes since v3: - Coverted SPI TPM to use the API as well - moved some log_info to log_debug - Added documentation on how to run QEMU and enabled TPM by default o arm qemu builds Changes since v2: - Add myself as a maintainer on TPM drivers Changes since v1: - split off the tis core code into a different file Ilias Apalodimas (6): tpm2: Introduce TIS tpm core tpm2: Add a TPMv2 MMIO TIS driver tpm: Use the new API on tpm2 spi driver configs: Enable tpmv2 mmio on qemu for arm/arm64 doc: qemu: Add instructions for swtpm usage MAINTAINERS: Add entry for TPM drivers [1] https://lore.kernel.org/u-boot/20211107213312.263357-1-ilias.apalodimas@lin… Ilias Apalodimas (8): tpm: refactor function names and macros for infineon v1.2 TPM tpm: refactor function names for LPC based TPMs tpm2: Introduce TIS tpm core tpm2: Add a TPMv2 MMIO TIS driver tpm: Use the new API on tpm2 spi driver configs: Enable tpmv2 mmio on qemu for arm/arm64 doc: qemu: Add instructions for swtpm usage MAINTAINERS: Add entry for TPM drivers MAINTAINERS | 5 + configs/qemu_arm64_defconfig | 2 + configs/qemu_arm_defconfig | 2 + doc/board/emulation/qemu-arm.rst | 25 ++ drivers/tpm/Kconfig | 9 + drivers/tpm/Makefile | 3 +- drivers/tpm/tpm2_tis_core.c | 463 +++++++++++++++++++++++++++++++ drivers/tpm/tpm2_tis_mmio.c | 157 +++++++++++ drivers/tpm/tpm2_tis_spi.c | 447 +++-------------------------- drivers/tpm/tpm_tis.h | 136 +++++++++ drivers/tpm/tpm_tis_infineon.c | 34 +-- drivers/tpm/tpm_tis_lpc.c | 4 +- include/tpm-v2.h | 1 + 13 files changed, 852 insertions(+), 436 deletions(-) create mode 100644 drivers/tpm/tpm2_tis_core.c create mode 100644 drivers/tpm/tpm2_tis_mmio.c -- 2.33.1

3 15

[PATCH 1/1] efi_loader: clean up uefi secure boot image verification logic
by Ilias Apalodimas 27 Jan '22

27 Jan '22

We currently distinguish between signed and non signed PE/COFF executables while trying to authenticate signatures and/or sha256 hashes in db and dbx. That code duplication can be avoided. When checking for sha256 hashes, in db, we don't really care if the image is signed or not. The sequence for verifying the binary can be 1. Is the sha256 of the image in dbx, reject the image 2. Certification checking 2a. Is the image signed with a certificate that's found in db and not in dbx 2b. The image carries a cert which is signed by a cert in db (and not in dbx) and the image can be verified against the former 3. Is the sha256 of the image in db So weed out the 'special' case, which is handling unsigned images. While at it move the checking of a hash outside the certificate verification loop which isn't really needed and check for the hash only once. Also allow a mix of signatures and hashes in db instead of explicitly breaking out the SHA256 verification loop if a signature happens to be the present before the hash. It's worth noting that (2a) only works if the certificate is self signed, but that can be fixed in a following patch. Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- changes since RFC: - added a comment indication sha256 approval is the last resort case - reworded the commit message, based on Takahiro's proposal lib/efi_loader/efi_image_loader.c | 89 +++++++------------------------ lib/efi_loader/efi_signature.c | 2 +- 2 files changed, 20 insertions(+), 71 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 255613eb72ba..90594acf9623 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -516,63 +516,17 @@ err: } #ifdef CONFIG_EFI_SECURE_BOOT -/** - * efi_image_unsigned_authenticate() - authenticate unsigned image with - * SHA256 hash - * @regs: List of regions to be verified - * - * If an image is not signed, it doesn't have a signature. In this case, - * its message digest is calculated and it will be compared with one of - * hash values stored in signature databases. - * - * Return: true if authenticated, false if not - */ -static bool efi_image_unsigned_authenticate(struct efi_image_regions *regs) -{ - struct efi_signature_store *db = NULL, *dbx = NULL; - bool ret = false; - - dbx = efi_sigstore_parse_sigdb(L"dbx"); - if (!dbx) { - EFI_PRINT("Getting signature database(dbx) failed\n"); - goto out; - } - - db = efi_sigstore_parse_sigdb(L"db"); - if (!db) { - EFI_PRINT("Getting signature database(db) failed\n"); - goto out; - } - - /* try black-list first */ - if (efi_signature_lookup_digest(regs, dbx)) { - EFI_PRINT("Image is not signed and its digest found in \"dbx\"\n"); - goto out; - } - - /* try white-list */ - if (efi_signature_lookup_digest(regs, db)) - ret = true; - else - EFI_PRINT("Image is not signed and its digest not found in \"db\" or \"dbx\"\n"); - -out: - efi_sigstore_free(db); - efi_sigstore_free(dbx); - - return ret; -} - /** * efi_image_authenticate() - verify a signature of signed image * @efi: Pointer to image * @efi_size: Size of @efi * - * A signed image should have its signature stored in a table of its PE header. + * An image should have its signature stored in the image certificate table + * * So if an image is signed and only if if its signature is verified using - * signature databases, an image is authenticated. - * If an image is not signed, its validity is checked by using - * efi_image_unsigned_authenticated(). + * signature databases or if it's sha256 is found in db an image is + * authenticated. + * * TODO: * When AuditMode==0, if the image's signature is not found in * the authorized database, or is found in the forbidden database, @@ -608,14 +562,7 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) if (!efi_image_parse(new_efi, efi_size, &regs, &wincerts, &wincerts_len)) { EFI_PRINT("Parsing PE executable image failed\n"); - goto err; - } - - if (!wincerts) { - /* The image is not signed */ - ret = efi_image_unsigned_authenticate(regs); - - goto err; + goto out; } /* @@ -624,18 +571,18 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) db = efi_sigstore_parse_sigdb(L"db"); if (!db) { EFI_PRINT("Getting signature database(db) failed\n"); - goto err; + goto out; } dbx = efi_sigstore_parse_sigdb(L"dbx"); if (!dbx) { EFI_PRINT("Getting signature database(dbx) failed\n"); - goto err; + goto out; } if (efi_signature_lookup_digest(regs, dbx)) { EFI_PRINT("Image's digest was found in \"dbx\"\n"); - goto err; + goto out; } /* @@ -729,20 +676,22 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) /* try white-list */ if (efi_signature_verify(regs, msg, db, dbx)) { ret = true; - break; + goto out; } EFI_PRINT("Signature was not verified by \"db\"\n"); - if (efi_signature_lookup_digest(regs, db)) { - ret = true; - break; - } - - EFI_PRINT("Image's digest was not found in \"db\" or \"dbx\"\n"); } -err: + /* + * This our last resort, the image is not found in dbx and is not + * authenticated by any certs in db. Try the image hash in db + */ + if (efi_signature_lookup_digest(regs, db)) + ret = true; + else + EFI_PRINT("Image's digest was not found in \"db\" or \"dbx\"\n"); +out: efi_sigstore_free(db); efi_sigstore_free(dbx); pkcs7_free_message(msg); diff --git a/lib/efi_loader/efi_signature.c b/lib/efi_loader/efi_signature.c index 3243e2c60de0..8fa82f8cea4c 100644 --- a/lib/efi_loader/efi_signature.c +++ b/lib/efi_loader/efi_signature.c @@ -176,7 +176,7 @@ bool efi_signature_lookup_digest(struct efi_image_regions *regs, if (guidcmp(&siglist->sig_type, &efi_guid_sha256)) { EFI_PRINT("Digest algorithm is not supported: %pUs\n", &siglist->sig_type); - break; + continue; } if (!efi_hash_regions(regs->reg, regs->num, &hash, &size)) { -- 2.30.2

1 1

[RFC 0/6] Exynos5: Update devicetree files from linux kernel
by Jaehoon Chung 27 Jan '22

27 Jan '22

Exynos5 is using old devicetree file for only U-boot. It's difficult to adjust the driver-model and sync codes with linux. This patchset is to copy exynos5 devicetree files from linux v5.16. I don't have all exynos5 boards, so it's difficult to check whether all boards are working fine or not. If this is worthful job, I will work this continously. Otherwise, I will drop this RFC patches. Tested on XU3 boards. Jaehoon Chung (6): ARM: exynos5: sync devicetree files from linux kernel board: exynos5-dt-type: add hardkernel,odroid-xu3 compatible mmc: exynos_dw_mmc: add exynos5420 compatible mmc: exynos_dw_mmc: remove the error message and not return i2c: exynos_hs_i2c: add samsung,exynos5250-hsi2c compatible power: s2pms11: change the subnode name to regulators arch/arm/dts/cros-adc-thermistors.dtsi | 41 + arch/arm/dts/exynos-syscon-restart.dtsi | 20 + arch/arm/dts/exynos4-cpu-thermal.dtsi | 48 + arch/arm/dts/exynos5.dtsi | 384 ++--- arch/arm/dts/exynos5250-arndale.dts | 638 +++++++- arch/arm/dts/exynos5250-pinctrl.dtsi | 1080 +++++++++---- arch/arm/dts/exynos5250-smdk5250.dts | 367 +++-- arch/arm/dts/exynos5250-snow-common.dtsi | 709 +++++++++ arch/arm/dts/exynos5250-snow-rev5.dts | 56 + arch/arm/dts/exynos5250-snow.dts | 549 +------ arch/arm/dts/exynos5250-spring.dts | 677 ++++---- arch/arm/dts/exynos5250.dtsi | 1298 +++++++++++++-- arch/arm/dts/exynos5420-cpus.dtsi | 163 ++ arch/arm/dts/exynos5420-peach-pit.dts | 1228 ++++++++++---- arch/arm/dts/exynos5420-pinctrl.dtsi | 734 +++++++++ arch/arm/dts/exynos5420-smdk5420.dts | 488 ++++-- arch/arm/dts/exynos5420-trip-points.dtsi | 31 + arch/arm/dts/exynos5420.dtsi | 1413 +++++++++++++++++ arch/arm/dts/exynos5422-cpus.dtsi | 170 ++ arch/arm/dts/exynos5422-odroid-core.dtsi | 1071 +++++++++++++ arch/arm/dts/exynos5422-odroidxu3-audio.dtsi | 83 + arch/arm/dts/exynos5422-odroidxu3-common.dtsi | 505 ++++++ arch/arm/dts/exynos5422-odroidxu3-lite.dts | 127 ++ arch/arm/dts/exynos5422-odroidxu3.dts | 336 +--- arch/arm/dts/exynos5422-odroidxu4.dts | 92 ++ arch/arm/dts/exynos54xx-odroidxu-leds.dtsi | 48 + arch/arm/dts/exynos54xx.dtsi | 376 +++-- arch/arm/dts/exynos5800-peach-pi.dts | 1080 +++++++++++-- arch/arm/dts/exynos5800.dtsi | 162 ++ board/samsung/common/exynos5-dt-types.c | 1 + drivers/i2c/exynos_hs_i2c.c | 1 + drivers/mmc/exynos_dw_mmc.c | 10 +- drivers/power/pmic/s2mps11.c | 2 +- include/dt-bindings/clock/exynos-audss-clk.h | 27 + include/dt-bindings/clock/exynos5250.h | 181 +++ include/dt-bindings/clock/exynos5420.h | 277 ++++ include/dt-bindings/clock/maxim,max77686.h | 20 + include/dt-bindings/clock/samsung,s2mps11.h | 20 + include/dt-bindings/pinctrl/samsung.h | 77 + include/dt-bindings/sound/samsung-i2s.h | 15 + 40 files changed, 11944 insertions(+), 2661 deletions(-) create mode 100644 arch/arm/dts/cros-adc-thermistors.dtsi create mode 100644 arch/arm/dts/exynos-syscon-restart.dtsi create mode 100644 arch/arm/dts/exynos4-cpu-thermal.dtsi create mode 100644 arch/arm/dts/exynos5250-snow-common.dtsi create mode 100644 arch/arm/dts/exynos5250-snow-rev5.dts create mode 100644 arch/arm/dts/exynos5420-cpus.dtsi create mode 100644 arch/arm/dts/exynos5420-pinctrl.dtsi create mode 100644 arch/arm/dts/exynos5420-trip-points.dtsi create mode 100644 arch/arm/dts/exynos5420.dtsi create mode 100644 arch/arm/dts/exynos5422-cpus.dtsi create mode 100644 arch/arm/dts/exynos5422-odroid-core.dtsi create mode 100644 arch/arm/dts/exynos5422-odroidxu3-audio.dtsi create mode 100644 arch/arm/dts/exynos5422-odroidxu3-common.dtsi create mode 100644 arch/arm/dts/exynos5422-odroidxu3-lite.dts create mode 100644 arch/arm/dts/exynos5422-odroidxu4.dts create mode 100644 arch/arm/dts/exynos54xx-odroidxu-leds.dtsi create mode 100644 arch/arm/dts/exynos5800.dtsi create mode 100644 include/dt-bindings/clock/exynos-audss-clk.h create mode 100644 include/dt-bindings/clock/exynos5250.h create mode 100644 include/dt-bindings/clock/exynos5420.h create mode 100644 include/dt-bindings/clock/maxim,max77686.h create mode 100644 include/dt-bindings/clock/samsung,s2mps11.h create mode 100644 include/dt-bindings/pinctrl/samsung.h create mode 100644 include/dt-bindings/sound/samsung-i2s.h -- 2.29.0

4 10

[PATCH v1] driver: fastboot: Fix getvar_get_part_info when flash nand
by qianfanguijin＠qq.com 27 Jan '22

27 Jan '22

From: qianfan Zhao <qianfanguijin(a)163.com> find_dev_and_part return 0 on success, 1 otherwise. So fastboot_nand_get_part_info follow this rule. Signed-off-by: qianfan Zhao <qianfanguijin(a)163.com> --- drivers/fastboot/fb_getvar.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index d43f2cfee6..a7a8dc458f 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -114,7 +114,10 @@ static int getvar_get_part_info(const char *part_name, char *response, struct part_info *part_info; r = fastboot_nand_get_part_info(part_name, &part_info, response); - if (r >= 0 && size) + + if (r) /* find nand device and part failed */ + r = -ENODEV; + else if (size) *size = part_info->size; # else fastboot_fail("this storage is not supported in bootloader", response); -- 2.17.1

3 2

[RESEND PATCH 1/3] Nokia RX-51: Update documentation about ext2/3/4
by Pali Rohár 27 Jan '22

27 Jan '22

Since commit 25c5b6517854 ("Nokia RX-51: Do not try calling both ext2load and ext4load") command ext4load is used for all ext2/3/4 fs variants. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- doc/README.nokia_rx51 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index 7f22ed49bd75..1be077514f03 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -44,8 +44,7 @@ Boot from SD or eMMC in this order: * 1.2 find uImage on first fat partition * 1.3 find zImage on first fat partition * 1.4 same order for 2. - 4. fat partition - * 2. same as 1. but for ext2/3 partition - * 3. same as 1. but for ext4 partition + * 2. same as 1. but for ext2/3/4 partition Available additional commands/variables: @@ -70,7 +69,7 @@ Additional variables for loading files from mmc: * mmc ${mmcnum} (0 - external, 1 - internal) * partition number ${mmcpart} (1 - 4) - * parition type ${mmctype} (fat, ext2, ext4) + * partition type ${mmctype} (fat, ext2, ext4; ext2 is just alias for ext4) Additional variables for booting kernel: -- 2.20.1

2 6

[PATCH 0/3] save prev bootloader data, when u-boot chainloaded
by sankouski-dzmitry 27 Jan '22

27 Jan '22

From: Dzmitry Sankouski <dsankouski(a)gmail.com> When u-boot is used as a chain-loaded bootloader (replacing OS kernel), previous bootloader leaves data in RAM, that can be reused. For example, on recent arm linux system, when chainloading u-boot, there are initramfs and fdt in RAM prepared for OS booting. Initramfs may be modified to store u-boot's payload, thus providing the ability to use chainloaded u-boot to boot OS without any storage support. Two config options added: - SAVE_PREV_BL_INITRAMFS_START_ADDR saves initramfs start address to 'prevbl_initrd_start_addr' environment variable - SAVE_PREV_BL_FDT_ADDR saves fdt address to 'prevbl_fdt_addr' environment variable This feature will be used for axy17lte and starqltechn boards for now, and more phones in future. Dzmitry Sankouski (3): arm: init: save previous bootloader data board: starqltechn: get board usable - add bootcmd and docs board: axy17lte: get board usable - add bootcmd and docs arch/arm/lib/Makefile | 2 + arch/arm/lib/save_prev_bl_data.c | 93 +++++++++++++++++++++++++++++ boot/Kconfig | 79 +++++++++++++++--------- configs/a3y17lte_defconfig | 11 ++-- configs/a5y17lte_defconfig | 10 ++-- configs/a7y17lte_defconfig | 10 ++-- configs/starqltechn_defconfig | 12 ++-- doc/board/qualcomm/sdm845.rst | 47 ++++++++++++++- doc/board/samsung/axy17lte.rst | 15 +---- include/configs/exynos78x0-common.h | 1 + include/configs/sdm845.h | 5 ++ include/init.h | 13 ++++ 12 files changed, 241 insertions(+), 57 deletions(-) create mode 100644 arch/arm/lib/save_prev_bl_data.c -- 2.25.1

1 3

Possiable memory conflict with fdt memory region
by Fangsuo Wu 27 Jan '22

27 Jan '22

Hi, in image_setup_linux(), stage 1: Boot_fdt_add_mem_rsv_regions() is called first to add the mem reserve regions which prevents u-boot from using them to store the initrd or the fdt blob; stage 2: Then boot_relocate_fdt() is called to reserve or alloc fdt blob from the avaiable lmb region. But it seems at stage 1 it doesn't cover up all mem reserve regions. For example, if CMD_PSTORE is configured, fdt_fixup_pstore(blob) will add pstore to reserved-memory node in fdt in image_setup_libfdt() after stage 2 , which may conflict with fdt memory region and can't be detected since fdt_fixup_pstore doesn't call lmb_reserve(lmb, pstrore addr, pstore len). In image_setup_libfdt, there are also other functions like ft_board_setup which may change existing reserved memory node's size and lead to the same issue. Do you think a common function is needed before boot_fdt_add_mem_rsv_regions() in stage 1? The function can be used to fix-up or add new reserved memory nodes. Thanks.

2 1

difference between fdtdec and fdt_support ?
by Marek Behún 27 Jan '22

27 Jan '22

Hi Simon, I am a little confused. We have common/fdt_support.c and lib/fdtdec.c The second one implements for example fdtdec_get_is_enabled(), which I would rather expect in fdt_support by name fdt_node_is_available(), or something like that. Also fdtdec does a strange thing with compatible strings: it declares an enum for compatible strings and then a map which maps this enum values to compatible strings... Why not just use the compatible strings? What is the purpose of having two files implementing fdt stuff? Marek

3 6