crypto/cnxk: support ucode API change
authorVidya Sagar Velumuri <vvelumuri@marvell.com>
Thu, 2 Sep 2021 12:22:33 +0000 (17:52 +0530)
committerAkhil Goyal <gakhil@marvell.com>
Mon, 6 Sep 2021 19:46:34 +0000 (21:46 +0200)
Add support for API changes in ucode 1.13

Signed-off-by: Vidya Sagar Velumuri <vvelumuri@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
drivers/crypto/cnxk/cnxk_se.h

index bbad289..aedc4bc 100644 (file)
@@ -993,10 +993,7 @@ cpt_zuc_snow3g_prep(uint32_t req_flags, uint64_t d_offs, uint64_t d_lens,
 
        cpt_inst_w4.s.opcode_major = ROC_SE_MAJOR_OP_ZUC_SNOW3G;
 
-       /* indicates CPTR ctx, operation type, KEY & IV mode from DPTR */
-
-       cpt_inst_w4.s.opcode_minor = ((1 << 7) | (pdcp_alg_type << 5) |
-                                     (0 << 4) | (0 << 3) | (flags & 0x7));
+       cpt_inst_w4.s.opcode_minor = se_ctx->template_w4.s.opcode_minor;
 
        if (flags == 0x1) {
                /*
@@ -1766,6 +1763,8 @@ fill_sess_cipher(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)
                                         NULL)))
                return -1;
 
+       if ((enc_type >= ROC_SE_ZUC_EEA3) && (enc_type <= ROC_SE_AES_CTR_EEA2))
+               roc_se_ctx_swap(&sess->roc_se_ctx);
        return 0;
 }
 
@@ -1869,6 +1868,10 @@ fill_sess_auth(struct rte_crypto_sym_xform *xform, struct cnxk_se_sess *sess)
                                         a_form->digest_length)))
                return -1;
 
+       if ((auth_type >= ROC_SE_ZUC_EIA3) &&
+           (auth_type <= ROC_SE_AES_CMAC_EIA2))
+               roc_se_ctx_swap(&sess->roc_se_ctx);
+
        return 0;
 }