arm: dts: rockchip: rk3399: add and enable rng node
Subsystems (2)
PATCH 1/5 arm: dts: rockchip: rk3399: add and enable rng node
Add rng node in rk3399-u-boot.dtsi and enable it in rk3399-evb-u-boot.dtsi.
--- arch/arm/dts/rk3399-evb-u-boot.dtsi | 5 +++++ arch/arm/dts/rk3399-u-boot.dtsi | 6 ++++++ 2 files changed, 11 insertions(+)
arch/arm/dts/rk3399-evb-u-boot.dtsi +5 -0
@@ -11,3 +11,8 @@ u-boot,spl-boot-order = &sdhci, &sdmmc; }; }; + +&rng { + status = "okay"; +}; +
arch/arm/dts/rk3399-u-boot.dtsi +6 -0
@@ -25,6 +25,12 @@ clock-names = "pclk_ddr_mon"; }; + rng: rng at ff8b8000 { + compatible = "rockchip,cryptov1-rng"; + reg = <0x0 0xff8b8000 0x0 0x1000>; + status = "disabled"; + }; + dmc: dmc { u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc";
Signature · 1 line
2.17.1
PATCH 2/5 arm: dts: rockchip: px30: add and enable rng node
Add enable rng node in px30-evb-u-boot.dtsi.
--- arch/arm/dts/px30-evb-u-boot.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/dts/px30-evb-u-boot.dtsi +7 -0
@@ -12,6 +12,13 @@ chosen { u-boot,spl-boot-order = &emmc, &sdmmc; }; + + rng: rng at ff0b0000 { + compatible = "rockchip,cryptov2-rng"; + reg = <0x0 0xff0b0000 0x0 0x4000>; + status = "okay"; + }; + }; &dmc {
Signature · 1 line
2.17.1
PATCH 2/5 arm: dts: rockchip: px30: add and enable rng node
Quoted 3 lines · Lin Jinhan
Add enable rng node in
px30-evb-u-boot.dtsi.Signed-off-by Lin Jinhan <[email protected]>
Thanks,
- Kever
Quoted 22 lines
--- arch/arm/dts/px30-evb-u-boot.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)arch/arm/dts/px30-evb-u-boot.dtsi +7
-0@@ -12,6 +12,13 @@ chosen { u-boot,spl-boot-order = &emmc, &sdmmc; }; + + rng: rng at ff0b0000 { + compatible = "rockchip,cryptov2-rng"; + reg = <0x0 0xff0b0000 0x0 0x4000>; + status = "okay"; + }; + }; &dmc {
PATCH 3/5 rockchip: rng: Add a driver for random number generator(rng) device
In reply to Lin JinhanAdd a driver for the rng device found on rockchip platforms. Support rng module of crypto v1 and crypto v2.
--- drivers/rng/Kconfig | 8 ++ drivers/rng/Makefile | 1 + drivers/rng/rockchip_rng.c | 224 +++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 drivers/rng/rockchip_rng.c
drivers/rng/Kconfig +8 -0
@@ -31,4 +31,12 @@ config RNG_STM32MP1 help Enable STM32MP1 rng driver. +config RNG_ROCKCHIP + bool "Enable random number generator for rockchip crypto rng" + depends on ARCH_ROCKCHIP && DM_RNG + default n + help + Enable random number generator for rockchip.This driver is + support rng module of crypto v1 and crypto v2. + endif
drivers/rng/Makefile +1 -0
@@ -7,3 +7,4 @@ obj-$(CONFIG_DM_RNG) += rng-uclass.o obj-$(CONFIG_RNG_MESON) += meson-rng.o obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o +obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.o
drivers/rng/rockchip_rng.c new file +224 -0
224 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 3/5 rockchip: rng: Add a driver for random number generator(rng) device
Quoted 4 lines
Add a driver for the rng device found on rockchip platforms. Support rng module of crypto v1 and crypto v2.
Signed-off-by Lin Jinhan <[email protected]>
Tested with UEFI RNG providing a seed for KASLR.
Quoted 268 lines
--- drivers/rng/Kconfig | 8 ++ drivers/rng/Makefile | 1 + drivers/rng/rockchip_rng.c | 224 +++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 drivers/rng/rockchip_rng.cdrivers/rng/Kconfig +8
-0@@ -31,4 +31,12 @@ config RNG_STM32MP1 help Enable STM32MP1 rng driver. +config RNG_ROCKCHIP + bool "Enable random number generator for rockchip crypto rng" + depends on ARCH_ROCKCHIP && DM_RNG + default n + help + Enable random number generator for rockchip.This driver is + support rng module of crypto v1 and crypto v2. + endifdrivers/rng/Makefile +1
-0@@ -7,3 +7,4 @@ obj-$(CONFIG_DM_RNG) += rng-uclass.o obj-$(CONFIG_RNG_MESON) += meson-rng.o obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o +obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.odrivers/rng/rockchip_rng.c new file +224
-1@@ -0,0 +1,224 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd +*/ +#include <asm/arch-rockchip/hardware.h> +#include <asm/io.h> +#include <common.h> +#include <dm.h> +#include <linux/iopoll.h> +#include <linux/string.h> +#include <rng.h> + +#define RK_HW_RNG_MAX 32 + +#define _SBF (s, v) ((v) << (s)) + +/* start of CRYPTO V1 register define */ +#define CRYPTO_V1_CTRL 0x0008 +#define CRYPTO_V1_RNG_START BIT(8) +#define CRYPTO_V1_RNG_FLUSH BIT(9) + +#define CRYPTO_V1_TRNG_CTRL 0x0200 +#define CRYPTO_V1_OSC_ENABLE BIT(16) +#define CRYPTO_V1_TRNG_SAMPLE_PERIOD (x) (x) + +#define CRYPTO_V1_TRNG_DOUT_0 0x0204 +/* end of CRYPTO V1 register define */ + +/* start of CRYPTO V2 register define */ +#define CRYPTO_V2_RNG_CTL 0x0400 +#define CRYPTO_V2_RNG_64_BIT_LEN _SBF(4, 0x00) +#define CRYPTO_V2_RNG_128_BIT_LEN _SBF(4, 0x01) +#define CRYPTO_V2_RNG_192_BIT_LEN _SBF(4, 0x02) +#define CRYPTO_V2_RNG_256_BIT_LEN _SBF(4, 0x03) +#define CRYPTO_V2_RNG_FATESY_SOC_RING _SBF(2, 0x00) +#define CRYPTO_V2_RNG_SLOWER_SOC_RING_0 _SBF(2, 0x01) +#define CRYPTO_V2_RNG_SLOWER_SOC_RING_1 _SBF(2, 0x02) +#define CRYPTO_V2_RNG_SLOWEST_SOC_RING _SBF(2, 0x03) +#define CRYPTO_V2_RNG_ENABLE BIT(1) +#define CRYPTO_V2_RNG_START BIT(0) +#define CRYPTO_V2_RNG_SAMPLE_CNT 0x0404 +#define CRYPTO_V2_RNG_DOUT_0 0x0410 +/* end of CRYPTO V2 register define */ + +#define RK_RNG_TIME_OUT 50000/* max 50ms */ + +struct rk_rng_soc_data { +int (*rk_rng_read)(struct udevice *dev,void *data,size_t len); +}; + +struct rk_rng_platdata { +fdt_addr_t base; +struct rk_rng_soc_data *soc_data; +}; + +static int rk_rng_read_regs (fdt_addr_t addr,void *buf,size_t size) +{ +u32 count =RK_HW_RNG_MAX /sizeof (u32); +u32 reg, tmp_len; + +if (size >RK_HW_RNG_MAX ) +return -EINVAL ; + +while (size && count) { + reg =readl (addr); + tmp_len =min (size,sizeof (u32)); +memcpy (buf, ®, tmp_len); + addr +=sizeof (u32); + buf += tmp_len; + size -= tmp_len; + count--; + } + +return 0 ; +} + +static int rk_v1_rng_read (struct udevice *dev,void *data,size_t len) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); +u32 reg =0 ; +int retval; + +if (len >RK_HW_RNG_MAX ) +return -EINVAL ; + +/* enable osc_ring to get entropy, sample period is set as 100 */ +writel (CRYPTO_V1_OSC_ENABLE |CRYPTO_V1_TRNG_SAMPLE_PERIOD (100 ), + pdata->base +CRYPTO_V1_TRNG_CTRL ); + +rk_clrsetreg (pdata->base +CRYPTO_V1_CTRL ,CRYPTO_V1_RNG_START , +CRYPTO_V1_RNG_START ); + + retval =readl_poll_timeout (pdata->base +CRYPTO_V1_CTRL , reg, + !(reg &CRYPTO_V1_RNG_START ), +RK_RNG_TIME_OUT ); +if (retval) + goto exit; + +rk_rng_read_regs (pdata->base +CRYPTO_V1_TRNG_DOUT_0 , data, len); + +exit: +/* close TRNG */ +rk_clrreg (pdata->base +CRYPTO_V1_CTRL ,CRYPTO_V1_RNG_START ); + +return 0 ; +} + +static int rk_v2_rng_read (struct udevice *dev,void *data,size_t len) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); +u32 reg =0 ; +int retval; + +if (len >RK_HW_RNG_MAX ) +return -EINVAL ; + +/* enable osc_ring to get entropy, sample period is set as 100 */ +writel (100 , pdata->base +CRYPTO_V2_RNG_SAMPLE_CNT ); + + reg |=CRYPTO_V2_RNG_256_BIT_LEN ; + reg |=CRYPTO_V2_RNG_SLOWER_SOC_RING_0 ; + reg |=CRYPTO_V2_RNG_ENABLE ; + reg |=CRYPTO_V2_RNG_START ; + +rk_clrsetreg (pdata->base +CRYPTO_V2_RNG_CTL ,0xffff , reg); + + retval =readl_poll_timeout (pdata->base +CRYPTO_V2_RNG_CTL , reg, + !(reg &CRYPTO_V2_RNG_START ), +RK_RNG_TIME_OUT ); +if (retval) + goto exit; + +rk_rng_read_regs (pdata->base +CRYPTO_V2_RNG_DOUT_0 , data, len); + +exit: +/* close TRNG */ +rk_clrreg (pdata->base +CRYPTO_V2_RNG_CTL ,0xffff ); + +return retval; +} + +static int rockchip_rng_read (struct udevice *dev,void *data,size_t len) +{ +unsigned char *buf = data; +unsigned int i; +int ret = -EIO ; + +struct rk_rng_platdata *pdata =dev_get_priv (dev); + +if (!len) +return 0 ; + +if (!pdata->soc_data || !pdata->soc_data->rk_rng_read) +return -EINVAL ; + +for (i =0 ; i < len /RK_HW_RNG_MAX ; i++, buf +=RK_HW_RNG_MAX ) { + ret = pdata->soc_data->rk_rng_read (dev, buf,RK_HW_RNG_MAX ); +if (ret) + goto exit; + } + +if (len %RK_HW_RNG_MAX ) + ret = pdata->soc_data->rk_rng_read (dev, buf, + len %RK_HW_RNG_MAX ); + +exit: +return ret; +} + +static int rockchip_rng_ofdata_to_platdata (struct udevice *dev) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); + +memset (pdata,0x00 ,sizeof (*pdata)); + + pdata->base = (fdt_addr_t )dev_read_addr_ptr (dev); +if (!pdata->base) +return -ENOMEM ; + +return 0 ; +} + +static int rockchip_rng_probe (struct udevice *dev) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); + + pdata->soc_data = (struct rk_rng_soc_data *)dev_get_driver_data (dev); + +return 0 ; +} + +static const struct rk_rng_soc_data rk_rng_v1_soc_data = { + .rk_rng_read = rk_v1_rng_read, +}; + +static const struct rk_rng_soc_data rk_rng_v2_soc_data = { + .rk_rng_read = rk_v2_rng_read, +}; + +static const struct dm_rng_ops rockchip_rng_ops = { + .read = rockchip_rng_read, +}; + +static const struct udevice_id rockchip_rng_match[] = { + { + .compatible ="rockchip,cryptov1-rng" , + .data = (ulong)&rk_rng_v1_soc_data, + }, + { + .compatible ="rockchip,cryptov2-rng" , + .data = (ulong)&rk_rng_v2_soc_data, + }, + {}, +}; + +U_BOOT_DRIVER (rockchip_rng) = { + .name ="rockchip-rng" , + .id =UCLASS_RNG , + .of_match = rockchip_rng_match, + .ops = &rockchip_rng_ops, + .probe = rockchip_rng_probe, + .ofdata_to_platdata = rockchip_rng_ofdata_to_platdata, + .priv_auto_alloc_size =sizeof (struct rk_rng_platdata ), +}; --2.17.1
PATCH 3/5 rockchip: rng: Add a driver for random number generator(rng) device
In reply to Lin JinhanQuoted 4 lines · Lin Jinhan
Add a driver for the rng device found on rockchip platforms. Support rng module of crypto v1 and crypto v2.
Signed-off-by Lin Jinhan <[email protected]>
Thanks,
- Kever
Quoted 263 lines
--- drivers/rng/Kconfig | 8 ++ drivers/rng/Makefile | 1 + drivers/rng/rockchip_rng.c | 224 +++++++++++++++++++++++++++++++++++++ 3 files changed, 233 insertions(+)create mode 100644
drivers/rng/rockchip_rng.cdrivers/rng/Kconfig +8
-0@@ -31,4 +31,12 @@ config RNG_STM32MP1 help Enable STM32MP1 rng driver. +config RNG_ROCKCHIP + bool "Enable random number generator for rockchip crypto rng" + depends on ARCH_ROCKCHIP && DM_RNG + default n + help + Enable random number generator for rockchip.This driver is + support rng module of crypto v1 and crypto v2. + endifdrivers/rng/Makefile +1
-0@@ -7,3 +7,4 @@ obj-$(CONFIG_DM_RNG) += rng-uclass.o obj-$(CONFIG_RNG_MESON) += meson-rng.o obj-$(CONFIG_RNG_SANDBOX) += sandbox_rng.o obj-$(CONFIG_RNG_STM32MP1) += stm32mp1_rng.o +obj-$(CONFIG_RNG_ROCKCHIP) += rockchip_rng.odrivers/rng/rockchip_rng.c new file +224
-0@@ -0,0 +1,224 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2020 Fuzhou Rockchip Electronics Co., Ltd +*/ +#include <asm/arch-rockchip/hardware.h> +#include <asm/io.h> +#include <common.h> +#include <dm.h> +#include <linux/iopoll.h> +#include <linux/string.h> +#include <rng.h> + +#define RK_HW_RNG_MAX 32 + +#define _SBF (s, v) ((v) << (s)) + +/* start of CRYPTO V1 register define */ +#define CRYPTO_V1_CTRL 0x0008 +#define CRYPTO_V1_RNG_START BIT(8) +#define CRYPTO_V1_RNG_FLUSH BIT(9) + +#define CRYPTO_V1_TRNG_CTRL 0x0200 +#define CRYPTO_V1_OSC_ENABLE BIT(16) +#define CRYPTO_V1_TRNG_SAMPLE_PERIOD (x) (x) + +#define CRYPTO_V1_TRNG_DOUT_0 0x0204 +/* end of CRYPTO V1 register define */ + +/* start of CRYPTO V2 register define */ +#define CRYPTO_V2_RNG_CTL 0x0400 +#define CRYPTO_V2_RNG_64_BIT_LEN _SBF(4, 0x00) +#define CRYPTO_V2_RNG_128_BIT_LEN _SBF(4, 0x01) +#define CRYPTO_V2_RNG_192_BIT_LEN _SBF(4, 0x02) +#define CRYPTO_V2_RNG_256_BIT_LEN _SBF(4, 0x03) +#define CRYPTO_V2_RNG_FATESY_SOC_RING _SBF(2, 0x00) +#define CRYPTO_V2_RNG_SLOWER_SOC_RING_0 _SBF(2, 0x01) +#define CRYPTO_V2_RNG_SLOWER_SOC_RING_1 _SBF(2, 0x02) +#define CRYPTO_V2_RNG_SLOWEST_SOC_RING _SBF(2, 0x03) +#define CRYPTO_V2_RNG_ENABLE BIT(1) +#define CRYPTO_V2_RNG_START BIT(0) +#define CRYPTO_V2_RNG_SAMPLE_CNT 0x0404 +#define CRYPTO_V2_RNG_DOUT_0 0x0410 +/* end of CRYPTO V2 register define */ + +#define RK_RNG_TIME_OUT 50000/* max 50ms */ + +struct rk_rng_soc_data { +int (*rk_rng_read)(struct udevice *dev,void *data,size_t len); +}; + +struct rk_rng_platdata { +fdt_addr_t base; +struct rk_rng_soc_data *soc_data; +}; + +static int rk_rng_read_regs (fdt_addr_t addr,void *buf,size_t size) +{ +u32 count =RK_HW_RNG_MAX /sizeof (u32); +u32 reg, tmp_len; + +if (size >RK_HW_RNG_MAX ) +return -EINVAL ; + +while (size && count) { + reg =readl (addr); + tmp_len =min (size,sizeof (u32)); +memcpy (buf, ®, tmp_len); + addr +=sizeof (u32); + buf += tmp_len; + size -= tmp_len; + count--; + } + +return 0 ; +} + +static int rk_v1_rng_read (struct udevice *dev,void *data,size_t len) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); +u32 reg =0 ; +int retval; + +if (len >RK_HW_RNG_MAX ) +return -EINVAL ; + +/* enable osc_ring to get entropy, sample period is set as 100 */ +writel (CRYPTO_V1_OSC_ENABLE |CRYPTO_V1_TRNG_SAMPLE_PERIOD (100 ), + pdata->base +CRYPTO_V1_TRNG_CTRL ); + +rk_clrsetreg (pdata->base +CRYPTO_V1_CTRL ,CRYPTO_V1_RNG_START , +CRYPTO_V1_RNG_START ); + + retval =readl_poll_timeout (pdata->base +CRYPTO_V1_CTRL , reg, + !(reg &CRYPTO_V1_RNG_START ), +RK_RNG_TIME_OUT ); +if (retval) + goto exit; + +rk_rng_read_regs (pdata->base +CRYPTO_V1_TRNG_DOUT_0 , data, len); + +exit: +/* close TRNG */ +rk_clrreg (pdata->base +CRYPTO_V1_CTRL ,CRYPTO_V1_RNG_START ); + +return 0 ; +} + +static int rk_v2_rng_read (struct udevice *dev,void *data,size_t len) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); +u32 reg =0 ; +int retval; + +if (len >RK_HW_RNG_MAX ) +return -EINVAL ; + +/* enable osc_ring to get entropy, sample period is set as 100 */ +writel (100 , pdata->base +CRYPTO_V2_RNG_SAMPLE_CNT ); + + reg |=CRYPTO_V2_RNG_256_BIT_LEN ; + reg |=CRYPTO_V2_RNG_SLOWER_SOC_RING_0 ; + reg |=CRYPTO_V2_RNG_ENABLE ; + reg |=CRYPTO_V2_RNG_START ; + +rk_clrsetreg (pdata->base +CRYPTO_V2_RNG_CTL ,0xffff , reg); + + retval =readl_poll_timeout (pdata->base +CRYPTO_V2_RNG_CTL , reg, + !(reg &CRYPTO_V2_RNG_START ), +RK_RNG_TIME_OUT ); +if (retval) + goto exit; + +rk_rng_read_regs (pdata->base +CRYPTO_V2_RNG_DOUT_0 , data, len); + +exit: +/* close TRNG */ +rk_clrreg (pdata->base +CRYPTO_V2_RNG_CTL ,0xffff ); + +return retval; +} + +static int rockchip_rng_read (struct udevice *dev,void *data,size_t len) +{ +unsigned char *buf = data; +unsigned int i; +int ret = -EIO ; + +struct rk_rng_platdata *pdata =dev_get_priv (dev); + +if (!len) +return 0 ; + +if (!pdata->soc_data || !pdata->soc_data->rk_rng_read) +return -EINVAL ; + +for (i =0 ; i < len /RK_HW_RNG_MAX ; i++, buf +=RK_HW_RNG_MAX ) { + ret = pdata->soc_data->rk_rng_read (dev, buf,RK_HW_RNG_MAX ); +if (ret) + goto exit; + } + +if (len %RK_HW_RNG_MAX ) + ret = pdata->soc_data->rk_rng_read (dev, buf, + len %RK_HW_RNG_MAX ); + +exit: +return ret; +} + +static int rockchip_rng_ofdata_to_platdata (struct udevice *dev) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); + +memset (pdata,0x00 ,sizeof (*pdata)); + + pdata->base = (fdt_addr_t )dev_read_addr_ptr (dev); +if (!pdata->base) +return -ENOMEM ; + +return 0 ; +} + +static int rockchip_rng_probe (struct udevice *dev) +{ +struct rk_rng_platdata *pdata =dev_get_priv (dev); + + pdata->soc_data = (struct rk_rng_soc_data *)dev_get_driver_data (dev); + +return 0 ; +} + +static const struct rk_rng_soc_data rk_rng_v1_soc_data = { + .rk_rng_read = rk_v1_rng_read, +}; + +static const struct rk_rng_soc_data rk_rng_v2_soc_data = { + .rk_rng_read = rk_v2_rng_read, +}; + +static const struct dm_rng_ops rockchip_rng_ops = { + .read = rockchip_rng_read, +}; + +static const struct udevice_id rockchip_rng_match[] = { + { + .compatible ="rockchip,cryptov1-rng" , + .data = (ulong)&rk_rng_v1_soc_data, + }, + { + .compatible ="rockchip,cryptov2-rng" , + .data = (ulong)&rk_rng_v2_soc_data, + }, + {}, +}; + +U_BOOT_DRIVER (rockchip_rng) = { + .name ="rockchip-rng" , + .id =UCLASS_RNG , + .of_match = rockchip_rng_match, + .ops = &rockchip_rng_ops, + .probe = rockchip_rng_probe, + .ofdata_to_platdata = rockchip_rng_ofdata_to_platdata, + .priv_auto_alloc_size =sizeof (struct rk_rng_platdata ), +};
PATCH 4/5 rockchip: rk3399: Enable CONFIG_RNG_ROCKCHIP
In reply to Lin JinhanCONFIG_RNG_ROCKCHIP/CONFIG_DM_RNG is enabled.
--- configs/evb-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/evb-rk3399_defconfig +2 -0
@@ -39,6 +39,8 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y
Signature · 1 line
2.17.1
PATCH 4/5 rockchip: rk3399: Enable CONFIG_RNG_ROCKCHIP
Quoted 2 lines · Lin Jinhan
CONFIG_RNG_ROCKCHIP/CONFIG_DM_RNG is enabled.
This should be universally available by default on all rk3399 devices shouldn't it or does it need external regulators or something that is per device? If so shouldn't we just enable it by default for the SoC?
Quoted 23 lines
Signed-off-by Lin Jinhan <[email protected]>--- configs/evb-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+)configs/evb-rk3399_defconfig +2
-1@@ -39,6 +39,8 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y --2.17.1
PATCH 4/5 rockchip: rk3399: Enable CONFIG_RNG_ROCKCHIP
Hi Peter,
Quoted 5 lines · Peter Robinson
Quoted 1 line · Lin Jinhan
CONFIG_RNG_ROCKCHIP/CONFIG_DM_RNG is enabled.
This should be universally available by default on all rk3399 devices shouldn't it or does it need external regulators or something that is per device? If so shouldn't we just enable it by default for the SoC?
This rng is a internal module, only need available clock and nothing to do with regulator,
it could default enable, but I'm not sure all the boards want to enable it, the U-Boot size is
already too big for me now.
Thanks,
- Kever
Quoted 23 lines
Quoted 23 lines
Signed-off-by Lin Jinhan <[email protected]>--- configs/evb-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+)configs/evb-rk3399_defconfig +2
-1@@ -39,6 +39,8 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y --2.17.1
PATCH 4/5 rockchip: rk3399: Enable CONFIG_RNG_ROCKCHIP
In reply to Lin JinhanQuoted 3 lines · Lin Jinhan
CONFIG_RNG_ROCKCHIP/CONFIG_DM_RNG is enabled.
Signed-off-by Lin Jinhan <[email protected]>
Thanks,
- Kever
Quoted 17 lines
--- configs/evb-rk3399_defconfig | 2 ++ 1 file changed, 2 insertions(+)configs/evb-rk3399_defconfig +2
-0@@ -39,6 +39,8 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYSRESET=y
PATCH 5/5 rockchip: px30: Enable CONFIG_RNG_ROCKCHIP
In reply to Lin JinhanCONFIG_RNG_ROCKCHIP/CONFIG_DM_RNG is enabled.
--- configs/evb-px30_defconfig | 2 ++ 1 file changed, 2 insertions(+)
configs/evb-px30_defconfig +2 -0
@@ -85,6 +85,8 @@ CONFIG_SPL_RAM=y CONFIG_TPL_RAM=y CONFIG_ROCKCHIP_SDRAM_COMMON=y CONFIG_DM_RESET=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y # CONFIG_SPECIFY_CONSOLE_INDEX is not set CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SKIP_INIT=y
Signature · 1 line
2.17.1
PATCH 5/5 rockchip: px30: Enable CONFIG_RNG_ROCKCHIP
Quoted 3 lines · Lin Jinhan
CONFIG_RNG_ROCKCHIP/CONFIG_DM_RNG is enabled.
Signed-off-by Lin Jinhan <[email protected]>
Thanks,
- Kever
Quoted 17 lines
--- configs/evb-px30_defconfig | 2 ++ 1 file changed, 2 insertions(+)configs/evb-px30_defconfig +2
-0@@ -85,6 +85,8 @@ CONFIG_SPL_RAM=y CONFIG_TPL_RAM=y CONFIG_ROCKCHIP_SDRAM_COMMON=y CONFIG_DM_RESET=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y # CONFIG_SPECIFY_CONSOLE_INDEX is not set CONFIG_DEBUG_UART_SHIFT=2 CONFIG_DEBUG_UART_SKIP_INIT=y
PATCH 1/5 arm: dts: rockchip: rk3399: add and enable rng node
In reply to Lin JinhanQuoted 5 lines · Lin Jinhan
Add rng node in
rk3399-u-boot.dtsiand enable it inrk3399-evb-u-boot.dtsi.Signed-off-by Lin Jinhan <[email protected]>
Tested with UEFI RNG providing a seed for KASLR.
Quoted 40 lines
--- arch/arm/dts/rk3399-evb-u-boot.dtsi | 5 +++++ arch/arm/dts/rk3399-u-boot.dtsi | 6 ++++++ 2 files changed, 11 insertions(+)arch/arm/dts/rk3399-evb-u-boot.dtsi +5
-0@@ -11,3 +11,8 @@ u-boot,spl-boot-order = &sdhci, &sdmmc; }; }; + +&rng { + status = "okay"; +}; +arch/arm/dts/rk3399-u-boot.dtsi +6
-1@@ -25,6 +25,12 @@ clock-names = "pclk_ddr_mon"; }; + rng: rng at ff8b8000 { + compatible = "rockchip,cryptov1-rng"; + reg = <0x0 0xff8b8000 0x0 0x1000>; + status = "disabled"; + }; + dmc: dmc { u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; --2.17.1
PATCH 1/5 arm: dts: rockchip: rk3399: add and enable rng node
In reply to Lin JinhanQuoted 5 lines · Lin Jinhan
Add rng node in
rk3399-u-boot.dtsiand enable it inrk3399-evb-u-boot.dtsi.Signed-off-by Lin Jinhan <[email protected]>
For the series
I guess Kever can pick it up directly in the rockchip tree. Thanks.
-sughosh
Quoted 43 lines
--- arch/arm/dts/rk3399-evb-u-boot.dtsi | 5 +++++ arch/arm/dts/rk3399-u-boot.dtsi | 6 ++++++ 2 files changed, 11 insertions(+)arch/arm/dts/rk3399-evb-u-boot.dtsi +5
-0@@ -11,3 +11,8 @@ u-boot,spl-boot-order = &sdhci, &sdmmc; }; }; + +&rng { + status = "okay"; +}; +arch/arm/dts/rk3399-u-boot.dtsi +6
-1@@ -25,6 +25,12 @@ clock-names = "pclk_ddr_mon"; }; + rng: rng at ff8b8000 { + compatible = "rockchip,cryptov1-rng"; + reg = <0x0 0xff8b8000 0x0 0x1000>; + status = "disabled"; + }; + dmc: dmc { u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc"; --2.17.1
PATCH 1/5 arm: dts: rockchip: rk3399: add and enable rng node
In reply to Lin JinhanQuoted 4 lines · Lin Jinhan
Add rng node in
rk3399-u-boot.dtsiand enable it inrk3399-evb-u-boot.dtsi.Signed-off-by Lin Jinhan <[email protected]>
Thanks,
- Kever
Quoted 35 lines
--- arch/arm/dts/rk3399-evb-u-boot.dtsi | 5 +++++ arch/arm/dts/rk3399-u-boot.dtsi | 6 ++++++ 2 files changed, 11 insertions(+)arch/arm/dts/rk3399-evb-u-boot.dtsi +5
-0@@ -11,3 +11,8 @@ u-boot,spl-boot-order = &sdhci, &sdmmc; }; }; + +&rng { + status = "okay"; +}; +arch/arm/dts/rk3399-u-boot.dtsi +6
-0@@ -25,6 +25,12 @@ clock-names = "pclk_ddr_mon"; }; + rng: rng at ff8b8000 { + compatible = "rockchip,cryptov1-rng"; + reg = <0x0 0xff8b8000 0x0 0x1000>; + status = "disabled"; + }; + dmc: dmc { u-boot,dm-pre-reloc; compatible = "rockchip,rk3399-dmc";