November 2020 - U-Boot

[PATCH 00/20] dm: Enhance of-platdata to support parent devices
by Simon Glass 04 Nov '20

04 Nov '20

At present dev_get_parent() always returns the root device with of-platdata. This means that it is not possible to find the I2C bus for an I2C device easily. In many cases this does not cause problems as there is only a single I2C bus, but it is still inconsistent with U-Boot proper. Worse is that because devices are not bound to the correct parent, they will not have parent_platdata allocated correctly. Manual fix-ups are required in the code. This series adds support for parent devices with of-platdata. Recent improvements to of-platadata have provided a function to obtain a device based on its driver_info struct. This requires in generated C code in dm_populate_phandle_data() which writes the udevice pointer into each phandle value, since this cannot be known at build time. This works well and fixes a big hole in of-platdata. But the implementation has a few drawbacks: the need for generated code adds (very slightly) to code size and it means that the SPL must sit in writable memory. The latter can be considered a security risk and is not actually supported on Intel Apollo Lake. Another point is that in future of-platadata may support instantiation of devices at build time. Pointer fix-ups could become quite taxing. So this series adjusts the approach, storing an index (idx) to the driver_info struct in the linker list instead. That index can be figured out in dtoc and the value placed directly in the phandle struct. For 64-bit machines it is also smaller than a pointer. It requires a new table (driver_rt) to be set up at runtime. This series adds more SPL tests written in C, using the infrastructure in the previous series (u-boot-dm/tes-working). A few clean-ups and a bug fix resulting from these are included. Finally, x86 is updated to use the parent support. For now, parent support is behind a Kconfig option, but I expect this will become the default, assuming that no major problems are found. SPL size impact is fairly neural, slightly positive on chromebook_jerry (Thumb-2) and slightly negative on rock64-rk3328 (aarch64): aarch64: spl/u-boot-spl:all +39.0 spl/u-boot-spl:rodata -5.0 spl/u-boot-spl:text +44.0 arm: spl/u-boot-spl:all -49.0 spl/u-boot-spl:data -80.0 spl/u-boot-spl:text +36.0 spl/u-boot-spl:rodata -5.0 The increase in code size is due to lists_bind_drivers() having to do multiple passes to ensure that parents are processed before children. This could possible be reduced with a more complex linker list ordering mechanism, but it would be a bit messy and that idea is not explored in this series. Simon Glass (20): sandbox: Drop ad-hoc device declarations in SPL dtoc: Document the return value of scan_structs() dtoc: Order the structures internally by name dm: core: Allow dm_warn() to be used in SPL dtoc: Fix widening of int to bytes dm: Add a C test for of-platdata properties sandbox: Allow selection of SPL unit tests dm: test: Drop of-platdata pytest dm: test: Add a check that all devices have a dev value dm: test: Add a test for of-platdata phandles dm: Use an allocated array for run-time device info sandbox: Fix up building for of-platdata dm: Support parent devices with of-platdata dm: Add a test for of-platdata parent information dm: core: Convert #ifdef to if() in root.c x86: apl: Enable SPI flash in TPL with APL_SPI_FLASH_BOOT x86: apl: Take advantage of the of-platdata parent support dm: Use driver_info index instead of pointer dm: Don't allow U_BOOT_DEVICE() when of-platdata is used dm: doc: Update the of-platadata documentation arch/sandbox/cpu/spl.c | 14 +- arch/sandbox/cpu/start.c | 16 +-- arch/sandbox/dts/sandbox.dts | 1 + arch/sandbox/dts/sandbox.dtsi | 27 ++++ arch/sandbox/include/asm/state.h | 2 +- arch/x86/cpu/apollolake/Kconfig | 2 + arch/x86/cpu/apollolake/spl.c | 3 +- board/sandbox/sandbox.c | 2 + configs/sandbox_spl_defconfig | 5 +- doc/driver-model/of-plat.rst | 42 +++--- drivers/clk/clk-uclass.c | 3 +- drivers/clk/clk_fixed_rate.c | 4 +- drivers/clk/clk_sandbox.c | 4 +- drivers/core/Kconfig | 18 ++- drivers/core/device.c | 23 +++- drivers/core/lists.c | 70 +++++++++- drivers/core/root.c | 29 ++-- drivers/core/util.c | 2 +- drivers/i2c/Makefile | 2 +- drivers/i2c/i2c-emul-uclass.c | 2 + drivers/i2c/sandbox_i2c.c | 4 +- drivers/misc/irq-uclass.c | 2 +- drivers/misc/p2sb-uclass.c | 27 ++-- drivers/misc/spltest_sandbox.c | 35 ----- drivers/mmc/fsl_esdhc_imx.c | 7 +- drivers/rtc/rtc-uclass.c | 2 + drivers/rtc/sandbox_rtc.c | 4 +- drivers/serial/sandbox.c | 3 + drivers/spi/ich.c | 4 +- drivers/sysreset/sysreset_sandbox.c | 2 + dts/Kconfig | 18 +++ include/asm-generic/global_data.h | 13 ++ include/config_uncmd_spl.h | 1 - include/dm/device-internal.h | 2 +- include/dm/device.h | 14 ++ include/dm/platdata.h | 32 ++++- include/dm/util.h | 2 +- include/dt-structs.h | 6 +- test/dm/of_platdata.c | 203 ++++++++++++++++++++++++++++ test/dm/test-main.c | 24 +++- test/py/tests/test_ofplatdata.py | 47 ------- test/py/tests/test_spl.py | 5 +- tools/dtoc/dtb_platdata.py | 63 +++++---- tools/dtoc/dtoc_test_simple.dts | 1 + tools/dtoc/fdt.py | 9 ++ tools/dtoc/test_dtoc.py | 178 ++++++++++++++++-------- tools/dtoc/test_fdt.py | 10 ++ 47 files changed, 705 insertions(+), 284 deletions(-) -- 2.28.0.806.g8561365e88-goog

