diff mbox series

[1/3] rockchip: Pinebook Pro: enable rng to provide an entropy source

Message ID 20200608225030.481733-1-pbrobinson@gmail.com
State Accepted
Commit dc38a58360bfc3b21621dc9d5e626febd1aa93ec
Delegated to: Kever Yang
Headers show
Series [1/3] rockchip: Pinebook Pro: enable rng to provide an entropy source | expand

Commit Message

Peter Robinson June 8, 2020, 10:50 p.m. UTC
Enable the rng so UEFI can provide entropy for KASLR

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
 arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ++++
 arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ++++
 configs/pinebook-pro-rk3399_defconfig        | 2 ++
 3 files changed, 10 insertions(+)

Comments

Marcin Juszkiewicz June 9, 2020, 7:54 a.m. UTC | #1
W dniu 09.06.2020 o 00:50, Peter Robinson pisze:
> Enable the rng so UEFI can provide entropy for KASLR
> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> ---
>  arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ++++
>  arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ++++
>  configs/pinebook-pro-rk3399_defconfig        | 2 ++
>  3 files changed, 10 insertions(+)
> 
> diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> index 1a2e24d3ef..296321d697 100644
> --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> @@ -24,6 +24,10 @@
>  	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 bac09df4a3..cb8991aa25 100644
> --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> @@ -19,6 +19,10 @@
>  	};
>  };
>  
> +&rng {
> +	status = "okay";
> +};
> +
>  &spi1 {
>  	spi_flash: flash@0 {
>  		u-boot,dm-pre-reloc;
> diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
> index 0c129b9aeb..21eecf477c 100644
> --- a/configs/pinebook-pro-rk3399_defconfig
> +++ b/configs/pinebook-pro-rk3399_defconfig
> @@ -54,6 +54,8 @@ CONFIG_DM_PMIC_FAN53555=y
>  CONFIG_PMIC_RK8XX=y
>  CONFIG_REGULATOR_PWM=y
>  CONFIG_REGULATOR_RK8XX=y
> +CONFIG_DM_RNG=y
> +CONFIG_RNG_ROCKCHIP=y
>  CONFIG_PWM_ROCKCHIP=y
>  CONFIG_RAM_RK3399_LPDDR4=y
>  CONFIG_DM_RESET=y
> 

You enabled RNG for RockPro64 in DTS but not in config.

diff --git configs/rockpro64-rk3399_defconfig configs/rockpro64-rk3399_defconfig
index a56126b042..1953316b0c 100644
--- configs/rockpro64-rk3399_defconfig
+++ configs/rockpro64-rk3399_defconfig
@@ -54,6 +54,8 @@ CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_DM_RESET=y
 CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_ROCKCHIP_SPI=y
Kever Yang June 27, 2020, 2:30 p.m. UTC | #2
On 2020/6/9 上午6:50, Peter Robinson wrote:
> Enable the rng so UEFI can provide entropy for KASLR
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever

> ---
>   arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 4 ++++
>   arch/arm/dts/rk3399-rockpro64-u-boot.dtsi    | 4 ++++
>   configs/pinebook-pro-rk3399_defconfig        | 2 ++
>   3 files changed, 10 insertions(+)
>
> diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> index 1a2e24d3ef..296321d697 100644
> --- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
> @@ -24,6 +24,10 @@
>   	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 bac09df4a3..cb8991aa25 100644
> --- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> +++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
> @@ -19,6 +19,10 @@
>   	};
>   };
>   
> +&rng {
> +	status = "okay";
> +};
> +
>   &spi1 {
>   	spi_flash: flash@0 {
>   		u-boot,dm-pre-reloc;
> diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
> index 0c129b9aeb..21eecf477c 100644
> --- a/configs/pinebook-pro-rk3399_defconfig
> +++ b/configs/pinebook-pro-rk3399_defconfig
> @@ -54,6 +54,8 @@ CONFIG_DM_PMIC_FAN53555=y
>   CONFIG_PMIC_RK8XX=y
>   CONFIG_REGULATOR_PWM=y
>   CONFIG_REGULATOR_RK8XX=y
> +CONFIG_DM_RNG=y
> +CONFIG_RNG_ROCKCHIP=y
>   CONFIG_PWM_ROCKCHIP=y
>   CONFIG_RAM_RK3399_LPDDR4=y
>   CONFIG_DM_RESET=y
diff mbox series

Patch

diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
index 1a2e24d3ef..296321d697 100644
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
@@ -24,6 +24,10 @@ 
 	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 bac09df4a3..cb8991aa25 100644
--- a/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-rockpro64-u-boot.dtsi
@@ -19,6 +19,10 @@ 
 	};
 };
 
+&rng {
+	status = "okay";
+};
+
 &spi1 {
 	spi_flash: flash@0 {
 		u-boot,dm-pre-reloc;
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
index 0c129b9aeb..21eecf477c 100644
--- a/configs/pinebook-pro-rk3399_defconfig
+++ b/configs/pinebook-pro-rk3399_defconfig
@@ -54,6 +54,8 @@  CONFIG_DM_PMIC_FAN53555=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
+CONFIG_DM_RNG=y
+CONFIG_RNG_ROCKCHIP=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
 CONFIG_DM_RESET=y