crypto: allwinner: add xRNG and hashes
v7 cover crypto: allwinner: add xRNG and hashes
Hello
The main goal of this serie is to add support for TRNG, PRNG and hashes to the sun8i-ss/sun8i-ce driver.
The whole serie is tested with CRYPTO_EXTRA_TESTS enabled and loading tcrypt.
The PRNG and TRNG are tested with rngtest.
Both LE and BE kernel are tested.
This serie was tested on:
- sun50i-a64-pine64
- sun8i-a83t-bananapi-m3
- sun8i-r40-bananapi-m2-ultra
- sun50i-h5-libretech-all-h3-cc
- sun8i-h3-orangepi-pc
Regards
Change since v1:
- removed _crypto_rng_cast patch
Change since v2:
- cleaned unused variables from sun8i-ce-prng
- added some missing memzero_explicit
Change since v3:
- rebased on latest next
- removed useless cpu_to_le32() in sun8i-ss
- added 2 last patches
- add handle endianness of t_common_ctl patch
Change since v4:
- added a style issue patch
Changes since v5:
- handle failure pattern of pm_runtime_get_sync
- Add missing linux/dma-mapping.h
Changes since v6:
- fix sparse error in sun8i-ce-cipher.c
Corentin Labbe (17):
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
crypto: sun8i-ce: handle endianness of t_common_ctl
crypto: sun8i-ce: move iv data to request context
crypto: sun8i-ce: split into prepare/run/unprepare
crypto: sun8i-ce: handle different error registers
crypto: sun8i-ce: rename has_t_dlen_in_bytes to cipher_t_dlen_in_bytes
crypto: sun8i-ce: support hash algorithms
crypto: sun8i-ce: Add stat_bytes debugfs
crypto: sun8i-ce: Add support for the PRNG
crypto: sun8i-ce: Add support for the TRNG
crypto: sun8i-ce: fix comparison of integer expressions of different
signedness
crypto: sun8i-ss: fix comparison of integer expressions of different
signedness
drivers/crypto/allwinner/Kconfig | 43 ++ drivers/crypto/allwinner/sun8i-ce/Makefile | 3 + .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 116 +++-- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 381 ++++++++++++++- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 413 ++++++++++++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 164 +++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 127 +++++ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 139 +++++- drivers/crypto/allwinner/sun8i-ss/Makefile | 2 + .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 205 +++++++- .../crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 444 ++++++++++++++++++ .../crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 173 +++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 89 +++- 13 files changed, 2240 insertions(+), 59 deletions(-) create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c 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.26.2
PATCH v7 2/17 crypto: sun8i-ss: Add support for the PRNG
This 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 | 173 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 25 +++ 5 files changed, 246 insertions(+) create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
drivers/crypto/allwinner/Kconfig +8 -0
@@ -104,3 +104,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"
@@ -264,6 +265,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
@@ -285,6 +305,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 ;
@@ -448,6 +474,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" );
@@ -469,6 +503,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 +173 -0
173 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
@@ -181,6 +188,16 @@ struct sun8i_cipher_tfm_ctx {struct crypto_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
@@ -191,6 +208,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;
@@ -199,10 +217,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 };
@@ -220,3 +240,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.26.2
PATCH v7 3/17 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 | 444 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 58 +++ 5 files changed, 667 insertions(+) create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
drivers/crypto/allwinner/Kconfig +9 -0
@@ -112,3 +112,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 +444 -0
444 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +58 -0
103 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v7 7/17 crypto: sun8i-ce: handle endianness of t_common_ctl
In reply to Corentin Labbet_common_ctl is LE32 so we need to convert its value before using it. This value is only used on H6 (ignored on other SoCs) and not handling the endianness cause failure on xRNG/hashes operations on H6 when running BE.
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +4 -1
@@ -120,7 +120,10 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name)/* Be sure all data is written before enabling the task */ wmb (); - v =1 | (ce->chanlist[flow].tl->t_common_ctl &0x7F ) <<8 ; +/* Only H6 needs to write a part of t_common_ctl along with "1", but since it is ignored +* on older SoCs, we have no reason to complicate things. +*/ + v =1 | ((le32_to_cpu (ce->chanlist[flow].tl->t_common_ctl) &0x7F ) <<8 );writel (v, ce->base +CE_TLR );mutex_unlock (&ce->mlock);
Signature · 1 line
2.26.2
PATCH v7 6/17 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
@@ -424,19 +424,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.26.2
PATCH v7 4/17 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.26.2
PATCH v7 5/17 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 | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h +2 -0
@@ -195,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.26.2
PATCH v7 14/17 crypto: sun8i-ce: Add support for the PRNG
In reply to Corentin LabbeThis patch had support for the PRNG present in the CE. The output was tested with rngtest without any failure.
--- drivers/crypto/allwinner/Kconfig | 8 + drivers/crypto/allwinner/sun8i-ce/Makefile | 1 + .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 58 ++++++- .../crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 164 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 31 ++++ 5 files changed, 261 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c
drivers/crypto/allwinner/Kconfig +8 -0
@@ -88,6 +88,14 @@ config CRYPTO_DEV_SUN8I_CE_HASH help Say y to enable support for hash algorithms. +config CRYPTO_DEV_SUN8I_CE_PRNG + bool "Support for Allwinner Crypto Engine PRNG" + depends on CRYPTO_DEV_SUN8I_CE + select CRYPTO_RNG + help + Select this option if you want to provide kernel-side support for + the Pseudo-Random Number Generator found in the Crypto Engine. + config CRYPTO_DEV_SUN8I_SS tristate "Support for Allwinner Security System cryptographic offloader" select CRYPTO_SKCIPHER
drivers/crypto/allwinner/sun8i-ce/Makefile +1 -0
@@ -1,3 +1,4 @@ obj-$(CONFIG_CRYPTO_DEV_SUN8I_CE) += sun8i-ce.o sun8i-ce-y += sun8i-ce-core.o sun8i-ce-cipher.o sun8i-ce-$(CONFIG_CRYPTO_DEV_SUN8I_CE_HASH) += sun8i-ce-hash.o +sun8i-ce-$(CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG) += sun8i-ce-prng.o
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +57 -1
138 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c new file +164 -0
164 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +31 -0
@@ -14,6 +14,7 @@#include <linux/crypto.h> #include <crypto/internal/hash.h> #include <crypto/md5.h> +#include <crypto/rng.h> #include <crypto/sha.h> /* CE Registers */
@@ -54,6 +55,8 @@#define CE_ALG_SHA256 19#define CE_ALG_SHA384 20#define CE_ALG_SHA512 21 +#define CE_ALG_PRNG 49 +#define CE_ALG_PRNG_V2 0x1d/* Used in ce_variant */ #define CE_ID_NOTSUPP 0xFF
@@ -88,6 +91,10 @@#define ESR_H5 3#define ESR_H6 4 +#define PRNG_DATA_SIZE (160 / 8) +#define PRNG_SEED_SIZE DIV_ROUND_UP(175, 8) +#define PRNG_LD BIT(17) +#define CE_DIE_ID_SHIFT 16#define CE_DIE_ID_MASK 0x07
@@ -120,8 +127,11 @@ struct ce_clock {* bytes or words * @hash_t_dlen_in_bytes: Does the request size for hash is in * bits or words +* @prng_t_dlen_in_bytes: Does the request size for PRNG is in +* bytes or words * @ce_clks: list of clocks needed by this variant * @esr: The type of error register +* @prng: The CE_ALG_XXX value for the PRNG */ struct ce_variant {char alg_cipher[CE_ID_CIPHER_MAX ];
@@ -129,8 +139,10 @@ struct ce_variant {u32 op_mode[CE_ID_OP_MAX ];bool cipher_t_dlen_in_bytes;bool hash_t_dlen_in_bits; +bool prng_t_dlen_in_bytes;struct ce_clock ce_clks[CE_MAX_CLOCKS ];int esr; +unsigned char prng; };struct sginfo {
@@ -185,6 +197,7 @@ struct sun8i_ce_flow {* @reset: pointer to reset controller * @dev: the platform device * @mlock: Control access to device registers +* @rnglock: Control access to the RNG (dedicated channel 3) * @chanlist: array of all flow * @flow: flow to use in next request * @variant: pointer to variant specific data
@@ -197,6 +210,7 @@ struct sun8i_ce_dev {struct reset_control *reset;struct device *dev;struct mutex mlock; +struct mutex rnglock;struct sun8i_ce_flow *chanlist;atomic_t flow;const struct ce_variant *variant;
@@ -270,6 +284,16 @@ struct sun8i_ce_hash_reqctx {int flow; }; +/* +* struct sun8i_ce_prng_ctx - context for PRNG TFM +* @seed: The seed to use +* @slen: The size of the seed +*/ +struct sun8i_ce_rng_tfm_ctx { +void *seed; +unsigned int slen; +}; +/* * struct sun8i_ce_alg_template - crypto_alg template * @type: the CRYPTO_ALG_TYPE for this template
@@ -290,6 +314,7 @@ struct sun8i_ce_alg_template {union {struct skcipher_alg skcipher;struct ahash_alg hash; +struct rng_alg rng; } alg;#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG unsigned long stat_req;
@@ -324,3 +349,9 @@ int sun8i_ce_hash_update(struct ahash_request *areq);int sun8i_ce_hash_finup (struct ahash_request *areq);int sun8i_ce_hash_digest (struct ahash_request *areq);int sun8i_ce_hash_run (struct crypto_engine *engine,void *breq); + +int sun8i_ce_prng_generate (struct crypto_rng *tfm,const u8 *src, +unsigned int slen,u8 *dst,unsigned int dlen); +int sun8i_ce_prng_seed (struct crypto_rng *tfm,const u8 *seed,unsigned int slen); +void sun8i_ce_prng_exit (struct crypto_tfm *tfm); +int sun8i_ce_prng_init (struct crypto_tfm *tfm);
Signature · 1 line
2.26.2
PATCH v7 17/17 crypto: sun8i-ss: fix comparison of integer expressions of different signedness
In reply to Corentin LabbeThis patch fixes the warning:
warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c +4 -3
@@ -414,7 +414,7 @@ static struct sun8i_ss_alg_template ss_algs[] = {static int sun8i_ss_dbgfs_read (struct seq_file *seq,void *v) {struct sun8i_ss_dev *ss = seq->private; -int i; +unsigned int i;for (i =0 ; i <MAXFLOW ; i++)seq_printf (seq,"Channel %d: nreq %lu\n" , i, ss->flows[i].stat_req);
@@ -571,7 +571,8 @@ static void sun8i_ss_pm_exit(struct sun8i_ss_dev *ss)static int sun8i_ss_register_algs (struct sun8i_ss_dev *ss) { -int ss_method, err, id, i; +int ss_method, err, id; +unsigned int i;for (i =0 ; i <ARRAY_SIZE (ss_algs); i++) { ss_algs[i].ss = ss;
@@ -642,7 +643,7 @@ static int sun8i_ss_register_algs(struct sun8i_ss_dev *ss)static void sun8i_ss_unregister_algs (struct sun8i_ss_dev *ss) { -int i; +unsigned int i;for (i =0 ; i <ARRAY_SIZE (ss_algs); i++) {if (!ss_algs[i].ss)
Signature · 1 line
2.26.2
PATCH v7 16/17 crypto: sun8i-ce: fix comparison of integer expressions of different signedness
In reply to Corentin LabbeThis patch fixes the warning:
warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +4 -3
@@ -566,7 +566,7 @@ static struct sun8i_ce_alg_template ce_algs[] = {static int sun8i_ce_dbgfs_read (struct seq_file *seq,void *v) {struct sun8i_ce_dev *ce = seq->private; -int i; +unsigned int i;for (i =0 ; i <MAXFLOW ; i++)seq_printf (seq,"Channel %d: nreq %lu\n" , i, ce->chanlist[i].stat_req);
@@ -778,7 +778,8 @@ static int sun8i_ce_get_clks(struct sun8i_ce_dev *ce)static int sun8i_ce_register_algs (struct sun8i_ce_dev *ce) { -int ce_method, err, id, i; +int ce_method, err, id; +unsigned int i;for (i =0 ; i <ARRAY_SIZE (ce_algs); i++) { ce_algs[i].ce = ce;
@@ -858,7 +859,7 @@ static int sun8i_ce_register_algs(struct sun8i_ce_dev *ce)static void sun8i_ce_unregister_algs (struct sun8i_ce_dev *ce) { -int i; +unsigned int i;for (i =0 ; i <ARRAY_SIZE (ce_algs); i++) {if (!ce_algs[i].ce)
Signature · 1 line
2.26.2
PATCH v7 15/17 crypto: sun8i-ce: Add support for the TRNG
In reply to Corentin LabbeThis patch had support for the TRNG present in the CE.
Note that according to the algorithm ID, 2 version of the TRNG exists, the first present in H3/H5/R40/A64 and the second present in H6. This patch adds support for both, but only the second is working reliabily according to rngtest.
--- drivers/crypto/allwinner/Kconfig | 8 ++ drivers/crypto/allwinner/sun8i-ce/Makefile | 1 + .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 18 +++ .../crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 127 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 18 +++ 5 files changed, 172 insertions(+) create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c
drivers/crypto/allwinner/Kconfig +8 -0
@@ -96,6 +96,14 @@ config CRYPTO_DEV_SUN8I_CE_PRNG Select this option if you want to provide kernel-side support for the Pseudo-Random Number Generator found in the Crypto Engine. +config CRYPTO_DEV_SUN8I_CE_TRNG + bool "Support for Allwinner Crypto Engine TRNG" + depends on CRYPTO_DEV_SUN8I_CE + select HW_RANDOM + help + Select this option if you want to provide kernel-side support for + the True Random Number Generator found in the Crypto Engine. + config CRYPTO_DEV_SUN8I_SS tristate "Support for Allwinner Security System cryptographic offloader" select CRYPTO_SKCIPHER
drivers/crypto/allwinner/sun8i-ce/Makefile +1 -0
@@ -2,3 +2,4 @@ obj-$(CONFIG_CRYPTO_DEV_SUN8I_CE) += sun8i-ce.o sun8i-ce-y += sun8i-ce-core.o sun8i-ce-cipher.o sun8i-ce-$(CONFIG_CRYPTO_DEV_SUN8I_CE_HASH) += sun8i-ce-hash.o sun8i-ce-$(CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG) += sun8i-ce-prng.o +sun8i-ce-$(CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG) += sun8i-ce-trng.o
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +18 -0
@@ -47,6 +47,7 @@ static const struct ce_variant ce_h3_variant = { }, .esr = ESR_H3, .prng = CE_ALG_PRNG, + .trng = CE_ID_NOTSUPP, };static const struct ce_variant ce_h5_variant = {
@@ -63,6 +64,7 @@ static const struct ce_variant ce_h5_variant = { }, .esr = ESR_H5, .prng = CE_ALG_PRNG, + .trng = CE_ID_NOTSUPP, };static const struct ce_variant ce_h6_variant = {
@@ -76,6 +78,7 @@ static const struct ce_variant ce_h6_variant = { .cipher_t_dlen_in_bytes = true, .hash_t_dlen_in_bits = true, .prng_t_dlen_in_bytes = true, + .trng_t_dlen_in_bytes = true, .ce_clks = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 },
@@ -83,6 +86,7 @@ static const struct ce_variant ce_h6_variant = { }, .esr = ESR_H6, .prng = CE_ALG_PRNG_V2, + .trng = CE_ALG_TRNG_V2, };static const struct ce_variant ce_a64_variant = {
@@ -99,6 +103,7 @@ static const struct ce_variant ce_a64_variant = { }, .esr = ESR_A64, .prng = CE_ALG_PRNG, + .trng = CE_ID_NOTSUPP, };static const struct ce_variant ce_r40_variant = {
@@ -115,6 +120,7 @@ static const struct ce_variant ce_r40_variant = { }, .esr = ESR_R40, .prng = CE_ALG_PRNG, + .trng = CE_ID_NOTSUPP, };/*
@@ -589,6 +595,10 @@ static int sun8i_ce_dbgfs_read(struct seq_file *seq, void *v)break ; } } +#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG +seq_printf (seq,"HWRNG %lu %lu\n" , + ce->hwrng_stat_req, ce->hwrng_stat_bytes); +#endif return 0 ; }
@@ -939,6 +949,10 @@ static int sun8i_ce_probe(struct platform_device *pdev)if (err <0 ) goto error_alg; +#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG +sun8i_ce_hwrng_register (ce); +#endif + v =readl (ce->base +CE_CTR ); v >>=CE_DIE_ID_SHIFT ; v &=CE_DIE_ID_MASK ;
@@ -968,6 +982,10 @@ static int sun8i_ce_remove(struct platform_device *pdev) {struct sun8i_ce_dev *ce =platform_get_drvdata (pdev); +#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG +sun8i_ce_hwrng_unregister (ce); +#endif +sun8i_ce_unregister_algs (ce);#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c new file +127 -0
127 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +18 -0
@@ -12,6 +12,7 @@#include <linux/atomic.h> #include <linux/debugfs.h> #include <linux/crypto.h> +#include <linux/hw_random.h> #include <crypto/internal/hash.h> #include <crypto/md5.h> #include <crypto/rng.h>
@@ -55,7 +56,9 @@#define CE_ALG_SHA256 19#define CE_ALG_SHA384 20#define CE_ALG_SHA512 21 +#define CE_ALG_TRNG 48#define CE_ALG_PRNG 49 +#define CE_ALG_TRNG_V2 0x1c#define CE_ALG_PRNG_V2 0x1d/* Used in ce_variant */
@@ -129,9 +132,12 @@ struct ce_clock {* bits or words * @prng_t_dlen_in_bytes: Does the request size for PRNG is in * bytes or words +* @trng_t_dlen_in_bytes: Does the request size for TRNG is in +* bytes or words * @ce_clks: list of clocks needed by this variant * @esr: The type of error register * @prng: The CE_ALG_XXX value for the PRNG +* @trng: The CE_ALG_XXX value for the TRNG */ struct ce_variant {char alg_cipher[CE_ID_CIPHER_MAX ];
@@ -140,9 +146,11 @@ struct ce_variant {bool cipher_t_dlen_in_bytes;bool hash_t_dlen_in_bits;bool prng_t_dlen_in_bytes; +bool trng_t_dlen_in_bytes;struct ce_clock ce_clks[CE_MAX_CLOCKS ];int esr;unsigned char prng; +unsigned char trng; };struct sginfo {
@@ -218,6 +226,13 @@ struct sun8i_ce_dev {struct dentry *dbgfs_dir;struct dentry *dbgfs_stats;#endif +#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG +struct hwrng trng; +#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG +unsigned long hwrng_stat_req; +unsigned long hwrng_stat_bytes; +#endif +#endif };/*
@@ -355,3 +370,6 @@ int sun8i_ce_prng_generate(struct crypto_rng *tfm, const u8 *src,int sun8i_ce_prng_seed (struct crypto_rng *tfm,const u8 *seed,unsigned int slen);void sun8i_ce_prng_exit (struct crypto_tfm *tfm);int sun8i_ce_prng_init (struct crypto_tfm *tfm); + +int sun8i_ce_hwrng_register (struct sun8i_ce_dev *ce); +void sun8i_ce_hwrng_unregister (struct sun8i_ce_dev *ce);
Signature · 1 line
2.26.2
PATCH v7 12/17 crypto: sun8i-ce: support hash algorithms
In reply to Corentin LabbeThe CE support multiples hash algorithms, this patch adds support for MD5, SHA1, SHA224, SHA256, SHA384 and SHA512.
--- drivers/crypto/allwinner/Kconfig | 10 + drivers/crypto/allwinner/sun8i-ce/Makefile | 1 + .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 229 ++++++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 413 ++++++++++++++++++ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 58 +++ 5 files changed, 711 insertions(+) create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c
drivers/crypto/allwinner/Kconfig +10 -0
@@ -78,6 +78,16 @@ config CRYPTO_DEV_SUN8I_CE_DEBUG This will create /sys/kernel/debug/sun8i-ce/stats for displaying the number of requests per flow and per algorithm. +config CRYPTO_DEV_SUN8I_CE_HASH + bool "Enable support for hash on sun8i-ce" + depends on CRYPTO_DEV_SUN8I_CE + select MD5 + select SHA1 + select SHA256 + select SHA512 + help + Say y to enable support for hash algorithms. + config CRYPTO_DEV_SUN8I_SS tristate "Support for Allwinner Security System cryptographic offloader" select CRYPTO_SKCIPHER
drivers/crypto/allwinner/sun8i-ce/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_CRYPTO_DEV_SUN8I_CE) += sun8i-ce.o sun8i-ce-y += sun8i-ce-core.o sun8i-ce-cipher.o +sun8i-ce-$(CONFIG_CRYPTO_DEV_SUN8I_CE_HASH) += sun8i-ce-hash.o
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +229 -0
286 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c new file +413 -0
413 lines not on this page · raw message
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +58 -0
107 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH v7 13/17 crypto: sun8i-ce: Add stat_bytes debugfs
In reply to Corentin LabbeThis patch adds a new stat_bytes counter in the sun8i-ce debugfs.
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 ++ 1 file changed, 2 insertions(+)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +2 -0
@@ -280,6 +280,7 @@ struct sun8i_ce_hash_reqctx {* @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_ce_alg_template {u32 type;
@@ -293,6 +294,7 @@ struct sun8i_ce_alg_template {#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG unsigned long stat_req;unsigned long stat_fb; +unsigned long stat_bytes;#endif };
Signature · 1 line
2.26.2
PATCH v7 11/17 crypto: sun8i-ce: rename has_t_dlen_in_bytes to cipher_t_dlen_in_bytes
In reply to Corentin LabbeHash algorithms will need also a spetial t_dlen handling, but since the meaning will be different, rename the current flag to specify it apply only on ciphers algorithms.
--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 2 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 2 +- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +1 -1
@@ -118,7 +118,7 @@ static int sun8i_ce_cipher_prepare(struct crypto_engine *engine, void *async_req common |= rctx->op_dir |CE_COMM_INT ; cet->t_common_ctl =cpu_to_le32 (common);/* CTS and recent CE (H6) need length in bytes, in word otherwise */ -if (ce->variant->has_t_dlen_in_bytes) +if (ce->variant->cipher_t_dlen_in_bytes) cet->t_dlen =cpu_to_le32 (areq->cryptlen);else cet->t_dlen =cpu_to_le32 (areq->cryptlen /4 );
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +1 -1
@@ -61,7 +61,7 @@ static const struct ce_variant ce_h6_variant = { }, .op_mode = { CE_OP_ECB, CE_OP_CBC }, - .has_t_dlen_in_bytes = true, + .cipher_t_dlen_in_bytes = true, .ce_clks = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 },
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +2 -2
@@ -97,7 +97,7 @@ struct ce_clock {* @alg_cipher: list of supported ciphers. for each CE_ID_ this will give the * coresponding CE_ALG_XXX value * @op_mode: list of supported block modes -* @has_t_dlen_in_bytes: Does the request size for cipher is in +* @cipher_t_dlen_in_bytes: Does the request size for cipher is in * bytes or words * @ce_clks: list of clocks needed by this variant * @esr: The type of error register
@@ -105,7 +105,7 @@ struct ce_clock {struct ce_variant {char alg_cipher[CE_ID_CIPHER_MAX ];u32 op_mode[CE_ID_OP_MAX ]; -bool has_t_dlen_in_bytes; +bool cipher_t_dlen_in_bytes;struct ce_clock ce_clks[CE_MAX_CLOCKS ];int esr; };
Signature · 1 line
2.26.2
PATCH v7 9/17 crypto: sun8i-ce: split into prepare/run/unprepare
In reply to Corentin LabbeThis patch split the do_one_request into three.
Prepare will handle all DMA mapping and initialisation of the task structure.
Unprepare will clean all DMA mapping.
And the do_one_request will be limited to just executing the task.
--- .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 91 +++++++++++++++---- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 8 ++ 2 files changed, 79 insertions(+), 20 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +71 -20
@@ -75,8 +75,9 @@ static int sun8i_ce_cipher_fallback(struct skcipher_request *areq)return err; } -static int sun8i_ce_cipher (struct skcipher_request *areq) +static int sun8i_ce_cipher_prepare (struct crypto_engine *engine,void *async_req) { + struct skcipher_request *areq = container_of(async_req, struct skcipher_request, base);struct crypto_skcipher *tfm =crypto_skcipher_reqtfm (areq);struct sun8i_cipher_tfm_ctx *op =crypto_skcipher_ctx (tfm);struct sun8i_ce_dev *ce = op->ce;
@@ -87,7 +88,6 @@ static int sun8i_ce_cipher(struct skcipher_request *areq)struct ce_task *cet;struct scatterlist *sg;unsigned int todo, len, offset, ivsize; -dma_addr_t addr_iv =0 , addr_key =0 ;u32 common, sym;int flow, i;int nr_sgs =0 ;
@@ -140,13 +140,13 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) cet->t_sym_ctl =cpu_to_le32 (sym); cet->t_asym_ctl =0 ; - addr_key =dma_map_single (ce->dev, op->key, op->keylen,DMA_TO_DEVICE ); - cet->t_key =cpu_to_le32 (addr_key); -if (dma_mapping_error (ce->dev, addr_key)) { + rctx->addr_key =dma_map_single (ce->dev, op->key, op->keylen,DMA_TO_DEVICE ); +if (dma_mapping_error (ce->dev, rctx->addr_key)) {dev_err (ce->dev,"Cannot DMA MAP KEY\n" ); err = -EFAULT ; goto theend; } + cet->t_key =cpu_to_le32 (rctx->addr_key); ivsize =crypto_skcipher_ivsize (tfm);if (areq->iv &&crypto_skcipher_ivsize (tfm) >0 ) {
@@ -167,14 +167,14 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) offset, ivsize, 0); }memcpy (rctx->bounce_iv, areq->iv, ivsize); - addr_iv =dma_map_single (ce->dev, rctx->bounce_iv, rctx->ivlen, -DMA_TO_DEVICE ); - cet->t_iv =cpu_to_le32 (addr_iv); -if (dma_mapping_error (ce->dev, addr_iv)) { + rctx->addr_iv =dma_map_single (ce->dev, rctx->bounce_iv, rctx->ivlen, +DMA_TO_DEVICE ); +if (dma_mapping_error (ce->dev, rctx->addr_iv)) {dev_err (ce->dev,"Cannot DMA MAP IV\n" ); err = -ENOMEM ; goto theend_iv; } + cet->t_iv =cpu_to_le32 (rctx->addr_iv); }if (areq->src == areq->dst) {
@@ -234,7 +234,9 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) } chan->timeout = areq->cryptlen; - err =sun8i_ce_run_task (ce, flow,crypto_tfm_alg_name (areq->base.tfm)); + rctx->nr_sgs = nr_sgs; + rctx->nr_sgd = nr_sgd; +return 0 ; theend_sgs:if (areq->src == areq->dst) {
@@ -247,9 +249,8 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) theend_iv:if (areq->iv && ivsize >0 ) { -if (addr_iv) -dma_unmap_single (ce->dev, addr_iv, rctx->ivlen, -DMA_TO_DEVICE ); +if (rctx->addr_iv) +dma_unmap_single (ce->dev, rctx->addr_iv, rctx->ivlen,DMA_TO_DEVICE ); offset = areq->cryptlen - ivsize;if (rctx->op_dir &CE_DECRYPTION ) {memcpy (areq->iv, rctx->backup_iv, ivsize);
@@ -262,19 +263,69 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) } theend_key: -dma_unmap_single (ce->dev, addr_key, op->keylen,DMA_TO_DEVICE ); +dma_unmap_single (ce->dev, rctx->addr_key, op->keylen,DMA_TO_DEVICE ); theend:return err; } -static int sun8i_ce_handle_cipher_request (struct crypto_engine *engine,void *areq) +static int sun8i_ce_cipher_run (struct crypto_engine *engine,void *areq) { -int err; struct skcipher_request *breq = container_of(areq, struct skcipher_request, base); +struct crypto_skcipher *tfm =crypto_skcipher_reqtfm (breq); +struct sun8i_cipher_tfm_ctx *op =crypto_skcipher_ctx (tfm); +struct sun8i_ce_dev *ce = op->ce; +struct sun8i_cipher_req_ctx *rctx =skcipher_request_ctx (breq); +int flow, err; - err =sun8i_ce_cipher (breq); + flow = rctx->flow; + err =sun8i_ce_run_task (ce, flow,crypto_tfm_alg_name (breq->base.tfm));crypto_finalize_skcipher_request (engine, breq, err); +return 0 ; +} + +static int sun8i_ce_cipher_unprepare (struct crypto_engine *engine,void *async_req) +{ + struct skcipher_request *areq = container_of(async_req, struct skcipher_request, base); +struct crypto_skcipher *tfm =crypto_skcipher_reqtfm (areq); +struct sun8i_cipher_tfm_ctx *op =crypto_skcipher_ctx (tfm); +struct sun8i_ce_dev *ce = op->ce; +struct sun8i_cipher_req_ctx *rctx =skcipher_request_ctx (areq); +struct sun8i_ce_flow *chan; +struct ce_task *cet; +unsigned int ivsize, offset; +int nr_sgs = rctx->nr_sgs; +int nr_sgd = rctx->nr_sgd; +int flow; + + flow = rctx->flow; + chan = &ce->chanlist[flow]; + cet = chan->tl; + ivsize =crypto_skcipher_ivsize (tfm); + +if (areq->src == areq->dst) { +dma_unmap_sg (ce->dev, areq->src, nr_sgs,DMA_BIDIRECTIONAL ); + }else { +if (nr_sgs >0 ) +dma_unmap_sg (ce->dev, areq->src, nr_sgs,DMA_TO_DEVICE ); +dma_unmap_sg (ce->dev, areq->dst, nr_sgd,DMA_FROM_DEVICE ); + } + +if (areq->iv && ivsize >0 ) { +if (cet->t_iv) +dma_unmap_single (ce->dev, rctx->addr_iv, rctx->ivlen,DMA_TO_DEVICE ); + offset = areq->cryptlen - ivsize; +if (rctx->op_dir &CE_DECRYPTION ) { +memcpy (areq->iv, rctx->backup_iv, ivsize); +kfree_sensitive (rctx->backup_iv); + }else { +scatterwalk_map_and_copy (areq->iv, areq->dst, offset, + ivsize,0 ); + } +kfree (rctx->bounce_iv); + } + +dma_unmap_single (ce->dev, rctx->addr_key, op->keylen,DMA_TO_DEVICE );return 0 ; }
@@ -346,9 +397,9 @@ int sun8i_ce_cipher_init(struct crypto_tfm *tfm)crypto_tfm_alg_driver_name (&sktfm->base), crypto_tfm_alg_driver_name(crypto_skcipher_tfm(op->fallback_tfm))); - op->enginectx.op.do_one_request = sun8i_ce_handle_cipher_request; - op->enginectx.op.prepare_request =NULL ; - op->enginectx.op.unprepare_request =NULL ; + op->enginectx.op.do_one_request = sun8i_ce_cipher_run; + op->enginectx.op.prepare_request = sun8i_ce_cipher_prepare; + op->enginectx.op.unprepare_request = sun8i_ce_cipher_unprepare; err =pm_runtime_get_sync (op->ce->dev);if (err <0 )
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +8 -0
@@ -182,6 +182,10 @@ struct sun8i_ce_dev {* @backup_iv: buffer which contain the next IV to store * @bounce_iv: buffer which contain the IV * @ivlen: size of bounce_iv +* @nr_sgs: The number of source SG (as given by dma_map_sg()) +* @nr_sgd: The number of destination SG (as given by dma_map_sg()) +* @addr_iv: The IV addr returned by dma_map_single, need to unmap later +* @addr_key: The key addr returned by dma_map_single, need to unmap later * @fallback_req: request struct for invoking the fallback skcipher TFM */ struct sun8i_cipher_req_ctx {
@@ -190,6 +194,10 @@ struct sun8i_cipher_req_ctx {void *backup_iv;void *bounce_iv;unsigned int ivlen; +int nr_sgs; +int nr_sgd; +dma_addr_t addr_iv; +dma_addr_t addr_key;struct skcipher_request fallback_req;// keep at the end };
Signature · 1 line
2.26.2
PATCH v7 10/17 crypto: sun8i-ce: handle different error registers
In reply to Corentin LabbeError registers are different across SoCs.
This patch handle those difference.
--- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 62 ++++++++++++++++--- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 8 +++ 2 files changed, 62 insertions(+), 8 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c +54 -8
@@ -40,7 +40,8 @@ static const struct ce_variant ce_h3_variant = { .ce_clks = { { "bus", 0, 200000000 }, { "mod", 50000000, 0 }, - } + }, + .esr = ESR_H3, }; static const struct ce_variant ce_h5_variant = {
@@ -51,7 +52,8 @@ static const struct ce_variant ce_h5_variant = { .ce_clks = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 }, - } + }, + .esr = ESR_H5, }; static const struct ce_variant ce_h6_variant = {
@@ -64,7 +66,8 @@ static const struct ce_variant ce_h6_variant = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 }, { "ram", 0, 400000000 }, - } + }, + .esr = ESR_H6, }; static const struct ce_variant ce_a64_variant = {
@@ -75,7 +78,8 @@ static const struct ce_variant ce_a64_variant = { .ce_clks = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 }, - } + }, + .esr = ESR_A64, }; static const struct ce_variant ce_r40_variant = {
@@ -86,7 +90,8 @@ static const struct ce_variant ce_r40_variant = { .ce_clks = { { "bus", 0, 200000000 }, { "mod", 300000000, 0 }, - } + }, + .esr = ESR_R40, }; /*
@@ -102,6 +107,7 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name) {u32 v;int err =0 ; +struct ce_task *cet = ce->chanlist[flow].tl;#ifdef CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG ce->chanlist[flow].stat_req++;
@@ -131,19 +137,56 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name) msecs_to_jiffies(ce->chanlist[flow].timeout));if (ce->chanlist[flow].status ==0 ) { -dev_err (ce->dev,"DMA timeout for %s\n" , name); +dev_err (ce->dev,"DMA timeout for %s (tm=%d) on flow %d\n" , name, + ce->chanlist[flow].timeout, flow); err = -EFAULT ; }/* No need to lock for this read, the channel is locked so * nothing could modify the error value for this channel */ v =readl (ce->base +CE_ESR ); -if (v) { +switch (ce->variant->esr) { +case ESR_H3 : +/* Sadly, the error bit is not per flow */ +if (v) { +dev_err (ce->dev,"CE ERROR: %x for flow %x\n" , v, flow); + err = -EFAULT ; +print_hex_dump (KERN_INFO ,"TASK: " ,DUMP_PREFIX_NONE ,16 ,4 , + cet,sizeof (struct ce_task ), false); + } +if (v &CE_ERR_ALGO_NOTSUP ) +dev_err (ce->dev,"CE ERROR: algorithm not supported\n" ); +if (v &CE_ERR_DATALEN ) +dev_err (ce->dev,"CE ERROR: data length error\n" ); +if (v &CE_ERR_KEYSRAM ) +dev_err (ce->dev,"CE ERROR: keysram access error for AES\n" ); +break ; +case ESR_A64 : +case ESR_H5 : +case ESR_R40 : v >>= (flow *4 ); + v &=0xF ; +if (v) { +dev_err (ce->dev,"CE ERROR: %x for flow %x\n" , v, flow); + err = -EFAULT ; +print_hex_dump (KERN_INFO ,"TASK: " ,DUMP_PREFIX_NONE ,16 ,4 , + cet,sizeof (struct ce_task ), false); + } +if (v &CE_ERR_ALGO_NOTSUP ) +dev_err (ce->dev,"CE ERROR: algorithm not supported\n" ); +if (v &CE_ERR_DATALEN ) +dev_err (ce->dev,"CE ERROR: data length error\n" ); +if (v &CE_ERR_KEYSRAM ) +dev_err (ce->dev,"CE ERROR: keysram access error for AES\n" ); +break ; +case ESR_H6 : + v >>= (flow *8 ); v &=0xFF ;if (v) {dev_err (ce->dev,"CE ERROR: %x for flow %x\n" , v, flow); err = -EFAULT ; +print_hex_dump (KERN_INFO ,"TASK: " ,DUMP_PREFIX_NONE ,16 ,4 , + cet,sizeof (struct ce_task ), false); }if (v &CE_ERR_ALGO_NOTSUP )dev_err (ce->dev,"CE ERROR: algorithm not supported\n" );
@@ -153,7 +196,10 @@ int sun8i_ce_run_task(struct sun8i_ce_dev *ce, int flow, const char *name)dev_err (ce->dev,"CE ERROR: keysram access error for AES\n" );if (v &CE_ERR_ADDR_INVALID )dev_err (ce->dev,"CE ERROR: address invalid\n" ); - } +if (v &CE_ERR_KEYLADDER ) +dev_err (ce->dev,"CE ERROR: key ladder configuration error\n" ); +break ; + }return err; }
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +8 -0
@@ -65,6 +65,12 @@#define CE_ERR_ADDR_INVALID BIT(5)#define CE_ERR_KEYLADDER BIT(6) +#define ESR_H3 0 +#define ESR_A64 1 +#define ESR_R40 2 +#define ESR_H5 3 +#define ESR_H6 4 +#define CE_DIE_ID_SHIFT 16#define CE_DIE_ID_MASK 0x07
@@ -94,12 +100,14 @@ struct ce_clock {* @has_t_dlen_in_bytes: Does the request size for cipher is in * bytes or words * @ce_clks: list of clocks needed by this variant +* @esr: The type of error register */ struct ce_variant {char alg_cipher[CE_ID_CIPHER_MAX ];u32 op_mode[CE_ID_OP_MAX ];bool has_t_dlen_in_bytes;struct ce_clock ce_clks[CE_MAX_CLOCKS ]; +int esr; };struct sginfo {
Signature · 1 line
2.26.2
PATCH v7 8/17 crypto: sun8i-ce: move iv data to request context
In reply to Corentin LabbeInstead of storing IV data in the channel context, store them in the request context.
Storing them in the channel structure was conceptualy wrong since they are per request related.
--- .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 27 +++++++++---------- drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 10 ++++--- 2 files changed, 19 insertions(+), 18 deletions(-)
drivers/crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c +13 -14
@@ -88,7 +88,6 @@ static int sun8i_ce_cipher(struct skcipher_request *areq)struct scatterlist *sg;unsigned int todo, len, offset, ivsize;dma_addr_t addr_iv =0 , addr_key =0 ; -void *backup_iv =NULL ;u32 common, sym;int flow, i;int nr_sgs =0 ;
@@ -151,24 +150,24 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) ivsize =crypto_skcipher_ivsize (tfm);if (areq->iv &&crypto_skcipher_ivsize (tfm) >0 ) { - chan->ivlen = ivsize; - chan->bounce_iv =kzalloc (ivsize,GFP_KERNEL |GFP_DMA ); -if (!chan->bounce_iv) { + rctx->ivlen = ivsize; + rctx->bounce_iv =kzalloc (ivsize,GFP_KERNEL |GFP_DMA ); +if (!rctx->bounce_iv) { err = -ENOMEM ; goto theend_key; }if (rctx->op_dir &CE_DECRYPTION ) { - backup_iv =kzalloc (ivsize,GFP_KERNEL ); -if (!backup_iv) { + rctx->backup_iv =kzalloc (ivsize,GFP_KERNEL ); +if (!rctx->backup_iv) { err = -ENOMEM ; goto theend_key; } offset = areq->cryptlen - ivsize; -scatterwalk_map_and_copy (backup_iv, areq->src, offset, - ivsize,0 ); +scatterwalk_map_and_copy (rctx->backup_iv, areq->src, + offset, ivsize,0 ); } -memcpy (chan->bounce_iv, areq->iv, ivsize); - addr_iv =dma_map_single (ce->dev, chan->bounce_iv, chan->ivlen, +memcpy (rctx->bounce_iv, areq->iv, ivsize); + addr_iv =dma_map_single (ce->dev, rctx->bounce_iv, rctx->ivlen,DMA_TO_DEVICE ); cet->t_iv =cpu_to_le32 (addr_iv);if (dma_mapping_error (ce->dev, addr_iv)) {
@@ -249,17 +248,17 @@ static int sun8i_ce_cipher(struct skcipher_request *areq) theend_iv:if (areq->iv && ivsize >0 ) {if (addr_iv) -dma_unmap_single (ce->dev, addr_iv, chan->ivlen, +dma_unmap_single (ce->dev, addr_iv, rctx->ivlen,DMA_TO_DEVICE ); offset = areq->cryptlen - ivsize;if (rctx->op_dir &CE_DECRYPTION ) { -memcpy (areq->iv, backup_iv, ivsize); -kfree_sensitive (backup_iv); +memcpy (areq->iv, rctx->backup_iv, ivsize); +kfree_sensitive (rctx->backup_iv); }else {scatterwalk_map_and_copy (areq->iv, areq->dst, offset, ivsize,0 ); } -kfree (chan->bounce_iv); +kfree (rctx->bounce_iv); } theend_key:
drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h +6 -4
@@ -129,8 +129,6 @@ struct ce_task {/* * struct sun8i_ce_flow - Information used by each flow * @engine: ptr to the crypto_engine for this flow -* @bounce_iv: buffer which contain the IV -* @ivlen: size of bounce_iv * @complete: completion for the current task on this flow * @status: set to 1 by interrupt if task is done * @t_phy: Physical address of task
@@ -139,8 +137,6 @@ struct ce_task {*/ struct sun8i_ce_flow {struct crypto_engine *engine; -void *bounce_iv; -unsigned int ivlen;struct completion complete;int status;dma_addr_t t_phy;
@@ -183,11 +179,17 @@ struct sun8i_ce_dev {* struct sun8i_cipher_req_ctx - context for a skcipher request * @op_dir: direction (encrypt vs decrypt) for this request * @flow: the flow to use for this request +* @backup_iv: buffer which contain the next IV to store +* @bounce_iv: buffer which contain the IV +* @ivlen: size of bounce_iv * @fallback_req: request struct for invoking the fallback skcipher TFM */ struct sun8i_cipher_req_ctx {u32 op_dir;int flow; +void *backup_iv; +void *bounce_iv; +unsigned int ivlen;struct skcipher_request fallback_req;// keep at the end };
Signature · 1 line
2.26.2
PATCH v7 1/17 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.26.2
Herbert Xu
maintainerQuoted 73 lines · Corentin Labbe
Hello
The main goal of this serie is to add support for TRNG, PRNG and hashes to the sun8i-ss/sun8i-ce driver.
The whole serie is tested withCRYPTO_EXTRA_TESTSenabled and loading tcrypt.
The PRNG and TRNG are tested with rngtest.
Both LE and BE kernel are tested.This serie was tested on:
- sun50i-a64-pine64
- sun8i-a83t-bananapi-m3
- sun8i-r40-bananapi-m2-ultra
- sun50i-h5-libretech-all-h3-cc
- sun8i-h3-orangepi-pcRegards
Change since v1:
- removed_crypto_rng_castpatchChange since v2:
- cleaned unused variables from sun8i-ce-prng
- added some missingmemzero_explicitChange since v3:
- rebased on latest next
- removed uselesscpu_to_le32()in sun8i-ss
- added 2 last patches
- add handle endianness oft_common_ctlpatchChange since v4:
- added a style issue patchChanges since v5:
- handle failure pattern ofpm_runtime_get_sync
- Add missinglinux/dma-mapping.hChanges since v6:
- fix sparse error insun8i-ce-cipher.cCorentin Labbe (17):
crypto: sun8i-ss: AddSS_STARTdefine
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
crypto: sun8i-ce: handle endianness oft_common_ctl
crypto: sun8i-ce: move iv data to request context
crypto: sun8i-ce: split into prepare/run/unprepare
crypto: sun8i-ce: handle different error registers
crypto: sun8i-ce: renamehas_t_dlen_in_bytestocipher_t_dlen_in_bytes
crypto: sun8i-ce: support hash algorithms
crypto: sun8i-ce: Addstat_bytesdebugfs
crypto: sun8i-ce: Add support for the PRNG
crypto: sun8i-ce: Add support for the TRNG
crypto: sun8i-ce: fix comparison of integer expressions of different
signedness
crypto: sun8i-ss: fix comparison of integer expressions of different
signednessdrivers/crypto/allwinner/Kconfig | 43 ++ drivers/crypto/allwinner/sun8i-ce/Makefile | 3 + .../allwinner/sun8i-ce/sun8i-ce-cipher.c | 116 +++-- .../crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 381 ++++++++++++++- .../crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 413 ++++++++++++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 164 +++++++ .../crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 127 +++++ drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 139 +++++- drivers/crypto/allwinner/sun8i-ss/Makefile | 2 + .../crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 205 +++++++- .../crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 444 ++++++++++++++++++
Quoted 8 lines
.../crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 173 +++++++ drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 89 +++- 13 files changed, 2240 insertions(+), 59 deletions(-) create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c create mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c create mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c
All applied. 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