July 2023 - U-Boot

Pull request: u-boot-rockchip-20230728
by Kever Yang 31 Jul '23

31 Jul '23

Hi Tom, Please pull the updates for rockchip platform: - Enable pcie support for rk3568; - Add boards: rk3399: Radxa ROCK 4SE; rk3328: Orange Pi R1 Plus, Orange Pi R1 Plus LTS rk3568: FriendlyARM NanoPi R5S/R5C, Hardkernel ODROID-M1 rk3588: Edgeble Neu6B - support OP-TEE with binman; - support Winbond SPI flash; - rk3588 usbdp phy support; - dts and config updates for different boards; CI: https://source.denx.de/u-boot/custodians/u-boot-rockchip/-/pipelines/17104 Thanks, - Kever The following changes since commit c98c401dfb485b39c7453a4147b17cd4b8d10c67: Merge https://source.denx.de/u-boot/custodians/u-boot-usb (2023-07-27 10:35:36 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-rockchip.git tags/u-boot-rockchip-20230728 for you to fetch changes up to 94da929b933668c4b9ece7d56a2a2bb5543198c9: board: rockchip: Add Hardkernel ODROID-M1 (2023-07-28 18:45:03 +0800) ---------------------------------------------------------------- Alex Bee (4): rockchip: Support OP-TEE for ARM in FIT images created by binman configs: evb-rk3229: Increase SPL_STACK_R_MALLOC_SIMPLE_LEN rockchip: RK322x: Select SPL_OPTEE_IMAGE rockchip: evb_rk3229: Update/fix README Alper Nebi Yasak (1): rockchip: veyron: Enable Winbond SPI flash Chris Morgan (7): rockchip: board: Update Odroid Go2 to Support Additional Revisions board: rockchip: Correct i2c2 pinctrl for RGxx3 board: rockchip: add DSI and DSI-DPHY for Anbernic RGxx3 board: rockchip: Add support for RG353PS to RGxx3 board: rockchip: Add panel auto-detection for Anbernic RGxx3 configs: Update anbernic-rgxx3_defconfig for panel detection doc: anbernic: Update RGxx3 Docs for panel detection Christopher Obbard (3): configs: rockchip: rock5b-rk3588: Enable CONFIG_PCI_INIT_R arm: rockchip: sync ROCK Pi 4 SoCs from Linux arm: rockchip: Add Radxa ROCK 4SE Eugen Hristev (4): configs: rock5b-rk3588: add rtl8169 driver ARM: dts: rockchip: rk3588: sync with Linux ARM: dts: rockchip: rk3588-rock-5b-u-boot: add USB3 support configs: rock5b-rk3588: enable USB 3.0 controller, command, gadget Frank Wang (1): phy: rockchip: add usbdp combo phy driver Jagan Teki (5): arch: rockchip: rk3588: Fix missing suffix 'A' for Edgeble Neu6A arm64: dts: rockchip: Add Rockchip RK3588J ARM: dts: rockchip: Add rk3588j-u-boot.dtsi arm64: dts: rockchip: Add rk3588 Edgeble Neu6B board: rockchip: Add Edgeble Neural Compute Module 6B Johan Jonker (1): mtd: nand: raw: rockchip_nfc: copy hwecc PA data to oob_poi buffer Jon Lin (1): pci: pcie_dw_rockchip: Disable unused BARs of the root complex Jonas Karlman (12): rockchip: rk3568: Fix alloc space exhausted in SPL core: read: add dev_read_addr_size_index_ptr function pci: pcie_dw_rockchip: Get config region from reg prop pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed pci: pcie_dw_rockchip: Speed up link probe regulator: fixed: Add support for gpios prop rockchip: clk: clk_rk3568: Add CLK_PCIEPHY2_REF support rockchip: rk3568-rock-3a: Enable PCIe and NVMe support rockchip: rk356x: Update PCIe config, IO and memory regions ata: dwc_ahci: Fix support for other platforms cmd: ini: Fix build warning board: rockchip: Add Hardkernel ODROID-M1 Joseph Chen (1): ARM: dts: rockchip: rk3588: add support for USB 3.0 devices Ondrej Jirman (1): video: rockchip: Add support for RK3399 to dw-mipi-dsi bridge Paul Kocialkowski (1): rockchip: px30: Define variables for compressed image support Quentin Schulz (2): rockchip: rk3399: pass platform parameter to TF-A by default for new RK3399 boards rockchip: puma: pass platform parameter to TF-A Tianling Shen (4): rockchip: rk3328: Add support for Orange Pi R1 Plus rockchip: rk3328: Add support for Orange Pi R1 Plus LTS rockchip: rk3568: Add support for FriendlyARM NanoPi R5S rockchip: rk3568: Add support for FriendlyARM NanoPi R5C arch/arm/dts/Makefile | 7 + arch/arm/dts/rk3288-u-boot.dtsi | 1 - .../dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 46 ++ arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts | 40 + arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 46 ++ arch/arm/dts/rk3328-orangepi-r1-plus.dts | 373 +++++++++ arch/arm/dts/rk3399-rock-4c-plus.dts | 3 +- arch/arm/dts/rk3399-rock-4se-u-boot.dtsi | 6 + arch/arm/dts/rk3399-rock-4se.dts | 65 ++ arch/arm/dts/rk3399-rock-pi-4.dtsi | 5 +- arch/arm/dts/rk3399-rock-pi-4a.dts | 1 + arch/arm/dts/rk3399-rock-pi-4c.dts | 1 + arch/arm/dts/rk3566-anbernic-rgxx3-u-boot.dtsi | 10 + arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi | 3 + arch/arm/dts/rk3568-nanopi-r5c.dts | 112 +++ arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi | 31 + arch/arm/dts/rk3568-nanopi-r5s.dts | 136 ++++ arch/arm/dts/rk3568-nanopi-r5s.dtsi | 590 ++++++++++++++ arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 37 + arch/arm/dts/rk3568-odroid-m1.dts | 744 +++++++++++++++++ arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 14 + arch/arm/dts/rk3568.dtsi | 14 +- arch/arm/dts/rk356x.dtsi | 7 +- arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi | 22 + arch/arm/dts/rk3588-edgeble-neu6b-io.dts | 27 + arch/arm/dts/rk3588-edgeble-neu6b.dtsi | 32 + arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 197 +++++ arch/arm/dts/rk3588-rock-5b.dts | 152 ++++ arch/arm/dts/rk3588-u-boot.dtsi | 93 +++ arch/arm/dts/rk3588.dtsi | 68 ++ arch/arm/dts/rk3588j-u-boot.dtsi | 6 + arch/arm/dts/rk3588j.dtsi | 7 + arch/arm/dts/rk3588s-u-boot.dtsi | 117 ++- arch/arm/dts/rk3588s.dtsi | 234 +++++- arch/arm/dts/rockchip-optee.dtsi | 64 -- arch/arm/dts/rockchip-u-boot.dtsi | 38 +- arch/arm/mach-rockchip/Kconfig | 2 +- arch/arm/mach-rockchip/rk3568/Kconfig | 8 +- arch/arm/mach-rockchip/rk3588/Kconfig | 20 +- board/anbernic/rgxx3_rk3566/rgxx3-rk3566.c | 322 +++++++- board/edgeble/neural-compute-module-6/MAINTAINERS | 1 + board/hardkernel/odroid_go2/go2.c | 103 +++ board/hardkernel/odroid_m1/Kconfig | 15 + board/hardkernel/odroid_m1/MAINTAINERS | 8 + board/hardkernel/odroid_m1/Makefile | 3 + board/hardkernel/odroid_m1/odroid_m1.c | 1 + board/rockchip/evb_rk3229/README | 72 +- board/rockchip/evb_rk3328/MAINTAINERS | 12 + board/rockchip/evb_rk3399/MAINTAINERS | 6 + board/rockchip/evb_rk3568/MAINTAINERS | 15 + cmd/ini.c | 2 +- configs/anbernic-rgxx3_defconfig | 15 + configs/chromebit_mickey_defconfig | 1 + configs/chromebook_bob_defconfig | 1 + configs/chromebook_jerry_defconfig | 1 + configs/chromebook_kevin_defconfig | 1 + configs/chromebook_minnie_defconfig | 1 + configs/chromebook_speedy_defconfig | 1 + configs/eaidk-610-rk3399_defconfig | 1 + configs/evb-rk3229_defconfig | 2 +- configs/evb-rk3399_defconfig | 1 + configs/ficus-rk3399_defconfig | 1 + configs/firefly-rk3399_defconfig | 1 + configs/khadas-edge-captain-rk3399_defconfig | 1 + configs/khadas-edge-rk3399_defconfig | 1 + configs/khadas-edge-v-rk3399_defconfig | 1 + configs/leez-rk3399_defconfig | 1 + configs/nanopc-t4-rk3399_defconfig | 1 + configs/nanopi-m4-2gb-rk3399_defconfig | 1 + configs/nanopi-m4-rk3399_defconfig | 1 + configs/nanopi-m4b-rk3399_defconfig | 1 + configs/nanopi-neo4-rk3399_defconfig | 1 + configs/nanopi-r4s-rk3399_defconfig | 1 + configs/nanopi-r5c-rk3568_defconfig | 85 ++ configs/nanopi-r5s-rk3568_defconfig | 85 ++ configs/neu6b-io-rk3588_defconfig | 64 ++ configs/odroid-go2_defconfig | 1 + configs/odroid-m1-rk3568_defconfig | 111 +++ configs/orangepi-r1-plus-lts-rk3328_defconfig | 114 +++ configs/orangepi-r1-plus-rk3328_defconfig | 114 +++ configs/orangepi-rk3399_defconfig | 1 + configs/pinebook-pro-rk3399_defconfig | 1 + configs/pinephone-pro-rk3399_defconfig | 1 + configs/roc-pc-mezzanine-rk3399_defconfig | 1 + configs/roc-pc-rk3399_defconfig | 1 + configs/rock-3a-rk3568_defconfig | 9 + configs/rock-4c-plus-rk3399_defconfig | 1 + configs/rock-4se-rk3399_defconfig | 100 +++ configs/rock-pi-4-rk3399_defconfig | 1 + configs/rock-pi-4c-rk3399_defconfig | 1 + configs/rock-pi-n10-rk3399pro_defconfig | 1 + configs/rock5b-rk3588_defconfig | 17 + configs/rock960-rk3399_defconfig | 1 + configs/rockpro64-rk3399_defconfig | 1 + doc/board/anbernic/rgxx3.rst | 31 +- doc/board/rockchip/rockchip.rst | 6 +- drivers/ata/dwc_ahci.c | 4 + drivers/clk/rockchip/clk_rk3568.c | 1 + drivers/core/read.c | 11 + drivers/mtd/nand/raw/rockchip_nfc.c | 34 +- drivers/pci/pcie_dw_common.c | 10 +- drivers/pci/pcie_dw_rockchip.c | 98 ++- drivers/phy/rockchip/Kconfig | 7 + drivers/phy/rockchip/Makefile | 1 + drivers/phy/rockchip/phy-rockchip-usbdp.c | 880 +++++++++++++++++++++ drivers/power/regulator/fixed.c | 4 +- drivers/video/rockchip/dw_mipi_dsi_rockchip.c | 99 +++ include/configs/odroid_m1.h | 11 + include/configs/px30_common.h | 5 +- include/dm/read.h | 21 + include/linux/usb/phy-rockchip-usbdp.h | 70 ++ 111 files changed, 5735 insertions(+), 245 deletions(-) create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi create mode 100644 arch/arm/dts/rk3328-orangepi-r1-plus.dts create mode 100644 arch/arm/dts/rk3399-rock-4se-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock-4se.dts create mode 100644 arch/arm/dts/rk3568-nanopi-r5c-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-nanopi-r5c.dts create mode 100644 arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-nanopi-r5s.dts create mode 100644 arch/arm/dts/rk3568-nanopi-r5s.dtsi create mode 100644 arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi create mode 100644 arch/arm/dts/rk3568-odroid-m1.dts create mode 100644 arch/arm/dts/rk3588-edgeble-neu6b-io-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588-edgeble-neu6b-io.dts create mode 100644 arch/arm/dts/rk3588-edgeble-neu6b.dtsi create mode 100644 arch/arm/dts/rk3588j-u-boot.dtsi create mode 100644 arch/arm/dts/rk3588j.dtsi delete mode 100644 arch/arm/dts/rockchip-optee.dtsi create mode 100644 board/hardkernel/odroid_m1/Kconfig create mode 100644 board/hardkernel/odroid_m1/MAINTAINERS create mode 100644 board/hardkernel/odroid_m1/Makefile create mode 100644 board/hardkernel/odroid_m1/odroid_m1.c create mode 100644 configs/nanopi-r5c-rk3568_defconfig create mode 100644 configs/nanopi-r5s-rk3568_defconfig create mode 100644 configs/neu6b-io-rk3588_defconfig create mode 100644 configs/odroid-m1-rk3568_defconfig create mode 100644 configs/orangepi-r1-plus-lts-rk3328_defconfig create mode 100644 configs/orangepi-r1-plus-rk3328_defconfig create mode 100644 configs/rock-4se-rk3399_defconfig create mode 100644 drivers/phy/rockchip/phy-rockchip-usbdp.c create mode 100644 include/configs/odroid_m1.h create mode 100644 include/linux/usb/phy-rockchip-usbdp.h

