|
@@ -614,7 +614,7 @@ skip_enc:
|
|
|
keys_fit_inline = true;
|
|
|
|
|
|
/* aead_givencrypt shared descriptor */
|
|
|
- desc = ctx->sh_desc_givenc;
|
|
|
+ desc = ctx->sh_desc_enc;
|
|
|
|
|
|
/* Note: Context registers are saved. */
|
|
|
init_sh_desc_key_aead(desc, ctx, keys_fit_inline, is_rfc3686);
|
|
@@ -645,13 +645,13 @@ copy_iv:
|
|
|
append_operation(desc, ctx->class2_alg_type |
|
|
|
OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT);
|
|
|
|
|
|
- /* ivsize + cryptlen = seqoutlen - authsize */
|
|
|
- append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize);
|
|
|
-
|
|
|
/* Read and write assoclen bytes */
|
|
|
append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ);
|
|
|
append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ);
|
|
|
|
|
|
+ /* ivsize + cryptlen = seqoutlen - authsize */
|
|
|
+ append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize);
|
|
|
+
|
|
|
/* Skip assoc data */
|
|
|
append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF);
|
|
|
|
|
@@ -697,7 +697,7 @@ copy_iv:
|
|
|
ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc,
|
|
|
desc_bytes(desc),
|
|
|
DMA_TO_DEVICE);
|
|
|
- if (dma_mapping_error(jrdev, ctx->sh_desc_givenc_dma)) {
|
|
|
+ if (dma_mapping_error(jrdev, ctx->sh_desc_enc_dma)) {
|
|
|
dev_err(jrdev, "unable to map shared descriptor\n");
|
|
|
return -ENOMEM;
|
|
|
}
|