crypto: sun8i-ss: support PRNG and hashes
cover crypto: sun8i-ss: support PRNG and hashes
Hello
The main goal of this serie is to add support for PRNG and hashes to the sun8i-ss.
The whole serie is tested with CRYPTO_EXTRA_TESTS enabled and loading tcrypt.
The PRNG is tested with rngtest.
Regards
Corentin Labbe (7):
crypto: rng - add missing __crypto_rng_cast to the rng header
crypto: sun8i-ss: Add SS_START define
crypto: sun8i-ss: Add support for the PRNG
crypto: sun8i-ss: support hash algorithms
crypto: sun8i-ss: fix a trivial typo
crypto: sun8i-ss: Add more comment on some structures
crypto: sun8i-ss: better debug printing
drivers/crypto/allwinner/Kconfig | 17 + drivers/crypto/allwinner/sun8i-ss/Makefile | 2 + .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 198 +++++++- .../crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 446 ++++++++++++++++++ .../crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 169 +++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 93 +++- include/crypto/rng.h | 5 + 7 files changed, 927 insertions(+), 3 deletions(-) create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
Signature · 1 line
2.24.1
PATCH 1/7 crypto: rng - add missing __crypto_rng_cast to the rng header
This patch add __crypto_rng_cast() to the rng header like other __algo_cast functions.
--- include/crypto/rng.h | 5 +++++ 1 file changed, 5 insertions(+)
include/crypto/rng.h +5 -0
@@ -198,4 +198,9 @@ static inline int crypto_rng_seedsize(struct crypto_rng *tfm)return crypto_rng_alg (tfm)->seedsize; } +static inline struct crypto_rng *__crypto_rng_cast (struct crypto_tfm *tfm) +{ + return container_of(tfm, struct crypto_rng, base); +} +#endif
Signature · 1 line
2.24.1
Herbert Xu
maintainerRe: [PATCH 1/7] crypto: rng - add missing __crypto_rng_cast to the rng header
Quoted 7 lines · Corentin Labbe
This patch add
__crypto_rng_cast()to the rng header like other__algo_castfunctions.Signed-off-by Corentin Labbe <[email protected]>--- include/crypto/rng.h | 5 +++++ 1 file changed, 5 insertions(+)
This should never be exported. Either change the driver to use use crypto_tfm_ctx instead of crypto_rng_ctx, or if you have the time please convert the rng API over to the new way of doing things like aead/skcipher.
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
PATCH 2/7 crypto: sun8i-ss: Add SS_START define
In reply to Corentin LabbeInstead of using an hardcoded value, let's use a defined value for SS_START.
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 2 +- drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +1 -1
@@ -61,7 +61,7 @@ int sun8i_ss_run_task(struct sun8i_ss_dev *ss, struct sun8i_cipher_req_ctx *rctx const char *name) {int flow = rctx->flow; -u32 v =1 ; +u32 v =SS_START ;int i;#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +2 -0
@@ -13,6 +13,8 @@#include <linux/debugfs.h> #include <linux/crypto.h> +#define SS_START 1 +#define SS_ENCRYPTION 0#define SS_DECRYPTION BIT(6)
Signature · 1 line
2.24.1
PATCH 3/7 crypto: sun8i-ss: Add support for the PRNG
In reply to Corentin LabbeThis patch had support for the PRNG present in the SS. The output was tested with rngtest without any failure.
--- drivers/crypto/allwinner/Kconfig | 8 + drivers/crypto/allwinner/sun8i-ss/Makefile | 1 + .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 39 ++++ .../crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 169 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 25 +++ 5 files changed, 242 insertions(+) create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
drivers/crypto/allwinner/Kconfig +8 -0
@@ -95,3 +95,11 @@ config CRYPTO_DEV_SUN8I_SS_DEBUG Say y to enable sun8i-ss debug stats. This will create /sys/kernel/debug/sun8i-ss/stats for displaying the number of requests per flow and per algorithm. + +config CRYPTO_DEV_SUN8I_SS_PRNG + bool "Support for Allwinner Security System PRNG" + depends on CRYPTO_DEV_SUN8I_SS + select CRYPTO_RNG + help + Select this option if you want to provide kernel-side support for + the Pseudo-Random Number Generator found in the Security System.
drivers/crypto/allwinner/sun8i-ss/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_SUN8I_SS) += sun8i-ss.o sun8i-ss-y += sun8i-ss-core.o sun8i-ss-cipher.o +sun8i-ss-$(CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG) += sun8i-ss-prng.o
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +39 -0
@@ -22,6 +22,7 @@#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/reset.h> +#include <crypto/internal/rng.h> #include <crypto/internal/skcipher.h> #include "sun8i-ss.h"
@@ -260,6 +261,25 @@ static struct sun8i_ss_alg_template ss_algs[] = { .decrypt = sun8i_ss_skdecrypt, } }, +#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG +{ + .type = CRYPTO_ALG_TYPE_RNG, + .alg.rng = { + .base = { + .cra_name = "stdrng", + .cra_driver_name = "sun8i-ss-prng", + .cra_priority = 300, + .cra_ctxsize = sizeof(struct sun8i_ss_rng_tfm_ctx), + .cra_module = THIS_MODULE, + .cra_init = sun8i_ss_prng_init, + .cra_exit = sun8i_ss_prng_exit, + }, + .generate = sun8i_ss_prng_generate, + .seed = sun8i_ss_prng_seed, + .seedsize = PRNG_SEED_SIZE, + } +}, +#endif }; #ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG
@@ -281,6 +301,12 @@ static int sun8i_ss_dbgfs_read(struct seq_file *seq, void *v) ss_algs[i].alg.skcipher.base.cra_name, ss_algs[i].stat_req, ss_algs[i].stat_fb);break ; +case CRYPTO_ALG_TYPE_RNG : +seq_printf (seq,"%s %s %lu %lu\n" , + ss_algs[i].alg.rng.base.cra_driver_name, + ss_algs[i].alg.rng.base.cra_name, + ss_algs[i].stat_req, ss_algs[i].stat_bytes); +break ; } }return 0 ;
@@ -444,6 +470,14 @@ static int sun8i_ss_register_algs(struct sun8i_ss_dev *ss)return err; }break ; +case CRYPTO_ALG_TYPE_RNG : + err =crypto_register_rng (&ss_algs[i].alg.rng); +if (err) { +dev_err (ss->dev,"Fail to register %s\n" , + ss_algs[i].alg.rng.base.cra_name); + ss_algs[i].ss =NULL ; + } +break ;default : ss_algs[i].ss =NULL ;dev_err (ss->dev,"ERROR: tried to register an unknown algo\n" );
@@ -465,6 +499,11 @@ static void sun8i_ss_unregister_algs(struct sun8i_ss_dev *ss) ss_algs[i].alg.skcipher.base.cra_name);crypto_unregister_skcipher (&ss_algs[i].alg.skcipher);break ; +case CRYPTO_ALG_TYPE_RNG : +dev_info (ss->dev,"Unregister %d %s\n" , i, + ss_algs[i].alg.rng.base.cra_name); +crypto_unregister_rng (&ss_algs[i].alg.rng); +break ; } } }
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c new file +169 -0
169 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +25 -0
@@ -8,6 +8,7 @@#include <crypto/aes.h> #include <crypto/des.h> #include <crypto/engine.h> +#include <crypto/rng.h> #include <crypto/skcipher.h> #include <linux/atomic.h> #include <linux/debugfs.h>
@@ -21,6 +22,7 @@#define SS_ALG_AES 0#define SS_ALG_DES (1 << 2)#define SS_ALG_3DES (2 << 2) +#define SS_ALG_PRNG (4 << 2)#define SS_CTL_REG 0x00#define SS_INT_CTL_REG 0x04
@@ -52,6 +54,8 @@#define SS_FLOW0 BIT(30)#define SS_FLOW1 BIT(31) +#define SS_PRNG_CONTINUE BIT(18) +#define MAX_SG 8#define MAXFLOW 2
@@ -61,6 +65,9 @@#define SS_DIE_ID_SHIFT 20#define SS_DIE_ID_MASK 0x07 +#define PRNG_DATA_SIZE (160 / 8) +#define PRNG_SEED_SIZE DIV_ROUND_UP(175, 8) +/* * struct ss_clock - Describe clocks used by sun8i-ss * @name: Name of clock needed by this variant
@@ -179,6 +186,16 @@ struct sun8i_cipher_tfm_ctx {struct crypto_sync_skcipher *fallback_tfm; }; +/* +* struct sun8i_ss_prng_ctx - context for PRNG TFM +* @seed: The seed to use +* @slen: The size of the seed +*/ +struct sun8i_ss_rng_tfm_ctx { +void *seed; +unsigned int slen; +}; +/* * struct sun8i_ss_alg_template - crypto_alg template * @type: the CRYPTO_ALG_TYPE for this template
@@ -189,6 +206,7 @@ struct sun8i_cipher_tfm_ctx {* @alg: one of sub struct must be used * @stat_req: number of request done on this template * @stat_fb: number of request which has fallbacked +* @stat_bytes: total data size done by this template */ struct sun8i_ss_alg_template {u32 type;
@@ -197,10 +215,12 @@ struct sun8i_ss_alg_template {struct sun8i_ss_dev *ss;union {struct skcipher_alg skcipher; +struct rng_alg rng; } alg;#ifdef CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG unsigned long stat_req;unsigned long stat_fb; +unsigned long stat_bytes;#endif };
@@ -218,3 +238,8 @@ int sun8i_ss_skencrypt(struct skcipher_request *areq);int sun8i_ss_get_engine_number (struct sun8i_ss_dev *ss);int sun8i_ss_run_task (struct sun8i_ss_dev *ss,struct sun8i_cipher_req_ctx *rctx,const char *name); +int sun8i_ss_prng_generate (struct crypto_rng *tfm,const u8 *src, +unsigned int slen,u8 *dst,unsigned int dlen); +int sun8i_ss_prng_seed (struct crypto_rng *tfm,const u8 *seed,unsigned int slen); +int sun8i_ss_prng_init (struct crypto_tfm *tfm); +void sun8i_ss_prng_exit (struct crypto_tfm *tfm);
Signature · 1 line
2.24.1
PATCH 4/7 crypto: sun8i-ss: support hash algorithms
In reply to Corentin LabbeThe SS support multiples hash algorithms, this patch adds support for MD5, SHA1, SHA224 and SHA256.
--- drivers/crypto/allwinner/Kconfig | 9 + drivers/crypto/allwinner/sun8i-ss/Makefile | 1 + .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 155 ++++++ .../crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 446 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 60 +++ 5 files changed, 671 insertions(+) create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
drivers/crypto/allwinner/Kconfig +9 -0
@@ -103,3 +103,12 @@ config CRYPTO_DEV_SUN8I_SS_PRNG help Select this option if you want to provide kernel-side support for the Pseudo-Random Number Generator found in the Security System. + +config CRYPTO_DEV_SUN8I_SS_HASH + bool "Enable support for hash on sun8i-ss" + depends on CRYPTO_DEV_SUN8I_SS + select MD5 + select SHA1 + select SHA256 + help + Say y to enable support for hash algorithms.
drivers/crypto/allwinner/sun8i-ss/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_CRYPTO_DEV_SUN8I_SS) += sun8i-ss.o sun8i-ss-y += sun8i-ss-core.o sun8i-ss-cipher.o sun8i-ss-$(CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG) += sun8i-ss-prng.o +sun8i-ss-$(CONFIG_CRYPTO_DEV_SUN8I_SS_HASH) += sun8i-ss-hash.o
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +155 -0
185 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c new file +446 -0
446 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +60 -0
105 lines not on this page · raw message
Signature · 1 line
2.24.1
PATCH 5/7 crypto: sun8i-ss: fix a trivial typo
In reply to Corentin LabbeThis fixes a trivial typo.
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +1 -1
@@ -100,7 +100,7 @@ struct ss_clock {* @alg_hash: list of supported hashes. for each SS_ID_ this will give the * corresponding SS_ALG_XXX value * @op_mode: list of supported block modes -* @ss_clks! list of clock needed by this variant +* @ss_clks: list of clock needed by this variant */ struct ss_variant {char alg_cipher[SS_ID_CIPHER_MAX ];
Signature · 1 line
2.24.1
PATCH 6/7 crypto: sun8i-ss: Add more comment on some structures
In reply to Corentin LabbeThis patch adds some comment on structures used by sun8i-ss.
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 4 ++++ 1 file changed, 4 insertions(+)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +4 -0
@@ -171,6 +171,8 @@ struct sun8i_ss_dev {* @ivlen: size of biv * @keylen: keylen for this request * @biv: buffer which contain the IV +* +* t_src, t_dst, p_key, p_iv op_mode, op_dir and method must be in LE32 */ struct sun8i_cipher_req_ctx {struct sginfo t_src[MAX_SG ];
@@ -193,6 +195,8 @@ struct sun8i_cipher_req_ctx {* @keylen: len of the key * @ss: pointer to the private data of driver handling this TFM * @fallback_tfm: pointer to the fallback TFM +* +* enginectx must be the first element */ struct sun8i_cipher_tfm_ctx {struct crypto_engine_ctx enginectx;
Signature · 1 line
2.24.1
PATCH 7/7 crypto: sun8i-ss: better debug printing
In reply to Corentin LabbeThis patch reworks the way debug info are printed. Instead of printing raw numbers, let's add a bit of context.
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +3 -3
@@ -420,19 +420,19 @@ static int sun8i_ss_dbgfs_read(struct seq_file *seq, void *v)continue ;switch (ss_algs[i].type) {case CRYPTO_ALG_TYPE_SKCIPHER : -seq_printf (seq,"%s %s %lu %lu\n" , +seq_printf (seq,"%s %s reqs=%lu fallback=%lu\n" , ss_algs[i].alg.skcipher.base.cra_driver_name, ss_algs[i].alg.skcipher.base.cra_name, ss_algs[i].stat_req, ss_algs[i].stat_fb);break ;case CRYPTO_ALG_TYPE_RNG : -seq_printf (seq,"%s %s %lu %lu\n" , +seq_printf (seq,"%s %s reqs=%lu tsize=%lu\n" , ss_algs[i].alg.rng.base.cra_driver_name, ss_algs[i].alg.rng.base.cra_name, ss_algs[i].stat_req, ss_algs[i].stat_bytes);break ;case CRYPTO_ALG_TYPE_AHASH : -seq_printf (seq,"%s %s %lu %lu\n" , +seq_printf (seq,"%s %s reqs=%lu fallback=%lu\n" , ss_algs[i].alg.hash.halg.base.cra_driver_name, ss_algs[i].alg.hash.halg.base.cra_name, ss_algs[i].stat_req, ss_algs[i].stat_fb);
Signature · 1 line
2.24.1