Skip to content

L
linux
Commit 1c876a90 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Herbert Xu
Browse files
Options

crypto: ccree - add support for CryptoCell 703 

Add support for Arm TrustZone CryptoCell 703.
The 703 is a variant of the CryptoCell 713 that supports only
algorithms certified by the Chinesse Office of the State Commercial
Cryptography Administration (OSCCA).
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 946dca8f
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 9 deletions
drivers/crypto/Kconfig
View file @ 1c876a90
...@@ -767,7 +767,7 @@ config CRYPTO_DEV_CCREE ...@@ -767,7 +767,7 @@ config CRYPTO_DEV_CCREE
help help
Say 'Y' to enable a driver for the REE interface of the Arm Say 'Y' to enable a driver for the REE interface of the Arm
TrustZone CryptoCell family of processors. Currently the TrustZone CryptoCell family of processors. Currently the
CryptoCell 713, 712, 710 and 630 are supported. CryptoCell 713, 703, 712, 710 and 630 are supported.
Choose this if you wish to use hardware acceleration of Choose this if you wish to use hardware acceleration of
cryptographic operations on the system REE. cryptographic operations on the system REE.
If unsure say Y. If unsure say Y.
......
drivers/crypto/ccree/cc_aead.c
View file @ 1c876a90
...@@ -2367,6 +2367,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2367,6 +2367,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_SHA1, .auth_mode = DRV_HASH_SHA1,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(hmac(sha1),cbc(des3_ede))", .name = "authenc(hmac(sha1),cbc(des3_ede))",
...@@ -2386,6 +2387,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2386,6 +2387,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_DES, .flow_mode = S_DIN_to_DES,
.auth_mode = DRV_HASH_SHA1, .auth_mode = DRV_HASH_SHA1,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(hmac(sha256),cbc(aes))", .name = "authenc(hmac(sha256),cbc(aes))",
...@@ -2405,6 +2407,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2405,6 +2407,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_SHA256, .auth_mode = DRV_HASH_SHA256,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(hmac(sha256),cbc(des3_ede))", .name = "authenc(hmac(sha256),cbc(des3_ede))",
...@@ -2424,6 +2427,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2424,6 +2427,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_DES, .flow_mode = S_DIN_to_DES,
.auth_mode = DRV_HASH_SHA256, .auth_mode = DRV_HASH_SHA256,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(xcbc(aes),cbc(aes))", .name = "authenc(xcbc(aes),cbc(aes))",
...@@ -2443,6 +2447,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2443,6 +2447,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_XCBC_MAC, .auth_mode = DRV_HASH_XCBC_MAC,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(hmac(sha1),rfc3686(ctr(aes)))", .name = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
...@@ -2462,6 +2467,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2462,6 +2467,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_SHA1, .auth_mode = DRV_HASH_SHA1,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(hmac(sha256),rfc3686(ctr(aes)))", .name = "authenc(hmac(sha256),rfc3686(ctr(aes)))",
...@@ -2481,6 +2487,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2481,6 +2487,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_SHA256, .auth_mode = DRV_HASH_SHA256,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "authenc(xcbc(aes),rfc3686(ctr(aes)))", .name = "authenc(xcbc(aes),rfc3686(ctr(aes)))",
...@@ -2500,6 +2507,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2500,6 +2507,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_XCBC_MAC, .auth_mode = DRV_HASH_XCBC_MAC,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ccm(aes)", .name = "ccm(aes)",
...@@ -2519,6 +2527,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2519,6 +2527,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_NULL, .auth_mode = DRV_HASH_NULL,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "rfc4309(ccm(aes))", .name = "rfc4309(ccm(aes))",
...@@ -2538,6 +2547,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2538,6 +2547,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_NULL, .auth_mode = DRV_HASH_NULL,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "gcm(aes)", .name = "gcm(aes)",
...@@ -2557,6 +2567,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2557,6 +2567,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_NULL, .auth_mode = DRV_HASH_NULL,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "rfc4106(gcm(aes))", .name = "rfc4106(gcm(aes))",
...@@ -2576,6 +2587,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2576,6 +2587,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_NULL, .auth_mode = DRV_HASH_NULL,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "rfc4543(gcm(aes))", .name = "rfc4543(gcm(aes))",
...@@ -2595,6 +2607,7 @@ static struct cc_alg_template aead_algs[] = { ...@@ -2595,6 +2607,7 @@ static struct cc_alg_template aead_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.auth_mode = DRV_HASH_NULL, .auth_mode = DRV_HASH_NULL,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
}; };
...@@ -2679,7 +2692,8 @@ int cc_aead_alloc(struct cc_drvdata *drvdata) ...@@ -2679,7 +2692,8 @@ int cc_aead_alloc(struct cc_drvdata *drvdata)
/* Linux crypto */ /* Linux crypto */
for (alg = 0; alg < ARRAY_SIZE(aead_algs); alg++) { for (alg = 0; alg < ARRAY_SIZE(aead_algs); alg++) {
if (aead_algs[alg].min_hw_rev > drvdata->hw_rev) if ((aead_algs[alg].min_hw_rev > drvdata->hw_rev) ||
!(drvdata->std_bodies & aead_algs[alg].std_body))
continue; continue;
t_alg = cc_create_aead_alg(&aead_algs[alg], dev); t_alg = cc_create_aead_alg(&aead_algs[alg], dev);
......
drivers/crypto/ccree/cc_cipher.c
View file @ 1c876a90
...@@ -833,6 +833,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -833,6 +833,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_XTS, .cipher_mode = DRV_CIPHER_XTS,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "xts512(paes)", .name = "xts512(paes)",
...@@ -850,6 +851,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -850,6 +851,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 512, .data_unit = 512,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "xts4096(paes)", .name = "xts4096(paes)",
...@@ -867,6 +869,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -867,6 +869,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 4096, .data_unit = 4096,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "essiv(paes)", .name = "essiv(paes)",
...@@ -883,6 +886,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -883,6 +886,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ESSIV, .cipher_mode = DRV_CIPHER_ESSIV,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "essiv512(paes)", .name = "essiv512(paes)",
...@@ -900,6 +904,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -900,6 +904,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 512, .data_unit = 512,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "essiv4096(paes)", .name = "essiv4096(paes)",
...@@ -917,6 +922,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -917,6 +922,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 4096, .data_unit = 4096,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "bitlocker(paes)", .name = "bitlocker(paes)",
...@@ -933,6 +939,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -933,6 +939,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_BITLOCKER, .cipher_mode = DRV_CIPHER_BITLOCKER,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "bitlocker512(paes)", .name = "bitlocker512(paes)",
...@@ -950,6 +957,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -950,6 +957,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 512, .data_unit = 512,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "bitlocker4096(paes)", .name = "bitlocker4096(paes)",
...@@ -967,6 +975,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -967,6 +975,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 4096, .data_unit = 4096,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ecb(paes)", .name = "ecb(paes)",
...@@ -983,6 +992,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -983,6 +992,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ECB, .cipher_mode = DRV_CIPHER_ECB,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cbc(paes)", .name = "cbc(paes)",
...@@ -999,6 +1009,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -999,6 +1009,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC, .cipher_mode = DRV_CIPHER_CBC,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ofb(paes)", .name = "ofb(paes)",
...@@ -1015,6 +1026,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1015,6 +1026,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_OFB, .cipher_mode = DRV_CIPHER_OFB,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cts(cbc(paes))", .name = "cts(cbc(paes))",
...@@ -1031,6 +1043,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1031,6 +1043,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC_CTS, .cipher_mode = DRV_CIPHER_CBC_CTS,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ctr(paes)", .name = "ctr(paes)",
...@@ -1047,6 +1060,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1047,6 +1060,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CTR, .cipher_mode = DRV_CIPHER_CTR,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "xts(aes)", .name = "xts(aes)",
...@@ -1063,6 +1077,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1063,6 +1077,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_XTS, .cipher_mode = DRV_CIPHER_XTS,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "xts512(aes)", .name = "xts512(aes)",
...@@ -1080,6 +1095,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1080,6 +1095,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 512, .data_unit = 512,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "xts4096(aes)", .name = "xts4096(aes)",
...@@ -1097,6 +1113,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1097,6 +1113,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 4096, .data_unit = 4096,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "essiv(aes)", .name = "essiv(aes)",
...@@ -1113,6 +1130,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1113,6 +1130,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ESSIV, .cipher_mode = DRV_CIPHER_ESSIV,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "essiv512(aes)", .name = "essiv512(aes)",
...@@ -1130,6 +1148,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1130,6 +1148,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 512, .data_unit = 512,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "essiv4096(aes)", .name = "essiv4096(aes)",
...@@ -1147,6 +1166,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1147,6 +1166,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 4096, .data_unit = 4096,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "bitlocker(aes)", .name = "bitlocker(aes)",
...@@ -1163,6 +1183,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1163,6 +1183,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_BITLOCKER, .cipher_mode = DRV_CIPHER_BITLOCKER,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "bitlocker512(aes)", .name = "bitlocker512(aes)",
...@@ -1180,6 +1201,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1180,6 +1201,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 512, .data_unit = 512,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "bitlocker4096(aes)", .name = "bitlocker4096(aes)",
...@@ -1197,6 +1219,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1197,6 +1219,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.data_unit = 4096, .data_unit = 4096,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ecb(aes)", .name = "ecb(aes)",
...@@ -1213,6 +1236,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1213,6 +1236,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ECB, .cipher_mode = DRV_CIPHER_ECB,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cbc(aes)", .name = "cbc(aes)",
...@@ -1229,6 +1253,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1229,6 +1253,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC, .cipher_mode = DRV_CIPHER_CBC,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ofb(aes)", .name = "ofb(aes)",
...@@ -1245,6 +1270,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1245,6 +1270,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_OFB, .cipher_mode = DRV_CIPHER_OFB,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cts(cbc(aes))", .name = "cts(cbc(aes))",
...@@ -1261,6 +1287,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1261,6 +1287,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC_CTS, .cipher_mode = DRV_CIPHER_CBC_CTS,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ctr(aes)", .name = "ctr(aes)",
...@@ -1277,6 +1304,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1277,6 +1304,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CTR, .cipher_mode = DRV_CIPHER_CTR,
.flow_mode = S_DIN_to_AES, .flow_mode = S_DIN_to_AES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cbc(des3_ede)", .name = "cbc(des3_ede)",
...@@ -1293,6 +1321,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1293,6 +1321,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC, .cipher_mode = DRV_CIPHER_CBC,
.flow_mode = S_DIN_to_DES, .flow_mode = S_DIN_to_DES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ecb(des3_ede)", .name = "ecb(des3_ede)",
...@@ -1309,6 +1338,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1309,6 +1338,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ECB, .cipher_mode = DRV_CIPHER_ECB,
.flow_mode = S_DIN_to_DES, .flow_mode = S_DIN_to_DES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cbc(des)", .name = "cbc(des)",
...@@ -1325,6 +1355,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1325,6 +1355,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC, .cipher_mode = DRV_CIPHER_CBC,
.flow_mode = S_DIN_to_DES, .flow_mode = S_DIN_to_DES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "ecb(des)", .name = "ecb(des)",
...@@ -1341,6 +1372,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1341,6 +1372,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ECB, .cipher_mode = DRV_CIPHER_ECB,
.flow_mode = S_DIN_to_DES, .flow_mode = S_DIN_to_DES,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "cbc(sm4)", .name = "cbc(sm4)",
...@@ -1357,6 +1389,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1357,6 +1389,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CBC, .cipher_mode = DRV_CIPHER_CBC,
.flow_mode = S_DIN_to_SM4, .flow_mode = S_DIN_to_SM4,
.min_hw_rev = CC_HW_REV_713, .min_hw_rev = CC_HW_REV_713,
.std_body = CC_STD_OSCCA,
}, },
{ {
.name = "ecb(sm4)", .name = "ecb(sm4)",
...@@ -1373,6 +1406,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1373,6 +1406,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_ECB, .cipher_mode = DRV_CIPHER_ECB,
.flow_mode = S_DIN_to_SM4, .flow_mode = S_DIN_to_SM4,
.min_hw_rev = CC_HW_REV_713, .min_hw_rev = CC_HW_REV_713,
.std_body = CC_STD_OSCCA,
}, },
{ {
.name = "ctr(sm4)", .name = "ctr(sm4)",
...@@ -1389,6 +1423,7 @@ static const struct cc_alg_template skcipher_algs[] = { ...@@ -1389,6 +1423,7 @@ static const struct cc_alg_template skcipher_algs[] = {
.cipher_mode = DRV_CIPHER_CTR, .cipher_mode = DRV_CIPHER_CTR,
.flow_mode = S_DIN_to_SM4, .flow_mode = S_DIN_to_SM4,
.min_hw_rev = CC_HW_REV_713, .min_hw_rev = CC_HW_REV_713,
.std_body = CC_STD_OSCCA,
}, },
}; };
...@@ -1464,7 +1499,8 @@ int cc_cipher_alloc(struct cc_drvdata *drvdata) ...@@ -1464,7 +1499,8 @@ int cc_cipher_alloc(struct cc_drvdata *drvdata)
dev_dbg(dev, "Number of algorithms = %zu\n", dev_dbg(dev, "Number of algorithms = %zu\n",
ARRAY_SIZE(skcipher_algs)); ARRAY_SIZE(skcipher_algs));
for (alg = 0; alg < ARRAY_SIZE(skcipher_algs); alg++) { for (alg = 0; alg < ARRAY_SIZE(skcipher_algs); alg++) {
if (skcipher_algs[alg].min_hw_rev > drvdata->hw_rev) if ((skcipher_algs[alg].min_hw_rev > drvdata->hw_rev) ||
!(drvdata->std_bodies & skcipher_algs[alg].std_body))
continue; continue;
dev_dbg(dev, "creating %s\n", skcipher_algs[alg].driver_name); dev_dbg(dev, "creating %s\n", skcipher_algs[alg].driver_name);
......
drivers/crypto/ccree/cc_driver.c
View file @ 1c876a90
...@@ -39,27 +39,37 @@ struct cc_hw_data { ...@@ -39,27 +39,37 @@ struct cc_hw_data {
char *name; char *name;
enum cc_hw_rev rev; enum cc_hw_rev rev;
u32 sig; u32 sig;
int std_bodies;
}; };
/* Hardware revisions defs. */ /* Hardware revisions defs. */
/* The 703 is a OSCCA only variant of the 713 */
static const struct cc_hw_data cc703_hw = {
.name = "703", .rev = CC_HW_REV_713, .std_bodies = CC_STD_OSCCA
};
static const struct cc_hw_data cc713_hw = { static const struct cc_hw_data cc713_hw = {
.name = "713", .rev = CC_HW_REV_713 .name = "713", .rev = CC_HW_REV_713, .std_bodies = CC_STD_ALL
}; };
static const struct cc_hw_data cc712_hw = { static const struct cc_hw_data cc712_hw = {
.name = "712", .rev = CC_HW_REV_712, .sig = 0xDCC71200U .name = "712", .rev = CC_HW_REV_712, .sig = 0xDCC71200U,
.std_bodies = CC_STD_ALL
}; };
static const struct cc_hw_data cc710_hw = { static const struct cc_hw_data cc710_hw = {
.name = "710", .rev = CC_HW_REV_710, .sig = 0xDCC63200U .name = "710", .rev = CC_HW_REV_710, .sig = 0xDCC63200U,
.std_bodies = CC_STD_ALL
}; };
static const struct cc_hw_data cc630p_hw = { static const struct cc_hw_data cc630p_hw = {
.name = "630P", .rev = CC_HW_REV_630, .sig = 0xDCC63000U .name = "630P", .rev = CC_HW_REV_630, .sig = 0xDCC63000U,
.std_bodies = CC_STD_ALL
}; };
static const struct of_device_id arm_ccree_dev_of_match[] = { static const struct of_device_id arm_ccree_dev_of_match[] = {
{ .compatible = "arm,cryptocell-703-ree", .data = &cc703_hw },
{ .compatible = "arm,cryptocell-713-ree", .data = &cc713_hw }, { .compatible = "arm,cryptocell-713-ree", .data = &cc713_hw },
{ .compatible = "arm,cryptocell-712-ree", .data = &cc712_hw }, { .compatible = "arm,cryptocell-712-ree", .data = &cc712_hw },
{ .compatible = "arm,cryptocell-710-ree", .data = &cc710_hw }, { .compatible = "arm,cryptocell-710-ree", .data = &cc710_hw },
...@@ -209,6 +219,7 @@ static int init_cc_resources(struct platform_device *plat_dev) ...@@ -209,6 +219,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
hw_rev = (struct cc_hw_data *)dev_id->data; hw_rev = (struct cc_hw_data *)dev_id->data;
new_drvdata->hw_rev_name = hw_rev->name; new_drvdata->hw_rev_name = hw_rev->name;
new_drvdata->hw_rev = hw_rev->rev; new_drvdata->hw_rev = hw_rev->rev;
new_drvdata->std_bodies = hw_rev->std_bodies;
if (hw_rev->rev >= CC_HW_REV_712) { if (hw_rev->rev >= CC_HW_REV_712) {
new_drvdata->axim_mon_offset = CC_REG(AXIM_MON_COMP); new_drvdata->axim_mon_offset = CC_REG(AXIM_MON_COMP);
......
drivers/crypto/ccree/cc_driver.h
View file @ 1c876a90
...@@ -45,6 +45,12 @@ enum cc_hw_rev { ...@@ -45,6 +45,12 @@ enum cc_hw_rev {
CC_HW_REV_713 = 713 CC_HW_REV_713 = 713
}; };
enum cc_std_body {
CC_STD_NIST = 0x1,
CC_STD_OSCCA = 0x2,
CC_STD_ALL = 0x3
};
#define CC_COHERENT_CACHE_PARAMS 0xEEE #define CC_COHERENT_CACHE_PARAMS 0xEEE
/* Maximum DMA mask supported by IP */ /* Maximum DMA mask supported by IP */
...@@ -131,6 +137,7 @@ struct cc_drvdata { ...@@ -131,6 +137,7 @@ struct cc_drvdata {
u32 axim_mon_offset; u32 axim_mon_offset;
u32 sig_offset; u32 sig_offset;
u32 ver_offset; u32 ver_offset;
int std_bodies;
}; };
struct cc_crypto_alg { struct cc_crypto_alg {
...@@ -156,6 +163,7 @@ struct cc_alg_template { ...@@ -156,6 +163,7 @@ struct cc_alg_template {
int flow_mode; /* Note: currently, refers to the cipher mode only. */ int flow_mode; /* Note: currently, refers to the cipher mode only. */
int auth_mode; int auth_mode;
u32 min_hw_rev; u32 min_hw_rev;
enum cc_std_body std_body;
unsigned int data_unit; unsigned int data_unit;
struct cc_drvdata *drvdata; struct cc_drvdata *drvdata;
}; };
......
drivers/crypto/ccree/cc_hash.c
View file @ 1c876a90
...@@ -1539,6 +1539,7 @@ struct cc_hash_template { ...@@ -1539,6 +1539,7 @@ struct cc_hash_template {
int inter_digestsize; int inter_digestsize;
struct cc_drvdata *drvdata; struct cc_drvdata *drvdata;
u32 min_hw_rev; u32 min_hw_rev;
enum cc_std_body std_body;
}; };
#define CC_STATE_SIZE(_x) \ #define CC_STATE_SIZE(_x) \
...@@ -1573,6 +1574,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1573,6 +1574,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_SHA1, .hw_mode = DRV_HASH_HW_SHA1,
.inter_digestsize = SHA1_DIGEST_SIZE, .inter_digestsize = SHA1_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "sha256", .name = "sha256",
...@@ -1599,6 +1601,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1599,6 +1601,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_SHA256, .hw_mode = DRV_HASH_HW_SHA256,
.inter_digestsize = SHA256_DIGEST_SIZE, .inter_digestsize = SHA256_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "sha224", .name = "sha224",
...@@ -1625,6 +1628,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1625,6 +1628,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_SHA256, .hw_mode = DRV_HASH_HW_SHA256,
.inter_digestsize = SHA256_DIGEST_SIZE, .inter_digestsize = SHA256_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "sha384", .name = "sha384",
...@@ -1651,6 +1655,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1651,6 +1655,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_SHA512, .hw_mode = DRV_HASH_HW_SHA512,
.inter_digestsize = SHA512_DIGEST_SIZE, .inter_digestsize = SHA512_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "sha512", .name = "sha512",
...@@ -1677,6 +1682,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1677,6 +1682,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_SHA512, .hw_mode = DRV_HASH_HW_SHA512,
.inter_digestsize = SHA512_DIGEST_SIZE, .inter_digestsize = SHA512_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_712, .min_hw_rev = CC_HW_REV_712,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "md5", .name = "md5",
...@@ -1703,6 +1709,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1703,6 +1709,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_MD5, .hw_mode = DRV_HASH_HW_MD5,
.inter_digestsize = MD5_DIGEST_SIZE, .inter_digestsize = MD5_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.name = "sm3", .name = "sm3",
...@@ -1727,6 +1734,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1727,6 +1734,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_HASH_HW_SM3, .hw_mode = DRV_HASH_HW_SM3,
.inter_digestsize = SM3_DIGEST_SIZE, .inter_digestsize = SM3_DIGEST_SIZE,
.min_hw_rev = CC_HW_REV_713, .min_hw_rev = CC_HW_REV_713,
.std_body = CC_STD_OSCCA,
}, },
{ {
.mac_name = "xcbc(aes)", .mac_name = "xcbc(aes)",
...@@ -1751,6 +1759,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1751,6 +1759,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_CIPHER_XCBC_MAC, .hw_mode = DRV_CIPHER_XCBC_MAC,
.inter_digestsize = AES_BLOCK_SIZE, .inter_digestsize = AES_BLOCK_SIZE,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
{ {
.mac_name = "cmac(aes)", .mac_name = "cmac(aes)",
...@@ -1775,6 +1784,7 @@ static struct cc_hash_template driver_hash[] = { ...@@ -1775,6 +1784,7 @@ static struct cc_hash_template driver_hash[] = {
.hw_mode = DRV_CIPHER_CMAC, .hw_mode = DRV_CIPHER_CMAC,
.inter_digestsize = AES_BLOCK_SIZE, .inter_digestsize = AES_BLOCK_SIZE,
.min_hw_rev = CC_HW_REV_630, .min_hw_rev = CC_HW_REV_630,
.std_body = CC_STD_NIST,
}, },
}; };
...@@ -2001,9 +2011,11 @@ int cc_hash_alloc(struct cc_drvdata *drvdata) ...@@ -2001,9 +2011,11 @@ int cc_hash_alloc(struct cc_drvdata *drvdata)
struct cc_hash_alg *t_alg; struct cc_hash_alg *t_alg;
int hw_mode = driver_hash[alg].hw_mode; int hw_mode = driver_hash[alg].hw_mode;
/* We either support both HASH and MAC or none */ /* Check that the HW revision and variants are suitable */
if (driver_hash[alg].min_hw_rev > drvdata->hw_rev) if ((driver_hash[alg].min_hw_rev > drvdata->hw_rev) ||
!(drvdata->std_bodies & driver_hash[alg].std_body))
continue; continue;
if (driver_hash[alg].is_mac) { if (driver_hash[alg].is_mac) {
/* register hmac version */ /* register hmac version */
t_alg = cc_alloc_hash_alg(&driver_hash[alg], dev, true); t_alg = cc_alloc_hash_alg(&driver_hash[alg], dev, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7