4 42

[PATCH v7 00/17] efi_loader: add capsule update support
by AKASHI Takahiro 04 Nov '20

04 Nov '20

Summary ======= 'UpdateCapsule' is one of runtime services defined in UEFI specification and its aim is to allow a caller (OS) to pass information to the firmware, i.e. U-Boot. This is mostly used to update firmware binary on devices by instructions from OS. While 'UpdateCapsule' is a runtime services function, it is, at least initially, supported only before exiting boot services alike other runtime functions, [Get/]SetVariable. This is because modifying storage which may be shared with OS must be carefully designed and there is no general assumption that we can do it. Therefore, we practically support only "capsule on disk"; any capsule can be handed over to UEFI subsystem as a file on a specific file system. In this patch series, all the related definitions and structures are given as UEFI specification describes, and basic framework for capsule support is provided. Currently supported is * firmware update (Firmware Management Protocol or simply FMP) Most of functionality of firmware update is provided by FMP driver and it can be, by nature, system/platform-specific. So you can and should implement your own FMP driver(s) based on your system requirements. Under the current implementation, we provide two basic but generic drivers with two formats: * FIT image format (as used in TFTP update and dfu) * raw image format It's totally up to users which one, or both, should be used on users' system depending on user requirements. Quick usage =========== 1. You can create a capsule file with the following host command: $ mkeficapsule [--fit <fit image> | --raw <raw image>] <output file> 2. Put the file under: /EFI/UpdateCapsule of UEFI system partition 3. Specify firmware storage to be updated in "dfu_alt_info" variable (Please follow README.dfu for details.) ==> env set dfu_alt_info '...' 4. After setting up UEFI's OsIndications variable, reboot U-Boot: OsIndications <= EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED Patch structure =============== Patch#1-#4,#12: preparatory patches Patch#5-#11,#13: main part of implementation Patch#14-#15: utilities Patch#16-#17: pytests [1] https://git.linaro.org/people/takahiro.akashi/u-boot.git efi/capsule Prerequisite patches ==================== None Test ==== * passed all the pytests which are included in this patch series on sandbox build locally. Please note that the capsule pytest itself won't be run in the CI partly because some specific configuration for sandbox build is required and partly because there is a problem with virt-make-fs. See test_efi_capsule_firmware.py. Issues ====== * Timing of executing capsules-on-disk Currently, processing a capsule is triggered only as part of UEFI subsystem initialization. This means that, for example, firmware update, may not take place at system booting time and will potentially be delayed until a first call of any UEFI functions. => See patch#5 for my proposal * A bunch of warnings like WARNING: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible I don't think that fixing those improves anything. * Add a document in uefi.rst TODO's ====== (Won't be addressed in this series.) * capsule authentication * capsule dependency (dependency expression instruction set, or depex) * loading drivers in a capsule * handling RESET flag in a capsule and QeuryCapsuleCaps * full semantics of ESRT (EFI System Resource Table) * enabling capsule API at runtime * json capsule * recovery from update failure Changes ======= v7 (October 29, 2020) * rename CONFIG_DFU_ALT to CONFIG_DFU_WRITE_ALT (Patch#1,#3,#13) v6 RESEND (October 29, 2020) * rebased on v2021.01-rc1 v6 (September 7, 2020) * temporarily drop the prerequisite patch[2] * add a missing field (dependencies) in efi_api.h (but never used) (Patch#10) * add a missing field (image_capsule_support) and related definitions in efi_api.h (Patch#10, #15) * cosmetic changes on constant definitions in efi_api.h (Patch#10) * strict check for INVALID_PARAMETER at GET_IMAGE_INFO api (Patch#11,#13) * fix warnings in pytest (Patch#16,#17) v5 (August 3, 2020) * removed superfluous type conversion at dfu_write_from_mem_addr() (Patch#2) * introduced a common helper function, efi_create_indexed_name() (Patch#6,#7,#8) * use efi_[get|set]_variable_int(), if necessary, with READ_ONLY (Patch#7,#8) * return EFI_UNSUPPORTED at Patch#7 * changed the word, number, to 'index' (Patch#7,#8) * removed 'ifdef CONFIG_EFI_CAPSULE_ON_DISK' from a header (Patch#8) * initialize 'CapsuleLast' in efi_init_obj_list() (Patch#7,#8) * added 'const' qualifier for filename argument at efi_capsule_[read|delete]_file() (Patch#8) v4 (July 22, 2020) * rebased to Heinrich's current efi-2020-10 * rework dfu-related code to align with Heinrich's change (Patch#1,#3) * change a type of 'addr' argument from int to 'void *' per Sughosh's comment (Patch#2-#3,#11-#12) * rework/simplify pytests (Patch#15-#16) - utilize virt-make-fs - drop Test Case 1 (updating U-Boot environment data) - remove useless definitions (MNT_PNT, EFI_CAPSULE_IMAGE_NAME) - apply autopep8 v3 (July 10, 2020) * rebased to Heinrich's current efi-2020-10-rc1 * refactor efi_firmware_[fit|raw]_get_image_info() (patch#11,#13) v2 (June 17, 2020) * rebased to v2020.07-rc4 * add preparatory patches for dfu (Patch#1-#5, #12) * rework FIT capsule driver to utilize dfu_alt_info instead of CONFIG_xxx (patch#11) * extend get_image_info() to correspond to dfu_alt_info (patch#11) * add a 'raw binary' capsule support (patch#13, #17) * allow multiple capsule formats (with different GUIDs) to be installed (patch#11, #13) * extend mkeficapsule command to accept additional parameters, like version/index/hardware instance for a capsule header info. (patch#15) * mkeficapsule can now also generate raw-binary capsule (patch#16) * add function descriptions * apply autopep8 to pytests and fix more against pylint v1 (April 27, 2020) * rebased to v2020.07-rc * removed already-merged patches (RFC's #1 to #4) * dropped 'variable update' capsule support (RFC's patch#10) * dropped 'variable configuration table' support (RFC's patch#11) (Those two should be discussed separately.) * add preparatory patches (patch#1/#2) * fix several build errors * rename some Kconfig options to be aligned with UEFI specification's terms (patch#3,4,6,7) * enforce UpdateCapsule API to be disabled after ExitBootServices (patch#3) * use config table, runtime_services_supported, instead of variable (patch#3) * make EFI_CAPSULE_ON_DISK buildable even if UpdateCapsule API is disabled (patch4) * support OsIndications, invoking capsule-on-disk only if the variable indicates so (patch#4) * introduced EFI_CAPSULE_ON_DISK_EARLY to invoke capsule-on-disk in U-Boot initialization (patch#4) * detect capsule files only if they are on EFI system partition (patch#4) * use printf, rather than EFI_PRINT, in error cases (patch#4) * use 'header_size' field to retrieve capsule data, adding sanity checks against capsule size (patch#6) * call fmpt driver interfaces with EFI_CALL (patch#6) * remove 'variable update capsule'-related code form mkeficapsule (patch#9) * add a test case of OsIndications not being set properly (patch#10) * adjust test scenario for EFI_CAPSULE_ON_DISK_EARLY (patch#10) * revise pytest scripts (patch#10) Initial release as RFC (March 17, 2020) AKASHI Takahiro (17): dfu: rename dfu_tftp_write() to dfu_write_by_name() dfu: modify an argument type for an address common: update: add a generic interface for FIT image dfu: export dfu_list efi_loader: add option to initialise EFI subsystem early efi_loader: add efi_create_indexed_name() efi_loader: define UpdateCapsule api efi_loader: capsule: add capsule_on_disk support efi_loader: capsule: add memory range capsule definitions efi_loader: capsule: support firmware update efi_loader: add firmware management protocol for FIT image dfu: add dfu_write_by_alt() efi_loader: add firmware management protocol for raw image cmd: add "efidebug capsule" command tools: add mkeficapsule command for UEFI capsule update test/py: efi_capsule: test for FIT image capsule test/py: efi_capsule: test for raw image capsule cmd/efidebug.c | 235 +++++ common/Kconfig | 15 + common/Makefile | 3 +- common/board_r.c | 6 + common/main.c | 4 + common/update.c | 77 +- drivers/dfu/Kconfig | 6 + drivers/dfu/Makefile | 2 +- drivers/dfu/dfu.c | 2 +- drivers/dfu/dfu_alt.c | 125 +++ drivers/dfu/dfu_tftp.c | 65 -- include/dfu.h | 57 +- include/efi_api.h | 166 ++++ include/efi_loader.h | 30 + include/image.h | 12 + lib/efi_loader/Kconfig | 72 ++ lib/efi_loader/Makefile | 2 + lib/efi_loader/efi_capsule.c | 917 ++++++++++++++++++ lib/efi_loader/efi_firmware.c | 403 ++++++++ lib/efi_loader/efi_runtime.c | 104 +- lib/efi_loader/efi_setup.c | 106 +- test/py/tests/test_efi_capsule/conftest.py | 72 ++ test/py/tests/test_efi_capsule/defs.py | 12 + .../test_efi_capsule/test_capsule_firmware.py | 241 +++++ .../tests/test_efi_capsule/uboot_bin_env.its | 36 + tools/Makefile | 2 + tools/mkeficapsule.c | 239 +++++ 27 files changed, 2871 insertions(+), 140 deletions(-) create mode 100644 drivers/dfu/dfu_alt.c delete mode 100644 drivers/dfu/dfu_tftp.c create mode 100644 lib/efi_loader/efi_capsule.c create mode 100644 lib/efi_loader/efi_firmware.c create mode 100644 test/py/tests/test_efi_capsule/conftest.py create mode 100644 test/py/tests/test_efi_capsule/defs.py create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware.py create mode 100644 test/py/tests/test_efi_capsule/uboot_bin_env.its create mode 100644 tools/mkeficapsule.c -- 2.28.0

