crypto: sun8i-ce - Add support for the D1 variant

The Allwinner D1 SoC has a crypto engine compatible with sun8i-ce.
Add support for it.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
index 00194d1..d8623c7 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c
@@ -106,6 +106,24 @@ static const struct ce_variant ce_a64_variant = {
        .trng = CE_ID_NOTSUPP,
 };
 
+static const struct ce_variant ce_d1_variant = {
+       .alg_cipher = { CE_ALG_AES, CE_ALG_DES, CE_ALG_3DES,
+       },
+       .alg_hash = { CE_ALG_MD5, CE_ALG_SHA1, CE_ALG_SHA224, CE_ALG_SHA256,
+               CE_ALG_SHA384, CE_ALG_SHA512
+       },
+       .op_mode = { CE_OP_ECB, CE_OP_CBC
+       },
+       .ce_clks = {
+               { "bus", 0, 200000000 },
+               { "mod", 300000000, 0 },
+               { "ram", 0, 400000000 },
+               },
+       .esr = ESR_D1,
+       .prng = CE_ALG_PRNG,
+       .trng = CE_ALG_TRNG,
+};
+
 static const struct ce_variant ce_r40_variant = {
        .alg_cipher = { CE_ALG_AES, CE_ALG_DES, CE_ALG_3DES,
        },
@@ -192,6 +210,7 @@ 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");
                break;
        case ESR_A64:
+       case ESR_D1:
        case ESR_H5:
        case ESR_R40:
                v >>= (flow * 4);
@@ -990,6 +1009,8 @@ static const struct of_device_id sun8i_ce_crypto_of_match_table[] = {
          .data = &ce_h3_variant },
        { .compatible = "allwinner,sun8i-r40-crypto",
          .data = &ce_r40_variant },
+       { .compatible = "allwinner,sun20i-d1-crypto",
+         .data = &ce_d1_variant },
        { .compatible = "allwinner,sun50i-a64-crypto",
          .data = &ce_a64_variant },
        { .compatible = "allwinner,sun50i-h5-crypto",

diff --git a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h
index cec781d..624a592 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h
+++ b/drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h
@@ -94,6 +94,7 @@
 #define ESR_R40        2
 #define ESR_H5 3
 #define ESR_H6 4
+#define ESR_D1 5
 
 #define PRNG_DATA_SIZE (160 / 8)
 #define PRNG_SEED_SIZE DIV_ROUND_UP(175, 8)