|
|
@ -442,7 +442,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> |
|
|
|
static int test_cipher(struct crypto_cipher *tfm, int enc,
|
|
|
|
static int test_cipher(struct crypto_cipher *tfm, int enc,
|
|
|
|
const struct cipher_testvec *template,
|
|
|
|
const struct cipher_testvec *template,
|
|
|
|
unsigned int tcount)
|
|
|
|
unsigned int tcount)
|
|
|
|
@@ -3518,6 +3753,15 @@ static const struct alg_test_desc alg_te
|
|
|
|
@@ -3524,6 +3759,15 @@ static const struct alg_test_desc alg_te
|
|
|
|
.hash = __VECS(tgr192_tv_template)
|
|
|
|
.hash = __VECS(tgr192_tv_template)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}, {
|
|
|
|
}, {
|
|
|
@ -1828,7 +1828,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> |
|
|
|
if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv))
|
|
|
|
if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv))
|
|
|
|
append_load_as_imm(desc, req->iv, ivsize,
|
|
|
|
append_load_as_imm(desc, req->iv, ivsize,
|
|
|
|
LDST_CLASS_1_CCB |
|
|
|
|
LDST_CLASS_1_CCB |
|
|
|
|
@@ -3203,9 +3247,11 @@ struct caam_crypto_alg {
|
|
|
|
@@ -3204,9 +3248,11 @@ struct caam_crypto_alg {
|
|
|
|
struct caam_alg_entry caam;
|
|
|
|
struct caam_alg_entry caam;
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
@ -1841,7 +1841,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> |
|
|
|
|
|
|
|
|
|
|
|
ctx->jrdev = caam_jr_alloc();
|
|
|
|
ctx->jrdev = caam_jr_alloc();
|
|
|
|
if (IS_ERR(ctx->jrdev)) {
|
|
|
|
if (IS_ERR(ctx->jrdev)) {
|
|
|
|
@@ -3213,10 +3259,16 @@ static int caam_init_common(struct caam_
|
|
|
|
@@ -3214,10 +3260,16 @@ static int caam_init_common(struct caam_
|
|
|
|
return PTR_ERR(ctx->jrdev);
|
|
|
|
return PTR_ERR(ctx->jrdev);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -1859,7 +1859,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> |
|
|
|
if (dma_mapping_error(ctx->jrdev, dma_addr)) {
|
|
|
|
if (dma_mapping_error(ctx->jrdev, dma_addr)) {
|
|
|
|
dev_err(ctx->jrdev, "unable to map key, shared descriptors\n");
|
|
|
|
dev_err(ctx->jrdev, "unable to map key, shared descriptors\n");
|
|
|
|
caam_jr_free(ctx->jrdev);
|
|
|
|
caam_jr_free(ctx->jrdev);
|
|
|
|
@@ -3244,7 +3296,7 @@ static int caam_cra_init(struct crypto_t
|
|
|
|
@@ -3245,7 +3297,7 @@ static int caam_cra_init(struct crypto_t
|
|
|
|
container_of(alg, struct caam_crypto_alg, crypto_alg);
|
|
|
|
container_of(alg, struct caam_crypto_alg, crypto_alg);
|
|
|
|
struct caam_ctx *ctx = crypto_tfm_ctx(tfm);
|
|
|
|
struct caam_ctx *ctx = crypto_tfm_ctx(tfm);
|
|
|
|
|
|
|
|
|
|
|
@ -1868,7 +1868,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> |
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int caam_aead_init(struct crypto_aead *tfm)
|
|
|
|
static int caam_aead_init(struct crypto_aead *tfm)
|
|
|
|
@@ -3254,14 +3306,15 @@ static int caam_aead_init(struct crypto_
|
|
|
|
@@ -3255,14 +3307,15 @@ static int caam_aead_init(struct crypto_
|
|
|
|
container_of(alg, struct caam_aead_alg, aead);
|
|
|
|
container_of(alg, struct caam_aead_alg, aead);
|
|
|
|
struct caam_ctx *ctx = crypto_aead_ctx(tfm);
|
|
|
|
struct caam_ctx *ctx = crypto_aead_ctx(tfm);
|
|
|
|
|
|
|
|
|
|
|
|