diff --git a/arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch b/arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch index 89e38f5..3aef1a9 100644 --- a/arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch +++ b/arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch @@ -1,102 +1,98 @@ -From c206a750c80dc4aaa8e7eade50199b3198a3e288 Mon Sep 17 00:00:00 2001 +From 5cb3ca7ebd46c1983d0929b5ba027a03c1f5e51e Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Wed, 19 Aug 2020 15:49:25 +0100 -Subject: [PATCH 1/3] rockchip: RockPro64: enable rng to provide an entropy - source +Date: Wed, 16 Dec 2020 15:22:34 +0000 +Subject: [PATCH 1/2] arm: dts: rockchip: rk3399: enable rng at the SoC level -Enable the rng so UEFI can provide entropy for KASLR +The rng is embedded in the SoC so enable it in the device tree +universally, the use of it can be controlled by enabling/disabling +at the device config level. Signed-off-by: Peter Robinson --- - configs/rockpro64-rk3399_defconfig | 2 ++ - 1 file changed, 2 insertions(+) + arch/arm/dts/rk3399-evb-u-boot.dtsi | 4 ---- + arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ---- + arch/arm/dts/rk3399-rockpro64-u-boot.dtsi | 4 ---- + arch/arm/dts/rk3399-u-boot.dtsi | 2 +- + 4 files changed, 1 insertion(+), 13 deletions(-) -diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig -index a6e2c3d71d..9b1ba04b9e 100644 ---- a/configs/rockpro64-rk3399_defconfig -+++ b/configs/rockpro64-rk3399_defconfig -@@ -41,6 +41,8 @@ CONFIG_MMC_DW=y - CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_DM_RNG=y -+CONFIG_RNG_ROCKCHIP=y - CONFIG_SPI_FLASH_GIGADEVICE=y - CONFIG_DM_ETH=y - CONFIG_ETH_DESIGNWARE=y --- -2.26.2 - -From 91db3a7baa4cfc8f1f8879b4bdafeb05902f2114 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 19 Aug 2020 15:52:15 +0100 -Subject: [PATCH 2/3] rockchip: Rock960: enable rng to provide an entropy - source - -Enable the rng so UEFI can provide entropy for KASLR - -Signed-off-by: Peter Robinson ---- - arch/arm/dts/rk3399-rock960-u-boot.dtsi | 4 ++++ - configs/rock960-rk3399_defconfig | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi -index c190089e26..08292dbd39 100644 ---- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi -@@ -24,3 +24,7 @@ +diff --git a/arch/arm/dts/rk3399-evb-u-boot.dtsi b/arch/arm/dts/rk3399-evb-u-boot.dtsi +index 8056dc843e..398b205ec2 100644 +--- a/arch/arm/dts/rk3399-evb-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-evb-u-boot.dtsi +@@ -13,10 +13,6 @@ + }; + }; + +-&rng { +- status = "okay"; +-}; +- + &i2c0 { + u-boot,dm-pre-reloc; + }; +diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +index ded7db0aef..c3e866a779 100644 +--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi +@@ -28,10 +28,6 @@ + u-boot,dm-pre-reloc; + }; + +-&rng { +- status = "okay"; +-}; +- + &sdhci { + max-frequency = <25000000>; + u-boot,dm-pre-reloc; +diff --git a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +index 6317b47e41..37dff04adf 100644 +--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi +@@ -15,10 +15,6 @@ + }; + }; + +-&rng { +- status = "okay"; +-}; +- + &spi1 { + spi_flash: flash@0 { + u-boot,dm-pre-reloc; +diff --git a/arch/arm/dts/rk3399-u-boot.dtsi b/arch/arm/dts/rk3399-u-boot.dtsi +index ecd230c720..73922c328a 100644 +--- a/arch/arm/dts/rk3399-u-boot.dtsi ++++ b/arch/arm/dts/rk3399-u-boot.dtsi +@@ -32,7 +32,7 @@ + rng: rng@ff8b8000 { + compatible = "rockchip,cryptov1-rng"; + reg = <0x0 0xff8b8000 0x0 0x1000>; +- status = "disabled"; ++ status = "okay"; }; - }; -+ -+&rng { -+ status = "okay"; -+}; -diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig -index 1d997847c2..9c4d8871b7 100644 ---- a/configs/rock960-rk3399_defconfig -+++ b/configs/rock960-rk3399_defconfig -@@ -38,6 +38,8 @@ CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_SDMA=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_DM_RNG=y -+CONFIG_RNG_ROCKCHIP=y - CONFIG_DM_ETH=y - CONFIG_NVME=y - CONFIG_PCI=y + dmc: dmc { -- -2.26.2 +2.29.2 -From ac0793c7c4ee032da11bddbd0bdefee2322bb621 Mon Sep 17 00:00:00 2001 +From 62093137fcbe760d009cf2757feda7ccf328fbb7 Mon Sep 17 00:00:00 2001 From: Peter Robinson -Date: Wed, 19 Aug 2020 15:53:58 +0100 -Subject: [PATCH 3/3] rockchip: firefly-rk3399: enable rng to provide an - entropy source +Date: Wed, 16 Dec 2020 15:37:21 +0000 +Subject: [PATCH 2/2] configs: rk3399: enable rng on firefly/rock960/rockpro64 -Enable the rng so UEFI can provide entropy for KASLR +Enable the RNG on the Firefly, rock960 and RockPro64 devices +to enable KASLR on devices that support it. Signed-off-by: Peter Robinson --- - arch/arm/dts/rk3399-firefly-u-boot.dtsi | 4 ++++ - configs/firefly-rk3399_defconfig | 2 ++ - 2 files changed, 6 insertions(+) + configs/firefly-rk3399_defconfig | 2 ++ + configs/rock960-rk3399_defconfig | 2 ++ + configs/rockpro64-rk3399_defconfig | 2 ++ + 3 files changed, 6 insertions(+) -diff --git a/arch/arm/dts/rk3399-firefly-u-boot.dtsi b/arch/arm/dts/rk3399-firefly-u-boot.dtsi -index 38e0897db9..a6c7b913da 100644 ---- a/arch/arm/dts/rk3399-firefly-u-boot.dtsi -+++ b/arch/arm/dts/rk3399-firefly-u-boot.dtsi -@@ -11,3 +11,7 @@ - u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc; - }; - }; -+ -+&rng { -+ status = "okay"; -+}; diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig -index ea4a30ebf3..e242ee5009 100644 +index c453b82dc5..cfbaae40aa 100644 --- a/configs/firefly-rk3399_defconfig +++ b/configs/firefly-rk3399_defconfig @@ -35,6 +35,8 @@ CONFIG_MMC_DW=y @@ -108,6 +104,32 @@ index ea4a30ebf3..e242ee5009 100644 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_DM_ETH=y CONFIG_ETH_DESIGNWARE=y +diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig +index 65dce3cd73..aadbc55f57 100644 +--- a/configs/rock960-rk3399_defconfig ++++ b/configs/rock960-rk3399_defconfig +@@ -39,6 +39,8 @@ CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_SDMA=y + CONFIG_MMC_SDHCI_ROCKCHIP=y ++CONFIG_DM_RNG=y ++CONFIG_RNG_ROCKCHIP=y + CONFIG_DM_ETH=y + CONFIG_NVME=y + CONFIG_PCI=y +diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig +index 575b7a20d5..f78dfcc8f7 100644 +--- a/configs/rockpro64-rk3399_defconfig ++++ b/configs/rockpro64-rk3399_defconfig +@@ -42,6 +42,8 @@ CONFIG_MMC_DW=y + CONFIG_MMC_DW_ROCKCHIP=y + CONFIG_MMC_SDHCI=y + CONFIG_MMC_SDHCI_ROCKCHIP=y ++CONFIG_DM_RNG=y ++CONFIG_RNG_ROCKCHIP=y + CONFIG_SF_DEFAULT_BUS=1 + CONFIG_SPI_FLASH_GIGADEVICE=y + CONFIG_DM_ETH=y -- -2.26.2 +2.29.2 diff --git a/uboot-tools.spec b/uboot-tools.spec index 98b93ed..76a39d2 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -34,7 +34,7 @@ Patch12: sunxi-add-PineCube-board.patch # TI fixes Patch13: 0001-Fix-BeagleAI-detection.patch # Rockchips improvements -#Patch14: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch +Patch14: arm-rk3399-enable-rng-on-rock960-and-firefly3399.patch Patch15: rk3399-Pinebook-pro-EDP-support.patch BuildRequires: bc