4 5

[PATCH v2 0/5] rockchip: Fix SPI flash SPL and payload overlap
by Jonas Karlman 31 Jul '23

31 Jul '23

This series fixes a build issue introduced in commit 5713135ecc75 ("rockchip: rockpro64: Build u-boot-rockchip-spi.bin"), reported by Peter Robinson. Closer inspection into how SPI flash is used revealed that current payload offset, 0x60000, is not enough to accommodate a worst-case scenario and may overlap SPL if written to SPI flash. This series fixes this by adjusting payload offset to 0xE0000, adjusting SPL max size to 0x40000, enables build of u-boot-rockchip-spi.bin for affected boards and update the SPI flashing documentation. Changes in v2: - Rebase on u-boot-rockchip/master - Collect r-b tags Jonas Karlman (5): rockchip: rk3399-rockpro64: Fix SPL max size and SPI flash payload offset rockchip: rk3399-pinebook-pro: Fix SPL max size and SPI flash payload offset rockchip: rk3399-pinephone-pro: Fix SPL max size and SPI flash payload offset rockchip: rk3399-roc-pc: Fix SPL max size and SPI flash payload offset doc: rockchip: Update SPI flashing instruction arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 --- arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi | 4 --- arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 4 --- arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 --- configs/pinebook-pro-rk3399_defconfig | 4 ++- configs/pinephone-pro-rk3399_defconfig | 4 ++- configs/roc-pc-mezzanine-rk3399_defconfig | 4 ++- configs/roc-pc-rk3399_defconfig | 4 ++- configs/rockpro64-rk3399_defconfig | 5 ++-- doc/board/rockchip/rockchip.rst | 26 ++++--------------- 10 files changed, 19 insertions(+), 44 deletions(-) -- 2.41.0

