December 2020 - U-Boot

test_efi_selftest occasionally fails on qemu-x86?
by Bin Meng 29 Dec '20

29 Dec '20

Hi, Please check the log: https://dev.azure.com/bmeng/GitHub/_build/results?buildId=302&view=logs&j=c… Re-run the pipeline with the same commit, the tests pass. https://dev.azure.com/bmeng/GitHub/_build/results?buildId=304&view=logs&j=c… There might be some instability on qemu-x86 with efi_selftest. Any ideas? Regards, Bin

3 3

[PATCH v2 1/2] trace: select TIMER_EARLY to avoid infinite recursion
by Pragnesh Patel 29 Dec '20

29 Dec '20

When tracing functions is enabled this adds calls to __cyg_profile_func_enter() and __cyg_profile_func_exit() to the traced functions. __cyg_profile_func_enter() and __cyg_profile_func_exit() invoke timer_get_us() to record the entry and exit time. initr_dm() will make gd->dm_root = NULL and gd->timer = NULL, so timer_get_us() -> get_ticks() -> dm_timer_init() will lead to an indefinite recursion. So select TIMER_EARLY when tracing got enabled. Signed-off-by: Pragnesh Patel <pragnesh.patel(a)sifive.com> --- Changes in v2: - new patch lib/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Kconfig b/lib/Kconfig index 7673d2e4e0..671386963a 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -210,6 +210,7 @@ config BITREVERSE config TRACE bool "Support for tracing of function calls and timing" imply CMD_TRACE + select TIMER_EARLY help Enables function tracing within U-Boot. This allows recording of call traces including timing information. The command can write data to -- 2.17.1

2 2

[v5 00/18] Enable ARM Trusted Firmware for U-Boot
by Siew Chin Lim 29 Dec '20

29 Dec '20

This is the 5th version of patchset to enable ARM Trusted Firmware for U-Boot for Intel Stratix10 and Agilex platform. New U-boot flow with ARM Trusted Firmware (ATF) support: SPL (EL3) -> ATF-BL31 (EL3) -> U-Boot Proper (EL2) -> Linux (EL1) SPL loads the u-boot.itb which consist of: 1) u-boot-nodtb.bin (U-Boot Proper image) 2) u-boot.dtb (U-Boot Proper DTB) 3) bl31.bin (ATF-BL31 image) Patch status: Have changes: Patch 7, 8, 9, 10, 16, 17 Other patches unchanged. Detail changelog can find in commit message. v4->v5: -------- Patch 7: - Change secure register access helper functions to return error code instead of hang the system if fail to access the secure register. Patch 8: - Change designware MMC driver 'clksel' callback function to return the status. This patch is a preparation for enabling Arm-Trusted-Firmware (ATF) in Intel SoC FPGA. This patch does not change functionality. Patch 9: - Report error if secure register access helper function failed to write SDMMC's DRVSEL and SMPLSEL via SMC call. Patch 10: - Report error if secure register access helper function failed to write PHY register via SMC call. patch 16: - Change 'blob' to 'blob-ext' entry in binman dts node for all input files. patch 17: - Revert all changes about BINMAN in Makefile. History: -------- [v1]: https://patchwork.ozlabs.org/project/uboot/cover/20200817043431.28718-1-che… [v2]: https://patchwork.ozlabs.org/project/uboot/cover/20201001091614.184612-1-el… [v3]: https://patchwork.ozlabs.org/project/uboot/cover/20201015122955.10259-1-ell… [v4]: https://patchwork.ozlabs.org/project/uboot/cover/20201218032853.46839-1-ell… These patchsets have dependency on: arm: socfpga: soc64: Add timeout waiting for NOC idle ACK https://lists.denx.de/pipermail/u-boot/2020-August/423029.html Rename Stratix10 FPGA driver and support Agilex https://lists.denx.de/pipermail/u-boot/2020-August/422798.html SoCFPGA mailbox driver fixes and enhancements https://lists.denx.de/pipermail/u-boot/2020-August/423140.html arm: socfpga: soc64: Initialize timer in SPL only https://lists.denx.de/pipermail/u-boot/2020-July/419692.html arm: socfpga: soc64: Remove PHY interface setup from misc arch init https://lists.denx.de/pipermail/u-boot/2020-July/419690.html Enable sysreset support for SoCFPGA SoC64 platforms https://lists.denx.de/pipermail/u-boot/2020-August/422509.html arm: socfpga: soc64: Disable CONFIG_PSCI_RESET https://lists.denx.de/pipermail/u-boot/2020-August/423373.html *** BLURB HERE *** Chee Hong Ang (14): arm: socfpga: Add function for checking description from FIT image arm: socfpga: soc64: Load FIT image with ATF support arm: socfpga: soc64: Override 'lowlevel_init' to support ATF arm: socfpga: Disable "spin-table" method for booting Linux arm: socfpga: soc64: Add SMC helper function for Intel SOCFPGA (64bits) arm: socfpga: soc64: Define SMC function identifiers for PSCI SiP services mmc: dwmmc: socfpga: Add ATF support for MMC driver net: designware: socfpga: Add ATF support for MAC driver arm: socfpga: soc64: Add ATF support for Reset Manager driver arm: socfpga: soc64: Add ATF support for FPGA reconfig driver arm: socfpga: mailbox: Add 'SYSTEM_RESET' PSCI support to mbox_reset_cold() arm: socfpga: soc64: SSBL shall not setup stack on OCRAM arm: socfpga: soc64: Skip handoff data access in SSBL configs: socfpga: Add defconfig for Agilex and Stratix 10 with ATF support Siew Chin Lim (4): arm: socfpga: Add secure register access helper functions for SoC 64bits mmc: dwmmc: Change designware MMC 'clksel' callback function to return status arm: socfpga: dts: soc64: Add binman node of FIT image with ATF support arm: socfpga: soc64: Enable FIT image generation using binman arch/arm/dts/socfpga_agilex-u-boot.dtsi | 4 +- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 120 +++++ arch/arm/dts/socfpga_stratix10-u-boot.dtsi | 8 + arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi | 4 +- arch/arm/mach-socfpga/Kconfig | 4 +- arch/arm/mach-socfpga/Makefile | 5 + arch/arm/mach-socfpga/board.c | 12 +- .../mach-socfpga/include/mach/secure_reg_helper.h | 19 + arch/arm/mach-socfpga/include/mach/smc_api.h | 13 + arch/arm/mach-socfpga/lowlevel_init_soc64.S | 76 +++ arch/arm/mach-socfpga/mailbox_s10.c | 5 + arch/arm/mach-socfpga/reset_manager_s10.c | 13 + arch/arm/mach-socfpga/secure_reg_helper.c | 97 ++++ arch/arm/mach-socfpga/smc_api.c | 56 ++ arch/arm/mach-socfpga/wrap_pll_config_s10.c | 3 +- configs/socfpga_agilex_atf_defconfig | 72 +++ configs/socfpga_stratix10_atf_defconfig | 74 +++ drivers/fpga/intel_sdm_mb.c | 139 +++++ drivers/mmc/ca_dw_mmc.c | 4 +- drivers/mmc/dw_mmc.c | 9 +- drivers/mmc/exynos_dw_mmc.c | 4 +- drivers/mmc/nexell_dw_mmc.c | 4 +- drivers/mmc/socfpga_dw_mmc.c | 18 +- drivers/net/dwmac_socfpga.c | 38 +- include/configs/socfpga_soc64_common.h | 24 +- include/dwmmc.h | 2 +- include/linux/intel-smc.h | 573 +++++++++++++++++++++ 27 files changed, 1380 insertions(+), 20 deletions(-) create mode 100644 arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi create mode 100644 arch/arm/dts/socfpga_stratix10-u-boot.dtsi create mode 100644 arch/arm/mach-socfpga/include/mach/secure_reg_helper.h create mode 100644 arch/arm/mach-socfpga/include/mach/smc_api.h create mode 100644 arch/arm/mach-socfpga/lowlevel_init_soc64.S create mode 100644 arch/arm/mach-socfpga/secure_reg_helper.c create mode 100644 arch/arm/mach-socfpga/smc_api.c create mode 100644 configs/socfpga_agilex_atf_defconfig create mode 100644 configs/socfpga_stratix10_atf_defconfig create mode 100644 include/linux/intel-smc.h -- 2.13.0

