May 2021 - U-Boot

[PATCH v4 00/14] arm64: synquacer: Add SynQuacer/DeveloperBox support
by Masami Hiramatsu 28 May '21

28 May '21

Hi, Here is the 4th version of the series (including some fixes for build errors) to add SynQuacer/DeveloperBox 96board EE suport on U-Boot. This series includes not only DeveloperBox support but also some fixes for the issues which I faced while porting U-Boot on the DeveloperBox. First 3 patches are fixes, next 1 patch is a code cleanup for generic gpio for arm. The next 7 patches adding DeveloperBox devices and board support. The last 3 patches are related to the UEFI capsule update (including bugfixes). Previous version is here: https://lists.denx.de/pipermail/u-boot/2021-May/449305.html Changes in v4 ------------- I dropped a PCI bugfix because it has been merged. And add I2C driver and enable RTC and EBBR support on the configuration. [06/14]: - Add Jaehoon's reviewed-by (Thanks!) [09/14]: - Add a new i2c driver. [10/14]: - Add i2c0 and RTC node. [11/14]: - Add I2C and RTC configuration. - Enable RTC and Date command. - Remove I2C0 node before booting linux to hide it same as EDK2 does. - Add some configurations to make it EBBR compliant. [14/14]: - Add some config options for EBBR. BTW, should I split fixes from this series? (since I didn't expect this took so long...) DeveloperBox ============ DeveloperBox is a certified 96boards Enterprise Edition board. The board/SoC has: - * Socionext SC2A11 24-cores ARM Cortex-A53 on tbe Mini-ATX form factor motherboard * 4 DIMM slots (4GB DDR4-2400 UDIMM shipped by default) * 1 4xPCIe Gen2 slot and 2 1xPCIe Gen2 slots (1x slots are connected via PCIe bridge chip) * 4 USB-3.0 ports * 2 SATA ports * 1 GbE network port * 1 USB-UART serial port (micro USB) * 64MB SPI NOR Flash * 8GB eMMC Flash Storage * 96boards LS connector The DeveloperBox schematic can be found here: - https://www.96boards.org/documentation/enterprise/developerbox/hardware-doc… And the other documents can be found here: - https://www.96boards.org/documentation/enterprise/developerbox/ Currently, the U-Boot port supports: - * USB * eMMC * SPI-NOR * SATA * GbE The DeveloperBox boots the TF-A and EDK2 as a main bootloader by default. The DeveloperBox U-Boot port will replace the EDK2 and boot from TF-A as BL33, but no need to combine with it. Thank you, --- Jassi Brar (4): mmc: synquacer: Add SynQuacer F_SDH30 SDHCI driver spi: synquacer: Add HSSPI SPI controller driver for SynQuacer net: synquacer: Add netsec driver i2c: synquacer: SNI Synquacer I2C controller Masami Hiramatsu (10): ata: ahci-pci: Use scsi_ops to initialize ops dm: pci: Skip setting VGA bridge bits if parent device is the host bus efi: Fix to use null handle to create new handle for efi_fmp_raw gpio: Introduce CONFIG_GPIO_EXTRA_HEADER to cleanup #ifdefs pci: synquacer: Add SynQuacer ECAM based PCIe driver ARM: dts: synquacer: Add device trees for DeveloperBox board: synquacer: Add DeveloperBox 96boards EE support dfu_mtd: Ignore non-implemented lock device failure doc: qemu: arm64: Fix the documentation of capsule update configs: synquacer: Enable EFI capsule update support arch/arm/Kconfig | 108 ++ arch/arm/dts/Makefile | 2 arch/arm/dts/synquacer-sc2a11-caches.dtsi | 73 + .../dts/synquacer-sc2a11-developerbox-u-boot.dtsi | 75 + arch/arm/dts/synquacer-sc2a11-developerbox.dts | 56 + arch/arm/dts/synquacer-sc2a11.dtsi | 595 ++++++++++ arch/arm/include/asm/gpio.h | 8 board/socionext/developerbox/Kconfig | 36 + board/socionext/developerbox/MAINTAINERS | 14 board/socionext/developerbox/Makefile | 9 board/socionext/developerbox/developerbox.c | 146 +++ configs/synquacer_developerbox_defconfig | 131 ++ doc/board/emulation/qemu_capsule_update.rst | 11 doc/board/index.rst | 1 doc/board/socionext/developerbox.rst | 87 ++ doc/board/socionext/index.rst | 9 drivers/ata/ahci-pci.c | 2 drivers/dfu/dfu_mtd.c | 2 drivers/i2c/Kconfig | 7 drivers/i2c/Makefile | 1 drivers/i2c/synquacer_i2c.c | 338 ++++++ drivers/mmc/Kconfig | 10 drivers/mmc/Makefile | 1 drivers/mmc/f_sdh30.c | 81 + drivers/net/Kconfig | 8 drivers/net/Makefile | 1 drivers/net/sni_netsec.c | 1134 ++++++++++++++++++++ drivers/pci/Kconfig | 12 drivers/pci/Makefile | 1 drivers/pci/pci-uclass.c | 3 drivers/pci/pcie_ecam_synquacer.c | 600 +++++++++++ drivers/spi/Kconfig | 8 drivers/spi/Makefile | 1 drivers/spi/spi-synquacer.c | 491 +++++++++ include/configs/synquacer.h | 115 ++ lib/efi_loader/efi_capsule.c | 2 36 files changed, 4162 insertions(+), 17 deletions(-) create mode 100644 arch/arm/dts/synquacer-sc2a11-caches.dtsi create mode 100644 arch/arm/dts/synquacer-sc2a11-developerbox-u-boot.dtsi create mode 100644 arch/arm/dts/synquacer-sc2a11-developerbox.dts create mode 100644 arch/arm/dts/synquacer-sc2a11.dtsi create mode 100644 board/socionext/developerbox/Kconfig create mode 100644 board/socionext/developerbox/MAINTAINERS create mode 100644 board/socionext/developerbox/Makefile create mode 100644 board/socionext/developerbox/developerbox.c create mode 100644 configs/synquacer_developerbox_defconfig create mode 100644 doc/board/socionext/developerbox.rst create mode 100644 doc/board/socionext/index.rst create mode 100644 drivers/i2c/synquacer_i2c.c create mode 100644 drivers/mmc/f_sdh30.c create mode 100644 drivers/net/sni_netsec.c create mode 100644 drivers/pci/pcie_ecam_synquacer.c create mode 100644 drivers/spi/spi-synquacer.c create mode 100644 include/configs/synquacer.h -- Masami Hiramatsu <masami.hiramatsu(a)linaro.org>