2 10

[PATCH 1/1] riscv: qemu: imply CONFIG_DM_RNG
by Heinrich Schuchardt 31 Jul '23

31 Jul '23

The EFI_RNG_PROTOCOL is needed for Linux' KASLR. QEMU can provide a virtio-rng device to emulate a hardware random number generator which is supported by our virtio_rng driver. Enabling CONFIG_DM_RNG will enable CONFIG_VIRTIO_RNG and CONFIG_EFI_RNG_PROTOCOL by default too. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- board/emulation/qemu-riscv/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig index 6114e1b812..21d6160f01 100644 --- a/board/emulation/qemu-riscv/Kconfig +++ b/board/emulation/qemu-riscv/Kconfig @@ -53,6 +53,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply NVME imply PCI imply PCIE_ECAM_GENERIC + imply DM_RNG imply SCSI imply DM_SCSI imply SYS_NS16550 -- 2.40.1

3 3

[PATCH] rockchip: rv1126: Enable fdtoverlay support
by Jagan Teki 31 Jul '23

31 Jul '23

Add fdtoverlay_addr_r and enable OF_LIBFDT_OVERLAY for the use of DT overlay in RV1126. Signed-off-by: Jagan Teki <jagan(a)edgeble.ai> --- arch/arm/mach-rockchip/Kconfig | 1 + include/configs/rv1126_common.h | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 07b5595dac..8c2dd8cffd 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -360,6 +360,7 @@ config ROCKCHIP_RV1126 select PMIC_RK8XX select BOARD_LATE_INIT imply ROCKCHIP_COMMON_BOARD + imply OF_LIBFDT_OVERLAY imply TPL_DM imply TPL_LIBCOMMON_SUPPORT imply TPL_LIBGENERIC_SUPPORT diff --git a/include/configs/rv1126_common.h b/include/configs/rv1126_common.h index 1ec1640f99..a64c0c6364 100644 --- a/include/configs/rv1126_common.h +++ b/include/configs/rv1126_common.h @@ -24,6 +24,7 @@ "scriptaddr=0x00000000\0" \ "pxefile_addr_r=0x00100000\0" \ "fdt_addr_r=0x08300000\0" \ + "fdtoverlay_addr_r=0x02000000\0" \ "kernel_addr_r=0x02008000\0" \ "ramdisk_addr_r=0x0a200000\0" -- 2.25.1