4 31

[PATCH] net: pfe_eth: fix crash with secure boot on LS1012A
by Biwen Li 04 Nov '20

04 Nov '20

From: Biwen Li <biwen.li(a)nxp.com> Fix crash with secure boot as follows, Net: SF: Detected s25fs512s with page size 256 Bytes, erase size 256 KiB, total 64 MiB "Synchronous Abort" handler, esr 0x96000210 elr: 000000008206db44 lr : 0000000082004ea0 (reloc) elr: 00000000b7ba6b44 lr : 00000000b7b3dea0 x0 : 00000000b79407e8 x1 : 0000000040640000 x2 : 0000000000000050 x3 : 0000000000000000 x4 : 000000000000000a x5 : 0000000000000050 x6 : 0000000000000366 x7 : 00000000b7942308 x8 : 00000000b76407c0 x9 : 0000000000000008 x10: 0000000000000044 x11: 00000000b7634d1c x12: 000000000000004f x13: 0000000000000044 x14: 00000000b7634d98 x15: 00000000b76407c0 x16: 0000000000000000 x17: 0000000000000000 x18: 00000000b7636dd8 x19: 0000000000000000 x20: 00000000b79407d0 x21: 00000000b79407e8 x22: 0000000040640000 x23: 00000000b7634e58 x24: 0000000000000000 x25: 0000000003800000 x26: 00000000b7bdd000 x27: 0000000000000000 x28: 0000000000000000 x29: 00000000b7634d10 Code: d2800003 eb03005f 54000101 d65f03c0 (f8636826) Resetting CPU ... Signed-off-by: Biwen Li <biwen.li(a)nxp.com> --- board/freescale/ls1012afrdm/Kconfig | 11 +++++ board/freescale/ls1012aqds/Kconfig | 14 +++++-- board/freescale/ls1012ardb/Kconfig | 18 +++++++-- drivers/net/pfe_eth/pfe_firmware.c | 62 +++++++++++++++++++++++++---- 4 files changed, 92 insertions(+), 13 deletions(-) diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig index 55b414e168..4ac69d7117 100644 --- a/board/freescale/ls1012afrdm/Kconfig +++ b/board/freescale/ls1012afrdm/Kconfig @@ -16,6 +16,10 @@ config SYS_LS_PFE_FW_ADDR hex "Flash address of PFE firmware" default 0x40a00000 +config SYS_LS_PFE_FW_LENGTH + hex "length of PFE firmware" + default 0x40000 + config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 @@ -65,6 +69,10 @@ config SYS_LS_PFE_FW_ADDR hex "Flash address of PFE firmware" default 0x40020000 +config SYS_LS_PFE_FW_LENGTH + hex "length of PFE firmware" + default 0x40000 + config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40060000 @@ -77,6 +85,9 @@ config SYS_LS_PFE_ESBC_ADDR hex "PFE Firmware HDR Addr" default 0x401f8000 +config SYS_LS_PFE_ESBC_LENGTH + hex "length of PFE Firmware HDR" + default 0xc00 endif if TARGET_LS1012AFRDM || TARGET_LS1012AFRWY diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig index 8844557aae..59b1a87665 100644 --- a/board/freescale/ls1012aqds/Kconfig +++ b/board/freescale/ls1012aqds/Kconfig @@ -20,6 +20,14 @@ if CHAIN_OF_TRUST config SYS_LS_PPA_ESBC_ADDR hex "PPA Firmware HDR Addr" default 0x40680000 + +config SYS_LS_PFE_ESBC_ADDR + hex "PFE Firmware HDR Addr" + default 0x40700000 + +config SYS_LS_PFE_ESBC_LENGTH + hex "length of PFE Firmware HDR" + default 0xc00 endif if FSL_PFE @@ -39,9 +47,9 @@ config SYS_LS_PFE_FW_ADDR hex "Flash address of PFE firmware" default 0x40a00000 -config SYS_LS_PFE_ESBC_ADDR - hex "PFE Firmware HDR Addr" - default 0x40700000 +config SYS_LS_PFE_FW_LENGTH + hex "length of PFE firmware" + default 0x300000 config DDR_PFE_PHYS_BASEADDR hex "PFE DDR physical base address" diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig index 5a2fa91f6b..c4acea3ae2 100644 --- a/board/freescale/ls1012ardb/Kconfig +++ b/board/freescale/ls1012ardb/Kconfig @@ -20,6 +20,14 @@ if CHAIN_OF_TRUST config SYS_LS_PPA_ESBC_ADDR hex "PPA Firmware HDR Addr" default 0x40680000 + +config SYS_LS_PFE_ESBC_ADDR + hex "PFE Firmware HDR Addr" + default 0x40640000 + +config SYS_LS_PFE_ESBC_LENGTH + hex "length of PFE Firmware HDR" + default 0xc00 endif if FSL_PFE @@ -33,9 +41,9 @@ config SYS_LS_PFE_FW_ADDR hex "Flash address of PFE firmware" default 0x40a00000 -config SYS_LS_PFE_ESBC_ADDR - hex "PFE Firmware HDR Addr" - default 0x40640000 +config SYS_LS_PFE_FW_LENGTH + hex "length of PFE firmware" + default 0x300000 config DDR_PFE_PHYS_BASEADDR hex "PFE DDR physical base address" @@ -89,6 +97,10 @@ config SYS_LS_PFE_FW_ADDR hex "Flash address of PFE firmware" default 0x40a00000 +config SYS_LS_PFE_FW_LENGTH + hex "length of PFE firmware" + default 0x300000 + config DDR_PFE_PHYS_BASEADDR hex "PFE DDR physical base address" default 0x03800000 diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index d414c750d4..d6718822b2 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -24,6 +24,9 @@ #define PFE_FIRMWARE_FIT_CNF_NAME "config@1" static const void *pfe_fit_addr; +#ifdef CONFIG_CHAIN_OF_TRUST +static const void *pfe_esbc_hdr_addr; +#endif /* * PFE elf firmware loader. @@ -166,10 +169,10 @@ static int pfe_fit_check(void) int pfe_spi_flash_init(void) { - struct spi_flash *pfe_flash; + struct spi_flash *pfe_flash = NULL; struct udevice *new; int ret = 0; - void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH); + void *addr = malloc(CONFIG_SYS_LS_PFE_FW_LENGTH); if (!addr) return -ENOMEM; @@ -179,24 +182,69 @@ int pfe_spi_flash_init(void) CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE, &new); + if (ret) { + printf("SF: failed to probe spi\n"); + goto exit1; + } + pfe_flash = dev_get_uclass_priv(new); if (!pfe_flash) { printf("SF: probe for pfe failed\n"); - free(addr); - return -ENODEV; + ret = -ENODEV; + goto exit1; } ret = spi_flash_read(pfe_flash, CONFIG_SYS_LS_PFE_FW_ADDR, - CONFIG_SYS_QE_FMAN_FW_LENGTH, + CONFIG_SYS_LS_PFE_FW_LENGTH, addr); - if (ret) + if (ret) { printf("SF: read for pfe failed\n"); + goto exit1; + } + +#ifdef CONFIG_CHAIN_OF_TRUST + void *hdr_addr = malloc(CONFIG_SYS_LS_PFE_ESBC_LENGTH); + + if (!hdr_addr) { + ret = -ENOMEM; + goto exit1; + } + ret = spi_flash_read(pfe_flash, + CONFIG_SYS_LS_PFE_ESBC_ADDR, + CONFIG_SYS_LS_PFE_ESBC_LENGTH, + hdr_addr); + if (ret) { + printf("SF: failed to read pfe esbc header\n"); + goto exit2; + } + + pfe_esbc_hdr_addr = hdr_addr; +#endif pfe_fit_addr = addr; spi_flash_free(pfe_flash); + goto exit; +#ifdef CONFIG_CHAIN_OF_TRUST +exit2: + if (hdr_addr) { + free(hdr_addr); + hdr_addr = NULL; + } +#endif +exit1: + if (addr) { + free(addr); + addr = NULL; + } +exit: + if (pfe_flash) { + spi_flash_free(pfe_flash); + pfe_flash = NULL; + } + return ret; } @@ -233,7 +281,7 @@ int pfe_firmware_init(void) goto err; #ifdef CONFIG_CHAIN_OF_TRUST - pfe_esbc_hdr = CONFIG_SYS_LS_PFE_ESBC_ADDR; + pfe_esbc_hdr = (uintptr_t)pfe_esbc_hdr_addr; pfe_img_addr = (uintptr_t)pfe_fit_addr; if (fsl_check_boot_mode_secure() != 0) { /* -- 2.17.1