4 19

[PATCH] efi_loader: build warning in efi_tcg2.c
by Masahisa Kojima 28 May '21

28 May '21

Building 32bit boards with the TCG2 protocol enabled leads to a build warning due to a missing conversion. lib/efi_loader/efi_tcg2.c: In function 'tcg2_measure_pe_image': lib/efi_loader/efi_tcg2.c:856:47: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] 856 | image_load_event->image_location_in_memory = (efi_physical_addr_t)efi; | ^ lib/efi_loader/efi_tcg2.c: In function 'efi_tcg2_hash_log_extend_event': lib/efi_loader/efi_tcg2.c:947:22: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 947 | ret = efi_check_pe((void *)data_to_hash, data_to_hash_len, | ^ lib/efi_loader/efi_tcg2.c:953:28: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 953 | ret = tcg2_hash_pe_image((void *)data_to_hash, data_to_hash_len, | ^ Signed-off-by: Masahisa Kojima <masahisa.kojima(a)linaro.org> --- lib/efi_loader/efi_tcg2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 3dd417aa27..47bc371477 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -853,7 +853,7 @@ efi_status_t tcg2_measure_pe_image(void *efi, u64 efi_size, if (!image_load_event) return EFI_OUT_OF_RESOURCES; - image_load_event->image_location_in_memory = (efi_physical_addr_t)efi; + image_load_event->image_location_in_memory = (uintptr_t)efi; image_load_event->image_length_in_memory = efi_size; image_load_event->length_of_device_path = device_path_length; @@ -944,14 +944,14 @@ efi_tcg2_hash_log_extend_event(struct efi_tcg2_protocol *this, u64 flags, if (flags & PE_COFF_IMAGE) { IMAGE_NT_HEADERS32 *nt; - ret = efi_check_pe((void *)data_to_hash, data_to_hash_len, - (void **)&nt); + ret = efi_check_pe((void *)(uintptr_t)data_to_hash, + data_to_hash_len, (void **)&nt); if (ret != EFI_SUCCESS) { log_err("Not a valid PE-COFF file\n"); goto out; } - ret = tcg2_hash_pe_image((void *)data_to_hash, data_to_hash_len, - &digest_list); + ret = tcg2_hash_pe_image((void *)(uintptr_t)data_to_hash, + data_to_hash_len, &digest_list); } else { ret = tcg2_create_digest((u8 *)(uintptr_t)data_to_hash, data_to_hash_len, &digest_list); -- 2.17.1

2 1

[NXP-IMX] please pull nxp-imx-2021-4-6
by Peng Fan (OSS) 27 May '21

27 May '21

Hi Stefano, Please pull nxp-imx-2021-4-6. This PR is based on Tom's master branch. If you need me rebase on imx/master, I could redo this PR. This is quite a large PR, since lots stuff in downstream tree. I ran local buildman test for all boards, no issue found. ------------------------------------------ convert to use binman for i.MX8MN/M/P EVK board i.MX8M caam/dek support hab update/fix for i.MX8M/7ULP env/distro cleanup for i.MX8M i.MX8M ddr script/driver update ------------------------------------------ Thanks, Peng. The following changes since commit 90eba245a66aa20589404ba537215faf2012c1a3: Merge branch 'next' (2021-04-05 11:29:57 -0400) are available in the Git repository at: https://github.com/MrVan/u-boot.git tags/nxp-imx-2021-4-6 for you to fetch changes up to 95dfcc086b419aece6835fd7aaad704de661e246: doc: imx8mp-evk: update after using binman (2021-04-06 17:19:45 +0800) ---------------------------------------------------------------- Aymen Sghaier (6): crypto: caam: Add CAAM support to i.MX8M platforms crypto: caam: Fix build warnings pointer casting crypto: Add blob command support for i.MX8M platforms crypto: caam: Fix pointer size to 32bit for i.MX8M crypto: caam: Add secure memory vid 3 support crypto: caam: RNG4 TRNG errata Breno Lima (13): imx: imx7 Support for Manufacturing Protection imx: Avoid hardcoded output ring size register offset (ORSR) imx: Ensure CAAM clock is enabled prior getting out_jr_size imx: Avoid hardcoded Job Ring Max size imx: hab: Enable hab.c to authenticate additional images in open configuration imx: hab: Check if IVT header is HABv4 mx7ulp: hab: Add hab_status command for HABv4 M4 boot imx: hab: Fix build warnings in 32-bit targets crypto: fsl: blob: Flush dcache range for destination address mx6dq: hab: Fix chip version in hab.h code cmd: blob: Add IMX_HAB and CAAM supported SoCs as dependency cmd: blob: Instantiate RNG before running CMD_BLOB fsl_mfgprot: Fix typo in sign_mppubk() Clement Faure (2): imx8m: Add DEK blob encapsulation for imx8m imx8: Add DEK blob encapsulation Clement Le Marquis (1): imx: caam: new u-boot command to set PRIBLOB bitfield from CAAM SCFGR register to 0x3 Franck LENORMAND (3): crypto: caam: change JR running loop caam: enable support for iMX7ULP imx7ulp: Enable support for cmd blob Jacky Bai (1): imx8mn: Update the DDR4 timing script on imx8mn ddr4 evk Peng Fan (21): tools: imx image: fix write warning imx8mm/p: remove boot.cmd imx8mm_evk: add/cleanup variable for distro imx8mp_evk: add/cleanup variable for distro imx8mp_evk: spl: clean up including headers imx8mp_evk: Increase VDD_ARM to 0.95v Overdrive voltage power: pca9450: add a new parameter for power_pca9450_init imx8mn_evk: drop duplicated code imx8mn: Add LPDDR4 EVK board support imx: logos: use NXP logo imx8m: soc: update fuse path arch: mach-imx: imx8m: fix unique_id read error for imx8mp imx: HAB: Update hab codes to support ARM64 and i.MX8M imx8m: add regs used by CAAM imx8mm_evk: switch to use binman to pack images doc: imx8mm_evk: update doc after using binman imx8mn-ddr4-evk: switch to use binman imx8mn-evk: switch to use binman doc: imx8mn_evk: update doc after using binman imx8mp-evk: switch to use binman doc: imx8mp-evk: update after using binman Sherry Sun (1): imx8mp: ddr: Add inline ECC feature support Utkarsh Gupta (2): imx: HAB: Validate IVT before authenticating image imx: hab: Display All HAB events via hab_status command Ye Li (18): imx8mm_evk: Update to latest LPDDR4 script imx8mm_evk: Switch to new imx8mm evk board imx8mp_evk: Update LPDDR4 timing for new FW 202006 imx8mp_evk: Update LPDDR4 refresh time imx8mn: Add low drive mode support for DDR4/LPDDR4 EVK imx8mn: Add support for 11x11 UltraLite part number imx8m: Update thermal and PMU kernel nodes for dual/single cores imx8m: ddr: Disable CA VREF Training for LPDDR4 iMX8MQ: Recognize the B2 revision misc: ocotp: Update OCOTP driver for iMX8MQ B2 imx8mq_evk: Applying default LPDDR4 script for B2 imx: hab: Add function to authenticate kernel image hab: Change calling to ROM API failsafe imx: HAB: Add support for iMX8MM iMX8M: Add support to enable CONFIG_IMX_HAB imx: cmd_dek: Enable DEK only for chips supporting CAAM crypto: caam: Add fsl caam driver crypto: fsl: refactor for 32 bit version CAAM support on ARM64 haidong.zheng (1): imx8mp: refine power on imx8mp board arch/arm/Kconfig | 6 + arch/arm/dts/Makefile | 1 + arch/arm/dts/imx8mm-evk-u-boot.dtsi | 117 ++++++++- arch/arm/dts/imx8mm-evk.dtsi | 127 +++++----- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 115 +++++++++ arch/arm/dts/imx8mn-evk-u-boot.dtsi | 128 ++++++++++ arch/arm/dts/imx8mn-evk.dts | 128 ++++++++++ arch/arm/dts/imx8mp-evk-u-boot.dtsi | 112 +++++++++ arch/arm/include/asm/arch-imx/cpu.h | 13 +- arch/arm/include/asm/arch-imx8/image.h | 11 + arch/arm/include/asm/arch-imx8m/clock.h | 1 + arch/arm/include/asm/arch-imx8m/imx-regs.h | 21 ++ arch/arm/include/asm/arch-mx7/crm_regs.h | 8 + arch/arm/include/asm/arch-mx7ulp/imx-regs.h | 12 + arch/arm/include/asm/mach-imx/hab.h | 37 ++- arch/arm/include/asm/mach-imx/sys_proto.h | 6 +- arch/arm/mach-imx/Kconfig | 44 +++- arch/arm/mach-imx/Makefile | 3 + arch/arm/mach-imx/cmd_dek.c | 262 ++++++++++++++++++-- arch/arm/mach-imx/cmd_mfgprot.c | 150 ++++++++++++ arch/arm/mach-imx/cpu.c | 8 +- arch/arm/mach-imx/hab.c | 417 ++++++++++++++++++++++++++++---- arch/arm/mach-imx/imx8/Kconfig | 1 + arch/arm/mach-imx/imx8m/Kconfig | 11 + arch/arm/mach-imx/imx8m/clock_imx8mm.c | 8 + arch/arm/mach-imx/imx8m/clock_imx8mq.c | 7 + arch/arm/mach-imx/imx8m/soc.c | 183 ++++++++++++-- arch/arm/mach-imx/mx7ulp/Kconfig | 1 + arch/arm/mach-imx/priblob.c | 33 +++ board/freescale/imx8mm_evk/boot.cmd | 35 --- board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg | 9 + board/freescale/imx8mm_evk/lpddr4_timing.c | 692 +++++++++++++++++++++------------------------------- board/freescale/imx8mm_evk/spl.c | 33 +-- board/freescale/imx8mn_evk/Kconfig | 6 +- board/freescale/imx8mn_evk/Makefile | 6 + board/freescale/imx8mn_evk/ddr4_timing.c | 1057 ++++++++++++++++++++++++++++++++++---------------------------------------------- board/freescale/imx8mn_evk/ddr4_timing_ld.c | 1057 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg | 10 + board/freescale/imx8mn_evk/lpddr4_timing.c | 1587 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8mn_evk/lpddr4_timing_ld.c | 1440 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/freescale/imx8mn_evk/spl.c | 50 +++- board/freescale/imx8mp_evk/boot.cmd | 25 -- board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg | 10 + board/freescale/imx8mp_evk/lpddr4_timing.c | 372 +++++++++++++++++++++------- board/freescale/imx8mp_evk/spl.c | 38 +-- board/freescale/imx8mq_evk/spl.c | 2 +- board/phytec/phycore_imx8mp/spl.c | 2 +- cmd/Kconfig | 8 + cmd/Makefile | 1 + cmd/blob.c | 16 ++ cmd/cmd_fsl_caam.c | 88 +++++++ configs/imx8mm_evk_defconfig | 6 +- configs/imx8mn_ddr4_evk_defconfig | 4 +- configs/imx8mn_evk_defconfig | 93 +++++++ configs/imx8mp_evk_defconfig | 4 +- doc/board/freescale/imx8mm_evk.rst | 3 +- doc/board/freescale/imx8mn_evk.rst | 3 +- doc/board/freescale/imx8mp_evk.rst | 11 +- doc/imx/habv4/guides/mx6_mx7_secure_boot.txt | 25 ++ drivers/crypto/Makefile | 1 + drivers/crypto/fsl/Kconfig | 6 + drivers/crypto/fsl/Makefile | 4 +- drivers/crypto/fsl/desc.h | 49 ++-- drivers/crypto/fsl/desc_constr.h | 28 +-- drivers/crypto/fsl/fsl_blob.c | 6 + drivers/crypto/fsl/fsl_hash.c | 6 +- drivers/crypto/fsl/fsl_mfgprot.c | 160 ++++++++++++ drivers/crypto/fsl/jobdesc.c | 16 +- drivers/crypto/fsl/jr.c | 53 ++-- drivers/crypto/fsl/jr.h | 11 +- drivers/crypto/fsl/type.h | 16 ++ drivers/crypto/fsl_caam.c | 720 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/crypto/fsl_caam_internal.h | 230 ++++++++++++++++++ drivers/ddr/imx/imx8m/Kconfig | 8 + drivers/misc/mxc_ocotp.c | 2 +- drivers/power/pmic/pmic_pca9450.c | 4 +- include/configs/imx8mm_evk.h | 8 +- include/configs/imx8mp_evk.h | 8 +- include/fsl_caam.h | 24 ++ include/fsl_sec.h | 54 +++-- include/power/pca9450.h | 2 +- tools/imx8image.c | 2 +- tools/imx8mimage.c | 2 +- tools/logos/freescale.bmp | Bin 46738 -> 47670 bytes 84 files changed, 8600 insertions(+), 1484 deletions(-) create mode 100644 arch/arm/dts/imx8mn-evk-u-boot.dtsi create mode 100644 arch/arm/dts/imx8mn-evk.dts create mode 100644 arch/arm/mach-imx/cmd_mfgprot.c create mode 100644 arch/arm/mach-imx/priblob.c delete mode 100644 board/freescale/imx8mm_evk/boot.cmd create mode 100644 board/freescale/imx8mm_evk/imximage-8mm-lpddr4.cfg create mode 100644 board/freescale/imx8mn_evk/ddr4_timing_ld.c create mode 100644 board/freescale/imx8mn_evk/imximage-8mn-ddr4.cfg create mode 100644 board/freescale/imx8mn_evk/lpddr4_timing.c create mode 100644 board/freescale/imx8mn_evk/lpddr4_timing_ld.c delete mode 100644 board/freescale/imx8mp_evk/boot.cmd create mode 100644 board/freescale/imx8mp_evk/imximage-8mp-lpddr4.cfg mode change 100644 => 100755 board/freescale/imx8mp_evk/lpddr4_timing.c create mode 100644 cmd/cmd_fsl_caam.c create mode 100644 configs/imx8mn_evk_defconfig create mode 100644 drivers/crypto/fsl/fsl_mfgprot.c create mode 100644 drivers/crypto/fsl/type.h create mode 100644 drivers/crypto/fsl_caam.c create mode 100644 drivers/crypto/fsl_caam_internal.h create mode 100644 include/fsl_caam.h

5 9

[GIT PULL] TI changes for v2021.07 rc4
by Lokesh Vutla 27 May '21

27 May '21

Hi Tom, Please find the PR for master branch targeted for v2021.07-rc4 release. Details about the PR are updated in the tag message. Gitlab CI report: https://source.denx.de/u-boot/custodians/u-boot-ti/-/pipelines/7645 The following changes since commit e1bf0336a58cfe873a34c36ff53e5e3806f2d263: Prepare v2021.07-rc3 (2021-05-24 20:53:13 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-ti.git tags/ti-v2021.07-rc4 for you to fetch changes up to fed603f868469a0d8f2548bdac137feead333c6b: ARM: ti: Increase the allocated size for MLO.raw (2021-05-27 14:56:42 +0530) ---------------------------------------------------------------- - Fix reset for AM64 platforms - Enable networking PHY driver for AM64 - Fix default R5F cluster setting in J7 ---------------------------------------------------------------- Dave Gerlach (1): firmware: ti_sci: Update ti_sci_msg_req_reboot to include domain Faiz Abbas (1): ARM: ti: Increase the allocated size for MLO.raw Suman Anna (3): arm: dts: k3-j721e: Fix up MAIN R5FSS cluster mode back to Split-mode arm: dts: k3-am642-evm: Add sysreset controller node arm: dts: k3-am642-sk: Add sysreset controller node Vignesh Raghavendra (1): configs: am64x_evm_a53_defconfig: Enable DP83867 PHY driver arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 8 ++++++++ configs/am64x_evm_a53_defconfig | 1 + drivers/firmware/ti_sci.c | 1 + drivers/firmware/ti_sci.h | 2 ++ include/environment/ti/dfu.h | 4 ++-- 7 files changed, 22 insertions(+), 2 deletions(-) -- 2.30.0

2 1

[PULL] u-boot-riscv/master
by Leo Liang 27 May '21

27 May '21

Hi Tom, The following changes since commit eb53b943be2949ca111140a8e05532cd74cda058: Merge https://source.denx.de/u-boot/custodians/u-boot-sh (2021-05-23 10:15:15 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-riscv.git for you to fetch changes up to 9358576a281ab5e3b7348685bbd5f713833a5048: drivers: pci: pcie_dw_common: fix Werror compilation error (2021-05-24 23:54:54 +0800) Gitlab CI result shows no issue: https://source.denx.de/u-boot/custodians/u-boot-riscv/-/pipelines/7620 ---------------------------------------------------------------- Green Wan (9): riscv: cpu: fu740: Add support for cpu fu740 drivers: clk: add fu740 support drivers: ram: sifive: rename fu540_ddr and add fu740 support drivers: pci: add pcie support for fu740 riscv: dts: add fu740 support riscv: dts: add SiFive Unmatched board support board: sifive: add HiFive Unmatched board support riscv: cpu: fu740: clear feature disable CSR drivers: pci: pcie_dw_common: fix Werror compilation error arch/riscv/Kconfig | 5 + arch/riscv/cpu/fu540/Kconfig | 2 +- arch/riscv/cpu/fu740/Kconfig | 37 + arch/riscv/cpu/fu740/Makefile | 12 + arch/riscv/cpu/fu740/cache.c | 55 + arch/riscv/cpu/fu740/cpu.c | 22 + arch/riscv/cpu/fu740/dram.c | 38 + arch/riscv/cpu/fu740/spl.c | 38 + arch/riscv/dts/Makefile | 1 + arch/riscv/dts/fu740-c000-u-boot.dtsi | 105 ++ arch/riscv/dts/fu740-c000.dtsi | 329 +++++ arch/riscv/dts/fu740-hifive-unmatched-a00-ddr.dtsi | 1489 ++++++++++++++++++++ arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi | 41 + arch/riscv/dts/hifive-unmatched-a00.dts | 259 ++++ arch/riscv/include/asm/arch-fu740/cache.h | 14 + arch/riscv/include/asm/arch-fu740/clk.h | 14 + arch/riscv/include/asm/arch-fu740/gpio.h | 38 + arch/riscv/include/asm/arch-fu740/reset.h | 13 + arch/riscv/include/asm/arch-fu740/spl.h | 14 + board/sifive/unleashed/Kconfig | 1 + board/sifive/unmatched/Kconfig | 51 + board/sifive/unmatched/MAINTAINERS | 9 + board/sifive/unmatched/Makefile | 9 + board/sifive/unmatched/spl.c | 85 ++ board/sifive/unmatched/unmatched.c | 24 + common/spl/Kconfig | 4 +- configs/sifive_unmatched_defconfig | 54 + doc/board/sifive/index.rst | 1 + doc/board/sifive/unmatched.rst | 536 +++++++ drivers/clk/sifive/Kconfig | 8 +- drivers/clk/sifive/Makefile | 4 +- drivers/clk/sifive/fu540-prci.c | 769 +--------- drivers/clk/sifive/fu540-prci.h | 22 + drivers/clk/sifive/fu740-prci.c | 158 +++ drivers/clk/sifive/fu740-prci.h | 22 + drivers/clk/sifive/sifive-prci.c | 733 ++++++++++ drivers/clk/sifive/sifive-prci.h | 323 +++++ drivers/pci/Kconfig | 10 + drivers/pci/Makefile | 1 + drivers/pci/pcie_dw_common.c | 54 +- drivers/pci/pcie_dw_sifive.c | 507 +++++++ drivers/ram/sifive/Kconfig | 8 +- drivers/ram/sifive/Makefile | 2 +- drivers/ram/sifive/{fu540_ddr.c => sifive_ddr.c} | 89 +- drivers/reset/Kconfig | 2 +- include/configs/sifive-unmatched.h | 85 ++ include/dt-bindings/clock/sifive-fu740-prci.h | 25 + include/dt-bindings/reset/sifive-fu740-prci.h | 19 + 48 files changed, 5310 insertions(+), 831 deletions(-) create mode 100644 arch/riscv/cpu/fu740/Kconfig create mode 100644 arch/riscv/cpu/fu740/Makefile create mode 100644 arch/riscv/cpu/fu740/cache.c create mode 100644 arch/riscv/cpu/fu740/cpu.c create mode 100644 arch/riscv/cpu/fu740/dram.c create mode 100644 arch/riscv/cpu/fu740/spl.c create mode 100644 arch/riscv/dts/fu740-c000-u-boot.dtsi create mode 100644 arch/riscv/dts/fu740-c000.dtsi create mode 100644 arch/riscv/dts/fu740-hifive-unmatched-a00-ddr.dtsi create mode 100644 arch/riscv/dts/hifive-unmatched-a00-u-boot.dtsi create mode 100644 arch/riscv/dts/hifive-unmatched-a00.dts create mode 100644 arch/riscv/include/asm/arch-fu740/cache.h create mode 100644 arch/riscv/include/asm/arch-fu740/clk.h create mode 100644 arch/riscv/include/asm/arch-fu740/gpio.h create mode 100644 arch/riscv/include/asm/arch-fu740/reset.h create mode 100644 arch/riscv/include/asm/arch-fu740/spl.h create mode 100644 board/sifive/unmatched/Kconfig create mode 100644 board/sifive/unmatched/MAINTAINERS create mode 100644 board/sifive/unmatched/Makefile create mode 100644 board/sifive/unmatched/spl.c create mode 100644 board/sifive/unmatched/unmatched.c create mode 100644 configs/sifive_unmatched_defconfig create mode 100644 doc/board/sifive/unmatched.rst create mode 100644 drivers/clk/sifive/fu540-prci.h create mode 100644 drivers/clk/sifive/fu740-prci.c create mode 100644 drivers/clk/sifive/fu740-prci.h create mode 100644 drivers/clk/sifive/sifive-prci.c create mode 100644 drivers/clk/sifive/sifive-prci.h create mode 100644 drivers/pci/pcie_dw_sifive.c rename drivers/ram/sifive/{fu540_ddr.c => sifive_ddr.c} (81%) create mode 100644 include/configs/sifive-unmatched.h create mode 100644 include/dt-bindings/clock/sifive-fu740-prci.h create mode 100644 include/dt-bindings/reset/sifive-fu740-prci.h Best regards, Leo

3 5

[PATCH] pinctrl: single: Fix address size reading
by Jan Kiszka 27 May '21

27 May '21

From: Jan Kiszka <jan.kiszka(a)siemens.com> dev_read_addr_size() is inconsistent in too many ways. In particular, it does not retrieve the correct address/size cell number from the DT. dev_read_addr_size_index() does the right thing, so use that for now. This fixes reading the address size e.g. on boards with the 64-bit AM65x where some pinctrl nodes only use 32-bit addresses and sizes. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index ebb7602dde..2769b7a7fd 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -509,7 +509,7 @@ static int single_of_to_plat(struct udevice *dev) return -EINVAL; } - addr = dev_read_addr_size(dev, "reg", &size); + addr = dev_read_addr_size_index(dev, 0, &size); if (addr == FDT_ADDR_T_NONE) { dev_err(dev, "failed to get base register size\n"); return -EINVAL; -- 2.26.2

1 1

[PATCH] test: Remove duplicate macro
by Sean Anderson 27 May '21

27 May '21

ut_asserteq_strn is defined twice. Remove one definition. Fixes: 33d7edfd5f ("test: Add a way to check part of a console line or skip it") Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- include/test/ut.h | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/include/test/ut.h b/include/test/ut.h index fbbba286ee..656e25fe57 100644 --- a/include/test/ut.h +++ b/include/test/ut.h @@ -177,23 +177,6 @@ int ut_check_console_dump(struct unit_test_state *uts, int total_bytes); } \ } -/* - * Assert that two string expressions are equal, up to length of the - * first - */ -#define ut_asserteq_strn(expr1, expr2) { \ - const char *_val1 = (expr1), *_val2 = (expr2); \ - int _len = strlen(_val1); \ - \ - if (memcmp(_val1, _val2, _len)) { \ - ut_failf(uts, __FILE__, __LINE__, __func__, \ - #expr1 " = " #expr2, \ - "Expected \"%.*s\", got \"%.*s\"", \ - _len, _val1, _len, _val2); \ - return CMD_RET_FAILURE; \ - } \ -} - /* Assert that two memory areas are equal */ #define ut_asserteq_mem(expr1, expr2, len) { \ const u8 *_val1 = (u8 *)(expr1), *_val2 = (u8 *)(expr2); \ -- 2.31.0

3 2

[PATCH] GitLab: Remove tags for sandbox_noinst tests
by Harm Berntsen 27 May '21

27 May '21

Commit 712cc962b70d ("GitLab: Remove "tags" stanzas") removed the 'all' tag from all the jobs. The sandbox_noinst_test.py test was added in between the author date and commit date (commit 6c914e4232cd ("azure/gitlab: Add tests for sandbox_noinst")) which is probably why it still contains the tags. This commit fixes that so all jobs now don't require tags on the GitLab runners. Signed-off-by: Harm Berntsen <harm.berntsen(a)nedap.com> CC: Simon Glass <sjg(a)chromium.org> --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bff487404f..4e21fca10f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -189,7 +189,6 @@ sandbox_spl test.py: <<: *buildman_and_testpy_dfn sandbox_noinst_test.py: - tags: [ 'all' ] variables: TEST_PY_BD: "sandbox_noinst" TEST_PY_TEST_SPEC: "test_ofplatdata or test_handoff or test_spl" -- 2.31.1

3 2

[PATCH] test: Fix filesystem tests always being skipped
by Alper Nebi Yasak 27 May '21

27 May '21

Commit 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system") fixes an issue in the filesystem tests where the test setup may fail to mount an image and still attempt to unmount it. However, the commit unintentionally breaks the test setups in two ways. The newly created unmounted filesystem images are being immediately deleted due to some cleanup steps being misplaced into finally blocks, which makes them always run instead of only on failures. The mount calls always fail since the images never exist, causing the tests to be always skipped. This patch moves these cleanup calls into the except blocks to fix this and makes the tests run again. There are also unmount calls misplaced into finally blocks, making them run after the tests instead of before the tests. These unmount calls make the filesystem image file consistent with the changes made to it as part of the test setup, and this misplacement is making a number of tests fail unexpectedly. The unmount calls must be run before the tests use the image, meaning before the yield call and not in the finally block. They must also be run as a cleanup step when the filesystem setup fails, so they can't be placed as the final call in the try blocks since they would be skipped on such failures. For these reasons, this patch places the unmount calls both in the except blocks and the else blocks of the final setup step. This makes the unexpectedly failing tests to succeed again. Furthermore, this isolates the mount calls to their own try-except statement to avoid reintroducing the original issue of unmounting a not-mounted image while fixing the unmount misplacement. After these fixes, running "make tests" with guestmount available results in two test failures not related to the mentioned commit. If the guestmount executables are unavailable, the mounts fallback to using sudo and result in no failures. Fixes: 1ba21bb06b08 ("test: Don't unmount not (yet) mounted system") Signed-off-by: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> --- There is more discussion at Heinrich's revert-patch [1] of the mentioned commit. This patch is an alternative to the revert. Andy: I don't think unmounting the failed-to-mount image was the cause of the sudo call you described in that commit, so I believe this would end up running sudo on your system. Wanted to warn in advance, but looks like your issue needs a different solution. [1] https://patchwork.ozlabs.org/project/uboot/patch/20210513114035.177293-1-xy… test/py/tests/test_fs/conftest.py | 48 +++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 50af9efcf768..410a675b9714 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -278,14 +278,19 @@ def fs_obj_basic(request, u_boot_config): check_call('mkdir -p %s' % mount_dir, shell=True) except CalledProcessError as err: pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err)) - return - finally: call('rm -f %s' % fs_img, shell=True) + return try: # Mount the image so we can populate it. mount_fs(fs_type, fs_img, mount_dir) + except CalledProcessError as err: + pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err)) + call('rmdir %s' % mount_dir, shell=True) + call('rm -f %s' % fs_img, shell=True) + return + try: # Create a subdirectory. check_call('mkdir %s/SUBDIR' % mount_dir, shell=True) @@ -348,11 +353,12 @@ def fs_obj_basic(request, u_boot_config): except CalledProcessError as err: pytest.skip('Setup failed for filesystem: ' + fs_type + '. {}'.format(err)) + umount_fs(mount_dir) return else: + umount_fs(mount_dir) yield [fs_ubtype, fs_img, md5val] finally: - umount_fs(mount_dir) call('rmdir %s' % mount_dir, shell=True) call('rm -f %s' % fs_img, shell=True) @@ -394,14 +400,19 @@ def fs_obj_ext(request, u_boot_config): check_call('mkdir -p %s' % mount_dir, shell=True) except CalledProcessError as err: pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err)) - return - finally: call('rm -f %s' % fs_img, shell=True) + return try: # Mount the image so we can populate it. mount_fs(fs_type, fs_img, mount_dir) + except CalledProcessError as err: + pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err)) + call('rmdir %s' % mount_dir, shell=True) + call('rm -f %s' % fs_img, shell=True) + return + try: # Create a test directory check_call('mkdir %s/dir1' % mount_dir, shell=True) @@ -443,11 +454,12 @@ def fs_obj_ext(request, u_boot_config): check_call('rm %s' % tmp_file, shell=True) except CalledProcessError: pytest.skip('Setup failed for filesystem: ' + fs_type) + umount_fs(mount_dir) return else: + umount_fs(mount_dir) yield [fs_ubtype, fs_img, md5val] finally: - umount_fs(mount_dir) call('rmdir %s' % mount_dir, shell=True) call('rm -f %s' % fs_img, shell=True) @@ -517,14 +529,19 @@ def fs_obj_unlink(request, u_boot_config): check_call('mkdir -p %s' % mount_dir, shell=True) except CalledProcessError as err: pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err)) - return - finally: call('rm -f %s' % fs_img, shell=True) + return try: # Mount the image so we can populate it. mount_fs(fs_type, fs_img, mount_dir) + except CalledProcessError as err: + pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err)) + call('rmdir %s' % mount_dir, shell=True) + call('rm -f %s' % fs_img, shell=True) + return + try: # Test Case 1 & 3 check_call('mkdir %s/dir1' % mount_dir, shell=True) check_call('dd if=/dev/urandom of=%s/dir1/file1 bs=1K count=1' @@ -548,11 +565,12 @@ def fs_obj_unlink(request, u_boot_config): except CalledProcessError: pytest.skip('Setup failed for filesystem: ' + fs_type) + umount_fs(mount_dir) return else: + umount_fs(mount_dir) yield [fs_ubtype, fs_img] finally: - umount_fs(mount_dir) call('rmdir %s' % mount_dir, shell=True) call('rm -f %s' % fs_img, shell=True) @@ -594,14 +612,19 @@ def fs_obj_symlink(request, u_boot_config): check_call('mkdir -p %s' % mount_dir, shell=True) except CalledProcessError as err: pytest.skip('Preparing mount folder failed for filesystem: ' + fs_type + '. {}'.format(err)) - return - finally: call('rm -f %s' % fs_img, shell=True) + return try: # Mount the image so we can populate it. mount_fs(fs_type, fs_img, mount_dir) + except CalledProcessError as err: + pytest.skip('Mounting to folder failed for filesystem: ' + fs_type + '. {}'.format(err)) + call('rmdir %s' % mount_dir, shell=True) + call('rm -f %s' % fs_img, shell=True) + return + try: # Create a subdirectory. check_call('mkdir %s/SUBDIR' % mount_dir, shell=True) @@ -625,10 +648,11 @@ def fs_obj_symlink(request, u_boot_config): except CalledProcessError: pytest.skip('Setup failed for filesystem: ' + fs_type) + umount_fs(mount_dir) return else: + umount_fs(mount_dir) yield [fs_ubtype, fs_img, md5val] finally: - umount_fs(mount_dir) call('rmdir %s' % mount_dir, shell=True) call('rm -f %s' % fs_img, shell=True) -- 2.31.1

3 2

[PATCH] spl: Kconfig: Use tabs instead of space for alignment
by Michal Simek 27 May '21

27 May '21

A lot of entries were using spaces instead of tab for alignment that's why it is good to fix it to use the same style everywhere. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- common/spl/Kconfig | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index df5468f1ac29..b709a05a7b79 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -165,7 +165,7 @@ config SPL_BOARD_INIT provided by the board. config SPL_BOOTROM_SUPPORT - bool "Support returning to the BOOTROM" + bool "Support returning to the BOOTROM" help Some platforms (e.g. the Rockchip RK3368) provide support in their ROM for loading the next boot-stage after performing basic setup @@ -707,7 +707,7 @@ config SYS_MMCSD_FS_BOOT_PARTITION default 1 help Partition on the MMC to load U-Boot from when the MMC is being - used in fs mode + used in fs mode config SPL_MMC_TINY bool "Tiny MMC framework in SPL" @@ -784,8 +784,8 @@ config SPL_NAND_SIMPLE config SPL_NAND_BASE depends on SPL_NAND_DRIVERS bool "Use Base NAND Driver" - help - Include nand_base.c in the SPL. + help + Include nand_base.c in the SPL. config SPL_NAND_IDENT depends on SPL_NAND_BASE @@ -1301,7 +1301,7 @@ config SPL_ATF_LOAD_IMAGE_V2 method, say Y. config SPL_ATF_NO_PLATFORM_PARAM - bool "Pass no platform parameter" + bool "Pass no platform parameter" depends on SPL_ATF help While we expect to call a pointer to a valid FDT (or NULL) @@ -1395,7 +1395,7 @@ config TPL_BOOTCOUNT_LIMIT For example, it may be useful to choose the device to boot. config TPL_LDSCRIPT - string "Linker script for the TPL stage" + string "Linker script for the TPL stage" depends on TPL default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 default "arch/\$(ARCH)/cpu/u-boot-spl.lds" @@ -1409,7 +1409,7 @@ config TPL_LDSCRIPT fall back to the linker-script used for the SPL stage. config TPL_NEEDS_SEPARATE_TEXT_BASE - bool "TPL needs a separate text-base" + bool "TPL needs a separate text-base" default n depends on TPL help @@ -1418,7 +1418,7 @@ config TPL_NEEDS_SEPARATE_TEXT_BASE .text sections of the TPL stage has to be set below. config TPL_NEEDS_SEPARATE_STACK - bool "TPL needs a separate initial stack-pointer" + bool "TPL needs a separate initial stack-pointer" default n depends on TPL help @@ -1426,20 +1426,20 @@ config TPL_NEEDS_SEPARATE_STACK stack-pointer from the settings for the SPL stage. config TPL_TEXT_BASE - hex "Base address for the .text section of the TPL stage" + hex "Base address for the .text section of the TPL stage" depends on TPL_NEEDS_SEPARATE_TEXT_BASE help The base address for the .text section of the TPL stage. config TPL_MAX_SIZE - int "Maximum size (in bytes) for the TPL stage" + int "Maximum size (in bytes) for the TPL stage" default 0 depends on TPL help The maximum size (in bytes) of the TPL stage. config TPL_STACK - hex "Address of the initial stack-pointer for the TPL stage" + hex "Address of the initial stack-pointer for the TPL stage" depends on TPL_NEEDS_SEPARATE_STACK help The address of the initial stack-pointer for the TPL stage. @@ -1457,7 +1457,7 @@ config TPL_READ_ONLY device-private data. config TPL_BOOTROM_SUPPORT - bool "Support returning to the BOOTROM (from TPL)" + bool "Support returning to the BOOTROM (from TPL)" help Some platforms (e.g. the Rockchip RK3368) provide support in their ROM for loading the next boot-stage after performing basic setup -- 2.31.1

3 2