2 1

[PATCH] spl: spl_legacy: Fix spl_end address for non ARM target
by Shiji Yang 31 Jul '23

31 Jul '23

Only ARM target defines _image_binary_end symbol as char*, All other targets define it as an ulong type in include/asm-generic/sections.h. This patch fixes the boot failure on MIPS target. Error log: SPL: Image overlaps SPL Fixes: 1b8a1be1a1f1 ("spl: spl_legacy: Fix spl_end address") Signed-off-by: Shiji Yang <yangshiji66(a)outlook.com> --- common/spl/spl_legacy.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 095443c63d..0fef890384 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -18,9 +18,13 @@ static void spl_parse_legacy_validate(uintptr_t start, uintptr_t size) { + uintptr_t end = start + size; uintptr_t spl_start = (uintptr_t)_start; +#ifdef CONFIG_ARM uintptr_t spl_end = (uintptr_t)_image_binary_end; - uintptr_t end = start + size; +#else + uintptr_t spl_end = (uintptr_t)&_image_binary_end; +#endif /* CONFIG_ARM */ if ((start >= spl_start && start < spl_end) || (end > spl_start && end <= spl_end) || -- 2.39.2

1 0

[PATCH] mtd: nand: pxa3xx: Fix buffer overflow during raw reads
by Pierre Bourdon 31 Jul '23

31 Jul '23

Chunked raw reads get accumulated to the data buffer, but in some ECC configurations they can end up being larger than the originally computed size (write page size + OOB size). For example: 4K page size, ECC strength 8: - Normal reads: writesize (4096B) + oobsize (128B) = 4224 bytes. - Chunked raw reads: 4 chunks of 1024B + 1 final spare area of 64B + 5 ECC areas of 32B = 4320B. Fixes: 6293b0361d9 ("mtd: nand: pxa3xx: add raw read support") Signed-off-by: Pierre Bourdon <delroth(a)gmail.com> --- drivers/mtd/nand/raw/pxa3xx_nand.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index d502e967f9..2894ababbe 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -1471,6 +1471,19 @@ static void pxa3xx_nand_detect_config(struct pxa3xx_nand_info *info) static int pxa3xx_nand_init_buff(struct pxa3xx_nand_info *info) { + unsigned int chunk_size; + unsigned int last_chunk_size; + + /* + * The data buffer needs to not only be large enough for normal + OOB + * reads, but also for raw reads. The raw reads can end up taking more + * space due to the chunking scheme. + */ + chunk_size = info->chunk_size + info->spare_size + info->ecc_size; + last_chunk_size = + info->last_chunk_size + info->last_spare_size + info->ecc_size; + info->buf_size = info->nfullchunks * chunk_size + last_chunk_size; + info->data_buff = kmalloc(info->buf_size, GFP_KERNEL); if (info->data_buff == NULL) return -ENOMEM; @@ -1661,7 +1674,6 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) kfree(info->data_buff); /* allocate the real data + oob buffer */ - info->buf_size = mtd->writesize + mtd->oobsize; ret = pxa3xx_nand_init_buff(info); if (ret) return ret; -- 2.41.0

3 5

[PATCH v2] rockchip: rk3568-rock-3a: Fix pcie2x1 and pcie3x2 pinctrl override
by Jonas Karlman 31 Jul '23

31 Jul '23

The pcie pinctrl override added in the commit a76aa6ffa6cd ("rockchip: rk3568-rock-3a: Enable PCIe and NVMe support") is causing a pinmux issue on linux when using a EFI boot flow. The pcie reset-gpios must however be configured with gpio function, or the device will freeze running pci enum and nothing is connected. Adjust the pinctrl override in u-boot.dtsi to fix this issue. PCIe/NVMe continues to work in both U-Boot and linux after this change. Also revert disable of sdmmc2 and uart1 to fix use of wifi in linux when using a EFI boot flow. Fixes: a76aa6ffa6cd ("rockchip: rk3568-rock-3a: Enable PCIe and NVMe support") Fixes: 073d911ae64a ("rockchip: rk3568-rock-3a: Sync device tree from linux") Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- Changes in v2: - Restore part of pcie3x2 override This may depend on the following series for a clean apply: - rockchip: rk3568: Device Tree updates v2 - rockchip: rk35xx: Fix SPI Flash alias v2 - rockchip: rk3568: Use dwc3-generic driver v5 arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index a36a329f59c5..b05b7151e6c7 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -12,12 +12,8 @@ }; }; -&pcie2x1 { - pinctrl-0 = <&pcie20m1_pins &pcie_reset_h>; -}; - &pcie3x2 { - pinctrl-0 = <&pcie30x2m1_pins &pcie3x2_reset_h>; + pinctrl-0 = <&pcie3x2_reset_h>; }; &pinctrl { @@ -53,14 +49,6 @@ }; }; -&sdmmc2 { - status = "disabled"; -}; - -&uart1 { - status = "disabled"; -}; - &uart2 { clock-frequency = <24000000>; bootph-all; -- 2.41.0

1 0

[PATCH v5 0/5] rockchip: rk3568: Use dwc3-generic driver
by Jonas Karlman 31 Jul '23

31 Jul '23

This series add support for rk3568 in dwc3-generic driver and change to use the dwc3-generic driver for rk3568 devices having usb enabled. After these changes it should be possible to support usb gadget on rk3568 with e.g.: # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_DM_USB_GADGET=y CONFIG_USB_GADGET=y Patch 1 reverts addition of now unnecessary regulator-boot-on props. Patch 2 improve support for childless glue/ctrl dt node. Patch 3 relax a hard error when usb gadget support is not enabled. Patch 4 add support for the glue/ctrl dt node used by rk3568. Patch 5 change rk3568 devices to use dwc3-generic driver. Changes in v5: - Drop device_is_compatible check - Collect r-b tag Changes in v4: - Rebase on u-boot-rockchip/master and v2 of the series "rockchip: rk3568: Device Tree updates" - Add fixes tag - Update nanopi-r5c-rk3568 and nanopi-r5s-rk3568 - Collect r-b tag Changes in v3: - Update debug message to include dr_mode (Marek Vasut) - Collect r-b tag Changes in v2: - Change to use CONFIG_IS_ENABLED for USB_HOST - Refactor switch to if statements (Marek Vasut) - Update commit message - Collect r-b tag This series is also available at [1] [1] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3568-dwc3-generic-v5 Jonas Karlman (5): Revert "arm: dts: rockchip: radxa-cm3-io, rock-3a: enable regulators for usb" usb: dwc3-generic: Return early when there is no child node usb: dwc3-generic: Relax unsupported dr_mode check usb: dwc3-generic: Add rk3568 support rockchip: rk3568: Use dwc3-generic driver arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 4 -- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 8 ---- configs/nanopi-r5c-rk3568_defconfig | 3 +- configs/nanopi-r5s-rk3568_defconfig | 3 +- configs/radxa-cm3-io-rk3566_defconfig | 2 +- configs/rock-3a-rk3568_defconfig | 2 +- drivers/usb/dwc3/dwc3-generic.c | 47 +++++++++++--------- 7 files changed, 29 insertions(+), 40 deletions(-) -- 2.41.0

2 6

[PATCH v4 0/5] rockchip: rk3568: Use dwc3-generic driver
by Jonas Karlman 31 Jul '23

31 Jul '23

This series add support for rk3568 in dwc3-generic driver and change to use the dwc3-generic driver for rk3568 devices having usb enabled. After these changes it should be possible to support usb gadget on rk3568 with e.g.: # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_DM_USB_GADGET=y CONFIG_USB_GADGET=y Patch 1 reverts addition of now unnecessary regulator-boot-on props. Patch 2 improve support for childless glue/ctrl dt node. Patch 3 relax a hard error when usb gadget support is not enabled. Patch 4 add support for the glue/ctrl dt node used by rk3568. Patch 5 change rk3568 devices to use dwc3-generic driver. Changes in v4: - Rebase on u-boot-rockchip/master and v2 of the series "rockchip: rk3568: Device Tree updates" - Add fixes tag - Update nanopi-r5c-rk3568 and nanopi-r5s-rk3568 - Collect r-b tag Changes in v3: - Update debug message to include dr_mode (Marek Vasut) - Collect r-b tag Changes in v2: - Change to use CONFIG_IS_ENABLED for USB_HOST - Refactor switch to if statements (Marek Vasut) - Update commit message - Collect r-b tag This series is also available at [1] [1] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3568-dwc3-generic-v4 Jonas Karlman (5): Revert "arm: dts: rockchip: radxa-cm3-io, rock-3a: enable regulators for usb" usb: dwc3-generic: Return early when there is no child node usb: dwc3-generic: Relax unsupported dr_mode check usb: dwc3-generic: Add rk3568 support rockchip: rk3568: Use dwc3-generic driver arch/arm/dts/rk3566-radxa-cm3-io-u-boot.dtsi | 4 -- arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 8 ---- configs/nanopi-r5c-rk3568_defconfig | 3 +- configs/nanopi-r5s-rk3568_defconfig | 3 +- configs/radxa-cm3-io-rk3566_defconfig | 2 +- configs/rock-3a-rk3568_defconfig | 2 +- drivers/usb/dwc3/dwc3-generic.c | 50 +++++++++++--------- 7 files changed, 32 insertions(+), 40 deletions(-) -- 2.41.0

2 11

[PATCH 1/1] efi_loader: fix invocation of efi_prepare_aligned_image
by Heinrich Schuchardt 30 Jul '23

30 Jul '23

When passing a pointer to a size_t variable to a function writing an u64 value to the address a buffer overrun occurs on 32bit systems. Fixes: 163a0d7e2cbd ("efi_loader: add PE/COFF image measurement") Reported-by: Dan Carpenter <dan.carpenter(a)linaro.org> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_image_loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 26df0da16c..71c713048d 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -591,6 +591,8 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) struct pkcs7_message *msg = NULL; struct efi_signature_store *db = NULL, *dbx = NULL; void *new_efi = NULL; + u64 new_efi_size = efi_size; + u8 *auth, *wincerts_end; size_t auth_size; bool ret = false; @@ -600,11 +602,11 @@ static bool efi_image_authenticate(void *efi, size_t efi_size) if (!efi_secure_boot_enabled()) return true; - new_efi = efi_prepare_aligned_image(efi, (u64 *)&efi_size); + new_efi = efi_prepare_aligned_image(efi, &new_efi_size); if (!new_efi) return false; - if (!efi_image_parse(new_efi, efi_size, &regs, &wincerts, + if (!efi_image_parse(new_efi, new_efi_size, &regs, &wincerts, &wincerts_len)) { log_err("Parsing PE executable image failed\n"); goto out; -- 2.40.1

2 1