1 0

[PATCH v2 0/7] Microchip PolarFire SoC support
by Padmarao Begari 04 Nov '20

04 Nov '20

This patch set adds Microchip PolarFire SoC Icicle Kit support to RISC-V U-Boot. The patches are based upon latest U-Boot tree (https://gitlab.denx.de/u-boot/u-boot.git) at commit id 5d92dacbbe8a751e95f0ad0cf7c3d2370e9a04c7 All drivers namely: NS16550 Serial, Microchip clock, Cadence eMMC and Cadence MACB Ethernet work fine on actual Microchip PolarFire SoC Icicle Kit. Changes in v2: - Add clock frequency for the clint device tree node - Move peripheral device tree nodes under /soc device tree node - Device tree nodes are in order based on the address - Enable UART0 for U-Boot logs - Update doc for the U-Boot logs are on UART0 - Move clock and reset index source into patch4 - Remove "dma_addr_r" type in the macb driver - Add lower_32_bits() for 32-bit address in the macb driver - Add set_rate() returns the new clock rate in the clock driver Padmarao Begari (7): riscv: Add DMA 64-bit address support net: macb: Add DMA 64-bit address support for macb net: macb: Add phy address to read it from device tree clk: Add Microchip PolarFire SoC clock driver riscv: dts: Add device tree for Microchip Icicle Kit riscv: Add Microchip MPFS Icicle Kit support doc: board: Add Microchip MPFS Icicle Kit doc arch/riscv/Kconfig | 5 + arch/riscv/dts/Makefile | 1 + arch/riscv/dts/microchip-icicle-kit-a000.dts | 426 ++++++++++++ arch/riscv/include/asm/types.h | 4 + board/microchip/mpfs_icicle/Kconfig | 25 + board/microchip/mpfs_icicle/mpfs_icicle.c | 96 ++- configs/microchip_mpfs_icicle_defconfig | 9 +- doc/board/index.rst | 1 + doc/board/microchip/index.rst | 9 + doc/board/microchip/mpfs_icicle.rst | 605 ++++++++++++++++++ drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/microchip/Kconfig | 5 + drivers/clk/microchip/Makefile | 1 + drivers/clk/microchip/clk_pfsoc.c | 127 ++++ drivers/clk/microchip/clk_pfsoc.h | 19 + drivers/clk/microchip/clk_pfsoc_cfg.c | 134 ++++ drivers/clk/microchip/clk_pfsoc_periph.c | 173 +++++ drivers/net/macb.c | 61 +- drivers/net/macb.h | 6 + include/configs/microchip_mpfs_icicle.h | 60 +- .../dt-bindings/clock/microchip,pfsoc-clock.h | 45 ++ 22 files changed, 1761 insertions(+), 53 deletions(-) create mode 100644 arch/riscv/dts/microchip-icicle-kit-a000.dts create mode 100644 doc/board/microchip/index.rst create mode 100644 doc/board/microchip/mpfs_icicle.rst create mode 100644 drivers/clk/microchip/Kconfig create mode 100644 drivers/clk/microchip/Makefile create mode 100644 drivers/clk/microchip/clk_pfsoc.c create mode 100644 drivers/clk/microchip/clk_pfsoc.h create mode 100644 drivers/clk/microchip/clk_pfsoc_cfg.c create mode 100644 drivers/clk/microchip/clk_pfsoc_periph.c create mode 100644 include/dt-bindings/clock/microchip,pfsoc-clock.h -- 2.17.1

6 29

[PATCH] Makefile: Fix u-boot-nodtb.bin target
by Pali Rohár 04 Nov '20

04 Nov '20

This change fixes two issues when building u-boot-nodtb.bin target: * Remove intermediate binary u-boot-nodtb.bin from disk when static_rela call (which modifies u-boot-nodtb.bin binary) failed. It is required because previous objcopy call creates binary and static_rela finish it. * Do not call static_rela cmd when u-boot-nodtb.bin binary was not created/updated by previous objcopy call. Second fix would ensure that u-boot-nodtb.bin binary is not updated when all prerequisites were up-to-date. And therefore final binary u-boot.bin is not updated in case all prerequisites were not modified and were up-to-date. Now running 'make SOURCE_DATE_EPOCH=0 u-boot.bin' second time now does not touch u-boot.bin binary in case nothing was modified, so GNU make can correctly detect that everything is up-to-date. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d4736bb501..91b6d2c2b3 100644 --- a/Makefile +++ b/Makefile @@ -884,7 +884,7 @@ cmd_static_rela = \ tools/relocate-rela $(3) $(4) $$start $$end else quiet_cmd_static_rela = -cmd_static_rela = +cmd_static_rela = true endif # Always append INPUTS so that arch config.mk's can add custom ones @@ -1317,9 +1317,13 @@ init_sp_bss_offset_check: u-boot.dtb FORCE fi endif +shell_cmd = { $(echo-cmd) $(cmd_$(1)); } + +quiet_cmd_objcopy_uboot = OBJCOPY $@ +cmd_objcopy_uboot = $(cmd_objcopy) && $(call shell_cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) || rm -f $@ + u-boot-nodtb.bin: u-boot FORCE - $(call if_changed,objcopy) - $(call cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) + $(call if_changed,objcopy_uboot) $(BOARD_SIZE_CHECK) u-boot.ldr: u-boot -- 2.20.1

4 6

[PATCH v2 0/3] Add Renesas SoC identification driver support
by Biju Das 04 Nov '20

04 Nov '20

This patch series aims to support Renesas SoC identification driver. Added a helper function of_match_node to find the matching of_match structure. This helper function can be used to replace the following code in u-boot [1] and [2] [1] https://elixir.bootlin.com/u-boot/latest/source/drivers/serial/serial_uniph… [2] https://elixir.bootlin.com/u-boot/latest/source/drivers/usb/phy/rockchip_us… Also added soc_id attribute support in UCLASS_SOC which is required for Renesas SoC identification driver similar to mainline linux. Biju Das (3): dm: core: Add of_match_node helper function dm: soc: Add SoC id for attribute matching dm: soc: SoC identification driver for Renesas SoC's drivers/core/device.c | 21 ++++ drivers/soc/Kconfig | 7 ++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 19 ++- drivers/soc/soc_renesas.c | 239 ++++++++++++++++++++++++++++++++++++++ drivers/soc/soc_sandbox.c | 8 ++ include/dm/device.h | 13 +++ include/soc.h | 39 ++++++- test/dm/soc.c | 8 ++ 9 files changed, 348 insertions(+), 7 deletions(-) create mode 100644 drivers/soc/soc_renesas.c -- 2.17.1

2 7

Re: [PATCH 1/1] riscv: enable SATA disk on qemu-riscv64_defconfig
by Rick Chen 04 Nov '20

04 Nov '20

> From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Heinrich Schuchardt > Sent: Monday, November 02, 2020 7:37 PM > To: Bin Meng > Cc: u-boot(a)lists.denx.de; Heinrich Schuchardt > Subject: [PATCH 1/1] riscv: enable SATA disk on qemu-riscv64_defconfig > > Allow attaching a virtual SATA disk to qemu-riscv64_defconfig. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > --- > configs/qemu-riscv64_defconfig | 6 ++++++ > 1 file changed, 6 insertions(+) > Reviewed-by: Rick Chen <rick(a)andestech.com>

1 0

Re: [PATCH v4 0/7] wdt: Add support for watchdogs on Kendryte K210
by Rick Chen 04 Nov '20

04 Nov '20

<rick(a)andestech.com> 於 2020年11月4日週三上午10:01寫道： > > > > -----Original Message----- > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Sean Anderson > Sent: Friday, October 23, 2020 9:30 PM > To: u-boot(a)lists.denx.de > Cc: Bin Meng; Marek Vasut; Jagan Teki; Simon Glass; Heinrich Schuchardt > Subject: Re: [PATCH v4 0/7] wdt: Add support for watchdogs on Kendryte K210 > > > On 10/1/20 10:56 AM, Sean Anderson wrote: > > On 9/9/20 5:04 PM, Sean Anderson wrote: > >> This series depends on > >> https://patchwork.ozlabs.org/project/uboot/list/?series=200642 > >> > >> Changes in v4: > >> - Fix build error without CONFIG_CLK > >> > >> Changes in v3: > >> - Note dependency on "time: Fix get_ticks being non-monotonic" > >> - Add a few signed-off-bys which were sent for version 1 > >> > >> Changes in v2: > >> - Fix fls being off-by-one when compared to log_2_n_round_up > >> - Move watchdog enable to k210.dtsi as it does not depend on anything > >> board-specific. > >> > >> Sean Anderson (7): > >> wdt: dw: Switch to using fls for log2 > >> wdt: dw: Switch to if(CONFIG()) instead of using #if > >> wdt: dw: Fix clock rate being off by 1000 > >> wdt: dw: Enable the clock before using it > >> wdt: dw: Free the clock on error > >> riscv: Add watchdog bindings for the k210 > >> riscv: Enable watchdog for the k210 > >> > >> arch/riscv/dts/k210.dtsi | 1 - > >> board/sipeed/maix/Kconfig | 2 ++ > >> drivers/watchdog/designware_wdt.c | 39 ++++++++++++++++++++----------- > >> 3 files changed, 27 insertions(+), 15 deletions(-) > >> > > > > *ping* > > > > Marek can these go into -next? > > > > --Sean > > > > *second ping* > > It appears that an earlier version of this series [1] was assigned to > Marek Vasut, but that the current version is assigned to Rick Chen. v2 > should be marked as superseded. Can this get picked up for the merge > window? Those patchs seem have been reviewed and tagged. If no other comments furthermore. I can help to pull via riscv tree later. But it shall sync to master again: Applying: wdt: dw: Switch to using fls for log2 Applying: wdt: dw: Switch to if(CONFIG()) instead of using #if Applying: wdt: dw: Fix clock rate being off by 1000 error: patch failed: drivers/watchdog/designware_wdt.c:129 error: drivers/watchdog/designware_wdt.c: patch does not apply Patch failed at 0003 wdt: dw: Fix clock rate being off by 1000 Thanks, Rick > > --Sean > > [1] https://patchwork.ozlabs.org/project/uboot/list/?series=194673 > [2] https://patchwork.ozlabs.org/project/uboot/list/?series=200657

1 0

Re: [PATCH] riscv: Fix efi header for RV32
by Rick Chen 04 Nov '20

04 Nov '20

Hi Atish > From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Heinrich Schuchardt > Sent: Wednesday, October 14, 2020 9:16 AM > To: Bin Meng; Atish Patra > Cc: U-Boot Mailing List; Anup Patel; Jagan Teki; Marek Vasut; Simon Goldschmidt; David Abdurachmanov; Tom Rini > Subject: Re: [PATCH] riscv: Fix efi header for RV32 > > Am 14. Oktober 2020 03:03:28 MESZ schrieb Bin Meng <bmeng.cn(a)gmail.com>: > >On Wed, Oct 14, 2020 at 3:23 AM Atish Patra <atish.patra(a)wdc.com> > >wrote: > >> > >> RV32 should use PE32 format instead of PE32+ as the efi header > >format. > >> This requires following changes > >> 1. A different header magic value > >> 2. An additional parameter known as BaseOfData. Currently, it is set > >to > >> zero in absence of any usage. > >> > >> Signed-off-by: Atish Patra <atish.patra(a)wdc.com> > >> --- > >> arch/riscv/lib/crt0_riscv_efi.S | 7 ++++++- > >> 1 file changed, 6 insertions(+), 1 deletion(-) > >> Reviewed-by: Rick Chen <rick(a)andestech.com> > >> diff --git a/arch/riscv/lib/crt0_riscv_efi.S > >b/arch/riscv/lib/crt0_riscv_efi.S > >> index 87fe1e56f906..4aaa49ad0777 100644 > >> --- a/arch/riscv/lib/crt0_riscv_efi.S > >> +++ b/arch/riscv/lib/crt0_riscv_efi.S > >> @@ -15,11 +15,13 @@ > >> #define SAVE_LONG(reg, idx) sd reg, (idx*SIZE_LONG)(sp) > >> #define LOAD_LONG(reg, idx) ld reg, (idx*SIZE_LONG)(sp) > >> #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV64 > >> +#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR64_MAGIC > > > >nits: the indentation seems to be incorrect > > > >> #else > >> #define SIZE_LONG 4 > >> #define SAVE_LONG(reg, idx) sw reg, (idx*SIZE_LONG)(sp) > >> #define LOAD_LONG(reg, idx) lw reg, (idx*SIZE_LONG)(sp) > >> #define PE_MACHINE IMAGE_FILE_MACHINE_RISCV32 > >> +#define PE_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC > >> #endif > >> > >> > >> @@ -48,7 +50,7 @@ coff_header: > >> IMAGE_FILE_LOCAL_SYMS_STRIPPED | \ > >> IMAGE_FILE_DEBUG_STRIPPED) > >> optional_header: > >> - .short IMAGE_NT_OPTIONAL_HDR64_MAGIC /* PE32+ format */ > > > >nits: PE32(+) ? > > > >> + .short PE_MAGIC /* PE32+ format */ > >> .byte 0x02 /* MajorLinkerVersion > >*/ > >> .byte 0x14 /* MinorLinkerVersion > >*/ > >> .long _edata - _start /* SizeOfCode */ > >> @@ -56,6 +58,9 @@ optional_header: > >> .long 0 /* > >SizeOfUninitializedData */ > >> .long _start - ImageBase /* > >AddressOfEntryPoint */ > >> .long _start - ImageBase /* BaseOfCode */ > >> +#if __riscv_xlen == 32 > >> + .long 0 /* BaseOfData */ > >> +#endif > >> > > The PE32 header has to be 96 bytes long, the PE32+ header 112 bytes long. > > See https://docs.microsoft.com/en-us/windows/win32/debug/pe-format > Do you have any comments ? The other headers seem for Windows-Specific Fields. If no other comments furthermore. I will pull it into riscv tree later. Thanks, Rick > Best regards > > Heinrich > > > >> extra_header_fields: > >> .quad 0 /* ImageBase */ > > > >Looks good otherwise > >Reviewed-by: Bin Meng <bin.meng(a)windriver.com>

1 0

[PATCH] binman: Call helper function binman_set_rom_offset() to fill offset
by Michal Simek 04 Nov '20

04 Nov '20

There is prepared function for filing rom_offset. That's why use it instead of copying content of it. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- lib/binman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/binman.c b/lib/binman.c index 7a8ad62c4a8c..082ac5679273 100644 --- a/lib/binman.c +++ b/lib/binman.c @@ -91,7 +91,7 @@ int binman_init(void) binman->image = ofnode_path("/binman"); if (!ofnode_valid(binman->image)) return log_msg_ret("binman node", -EINVAL); - binman->rom_offset = ROM_OFFSET_NONE; + binman_set_rom_offset(ROM_OFFSET_NONE); return 0; } -- 2.28.0

2 3