4 28

[PATCH 1/1] efi_loader: use after free in efi_exit()
by Heinrich Schuchardt 28 Dec '20

28 Dec '20

Do not use data from the loaded image object after deleting it. Fixes: 126a43f15b36 ("efi_loader: unload applications upon Exit()") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_loader.h | 4 ++-- lib/efi_loader/efi_boottime.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index dc3c6ac304..0fc2255f3f 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -304,10 +304,10 @@ enum efi_image_auth_status { */ struct efi_loaded_image_obj { struct efi_object header; - efi_status_t exit_status; + efi_status_t *exit_status; efi_uintn_t *exit_data_size; u16 **exit_data; - struct jmp_buf_data exit_jmp; + struct jmp_buf_data *exit_jmp; EFIAPI efi_status_t (*entry)(efi_handle_t image_handle, struct efi_system_table *st); u16 image_type; diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 392cf865f2..3ea7e3c9bb 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2907,6 +2907,8 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, efi_status_t ret; void *info; efi_handle_t parent_image = current_image; + efi_status_t exit_status; + struct jmp_buf_data exit_jmp; EFI_ENTRY("%p, %p, %p", image_handle, exit_data_size, exit_data); @@ -2928,9 +2930,11 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, image_obj->exit_data_size = exit_data_size; image_obj->exit_data = exit_data; + image_obj->exit_status = &exit_status; + image_obj->exit_jmp = &exit_jmp; /* call the image! */ - if (setjmp(&image_obj->exit_jmp)) { + if (setjmp(&exit_jmp)) { /* * We called the entry point of the child image with EFI_CALL * in the lines below. The child image called the Exit() boot @@ -2952,10 +2956,10 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, */ assert(__efi_entry_check()); EFI_PRINT("%lu returned by started image\n", - (unsigned long)((uintptr_t)image_obj->exit_status & + (unsigned long)((uintptr_t)exit_status & ~EFI_ERROR_MASK)); current_image = parent_image; - return EFI_EXIT(image_obj->exit_status); + return EFI_EXIT(exit_status); } current_image = image_handle; @@ -3138,6 +3142,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, struct efi_loaded_image *loaded_image_protocol; struct efi_loaded_image_obj *image_obj = (struct efi_loaded_image_obj *)image_handle; + struct jmp_buf_data *exit_jmp; EFI_ENTRY("%p, %ld, %zu, %p", image_handle, exit_status, exit_data_size, exit_data); @@ -3179,6 +3184,9 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, if (ret != EFI_SUCCESS) EFI_PRINT("%s: out of memory\n", __func__); } + /* efi_delete_image() frees image_obj. Copy before the call. */ + exit_jmp = image_obj->exit_jmp; + *image_obj->exit_status = exit_status; if (image_obj->image_type == IMAGE_SUBSYSTEM_EFI_APPLICATION || exit_status != EFI_SUCCESS) efi_delete_image(image_obj, loaded_image_protocol); @@ -3192,8 +3200,7 @@ static efi_status_t EFIAPI efi_exit(efi_handle_t image_handle, */ efi_restore_gd(); - image_obj->exit_status = exit_status; - longjmp(&image_obj->exit_jmp, 1); + longjmp(exit_jmp, 1); panic("EFI application exited"); out: -- 2.29.2

1 0

[PATCH 0/6] Change logic of EFI LoadFile2 protocol for initrd loading
by Ilias Apalodimas 28 Dec '20

28 Dec '20

Right now in U-Boot, we unconditionally register the EFI LoadFile2 protocol and the initrd file path is a U-boot .config option. This imposes a number of limitations. Using multiple initrd's implies you'd have to concatenate them into one big file. Alternatively you'd have to recompile U-Boot or overwrite your initrd with a newer one in order to use it. Since linux efi-stub only falls back to the cmdline interpreted initrd if the protocol is not registered, this also creates a problem for EFI installers, since they won't be able to load their own initrd and start the installation if the option is enabled. This patchset is trying to address all of the above, by changing the logic of the protocol registration and initrd discovery. It introduces a new EFI variable 'Initrd####', which we try to match on the BootCurrent value the bootmanager sets up. For example Boot0010 will search for Initrd0010, which should include the full initrd path i.e 'mmc 0:0 initrd'. If the file is present, the protocol will be registered, so the efi-stub can use it. This opens up another path using U-Boot and defines a new boot flow. A user will be able to control the kernel/initrd pairs without explicit cmdline args or GRUB, just by setting the correct 'Initrd####' variable. Ilias Apalodimas (6): efi_loader: remove unconditional initialization of file2 protocol for initrd efi_loader: Introduce helper functions for EFI efi_loader: Replace config option with EFI variable for initrd loading efi_loader: Remove unused headers from efi_load_initrd.c efi_selftest: Modify self-tests for initrd loading efi_loader: bootmgr: use get_var from efi_helper file include/efi_helper.h | 29 +++ lib/efi_loader/Kconfig | 12 +- lib/efi_loader/Makefile | 4 +- lib/efi_loader/efi_bootmgr.c | 39 +--- lib/efi_loader/efi_helper.c | 189 ++++++++++++++++++++ lib/efi_loader/efi_load_initrd.c | 88 +++------ lib/efi_loader/efi_setup.c | 5 - lib/efi_selftest/efi_selftest_load_initrd.c | 90 +++++++++- 8 files changed, 341 insertions(+), 115 deletions(-) create mode 100644 include/efi_helper.h create mode 100644 lib/efi_loader/efi_helper.c -- 2.30.0.rc2

2 13

[PATCH 1/1] efi_loader: describe struct efi_loaded_image_obj
by Heinrich Schuchardt 28 Dec '20

28 Dec '20

Add the missing description of some fields of struct efi_loaded_image_obj. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- include/efi_loader.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 3c68b85b68..dc3c6ac304 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -297,8 +297,10 @@ enum efi_image_auth_status { * @exit_status: exit status passed to Exit() * @exit_data_size: exit data size passed to Exit() * @exit_data: exit data passed to Exit() - * @exit_jmp: long jump buffer for returning form started image + * @exit_jmp: long jump buffer for returning from started image * @entry: entry address of the relocated image + * @image_type: indicates if the image is an applicition or a driver + * @auth_status: indicates if the image is authenticated */ struct efi_loaded_image_obj { struct efi_object header; -- 2.29.2

1 0

[PATCH RFC v1 0/4] Add support for ECDSA image signing
by Alexandru Gagniuc 28 Dec '20

28 Dec '20

# Introduction This series is part of a larger effort to implement verified boot on STM32MP1. The ROM code on this chip requires an ECDSA-signed SSBL. Maintaining verified boot through FIT images would require switching to an RSA key after SPL. This would be stupid, so this series is focused on enabling ECDSA signing. The purpose of this series is to let people know I'm looking into ECDSA ## Purpose and intent The use case that I am focused on is signing an existing FIT image. mkimage -F some-existing.fit --signing-key some/key.pem I don't care about signing while assembling the FIT. The reason is that I want the machine that builds things to be separate from the machine that has access to the super-secret-key.pem. Astute readers may have noticed the lack of a device-side implementation, and thus have the audacity to call this series "useless". I don't plan to write out the algorithm for ECDSA, but instead use the CRYPTO engine of the stm32mp. This is a matter for another series. # Implementation I initially tried to model this after the RSA implementation, but that didn't go well for a few reasons: (a) The openssl/libcrypto API is a pain in the ass (b) The RSA path doesn't have a way to pass a specific key file. On point (a), I don't want to spend too much time battling a C API for crypto. I'd much rather be using pyCryptodomex, but that is not available for mkimage. I am thus focusing on the simple case of key in, signature out. On point (b), the RSA path takes the FDT property 'key-name-hint' to decide which key file to read from disk. In the context of "which fdt node describes my signing key", this makes sense. On the other hand, 'key-name-hint' is also used as th basename of where the key is on the filesystem. This leads to some funny search paths, such as "some/dir/(null).key" So I am using the -K option to mkimage as the _full_ path to the key file. It doesn't have to be named .key, it doesn't have to be named .crt, and it doesn't have to exist in a particular directory (as is the case for the RSA path). Take that as is for here -- we can discuss the merits of this in a separate thread. A bonus point is that I have decided to keep signin/verifying in the same source file. This allows me to reuse some helper functions. I'm only adding 300 lines of code, so I don't see the point in splitting it up. # Testing The only test I've run is to take the binary signature and has, feed them back to libcrypto, and check that it verifies. This is already done automatically for each image signed. I see some tests for RSA under test/. I have not looked into adding tests for the ECDSA path. I do think it's a great idea, and I intend to look into it. Beyond the scope of this series (for now). Alexandru Gagniuc (4): lib: Rename rsa-checksum.c to hash-checksum.c lib/rsa: Make fdt_add_bignum() available outside of RSA code lib: Add support for ECDSA image signing doc: signature.txt: Document devicetree format for ECDSA keys common/image-fit-sig.c | 2 +- common/image-sig.c | 16 +- doc/uImage.FIT/signature.txt | 7 +- include/image.h | 2 +- include/u-boot/ecdsa.h | 27 ++ include/u-boot/fdt-libcrypto.h | 15 + .../{rsa-checksum.h => hash-checksum.h} | 0 lib/crypto/pkcs7_verify.c | 2 +- lib/crypto/x509_public_key.c | 2 +- lib/ecdsa/ecdsa-libcrypto.c | 300 ++++++++++++++++++ lib/fdt-libcrypto.c | 72 +++++ lib/{rsa/rsa-checksum.c => hash-checksum.c} | 3 +- lib/rsa/rsa-sign.c | 65 +--- tools/Makefile | 7 +- 14 files changed, 446 insertions(+), 74 deletions(-) create mode 100644 include/u-boot/ecdsa.h create mode 100644 include/u-boot/fdt-libcrypto.h rename include/u-boot/{rsa-checksum.h => hash-checksum.h} (100%) create mode 100644 lib/ecdsa/ecdsa-libcrypto.c create mode 100644 lib/fdt-libcrypto.c rename lib/{rsa/rsa-checksum.c => hash-checksum.c} (96%) -- 2.26.2

1 4

[PATCH v2 00/18] dm: Preparation for enhanced of-platdata
by Simon Glass 28 Dec '20

28 Dec '20

This series includes various patches in service of some upcoming of-platdata enhancements. The new features will support declaring devices and uclasses at build time (automatically, using dtoc) so as to further reduce the code-size overhead of driver model. The main changes in this series are: - Support for separate SPL and TPL devicetree files, so dtoc can produce of-platdata for each individually - Rename of NS16550 to ns16550 so it follows the identifier rules - Drop unprintable characters to avoid dtoc warnings - Report TPL code/data sizes in buildman, to support measuring size - Update U-Boot to access device/uclass-private data via functions (to allow the storage mechanism to change later) - Drop bd_info from the image to save space Changes in v2: - Remove an old comment about this in pinctrl - Add a warning for clk_reqister() Simon Glass (18): Makefile: Build a separate .dtb for TPL Makefile: Build SPL dtbs in the spl/ directory Makefile: Tidy up SPL dtb production Makefile: Use common args for dtoc buildman: Report sizes for TPL also serial: Update NS16550_t and struct NS16550 serial: Rename ns16550 functions to lower case sandbox: Drop unnecessary test node spl: Drop bd_info in the data section dm: core: Support dm_dump_all() in SPL dm: core: Use 'uclass_driver' for the uclass linker_list dm: core: Only include simple-bus devicetree id when needed x86: apl: Drop support for !OF_PLATDATA_PARENT dm: core: Add function to access uclass priv dm: core: Add functions to set priv/plat dm: Use access methods for dev/uclass private data dm: core: Use access methods for dev/uclass private data dm: core: Rename the priv/plat members arch/arm/cpu/armv7/ls102xa/fdt.c | 4 + arch/arm/cpu/armv8/fsl-layerscape/spl.c | 5 +- arch/arm/mach-davinci/da850_lowlevel.c | 4 +- arch/arm/mach-davinci/spl.c | 4 +- arch/arm/mach-keystone/init.c | 2 +- arch/arm/mach-stm32mp/pwr_regulator.c | 3 +- arch/sandbox/dts/sandbox.dtsi | 5 - arch/x86/cpu/apollolake/Kconfig | 1 + arch/x86/cpu/apollolake/spl.c | 28 ------ arch/x86/cpu/apollolake/uart.c | 5 +- arch/x86/cpu/slimbootloader/serial.c | 4 +- board/Arcturus/ucp1020/spl.c | 2 +- board/Arcturus/ucp1020/spl_minimal.c | 6 +- board/Synology/ds109/ds109.c | 9 +- board/freescale/mpc8313erdb/mpc8313erdb.c | 6 +- board/freescale/mpc8315erdb/mpc8315erdb.c | 6 +- board/freescale/p1010rdb/spl.c | 2 +- board/freescale/p1010rdb/spl_minimal.c | 8 +- board/freescale/p1_p2_rdb_pc/spl.c | 2 +- board/freescale/p1_p2_rdb_pc/spl_minimal.c | 8 +- board/freescale/t102xrdb/spl.c | 2 +- board/freescale/t104xrdb/spl.c | 2 +- board/freescale/t208xqds/spl.c | 2 +- board/freescale/t208xrdb/spl.c | 2 +- board/freescale/t4rdb/spl.c | 2 +- common/spl/Kconfig | 9 ++ common/spl/spl.c | 20 ++-- drivers/clk/clk.c | 4 +- drivers/clk/clk_fixed_rate.c | 4 +- drivers/clk/rockchip/clk_px30.c | 3 +- drivers/clk/rockchip/clk_rk3036.c | 3 +- drivers/clk/rockchip/clk_rk3128.c | 3 +- drivers/clk/rockchip/clk_rk3188.c | 2 +- drivers/clk/rockchip/clk_rk322x.c | 3 +- drivers/clk/rockchip/clk_rk3288.c | 2 +- drivers/clk/rockchip/clk_rk3308.c | 3 +- drivers/clk/rockchip/clk_rk3328.c | 3 +- drivers/clk/rockchip/clk_rk3368.c | 3 +- drivers/clk/rockchip/clk_rk3399.c | 3 +- drivers/clk/rockchip/clk_rv1108.c | 3 +- drivers/core/device-remove.c | 24 ++--- drivers/core/device.c | 103 ++++++++++++++------- drivers/core/dump.c | 6 +- drivers/core/lists.c | 4 +- drivers/core/root.c | 4 +- drivers/core/simple-bus.c | 4 +- drivers/core/uclass.c | 23 ++++- drivers/ddr/altera/sdram_agilex.c | 2 +- drivers/ddr/altera/sdram_gen5.c | 4 +- drivers/ddr/altera/sdram_s10.c | 2 +- drivers/ddr/altera/sdram_soc64.c | 2 +- drivers/gpio/dwapb_gpio.c | 2 +- drivers/gpio/gpio-uclass.c | 2 +- drivers/gpio/hi6220_gpio.c | 2 +- drivers/gpio/imx_rgpio2p.c | 5 +- drivers/gpio/lpc32xx_gpio.c | 2 +- drivers/gpio/mt7621_gpio.c | 2 +- drivers/gpio/mxs_gpio.c | 2 +- drivers/gpio/omap_gpio.c | 3 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/gpio/sandbox.c | 6 +- drivers/gpio/sunxi_gpio.c | 2 +- drivers/gpio/tegra186_gpio.c | 6 +- drivers/gpio/tegra_gpio.c | 6 +- drivers/misc/altera_sysid.c | 2 +- drivers/misc/cros_ec_sandbox.c | 4 +- drivers/misc/fs_loader.c | 6 +- drivers/misc/p2sb-uclass.c | 15 --- drivers/misc/vexpress_config.c | 2 +- drivers/mmc/arm_pl180_mmci.c | 6 +- drivers/mmc/mxsmmc.c | 2 +- drivers/mmc/octeontx_hsmmc.c | 17 +++- drivers/mux/mmio.c | 3 +- drivers/net/eth-phy-uclass.c | 4 +- drivers/net/fm/eth.c | 22 ++++- drivers/net/fsl_mcdmafec.c | 10 +- drivers/net/mcffec.c | 12 +-- drivers/net/mcfmii.c | 8 ++ drivers/net/pfe_eth/pfe_eth.c | 2 +- drivers/net/sunxi_emac.c | 2 +- drivers/net/tsec.c | 46 ++++++--- drivers/net/xilinx_emaclite.c | 2 +- drivers/pci/pci-emul-uclass.c | 4 +- drivers/pci/pci-uclass.c | 8 +- drivers/pinctrl/intel/pinctrl_apl.c | 2 - drivers/pinctrl/pinctrl-qe-io.c | 4 +- drivers/pinctrl/pinctrl-single.c | 6 +- drivers/power/regulator/da9063.c | 24 ++--- drivers/power/regulator/pbias_regulator.c | 3 +- drivers/remoteproc/rproc-uclass.c | 4 +- drivers/reset/reset-mediatek.c | 3 +- drivers/reset/reset-rockchip.c | 3 +- drivers/reset/reset-sifive.c | 3 +- drivers/reset/reset-sunxi.c | 3 +- drivers/serial/altera_jtag_uart.c | 8 +- drivers/serial/altera_uart.c | 8 +- drivers/serial/atmel_usart.c | 2 +- drivers/serial/ns16550.c | 62 ++++++------- drivers/serial/sandbox.c | 6 +- drivers/serial/serial_arc.c | 8 +- drivers/serial/serial_coreboot.c | 2 +- drivers/serial/serial_intel_mid.c | 2 +- drivers/serial/serial_linflexuart.c | 2 +- drivers/serial/serial_lpuart.c | 10 +- drivers/serial/serial_mcf.c | 10 +- drivers/serial/serial_meson.c | 12 +-- drivers/serial/serial_mxc.c | 12 +-- drivers/serial/serial_ns16550.c | 26 +++--- drivers/serial/serial_omap.c | 8 +- drivers/serial/serial_pxa.c | 10 +- drivers/serial/serial_rockchip.c | 7 +- drivers/serial/serial_s5p.c | 12 +-- drivers/spi/cadence_qspi.c | 12 +-- drivers/spi/cf_spi.c | 2 +- drivers/spi/davinci_spi.c | 4 +- drivers/spi/designware_spi.c | 4 +- drivers/spi/exynos_spi.c | 4 +- drivers/spi/fsl_dspi.c | 4 +- drivers/spi/fsl_espi.c | 2 +- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/mxs_spi.c | 2 +- drivers/spi/pl022_spi.c | 2 +- drivers/spi/rk_spi.c | 6 +- drivers/spi/soft_spi.c | 4 +- drivers/spi/tegra114_spi.c | 4 +- drivers/spi/tegra20_sflash.c | 4 +- drivers/spi/tegra20_slink.c | 4 +- drivers/spi/tegra210_qspi.c | 4 +- drivers/spi/uniphier_spi.c | 8 +- drivers/spi/zynq_qspi.c | 4 +- drivers/spi/zynq_spi.c | 8 +- drivers/spi/zynqmp_gqspi.c | 6 +- drivers/timer/ag101p_timer.c | 4 +- drivers/timer/altera_timer.c | 4 +- drivers/timer/andes_plmt_timer.c | 7 +- drivers/timer/mpc83xx_timer.c | 2 +- drivers/timer/sifive_clint_timer.c | 7 +- drivers/timer/timer-uclass.c | 2 +- drivers/usb/gadget/ether.c | 16 +++- drivers/usb/host/usb-uclass.c | 6 +- drivers/video/video-uclass.c | 2 +- dts/Makefile | 14 ++- include/dm/device-internal.h | 84 +++++++++++++++++ include/dm/device.h | 29 +++--- include/dm/uclass-internal.h | 14 +++ include/dm/uclass.h | 14 ++- include/ns16550.h | 21 +++-- include/spl.h | 10 +- lib/efi/efi_stub.c | 2 +- lib/efi_loader/efi_device_path.c | 2 +- net/eth-uclass.c | 22 ++--- scripts/Makefile.spl | 18 ++-- test/dm/core.c | 24 ++--- test/dm/test-driver.c | 7 +- test/dm/test-fdt.c | 4 +- test/dm/test-uclass.c | 4 +- test/py/tests/test_ofplatdata.py | 1 - tools/buildman/builderthread.py | 2 +- tools/dtoc/dtoc_test_simple.dts | 5 - tools/dtoc/test_dtoc.py | 12 --- 160 files changed, 757 insertions(+), 527 deletions(-) -- 2.29.2.729.g45daf8777d-goog

1 36

[PATCH v2 00/21] dm: Preparation for enhanced of-platdata (part B)
by Simon Glass 28 Dec '20

28 Dec '20

This series includes some refactoring of the dtoc tool and some changes to a few drivers (particularly on x86) to reduce TPL size. It is available at u-boot-dm/prep-working Changes in v2: - Rename DriverInfo to Driver - Add a test for the new code and a comment for Driver Simon Glass (21): pinctrl: Drop post_bind() method when not needed sysreset: Use a shorter error with SPL arc: m68k: nds32: nios2: sh: xtensa: Add empty spl.h header timer: Use a shorter error in TPL test: Use a simple variable to record removed device test: Move some test drivers into their own file dtoc: Fix a few pylint warnings in dtb_platdata dtoc: Make _output_list a top-level function dtoc: Output the device in a separate function dtoc: Output the struct values in a separate function dtoc: Convert _drivers to a dict dtoc: Scan drivers for available information dtoc: Allow use of the of_match_ptr() macro x86: apl: Use const for driver operations x86: Move call64 into its own section x86: coral: Move fsp-m settings to a subnode x86: apl: Update hostbridge to remove unwanted TPL code x86: apl: Reduce size for TPL x86: pinctrl: Drop unlikely error messages from TPL x86: tpl: Remove unwanted devicetree string x86: Fix header guard in asm/pmu.h arch/arc/include/asm/spl.h | 0 arch/m68k/include/asm/spl.h | 0 arch/nds32/include/asm/spl.h | 0 arch/nios2/include/asm/spl.h | 0 arch/sh/include/asm/spl.h | 0 arch/x86/cpu/apollolake/fsp_m.c | 5 +- arch/x86/cpu/apollolake/hostbridge.c | 14 +- arch/x86/cpu/apollolake/lpc.c | 13 +- arch/x86/cpu/apollolake/pch.c | 4 +- arch/x86/cpu/apollolake/pmc.c | 6 +- arch/x86/cpu/apollolake/uart.c | 4 +- arch/x86/cpu/i386/call64.S | 1 + arch/x86/cpu/intel_common/Makefile | 2 +- arch/x86/cpu/intel_common/itss.c | 4 +- arch/x86/cpu/intel_common/p2sb.c | 6 +- arch/x86/cpu/turbo.c | 5 + arch/x86/dts/chromebook_coral.dts | 5 + arch/x86/include/asm/pmu.h | 6 +- arch/x86/lib/tpl.c | 4 +- arch/xtensa/include/asm/spl.h | 0 board/google/chromebook_coral/coral.c | 4 +- drivers/gpio/intel_gpio.c | 4 +- drivers/misc/Kconfig | 9 + drivers/misc/Makefile | 1 + drivers/misc/test_drv.c | 230 ++++++++++++++ drivers/pinctrl/intel/pinctrl.c | 11 +- drivers/pinctrl/intel/pinctrl_apl.c | 4 +- drivers/pinctrl/pinctrl-uclass.c | 4 +- drivers/power/acpi_pmc/acpi-pmc-uclass.c | 4 +- drivers/sysreset/sysreset-uclass.c | 12 +- drivers/timer/tsc_timer.c | 4 +- include/dm/test.h | 20 +- include/test/test.h | 9 + lib/time.c | 10 +- test/dm/bus.c | 107 +------ test/dm/test-fdt.c | 120 -------- tools/dtoc/dtb_platdata.py | 370 +++++++++++++++++------ tools/dtoc/test_dtoc.py | 123 ++++++++ 38 files changed, 777 insertions(+), 348 deletions(-) create mode 100644 arch/arc/include/asm/spl.h create mode 100644 arch/m68k/include/asm/spl.h create mode 100644 arch/nds32/include/asm/spl.h create mode 100644 arch/nios2/include/asm/spl.h create mode 100644 arch/sh/include/asm/spl.h create mode 100644 arch/xtensa/include/asm/spl.h create mode 100644 drivers/misc/test_drv.c -- 2.29.2.729.g45daf8777d-goog

1 39

[PATCH v2 1/2] rng: Add iProc RNG200 driver
by matthias.bgg＠kernel.org 28 Dec '20

28 Dec '20

From: Matthias Brugger <mbrugger(a)suse.com> Add support for random number generator RNG200. This is for example found on RPi4. Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> --- Changes in v2: None drivers/rng/Kconfig | 6 ++ drivers/rng/Makefile | 1 + drivers/rng/iproc_rng200.c | 186 +++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+) create mode 100644 drivers/rng/iproc_rng200.c diff --git a/drivers/rng/Kconfig b/drivers/rng/Kconfig index 11001c8ae7..94915d45b3 100644 --- a/drivers/rng/Kconfig +++ b/drivers/rng/Kconfig @@ -46,4 +46,10 @@ config RNG_ROCKCHIP Enable random number generator for rockchip.This driver is support rng module of crypto v1 and crypto v2. +config RNG_IPROC200 + bool "Broadcom iProc RNG200 random number generator" + depends on DM_RNG + default n + help + Enable random number generator for RPI4. endif diff --git a/drivers/rng/Makefile b/drivers/rng/Makefile index 8953406882..39f7ee3f03 100644 --- a/drivers/rng/Makefile +++ b/drivers/rng/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o obj-$(CONFIG_RNG_MSM) += msm_rng.o obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.o +obj-$(CONFIG_RNG_IPROC200) += iproc_rng200.o diff --git a/drivers/rng/iproc_rng200.c b/drivers/rng/iproc_rng200.c new file mode 100644 index 0000000000..1063f43953 --- /dev/null +++ b/drivers/rng/iproc_rng200.c @@ -0,0 +1,186 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright 2020, Matthias Brugger <mbrugger(a)suse.com> + * + * Driver for Raspberry Pi hardware random number generator + */ + +#include <common.h> +#include <dm.h> +#include <linux/delay.h> +#include <rng.h> +#include <asm/io.h> + +#define usleep_range(a, b) udelay((b)) + +#define RNG_CTRL_OFFSET 0x00 +#define RNG_CTRL_RNG_RBGEN_MASK 0x00001FFF +#define RNG_CTRL_RNG_RBGEN_ENABLE 0x00000001 +#define RNG_CTRL_RNG_RBGEN_DISABLE 0x00000000 + +#define RNG_SOFT_RESET_OFFSET 0x04 +#define RNG_SOFT_RESET 0x00000001 + +#define RBG_SOFT_RESET_OFFSET 0x08 +#define RBG_SOFT_RESET 0x00000001 + +#define RNG_INT_STATUS_OFFSET 0x18 +#define RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK 0x80000000 +#define RNG_INT_STATUS_NIST_FAIL_IRQ_MASK 0x00000020 + +#define RNG_FIFO_DATA_OFFSET 0x20 + +#define RNG_FIFO_COUNT_OFFSET 0x24 +#define RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK 0x000000FF + +struct iproc_rng200_platdata { + fdt_addr_t base; +}; + +static void iproc_rng200_enable(struct iproc_rng200_platdata *pdata, bool enable) +{ + fdt_addr_t rng_base = pdata->base; + u32 val; + + val = readl(rng_base + RNG_CTRL_OFFSET); + val &= ~RNG_CTRL_RNG_RBGEN_MASK; + if (enable) + val |= RNG_CTRL_RNG_RBGEN_ENABLE; + else + val &= ~RNG_CTRL_RNG_RBGEN_ENABLE; + + writel(val, rng_base + RNG_CTRL_OFFSET); + +} + +static void iproc_rng200_restart(struct iproc_rng200_platdata *pdata) +{ + fdt_addr_t rng_base = pdata->base; + u32 val; + + iproc_rng200_enable(pdata, false); + + /* Clear all interrupt status */ + writel(0xFFFFFFFFUL, rng_base + RNG_INT_STATUS_OFFSET); + + /* Reset RNG and RBG */ + val = readl(rng_base + RBG_SOFT_RESET_OFFSET); + val |= RBG_SOFT_RESET; + writel(val, rng_base + RBG_SOFT_RESET_OFFSET); + + val = readl(rng_base + RNG_SOFT_RESET_OFFSET); + val |= RNG_SOFT_RESET; + writel(val, rng_base + RNG_SOFT_RESET_OFFSET); + + val = readl(rng_base + RNG_SOFT_RESET_OFFSET); + val &= ~RNG_SOFT_RESET; + writel(val, rng_base + RNG_SOFT_RESET_OFFSET); + + val = readl(rng_base + RBG_SOFT_RESET_OFFSET); + val &= ~RBG_SOFT_RESET; + writel(val, rng_base + RBG_SOFT_RESET_OFFSET); + + iproc_rng200_enable(pdata, true); +} + +static int iproc_rng200_read(struct udevice *dev, void *data, size_t len) +{ + struct iproc_rng200_platdata *priv = dev_get_platdata(dev); + char *buf = (char *)data; + u32 num_remaining = len; + u32 status; + + #define MAX_RESETS_PER_READ 1 + u32 num_resets = 0; + + while (num_remaining > 0) { + + /* Is RNG sane? If not, reset it. */ + status = readl(priv->base + RNG_INT_STATUS_OFFSET); + if ((status & (RNG_INT_STATUS_MASTER_FAIL_LOCKOUT_IRQ_MASK | + RNG_INT_STATUS_NIST_FAIL_IRQ_MASK)) != 0) { + + if (num_resets >= MAX_RESETS_PER_READ) + return len - num_remaining; + + iproc_rng200_restart(priv); + num_resets++; + } + + /* Are there any random numbers available? */ + if ((readl(priv->base + RNG_FIFO_COUNT_OFFSET) & + RNG_FIFO_COUNT_RNG_FIFO_COUNT_MASK) > 0) { + + if (num_remaining >= sizeof(u32)) { + /* Buffer has room to store entire word */ + *(u32 *)buf = readl(priv->base + + RNG_FIFO_DATA_OFFSET); + buf += sizeof(u32); + num_remaining -= sizeof(u32); + } else { + /* Buffer can only store partial word */ + u32 rnd_number = readl(priv->base + + RNG_FIFO_DATA_OFFSET); + memcpy(buf, &rnd_number, num_remaining); + buf += num_remaining; + num_remaining = 0; + } + + } else { + /* Can wait, give others chance to run */ + usleep_range(min(num_remaining * 10, 500U), 500); + } + } + + return 0; +} + +static int iproc_rng200_probe(struct udevice *dev) +{ + struct iproc_rng200_platdata *priv = dev_get_platdata(dev); + + iproc_rng200_enable(priv, true); + + return 0; +} + +static int iproc_rng200_remove(struct udevice *dev) +{ + struct iproc_rng200_platdata *priv = dev_get_platdata(dev); + + iproc_rng200_enable(priv, false); + + return 0; +} + +static int iproc_rng200_ofdata_to_platdata(struct udevice *dev) +{ + struct iproc_rng200_platdata *pdata = dev_get_platdata(dev); + + pdata->base = dev_read_addr(dev); + if (!pdata->base) + return -ENODEV; + + return 0; +} + +static const struct dm_rng_ops iproc_rng200_ops = { + .read = iproc_rng200_read, +}; + +static const struct udevice_id iproc_rng200_rng_match[] = { + { .compatible = "brcm,bcm2711-rng200", }, + { .compatible = "brcm,iproc-rng200", }, + {}, +}; + +U_BOOT_DRIVER(iproc_rng200_rng) = { + .name = "iproc_rng200-rng", + .id = UCLASS_RNG, + .of_match = iproc_rng200_rng_match, + .ops = &iproc_rng200_ops, + .probe = iproc_rng200_probe, + .remove = iproc_rng200_remove, + .platdata_auto_alloc_size = sizeof(struct iproc_rng200_platdata), + .ofdata_to_platdata = iproc_rng200_ofdata_to_platdata, +}; -- 2.29.2

3 4