Add Versal TRNG driver
Subsystems (3)
cover Add Versal TRNG driver
Versal TRNG module consist of array of Ring Oscillators as entropy source and a deterministic CTR_DRBG random bit generator (DRBG). Add driver to registers entropy source to hwrng and CTR_DRBG generator to crypto subsystem. Derivation Function (DF) defined in NIST SP-800-90A for CTR_DRBG is not supported in current TRNG IP. For DF processing, Update drbg module to export CTR_DRBG derivation function.
Harsh Jain (3):
dt-bindings: crypto: Add node for True Random Number Generator
crypto: xilinx: Add TRNG driver for Versal
crypto: drbg: Export CTR DRBG DF functions
.../bindings/crypto/xlnx,versal-trng.yaml | 36 ++ MAINTAINERS | 6 + crypto/drbg.c | 108 +++-- drivers/crypto/Kconfig | 13 + drivers/crypto/xilinx/Makefile | 1 + drivers/crypto/xilinx/xilinx-trng.c | 434 ++++++++++++++++++ include/crypto/drbg.h | 15 + 7 files changed, 562 insertions(+), 51 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml create mode 100644 drivers/crypto/xilinx/xilinx-trng.c
Signature · 1 line
2.34.1
PATCH 1/3 dt-bindings: crypto: Add node for True Random Number Generator
Add TRNG node compatible string and reg properities.
--- .../bindings/crypto/xlnx,versal-trng.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +36 -0
@@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/crypto/xlnx,versal-trng.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Xilinx Versal True Random Number Generator Hardware Accelerator + +maintainers: + - Harsh Jain <[email protected]> + - Mounika Botcha <[email protected]> + +description: + The Versal True Random Number Generator cryptographic accelerator + is used to generate the random number. + +properties: + compatible: + const: xlnx,versal-trng + + reg: + maxItems: 1 + +required: + - reg + +additionalProperties: false + +examples: + - | + trng@f1230000 { + compatible = "xlnx,versal-trng"; + reg = <0xf1230000 0x1000>; + }; +... +
Signature · 1 line
2.34.1
Re: [PATCH 1/3] dt-bindings: crypto: Add node for True Random Number Generator
Quoted 4 lines · Harsh Jain
Add TRNG node compatible string and reg properities.
Signed-off-by Mounika Botcha <[email protected]>Signed-off-by Harsh Jain <[email protected]>
The signoff chain here looks wrong, since there's no From: field in the patch, meaning that you are the author and submitter, but the order of signoffs suggests that Mounika is the author. If you are in fact the author and submitter, what was their role?
Quoted 16 lines
--- .../bindings/crypto/xlnx,versal-trng.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yamlDocumentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +5
-0@@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/crypto/xlnx,versal-trng.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml#
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml line 15
Quoted 10 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +10
-0+ +title: Xilinx Versal True Random Number Generator Hardware Accelerator + +maintainers: + - Harsh Jain <[email protected]> + - Mounika Botcha <[email protected]> + +description: + The Versal True Random Number Generator cryptographic accelerator + is used to generate the random number.
I would be surprised if the random number generator did not generate random numbers. I think you can probably just drop the description entirely in the future
Quoted 6 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +6
-0+ +properties: + compatible: + const: xlnx,versal-trng + + reg:
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml line 31
Quoted 10 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +10
-0+ maxItems: 1 + +required: + - reg + +additionalProperties: false + +examples: + - | + trng@f1230000 {
"rng" I think is the standard node name here, since you need to respin to fix the signoff chain.
Quoted 9 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +5
-0+ compatible = "xlnx,versal-trng"; + reg = <0xf1230000 0x1000>; + }; +... +Signature · 1 line
2.34.1
RE: [PATCH 1/3] dt-bindings: crypto: Add node for True Random Number Generator
[AMD Official Use Only - AMD Internal Distribution Only]
Quoted 15 lines
-----Original Message-----
From: Conor Dooley <[email protected]>
Sent: Friday, May 30, 2025 9:42 PM
To: Jain, Harsh (AECG-SSW) <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]; Botcha, Mounika <[email protected]>; Savitala, Sarat Chand <[email protected]>; Dhanawade, Mohan <[email protected]>; Simek, Michal <[email protected]>
Subject: Re: [PATCH 1/3] dt-bindings: crypto: Add node for True Random Number GeneratorQuoted 2 lines · Harsh Jain
Add TRNG node compatible string and reg properities.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Mounika Botcha <[email protected]>Signed-off-by Harsh Jain <[email protected]>The signoff chain here looks wrong, since there's no From: field in the patch, meaning that you are the author and submitter, but the order of signoffs suggests that Mounika is the author. If you are in fact the author and submitter, what was their role?
Author should be Mounika. I will add From: Mounika Botcha <[email protected]> in next version.
Thanks
Quoted 25 lines
Quoted 5 lines
--- .../bindings/crypto/xlnx,versal-trng.yaml | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/xlnx,versal-
trng.yamlReview
Quoted 2 lines
(quoted diff) +0
-0
b/Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yamlQuoted 16 lines
new file mode 100644
index 000000000000..547ed91aa873Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +11
-0@@ -0,0 +1,36 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/crypto/xlnx,versal-trng.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Xilinx Versal True Random Number Generator Hardware Accelerator + +maintainers: + - Harsh Jain <[email protected]> + - Mounika Botcha <[email protected]>
Quoted 8 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml line 15
Quoted 4 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +4
-0+ +description: + The Versal True Random Number Generator cryptographic accelerator + is used to generate the random number.I would be surprised if the random number generator did not generate random numbers. I think you can probably just drop the description entirely in the future
I will update the description
Quoted 12 lines
Quoted 12 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +11
-0+ +properties: + compatible: + const: xlnx,versal-trng + + reg: + maxItems: 1 + +required: + - reg +
Quoted 8 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml line 31
Quoted 5 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +5
-0+additionalProperties: false + +examples: + - | + trng@f1230000 {"rng" I think is the standard node name here, since you need to respin to fix the signoff chain.
Sure
Quoted 10 lines
Quoted 10 lines
Documentation/devicetree/bindings/crypto/xlnx,versal-trng.yaml new file +5
-1+ compatible = "xlnx,versal-trng"; + reg = <0xf1230000 0x1000>; + }; +... + --2.34.1
PATCH 2/3 crypto: xilinx: Add TRNG driver for Versal
In reply to Harsh JainAdd True Random Number Generator(TRNG) driver for Versal platform.
--- MAINTAINERS | 6 + drivers/crypto/Kconfig | 12 + drivers/crypto/xilinx/Makefile | 1 + drivers/crypto/xilinx/xilinx-trng.c | 408 ++++++++++++++++++++++++++++ 4 files changed, 427 insertions(+) create mode 100644 drivers/crypto/xilinx/xilinx-trng.c
MAINTAINERS +6 -0
@@ -26578,6 +26578,12 @@ F: drivers/misc/Makefile F: drivers/misc/xilinx_sdfec.c F: include/uapi/misc/xilinx_sdfec.h +XILINX TRNG DRIVER +M: Mounika Botcha <[email protected]> +M: Harsh Jain <[email protected]> +S: Maintained +F: drivers/crypto/xilinx/xilinx-trng.c + XILINX UARTLITE SERIAL DRIVER M: Peter Korsgaard <[email protected]> L: [email protected]
drivers/crypto/Kconfig +12 -0
@@ -711,6 +711,18 @@ config CRYPTO_DEV_TEGRA Select this to enable Tegra Security Engine which accelerates various AES encryption/decryption and HASH algorithms. +config CRYPTO_DEV_XILINX_TRNG + tristate "Support for Xilinx True Random Generator" + depends on ZYNQMP_FIRMWARE || COMPILE_TEST + select CRYPTO_RNG + select HW_RANDOM + help + Xilinx Versal SoC driver provides kernel-side support for True Random Number + Generator and Pseudo random Number in CTR_DRBG mode as defined in NIST SP800-90A. + + To compile this driver as a module, choose M here: the module + will be called xilinx-trng. + config CRYPTO_DEV_ZYNQMP_AES tristate "Support for Xilinx ZynqMP AES hw accelerator" depends on ZYNQMP_FIRMWARE || COMPILE_TEST
drivers/crypto/xilinx/Makefile +1 -0
@@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_CRYPTO_DEV_XILINX_TRNG) += xilinx-trng.o obj-$(CONFIG_CRYPTO_DEV_ZYNQMP_AES) += zynqmp-aes-gcm.o obj-$(CONFIG_CRYPTO_DEV_ZYNQMP_SHA3) += zynqmp-sha.o
drivers/crypto/xilinx/xilinx-trng.c new file +408 -0
408 lines not on this page · raw message
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH 2/3] crypto: xilinx: Add TRNG driver for Versal
kernel test robot noticed the following build errors:
Hi Harsh,
kernel test robot noticed the following build errors:
[auto build test ERROR on herbert-cryptodev-2.6/master]
[also build test ERROR on herbert-crypto-2.6/master linus/master v6.15 next-20250530] [cannot apply to xilinx-xlnx/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Harsh-Jain/dt-bindings-crypto-Add-node-for-True-Random-Number-Generator/20250529-193255 base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master patch link: https://lore.kernel.org/r/20250529113116.669667-3-h.jain%40amd.com patch subject: [PATCH 2/3] crypto: xilinx: Add TRNG driver for Versal config: arc-randconfig-r053-20250531 (https://download.01.org/0day-ci/archive/20250531/[email protected]/config) compiler: arc-linux-gcc (GCC) 10.5.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250531/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from <command-line>:
drivers/crypto/xilinx/xilinx-trng.c: In function 'xtrng_hwrng_trng_read':
>> include/linux/compiler_types.h:557:38: error: call to '__compiletime_assert_299' declared with attribute error: min(ret, (max - i)) signedness error
557 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
include/linux/compiler_types.h:538:4: note: in definition of macro '__compiletime_assert'
538 | prefix ## suffix(); \
| ^~~~~~
include/linux/compiler_types.h:557:2: note: in expansion of macro '_compiletime_assert'
557 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
| ^~~~~~~~~~~~~~~~~~
include/linux/minmax.h:93:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
93 | BUILD_BUG_ON_MSG(!__types_ok(ux, uy), \
| ^~~~~~~~~~~~~~~~
include/linux/minmax.h:98:2: note: in expansion of macro '__careful_cmp_once'
98 | __careful_cmp_once(op, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))
| ^~~~~~~~~~~~~~~~~~
include/linux/minmax.h:105:19: note: in expansion of macro '__careful_cmp'
105 | #define min(x, y) __careful_cmp(min, x, y)
| ^~~~~~~~~~~~~
drivers/crypto/xilinx/xilinx-trng.c:300:25: note: in expansion of macro 'min'
300 | memcpy(data + i, buf, min(ret, (max - i)));
| ^~~
--
In file included from <command-line>:
xilinx-trng.c: In function 'xtrng_hwrng_trng_read':
>> include/linux/compiler_types.h:557:38: error: call to '__compiletime_assert_299' declared with attribute error: min(ret, (max - i)) signedness error
557 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
include/linux/compiler_types.h:538:4: note: in definition of macro '__compiletime_assert'
538 | prefix ## suffix(); \
| ^~~~~~
include/linux/compiler_types.h:557:2: note: in expansion of macro '_compiletime_assert'
557 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^~~~~~~~~~~~~~~~~~~
include/linux/build_bug.h:39:37: note: in expansion of macro 'compiletime_assert'
39 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
| ^~~~~~~~~~~~~~~~~~
include/linux/minmax.h:93:2: note: in expansion of macro 'BUILD_BUG_ON_MSG'
93 | BUILD_BUG_ON_MSG(!__types_ok(ux, uy), \
| ^~~~~~~~~~~~~~~~
include/linux/minmax.h:98:2: note: in expansion of macro '__careful_cmp_once'
98 | __careful_cmp_once(op, x, y, __UNIQUE_ID(x_), __UNIQUE_ID(y_))
| ^~~~~~~~~~~~~~~~~~
include/linux/minmax.h:105:19: note: in expansion of macro '__careful_cmp'
105 | #define min(x, y) __careful_cmp(min, x, y)
| ^~~~~~~~~~~~~
xilinx-trng.c:300:25: note: in expansion of macro 'min'
300 | memcpy(data + i, buf, min(ret, (max - i)));
| ^~~vim +/__compiletime_assert_299 +557 include/linux/compiler_types.h
eb5c2d4b45e3d2 Will Deacon 2020-07-21 543 eb5c2d4b45e3d2 Will Deacon 2020-07-21 544 #define _compiletime_assert(condition, msg, prefix, suffix) \ eb5c2d4b45e3d2 Will Deacon 2020-07-21 545 __compiletime_assert(condition, msg, prefix, suffix) eb5c2d4b45e3d2 Will Deacon 2020-07-21 546 eb5c2d4b45e3d2 Will Deacon 2020-07-21 547 /** eb5c2d4b45e3d2 Will Deacon 2020-07-21 548 * compiletime_assert - break build and emit msg if condition is false eb5c2d4b45e3d2 Will Deacon 2020-07-21 549 * @condition: a compile-time constant condition to check eb5c2d4b45e3d2 Will Deacon 2020-07-21 550 * @msg: a message to emit if condition is false eb5c2d4b45e3d2 Will Deacon 2020-07-21 551 * eb5c2d4b45e3d2 Will Deacon 2020-07-21 552 * In tradition of POSIX assert, this macro will break the build if the eb5c2d4b45e3d2 Will Deacon 2020-07-21 553 * supplied condition is *false*, emitting the supplied error message if the eb5c2d4b45e3d2 Will Deacon 2020-07-21 554 * compiler has support to do so. eb5c2d4b45e3d2 Will Deacon 2020-07-21 555 */ eb5c2d4b45e3d2 Will Deacon 2020-07-21 556 #define compiletime_assert(condition, msg) \
eb5c2d4b45e3d2 Will Deacon 2020-07-21 @557 _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)eb5c2d4b45e3d2 Will Deacon 2020-07-21 558
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH 3/3 crypto: drbg: Export CTR DRBG DF functions
In reply to Harsh JainExport drbg_ctr_df() derivative function to re-use it in xilinx trng driver. Changes has been tested by enabling CONFIG_CRYPTO_USER_API_RNG_CAVP
--- crypto/drbg.c | 108 +++++++++++++++------------- drivers/crypto/Kconfig | 1 + drivers/crypto/xilinx/xilinx-trng.c | 30 +++++++- include/crypto/drbg.h | 15 ++++ 4 files changed, 101 insertions(+), 53 deletions(-)
crypto/drbg.c +57 -51
@@ -294,10 +294,11 @@ MODULE_ALIAS_CRYPTO("drbg_nopr_ctr_aes192");MODULE_ALIAS_CRYPTO ("drbg_pr_ctr_aes128" );MODULE_ALIAS_CRYPTO ("drbg_nopr_ctr_aes128" ); -static void drbg_kcapi_symsetkey (struct drbg_state *drbg, -const unsigned char *key); -static int drbg_kcapi_sym (struct drbg_state *drbg,unsigned char *outval, -const struct drbg_string *in); +static void drbg_kcapi_symsetkey (struct crypto_cipher *tfm, +const unsigned char *key, +u8 keylen); +static int drbg_kcapi_sym (struct crypto_cipher *tfm,unsigned char *outval, +const struct drbg_string *in,u8 blocklen_bytes);static int drbg_init_sym_kernel (struct drbg_state *drbg);static int drbg_fini_sym_kernel (struct drbg_state *drbg); static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,
@@ -306,28 +307,31 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg,#define DRBG_OUTSCRATCHLEN 256/* BCC function for CTR DRBG as defined in 10.4.3 */ -static int drbg_ctr_bcc (struct drbg_state *drbg, + +static int drbg_ctr_bcc (struct crypto_cipher *tfm,unsigned char *out,const unsigned char *key, -struct list_head *in) +struct list_head *in, +u8 blocklen_bytes, +u8 keylen) {int ret =0 ;struct drbg_string *curr =NULL ;struct drbg_string data;short cnt =0 ; -drbg_string_fill (&data, out,drbg_blocklen (drbg)); +drbg_string_fill (&data, out, blocklen_bytes);/* 10.4.3 step 2 / 4 */ -drbg_kcapi_symsetkey (drbg, key); +drbg_kcapi_symsetkey (tfm, key, keylen);list_for_each_entry (curr, in, list) {const unsigned char *pos = curr->buf;size_t len = curr->len;/* 10.4.3 step 4.1 */ while (len) {/* 10.4.3 step 4.2 */ -if (drbg_blocklen (drbg) == cnt) { +if (blocklen_bytes == cnt) { cnt =0 ; - ret =drbg_kcapi_sym (drbg, out, &data); + ret =drbg_kcapi_sym (tfm, out, &data, blocklen_bytes);if (ret)return ret; }
@@ -339,13 +343,13 @@ static int drbg_ctr_bcc(struct drbg_state *drbg, }/* 10.4.3 step 4.2 for last block */ if (cnt) - ret =drbg_kcapi_sym (drbg, out, &data); + ret =drbg_kcapi_sym (tfm, out, &data, blocklen_bytes);return ret; }/* -* scratchpad usage: drbg_ctr_update is interlinked with drbg_ctr_df +* scratchpad usage: drbg_ctr_update is interlinked with crypto_drbg_ctr_df * (and drbg_ctr_bcc, but this function does not need any temporary buffers), * the scratchpad is used as follows: * drbg_ctr_update:
@@ -362,7 +366,7 @@ static int drbg_ctr_bcc(struct drbg_state *drbg,* drbg_statelen(drbg) + drbg_blocklen(drbg) * length: drbg_statelen(drbg) * -* drbg_ctr_df: +* crypto_drbg_ctr_df: * pad * start: df_data + drbg_statelen(drbg) * length: drbg_blocklen(drbg)
@@ -381,21 +385,24 @@ static int drbg_ctr_bcc(struct drbg_state *drbg,* the final output of all BCC rounds are truncated). * Therefore, add drbg_blocklen(drbg) to cover all * possibilities. +* refer to crypto_drbg_ctr_df_datalen() to get required length */ /* Derivation Function for CTR DRBG as defined in 10.4.2 */ -static int drbg_ctr_df (struct drbg_state *drbg, +int crypto_drbg_ctr_df (struct crypto_cipher *tfm,unsigned char *df_data,size_t bytes_to_return, -struct list_head *seedlist) +struct list_head *seedlist, +u8 blocklen_bytes, +u8 statelen) {int ret = -EFAULT ;unsigned char L_N [8 ];/* S3 is input */ struct drbg_string S1 ,S2 ,S4 , cipherin;LIST_HEAD (bcc_list); -unsigned char *pad = df_data +drbg_statelen (drbg); -unsigned char *iv = pad +drbg_blocklen (drbg); -unsigned char *temp = iv +drbg_blocklen (drbg); +unsigned char *pad = df_data + statelen; +unsigned char *iv = pad + blocklen_bytes; +unsigned char *temp = iv + blocklen_bytes;size_t padlen =0 ;unsigned int templen =0 ;/* 10.4.2 step 7 */
@@ -410,10 +417,11 @@ static int drbg_ctr_df(struct drbg_state *drbg,size_t generated_len =0 ;size_t inputlen =0 ;struct drbg_string *seed =NULL ; +u8 keylen; -memset (pad,0 ,drbg_blocklen (drbg)); -memset (iv,0 ,drbg_blocklen (drbg)); - +memset (pad,0 , blocklen_bytes); +memset (iv,0 , blocklen_bytes); + keylen = statelen - blocklen_bytes;/* 10.4.2 step 1 is implicit as we work byte-wise */ /* 10.4.2 step 2 */
@@ -429,10 +437,10 @@ static int drbg_ctr_df(struct drbg_state *drbg,drbg_cpu_to_be32 (bytes_to_return, &L_N [4 ]);/* 10.4.2 step 5: length is L_N, input_string, one byte, padding */ - padlen = (inputlen +sizeof (L_N ) +1 ) % (drbg_blocklen (drbg)); + padlen = (inputlen +sizeof (L_N ) +1 ) % (blocklen_bytes);/* wrap the padlen appropriately */ if (padlen) - padlen =drbg_blocklen (drbg) - padlen; + padlen = blocklen_bytes - padlen;/* * pad / padlen contains the 0x80 byte and the following zero bytes. * As the calculated padlen value only covers the number of zero
@@ -442,7 +450,7 @@ static int drbg_ctr_df(struct drbg_state *drbg, pad[0 ] =0x80 ;/* 10.4.2 step 4 -- first fill the linked list and then order it */ -drbg_string_fill (&S1 , iv,drbg_blocklen (drbg)); +drbg_string_fill (&S1 , iv, blocklen_bytes);list_add_tail (&S1 .list, &bcc_list);drbg_string_fill (&S2 ,L_N ,sizeof (L_N ));list_add_tail (&S2 .list, &bcc_list);
@@ -451,7 +459,7 @@ static int drbg_ctr_df(struct drbg_state *drbg,list_add_tail (&S4 .list, &bcc_list);/* 10.4.2 step 9 */ -while (templen < (drbg_keylen (drbg) + (drbg_blocklen (drbg)))) { +while (templen < (keylen + (blocklen_bytes))) {/* * 10.4.2 step 9.1 - the padding is implicit as the buffer * holds zeros after allocation -- even the increment of i
@@ -459,22 +467,23 @@ static int drbg_ctr_df(struct drbg_state *drbg,*/ drbg_cpu_to_be32 (i, iv);/* 10.4.2 step 9.2 -- BCC and concatenation with temp */ - ret =drbg_ctr_bcc (drbg, temp + templen,K , &bcc_list); + ret =drbg_ctr_bcc (tfm, temp + templen,K , &bcc_list, + blocklen_bytes, keylen);if (ret) goto out;/* 10.4.2 step 9.3 */ i++; - templen +=drbg_blocklen (drbg); + templen += blocklen_bytes; }/* 10.4.2 step 11 */ -X = temp + (drbg_keylen (drbg)); -drbg_string_fill (&cipherin,X ,drbg_blocklen (drbg)); +X = temp + (keylen); +drbg_string_fill (&cipherin,X , blocklen_bytes);/* 10.4.2 step 12: overwriting of outval is implemented in next step */ /* 10.4.2 step 13 */ -drbg_kcapi_symsetkey (drbg, temp); +drbg_kcapi_symsetkey (tfm, temp, keylen);while (generated_len < bytes_to_return) {short blocklen =0 ;/*
@@ -482,12 +491,12 @@ static int drbg_ctr_df(struct drbg_state *drbg,* implicit as the key is only drbg_blocklen in size based on * the implementation of the cipher function callback */ - ret =drbg_kcapi_sym (drbg,X , &cipherin); + ret =drbg_kcapi_sym (tfm,X , &cipherin, blocklen_bytes);if (ret) goto out; - blocklen = (drbg_blocklen (drbg) < + blocklen = (blocklen_bytes < (bytes_to_return - generated_len)) ? -drbg_blocklen (drbg) : + blocklen_bytes : (bytes_to_return - generated_len);/* 10.4.2 step 13.2 and 14 */ memcpy (df_data + generated_len,X , blocklen);
@@ -497,11 +506,12 @@ static int drbg_ctr_df(struct drbg_state *drbg, ret =0 ; out: -memset (iv,0 ,drbg_blocklen (drbg)); -memset (temp,0 ,drbg_statelen (drbg) +drbg_blocklen (drbg)); -memset (pad,0 ,drbg_blocklen (drbg)); +memset (iv,0 , blocklen_bytes); +memset (temp,0 , statelen + blocklen_bytes); +memset (pad,0 , blocklen_bytes);return ret; } +EXPORT_SYMBOL_GPL (crypto_drbg_ctr_df);/* * update function of CTR DRBG as defined in 10.2.1.2
@@ -548,7 +558,9 @@ static int drbg_ctr_update(struct drbg_state *drbg, struct list_head *seed,/* 10.2.1.3.2 step 2 and 10.2.1.4.2 step 2 */ if (seed) { - ret =drbg_ctr_df (drbg, df_data,drbg_statelen (drbg), seed); + ret =crypto_drbg_ctr_df (drbg->priv_data, df_data,drbg_statelen (drbg), seed, +drbg_blocklen (drbg), +drbg_statelen (drbg));if (ret) goto out; }
@@ -1310,10 +1322,8 @@ static inline int drbg_alloc_state(struct drbg_state *drbg) sb_size =0 ; else if (drbg->core->flags & DRBG_CTR) sb_size =drbg_statelen (drbg) +drbg_blocklen (drbg) +/* temp */ -drbg_statelen (drbg) +/* df_data */ -drbg_blocklen (drbg) +/* pad */ -drbg_blocklen (drbg) +/* iv */ -drbg_statelen (drbg) +drbg_blocklen (drbg);/* temp */ +crypto_drbg_ctr_df_datalen (drbg_statelen (drbg), +drbg_blocklen (drbg)); else sb_size =drbg_statelen (drbg) +drbg_blocklen (drbg);
@@ -1800,21 +1810,17 @@ static int drbg_init_sym_kernel(struct drbg_state *drbg)return alignmask; } -static void drbg_kcapi_symsetkey (struct drbg_state *drbg, -const unsigned char *key) +static void drbg_kcapi_symsetkey (struct crypto_cipher *tfm, +const unsigned char *key,u8 keylen) { -struct crypto_cipher *tfm = drbg->priv_data; - -crypto_cipher_setkey (tfm, key, (drbg_keylen (drbg))); +crypto_cipher_setkey (tfm, key, keylen); } -static int drbg_kcapi_sym (struct drbg_state *drbg,unsigned char *outval, -const struct drbg_string *in) +static int drbg_kcapi_sym (struct crypto_cipher *tfm,unsigned char *outval, +const struct drbg_string *in,u8 blocklen_bytes) { -struct crypto_cipher *tfm = drbg->priv_data; -/* there is only component in *in */ -BUG_ON (in->len <drbg_blocklen (drbg)); +BUG_ON (in->len < blocklen_bytes);crypto_cipher_encrypt_one (tfm, outval, in->buf);return 0 ; }
drivers/crypto/Kconfig +1 -0
@@ -714,6 +714,7 @@ config CRYPTO_DEV_TEGRA config CRYPTO_DEV_XILINX_TRNG tristate "Support for Xilinx True Random Generator" depends on ZYNQMP_FIRMWARE || COMPILE_TEST + select CRYPTO_DRBG_CTR select CRYPTO_RNG select HW_RANDOM help
drivers/crypto/xilinx/xilinx-trng.c +28 -2
@@ -57,6 +57,8 @@struct xilinx_rng {void __iomem *rng_base;struct device *dev; +unsigned char *scratchpadbuf; +struct crypto_cipher *tfm;struct mutex lock;/* Protect access to TRNG device */ struct hwrng trng; };
@@ -195,9 +197,14 @@ static int xtrng_reseed_internal(struct xilinx_rng *rng) ret =xtrng_collect_random_data (rng, entropy,TRNG_SEED_LEN_BYTES , true);if (ret !=TRNG_SEED_LEN_BYTES )return -EINVAL ; + ret =crypto_drbg_ctr_df (rng->tfm, rng->scratchpadbuf, +TRNG_SEED_LEN_BYTES , &seedlist,AES_BLOCK_SIZE , +TRNG_SEED_LEN_BYTES ); +if (ret) +return ret;xtrng_write_multiple_registers (rng->rng_base +TRNG_EXT_SEED_OFFSET , - (u32 *)entropy,TRNG_NUM_INIT_REGS ); + (u32 *)rng->scratchpadbuf,TRNG_NUM_INIT_REGS );/* select reseed operation */ iowrite32 (TRNG_CTRL_PRNGXS_MASK , rng->rng_base +TRNG_CTRL_OFFSET );
@@ -327,6 +334,7 @@ static void xtrng_hwrng_unregister(struct hwrng *trng)static int xtrng_probe (struct platform_device *pdev) {struct xilinx_rng *rng; +size_t sb_size;int ret; rng =devm_kzalloc (&pdev->dev,sizeof (*rng),GFP_KERNEL );
@@ -340,6 +348,19 @@ static int xtrng_probe(struct platform_device *pdev)return PTR_ERR (rng->rng_base); } + rng->tfm =crypto_alloc_cipher ("aes" ,0 ,0 ); +if (IS_ERR (rng->tfm)) { +pr_info ("DRBG: could not allocate cipher TFM handle:\n" ); +return PTR_ERR (rng->tfm); + } + + sb_size =crypto_drbg_ctr_df_datalen (TRNG_SEED_LEN_BYTES ,AES_BLOCK_SIZE ); + rng->scratchpadbuf =devm_kzalloc (&pdev->dev, sb_size,GFP_KERNEL ); +if (!rng->scratchpadbuf) { + ret = -ENOMEM ; + goto cipher_cleanup; + } +xtrng_trng_reset (rng->rng_base); ret =xtrng_reseed_internal (rng);if (ret) {
@@ -352,8 +373,9 @@ static int xtrng_probe(struct platform_device *pdev) ret =crypto_register_rng (&xtrng_trng_alg);if (ret) {dev_err (&pdev->dev,"Crypto Random device registration failed: %d\n" , ret); -return ret; + goto cipher_cleanup; } + ret =xtrng_hwrng_register (&rng->trng);if (ret) {dev_err (&pdev->dev,"HWRNG device registration failed: %d\n" , ret);
@@ -366,6 +388,9 @@ static int xtrng_probe(struct platform_device *pdev) crypto_rng_free:crypto_unregister_rng (&xtrng_trng_alg); +cipher_cleanup: +crypto_free_cipher (rng->tfm); +return ret; }
@@ -377,6 +402,7 @@ static void xtrng_remove(struct platform_device *pdev) rng =platform_get_drvdata (pdev);xtrng_hwrng_unregister (&rng->trng);crypto_unregister_rng (&xtrng_trng_alg); +crypto_free_cipher (rng->tfm);xtrng_write_multiple_registers (rng->rng_base +TRNG_EXT_SEED_OFFSET , zero,TRNG_NUM_INIT_REGS ); xtrng_write_multiple_registers(rng->rng_base + TRNG_PER_STRNG_OFFSET, zero,
include/crypto/drbg.h +15 -0
@@ -53,6 +53,7 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/workqueue.h> +#include <crypto/internal/cipher.h> /* * Concatenation Helper and string operation helper
@@ -264,6 +265,14 @@ static inline int crypto_drbg_reset_test(struct crypto_rng *drng,return crypto_rng_reset (drng, pers->buf, pers->len); } +static inline int crypto_drbg_ctr_df_datalen (u8 statelen,u8 blocklen) +{ +return statelen +/* df_data */ + blocklen +/* pad */ + blocklen +/* iv */ + statelen + blocklen;/* temp */ +} +/* DRBG type flags */ #define DRBG_CTR ((drbg_flag_t)1<<0)#define DRBG_HMAC ((drbg_flag_t)1<<1)
@@ -283,4 +292,10 @@ enum drbg_prefixes {DRBG_PREFIX3 }; +int crypto_drbg_ctr_df (struct crypto_cipher *tfm, +unsigned char *df_data,size_t bytes_to_return, +struct list_head *seedlist, +u8 blocklen_bytes, +u8 statelen); +#endif /* _DRBG_H */
Signature · 1 line
2.34.1
kernel test robot
build botRe: [PATCH 3/3] crypto: drbg: Export CTR DRBG DF functions
kernel test robot noticed the following build warnings:
Hi Harsh,
kernel test robot noticed the following build warnings:
[auto build test WARNING on herbert-cryptodev-2.6/master]
[also build test WARNING on herbert-crypto-2.6/master linus/master v6.15 next-20250530] [cannot apply to xilinx-xlnx/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Harsh-Jain/dt-bindings-crypto-Add-node-for-True-Random-Number-Generator/20250529-193255 base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master patch link: https://lore.kernel.org/r/20250529113116.669667-4-h.jain%40amd.com patch subject: [PATCH 3/3] crypto: drbg: Export CTR DRBG DF functions config: alpha-kismet-CONFIG_CRYPTO_DRBG_CTR-CONFIG_CRYPTO_DEV_XILINX_TRNG-0-0 (https://download.01.org/0day-ci/archive/20250530/[email protected]/config) reproduce: (https://download.01.org/0day-ci/archive/20250530/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
kismet warnings: (new ones prefixed by >>)
>> kismet: WARNING: unmet direct dependencies detected for CRYPTO_DRBG_CTR when selected by CRYPTO_DEV_XILINX_TRNG
WARNING: unmet direct dependencies detected for CRYPTO_DRBG_CTR
Depends on [n]: CRYPTO [=y] && CRYPTO_DRBG_MENU [=n]
Selected by [y]:
- CRYPTO_DEV_XILINX_TRNG [=y] && CRYPTO [=y] && CRYPTO_HW [=y] && (ZYNQMP_FIRMWARE [=n] || COMPILE_TEST [=y])
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Dan Carpenter
build botRe: [PATCH 3/3] crypto: drbg: Export CTR DRBG DF functions
In reply to Harsh JainBCC: [email protected] CC: [email protected] In-Reply-To: <[email protected]> References: <[email protected]> TO: Harsh Jain <[email protected]> TO…
BCC: [email protected]
CC: [email protected]
In-Reply-To: <[email protected]>
References: <[email protected]>
TO: Harsh Jain <[email protected]>
TO: [email protected]
TO: [email protected]
TO: [email protected]
TO: [email protected]
TO: [email protected]
TO: [email protected]
TO: [email protected]
TO: [email protected]
CC: Harsh Jain <[email protected]>
Hi Harsh,
kernel test robot noticed the following build warnings:
[auto build test WARNING on herbert-cryptodev-2.6/master]
[also build test WARNING on herbert-crypto-2.6/master linus/master v6.15 next-20250530] [cannot apply to xilinx-xlnx/master]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Harsh-Jain/dt-bindings-crypto-Add-node-for-True-Random-Number-Generator/20250529-193255 base: https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git master patch link: https://lore.kernel.org/r/20250529113116.669667-4-h.jain%40amd.com patch subject: [PATCH 3/3] crypto: drbg: Export CTR DRBG DF functions
:::::: branch date: 2 days ago
:::::: commit date: 2 days ago
config: s390-randconfig-r073-20250531 (https://download.01.org/0day-ci/archive/20250531/[email protected]/config)
compiler: clang version 21.0.0git (https://github.com/llvm/llvm-project f819f46284f2a79790038e1f6649172789734ae8)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]> | Reported-by: Dan Carpenter <[email protected]> | Closes: https://lore.kernel.org/r/[email protected]/
smatch warnings:drivers/crypto/xilinx/xilinx-trng.c:368 xtrng_probe() warn: missing unwind goto?
vim +368 drivers/crypto/xilinx/xilinx-trng.c
940a39f34689c6 Harsh Jain 2025-05-29 333
940a39f34689c6 Harsh Jain 2025-05-29 334 static int xtrng_probe(struct platform_device *pdev)
940a39f34689c6 Harsh Jain 2025-05-29 335 {
940a39f34689c6 Harsh Jain 2025-05-29 336 struct xilinx_rng *rng;
bf8ac5fe42abd6 Harsh Jain 2025-05-29 337 size_t sb_size;
940a39f34689c6 Harsh Jain 2025-05-29 338 int ret;
940a39f34689c6 Harsh Jain 2025-05-29 339
940a39f34689c6 Harsh Jain 2025-05-29 340 rng = devm_kzalloc(&pdev->dev, sizeof(*rng), GFP_KERNEL);
940a39f34689c6 Harsh Jain 2025-05-29 341 if (!rng)
940a39f34689c6 Harsh Jain 2025-05-29 342 return -ENOMEM;
940a39f34689c6 Harsh Jain 2025-05-29 343
940a39f34689c6 Harsh Jain 2025-05-29 344 rng->dev = &pdev->dev;
940a39f34689c6 Harsh Jain 2025-05-29 345 rng->rng_base = devm_platform_ioremap_resource(pdev, 0);
940a39f34689c6 Harsh Jain 2025-05-29 346 if (IS_ERR(rng->rng_base)) {
940a39f34689c6 Harsh Jain 2025-05-29 347 dev_err(&pdev->dev, "Failed to map resource %ld\n", PTR_ERR(rng->rng_base));
940a39f34689c6 Harsh Jain 2025-05-29 348 return PTR_ERR(rng->rng_base);
940a39f34689c6 Harsh Jain 2025-05-29 349 }
940a39f34689c6 Harsh Jain 2025-05-29 350
bf8ac5fe42abd6 Harsh Jain 2025-05-29 351 rng->tfm = crypto_alloc_cipher("aes", 0, 0);
bf8ac5fe42abd6 Harsh Jain 2025-05-29 352 if (IS_ERR(rng->tfm)) {
bf8ac5fe42abd6 Harsh Jain 2025-05-29 353 pr_info("DRBG: could not allocate cipher TFM handle:\n");
bf8ac5fe42abd6 Harsh Jain 2025-05-29 354 return PTR_ERR(rng->tfm);
bf8ac5fe42abd6 Harsh Jain 2025-05-29 355 }
bf8ac5fe42abd6 Harsh Jain 2025-05-29 356
bf8ac5fe42abd6 Harsh Jain 2025-05-29 357 sb_size = crypto_drbg_ctr_df_datalen(TRNG_SEED_LEN_BYTES, AES_BLOCK_SIZE);
bf8ac5fe42abd6 Harsh Jain 2025-05-29 358 rng->scratchpadbuf = devm_kzalloc(&pdev->dev, sb_size, GFP_KERNEL);
bf8ac5fe42abd6 Harsh Jain 2025-05-29 359 if (!rng->scratchpadbuf) {
bf8ac5fe42abd6 Harsh Jain 2025-05-29 360 ret = -ENOMEM;
bf8ac5fe42abd6 Harsh Jain 2025-05-29 361 goto cipher_cleanup;
bf8ac5fe42abd6 Harsh Jain 2025-05-29 362 }
bf8ac5fe42abd6 Harsh Jain 2025-05-29 363
940a39f34689c6 Harsh Jain 2025-05-29 364 xtrng_trng_reset(rng->rng_base);
940a39f34689c6 Harsh Jain 2025-05-29 365 ret = xtrng_reseed_internal(rng);
940a39f34689c6 Harsh Jain 2025-05-29 366 if (ret) {
940a39f34689c6 Harsh Jain 2025-05-29 367 dev_err(&pdev->dev, "TRNG Seed fail\n");
940a39f34689c6 Harsh Jain 2025-05-29 @368 return ret;
940a39f34689c6 Harsh Jain 2025-05-29 369 }
940a39f34689c6 Harsh Jain 2025-05-29 370
940a39f34689c6 Harsh Jain 2025-05-29 371 xilinx_rng_dev = rng;
940a39f34689c6 Harsh Jain 2025-05-29 372 mutex_init(&rng->lock);
940a39f34689c6 Harsh Jain 2025-05-29 373 ret = crypto_register_rng(&xtrng_trng_alg);
940a39f34689c6 Harsh Jain 2025-05-29 374 if (ret) {
940a39f34689c6 Harsh Jain 2025-05-29 375 dev_err(&pdev->dev, "Crypto Random device registration failed: %d\n", ret);
bf8ac5fe42abd6 Harsh Jain 2025-05-29 376 goto cipher_cleanup;
940a39f34689c6 Harsh Jain 2025-05-29 377 }
bf8ac5fe42abd6 Harsh Jain 2025-05-29 378
940a39f34689c6 Harsh Jain 2025-05-29 379 ret = xtrng_hwrng_register(&rng->trng);
940a39f34689c6 Harsh Jain 2025-05-29 380 if (ret) {
940a39f34689c6 Harsh Jain 2025-05-29 381 dev_err(&pdev->dev, "HWRNG device registration failed: %d\n", ret);
940a39f34689c6 Harsh Jain 2025-05-29 382 goto crypto_rng_free;
940a39f34689c6 Harsh Jain 2025-05-29 383 }
940a39f34689c6 Harsh Jain 2025-05-29 384 platform_set_drvdata(pdev, rng);
940a39f34689c6 Harsh Jain 2025-05-29 385
940a39f34689c6 Harsh Jain 2025-05-29 386 return 0;
940a39f34689c6 Harsh Jain 2025-05-29 387
940a39f34689c6 Harsh Jain 2025-05-29 388 crypto_rng_free:
940a39f34689c6 Harsh Jain 2025-05-29 389 crypto_unregister_rng(&xtrng_trng_alg);
940a39f34689c6 Harsh Jain 2025-05-29 390
bf8ac5fe42abd6 Harsh Jain 2025-05-29 391 cipher_cleanup:
bf8ac5fe42abd6 Harsh Jain 2025-05-29 392 crypto_free_cipher(rng->tfm);
bf8ac5fe42abd6 Harsh Jain 2025-05-29 393
940a39f34689c6 Harsh Jain 2025-05-29 394 return ret;
940a39f34689c6 Harsh Jain 2025-05-29 395 }
940a39f34689c6 Harsh Jain 2025-05-29 396 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki