Add RK3588 TRNG
Subsystems (2)
v3 cover Add RK3588 TRNG
From: Chris Morgan <[email protected]>
Add support for the RK3588 TRNG. The code was taken directly from the Rockchip BSP U-Boot source.
This code was taken wholesale from the Rockchip BSP U-Boot source located here:
https://github.com/rockchip-linux/u-boot/commit/09f31aed858c36a8a5ee20789712e65bb4762068
Tested on an Indiedroid Nova with an RK3588s and a Radxa Rock 5B with an RK3588.
Chris Morgan (2):
rockchip: rng: add trngv1 for rk3588
ARM: dts: rockchip: rk3588s-u-boot: Add rng node
arch/arm/dts/rk3588s-u-boot.dtsi | 6 ++ drivers/rng/Kconfig | 5 +- drivers/rng/rockchip_rng.c | 120 ++++++++++++++++++++++++++++--- 3 files changed, 120 insertions(+), 11 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 rockchip: rng: add trngv1 for rk3588
From: Chris Morgan <[email protected]>
This adds support for the TRNG found in the RK3588 SoC to the rockchip_rng driver so that it can be used for things such as seeding randomness to Linux.
Changes in V3:
- Moved notes from commit to cover letter.
- Added Reviewed-By tag.
Changes in V2:
- Modified Kconfig to note that the Rockchip RNG driver supports all versions of the hardware (v1, v2, and the trng in the rk3588).
--- drivers/rng/Kconfig | 5 +- drivers/rng/rockchip_rng.c | 120 ++++++++++++++++++++++++++++++++++--- 2 files changed, 114 insertions(+), 11 deletions(-)
drivers/rng/Kconfig +3 -2
@@ -58,8 +58,9 @@ config RNG_ROCKCHIP bool "Enable random number generator for rockchip crypto rng" depends on ARCH_ROCKCHIP && DM_RNG help - Enable random number generator for rockchip.This driver is - support rng module of crypto v1 and crypto v2. + Enable random number generator for rockchip. This driver + supports the rng module of crypto v1, crypto v2, and the + trng module of the rk3588 series. config RNG_IPROC200 bool "Broadcom iProc RNG200 random number generator"
drivers/rng/rockchip_rng.c +111 -9
169 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH V3 1/2] rockchip: rng: add trngv1 for rk3588
hi Chris,
Quoted 7 lines · Chris Morgan
From: Chris Morgan <[email protected]>
This adds support for the TRNG found in the RK3588 SoC to the
rockchip_rngdriver so that it can be used for things such as seeding randomness to Linux.
Quoted 7 lines
Changes in V3:
- Moved notes from commit to cover letter.
- Added Reviewed-By tag.Changes in V2:
- ModifiedKconfigto note that the Rockchip RNG driver supports all versions of the hardware (v1, v2, and the trng in the rk3588).
The changelog lines should come below the --- line after the Signed-off-by, R-b lines.
Quoted 121 lines
Signed-off-by Lin Jinhan <[email protected]>Signed-off-by Chris Morgan <[email protected]>Reviewed-by Kever Yang <[email protected]>--- drivers/rng/Kconfig | 5 +- drivers/rng/rockchip_rng.c | 120 ++++++++++++++++++++++++++++++++++--- 2 files changed, 114 insertions(+), 11 deletions(-)drivers/rng/Kconfig +3
-2@@ -58,8 +58,9 @@ config RNG_ROCKCHIP bool "Enable random number generator for rockchip crypto rng" depends on ARCH_ROCKCHIP && DM_RNG help - Enable random number generator for rockchip.This driver is - support rng module of crypto v1 and crypto v2. + Enable random number generator for rockchip. This driver + supports the rng module of crypto v1, crypto v2, and the + trng module of the rk3588 series. config RNG_IPROC200 bool "Broadcom iProc RNG200 random number generator"drivers/rng/rockchip_rng.c +62
-2@@ -43,9 +43,41 @@#define CRYPTO_V2_RNG_DOUT_0 0x0410/* end of CRYPTO V2 register define */ +/* start of TRNG V1 register define */ +#define TRNG_V1_CTRL 0x0000 +#define TRNG_V1_CTRL_NOP _SBF(0, 0x00) +#define TRNG_V1_CTRL_RAND _SBF(0, 0x01) +#define TRNG_V1_CTRL_SEED _SBF(0, 0x02) + +#define TRNG_V1_MODE 0x0008 +#define TRNG_V1_MODE_128_BIT _SBF(3, 0x00) +#define TRNG_V1_MODE_256_BIT _SBF(3, 0x01) + +#define TRNG_V1_IE 0x0010 +#define TRNG_V1_IE_GLBL_EN BIT(31) +#define TRNG_V1_IE_SEED_DONE_EN BIT(1) +#define TRNG_V1_IE_RAND_RDY_EN BIT(0) + +#define TRNG_V1_ISTAT 0x0014 +#define TRNG_V1_ISTAT_RAND_RDY BIT(0) + +/* RAND0 ~ RAND7 */ +#define TRNG_V1_RAND0 0x0020 +#define TRNG_V1_RAND7 0x003C + +#define TRNG_V1_AUTO_RQSTS 0x0060 + +#define TRNG_V1_VERSION 0x00F0 +#define TRNG_v1_VERSION_CODE 0x46BC +/* end of TRNG V1 register define */ +#define RK_RNG_TIME_OUT 50000/* max 50ms */ +#define trng_write (pdata, pos, val) writel(val, (pdata)->base + (pos)) +#define trng_read (pdata, pos) readl((pdata)->base + (pos)) +struct rk_rng_soc_data { +int (*rk_rng_init)(struct udevice *dev);int (*rk_rng_read)(struct udevice *dev,void *data,size_t len); };@@ -75,7 +107,7 @@ static int rk_rng_read_regs(fdt_addr_t addr, void *buf, size_t size)return 0 ; } -static int rk_v1_rng_read (struct udevice *dev,void *data,size_t len) +static int rk_cryptov1_rng_read (struct udevice *dev,void *data,size_t len) {struct rk_rng_plat *pdata =dev_get_priv (dev);u32 reg =0 ;@@ -106,7 +138,7 @@ exit:return 0 ; } -static int rk_v2_rng_read (struct udevice *dev,void *data,size_t len) +static int rk_cryptov2_rng_read (struct udevice *dev,void *data,size_t len) {struct rk_rng_plat *pdata =dev_get_priv (dev);u32 reg =0 ;@@ -140,6 +172,63 @@ exit:return retval; } +static int rk_trngv1_init (struct udevice *dev) +{ +u32 status, version; +u32 auto_reseed_cnt =1000 ; +struct rk_rng_plat *pdata =dev_get_priv (dev); + + version =trng_read (pdata,TRNG_V1_VERSION ); +if (version != TRNG_v1_VERSION_CODE) { +printf ("wrong trng version, expected = %08x, actual = %08x" , +TRNG_V1_VERSION , version); +return -EFAULT ; + } + +/* wait in case of RND_RDY triggered at firs power on */ +readl_poll_timeout (pdata->base +TRNG_V1_ISTAT , status, + (status &TRNG_V1_ISTAT_RAND_RDY ), +RK_RNG_TIME_OUT ); + +/* clear RAND_RDY flag for first power on */ +trng_write (pdata,TRNG_V1_ISTAT , status); + +/* auto reseed after (auto_reseed_cnt * 16) byte rand generate */ +trng_write (pdata,TRNG_V1_AUTO_RQSTS , auto_reseed_cnt); + +return 0 ; +} + +static int rk_trngv1_rng_read (struct udevice *dev,void *data,size_t len)
drivers/rng/rockchip_rng.c exit: · line 212
Quoted 10 lines
drivers/rng/rockchip_rng.c +10
-0+{ +struct rk_rng_plat *pdata =dev_get_priv (dev); +u32 reg =0 ; +int retval; + +if (len >RK_HW_RNG_MAX ) +return -EINVAL ; + +trng_write (pdata,TRNG_V1_MODE ,TRNG_V1_MODE_256_BIT ); +trng_write (pdata,TRNG_V1_CTRL ,TRNG_V1_CTRL_RAND );
The same values are being set for all the reads. Can these not be moved to the init function instead?
-sughosh
Quoted 76 lines
drivers/rng/rockchip_rng.c +39
-8+ + retval =readl_poll_timeout (pdata->base +TRNG_V1_ISTAT , reg, + (reg &TRNG_V1_ISTAT_RAND_RDY ), +RK_RNG_TIME_OUT ); +/* clear ISTAT */ +trng_write (pdata,TRNG_V1_ISTAT , reg); + +if (retval) + goto exit; + +rk_rng_read_regs (pdata->base +TRNG_V1_RAND0 , data, len); + +exit: +/* close TRNG */ +trng_write (pdata,TRNG_V1_CTRL ,TRNG_V1_CTRL_NOP ); + +return retval; +} +static int rockchip_rng_read (struct udevice *dev,void *data,size_t len) {unsigned char *buf = data;@@ -184,18 +273,27 @@ static int rockchip_rng_of_to_plat(struct udevice *dev)static int rockchip_rng_probe (struct udevice *dev) {struct rk_rng_plat *pdata =dev_get_priv (dev); +int ret =0 ; pdata->soc_data = (struct rk_rng_soc_data *)dev_get_driver_data (dev); -return 0 ; +if (pdata->soc_data->rk_rng_init) + ret = pdata->soc_data->rk_rng_init (dev); + +return ret; } -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_cryptov1_soc_data = { + .rk_rng_read = rk_cryptov1_rng_read, +}; + +static const struct rk_rng_soc_data rk_cryptov2_soc_data = { + .rk_rng_read = rk_cryptov2_rng_read, }; -static const struct rk_rng_soc_data rk_rng_v2_soc_data = { - .rk_rng_read = rk_v2_rng_read, +static const struct rk_rng_soc_data rk_trngv1_soc_data = { + .rk_rng_init = rk_trngv1_init, + .rk_rng_read = rk_trngv1_rng_read, };static const struct dm_rng_ops rockchip_rng_ops = {@@ -205,11 +303,15 @@ static const struct dm_rng_ops rockchip_rng_ops = {static const struct udevice_id rockchip_rng_match[] = { { .compatible ="rockchip,cryptov1-rng" , - .data = (ulong)&rk_rng_v1_soc_data, + .data = (ulong)&rk_cryptov1_soc_data, }, { .compatible ="rockchip,cryptov2-rng" , - .data = (ulong)&rk_rng_v2_soc_data, + .data = (ulong)&rk_cryptov2_soc_data, + }, + { + .compatible ="rockchip,trngv1" , + .data = (ulong)&rk_trngv1_soc_data, }, {}, }; --2.34.1
PATCH v3 2/2 ARM: dts: rockchip: rk3588s-u-boot: Add rng node
In reply to Chris MorganFrom: Chris Morgan <[email protected]>
Add a node for the trng found on RK3588 SoCs.
Changes in V3:
- Added Reviewed-By tag.
Changes in V2:
- None
--- arch/arm/dts/rk3588s-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/dts/rk3588s-u-boot.dtsi +6 -0
@@ -43,6 +43,12 @@ reg = <0x07 0x10>; }; }; + + rng: rng@fe378000 { + compatible = "rockchip,trngv1"; + reg = <0x0 0xfe378000 0x0 0x200>; + status = "disabled"; + }; }; &xin24m {
Signature · 1 line
2.34.1
Re: [PATCH V3 2/2] ARM: dts: rockchip: rk3588s-u-boot: Add rng node
hi Chris,
Quoted 10 lines · Chris Morgan
From: Chris Morgan <[email protected]>
Add a node for the trng found on RK3588 SoCs.
Changes in V3:
- Added Reviewed-By tag.Changes in V2:
- None
Same comment for the changelog lines as in the other patch.
Other than that
-sughosh
Quoted 27 lines
Signed-off-by Chris Morgan <[email protected]>Reviewed-by Kever Yang <[email protected]>--- arch/arm/dts/rk3588s-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)arch/arm/dts/rk3588s-u-boot.dtsi +6
-1@@ -43,6 +43,12 @@ reg = <0x07 0x10>; }; }; + + rng: rng@fe378000 { + compatible = "rockchip,trngv1"; + reg = <0x0 0xfe378000 0x0 0x200>; + status = "disabled"; + }; }; &xin24m { --2.34.1
Re: [PATCH V3 2/2] ARM: dts: rockchip: rk3588s-u-boot: Add rng node
In reply to Chris MorganQuoted 8 lines · Chris Morgan
From: Chris Morgan <[email protected]>
Add a node for the trng found on RK3588 SoCs.
Changes in V3:
- Added Reviewed-By tag.
Quoted 9 lines
Changes in V2:
- NoneSigned-off-by Chris Morgan <[email protected]>Reviewed-by Kever Yang <[email protected]>--- arch/arm/dts/rk3588s-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
Any particular reason why the node is being included in the u-boot.dtsi, instead of the soc specific dtsi, given that this is describing a hardware peripheral. Why can this not be in the rk3588s.dtsi instead?
-sughosh
Quoted 20 lines
arch/arm/dts/rk3588s-u-boot.dtsi +6
-1@@ -43,6 +43,12 @@ reg = <0x07 0x10>; }; }; + + rng: rng@fe378000 { + compatible = "rockchip,trngv1"; + reg = <0x0 0xfe378000 0x0 0x200>; + status = "disabled"; + }; }; &xin24m { --2.34.1
Re: [PATCH V3 2/2] ARM: dts: rockchip: rk3588s-u-boot: Add rng node
Quoted 19 lines · Sughosh Ganu
Quoted 8 lines · Chris Morgan
From: Chris Morgan <[email protected]>
Add a node for the trng found on RK3588 SoCs.
Changes in V3:
- Added Reviewed-By tag.Quoted 9 lines
Changes in V2:
- NoneSigned-off-by Chris Morgan <[email protected]>Reviewed-by Kever Yang <[email protected]>--- arch/arm/dts/rk3588s-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
Quoted 4 lines
Any particular reason why the node is being included in the
u-boot.dtsi, instead of the soc specific dtsi, given that this is describing a hardware peripheral. Why can this not be in therk3588s.dtsiinstead?
There is no driver in mainline Linux yet. As a result I thought it prudent to add this to the U-Boot specific tree rather than the mainline one. Once it does get support in mainline though I can remove it from here and add it there. I probably should change it to "okay" instead of "disabled" though, and just let the user decide by compiling the driver or not if they want to use it in U-Boot.
Thank you.
Quoted 23 lines
-sughosh
Quoted 20 lines
arch/arm/dts/rk3588s-u-boot.dtsi +6
-1@@ -43,6 +43,12 @@ reg = <0x07 0x10>; }; }; + + rng: rng@fe378000 { + compatible = "rockchip,trngv1"; + reg = <0x0 0xfe378000 0x0 0x200>; + status = "disabled"; + }; }; &xin24m { --2.34.1
Re: [PATCH V3 2/2] ARM: dts: rockchip: rk3588s-u-boot: Add rng node
Quoted 26 lines · Chris Morgan
Quoted 19 lines · Sughosh Ganu
Quoted 8 lines · Chris Morgan
From: Chris Morgan <[email protected]>
Add a node for the trng found on RK3588 SoCs.
Changes in V3:
- Added Reviewed-By tag.Quoted 9 lines
Changes in V2:
- NoneSigned-off-by Chris Morgan <[email protected]>Reviewed-by Kever Yang <[email protected]>--- arch/arm/dts/rk3588s-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)Quoted 4 lines
Any particular reason why the node is being included in the
u-boot.dtsi, instead of the soc specific dtsi, given that this is describing a hardware peripheral. Why can this not be in therk3588s.dtsiinstead?
Quoted 4 lines
There is no driver in mainline Linux yet. As a result I thought it prudent to add this to the U-Boot specific tree rather than the mainline one. Once it does get support in mainline though I can remove it from here and add it there.
Okay. Please work on moving the node to the soc's dtsi once the binding gets upstreamed in linux. I think there are other rockchip soc's too which have rng nodes in the u-boot.dtsi.
-sughosh
Quoted 30 lines
I probably should change it
to "okay" instead of "disabled" though, and just let the user decide by compiling the driver or not if they want to use it in U-Boot.Thank you.
Quoted 23 lines
-sughosh
Quoted 20 lines
arch/arm/dts/rk3588s-u-boot.dtsi +6
-1@@ -43,6 +43,12 @@ reg = <0x07 0x10>; }; }; + + rng: rng@fe378000 { + compatible = "rockchip,trngv1"; + reg = <0x0 0xfe378000 0x0 0x200>; + status = "disabled"; + }; }; &xin24m { --2.34.1