common/cnxk: convert warning to debug print

[dpdk.git] / drivers / crypto / cnxk / cn10k_ipsec.c

diff --git a/drivers/crypto/cnxk/cn10k_ipsec.c b/drivers/crypto/cnxk/cn10k_ipsec.c
index c95c57a..d6ff134 100644 (file)
--- a/drivers/crypto/cnxk/cn10k_ipsec.c
+++ b/drivers/crypto/cnxk/cn10k_ipsec.c
@@ -74,9 +74,12 @@ cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt, struct roc_cpt_lf *lf,
                if (crypto_xfrm->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
                        sa->iv_offset = crypto_xfrm->aead.iv.offset;
                        sa->iv_length = crypto_xfrm->aead.iv.length;
-               } else {
+               } else if (crypto_xfrm->type == RTE_CRYPTO_SYM_XFORM_CIPHER) {
                        sa->iv_offset = crypto_xfrm->cipher.iv.offset;
                        sa->iv_length = crypto_xfrm->cipher.iv.length;
+               } else {
+                       sa->iv_offset = crypto_xfrm->auth.iv.offset;
+                       sa->iv_length = crypto_xfrm->auth.iv.length;
                }
        }
 #else
@@ -102,6 +105,8 @@ cn10k_ipsec_outb_sa_create(struct roc_cpt *roc_cpt, struct roc_cpt_lf *lf,
 
        param1.u16 = 0;
 
+       param1.s.ttl_or_hop_limit = ipsec_xfrm->options.dec_ttl;
+
        /* Disable IP checksum computation by default */
        param1.s.ip_csum_disable = ROC_IE_OT_SA_INNER_PKT_IP_CSUM_DISABLE;
 
@@ -180,7 +185,8 @@ cn10k_ipsec_inb_sa_create(struct roc_cpt *roc_cpt, struct roc_cpt_lf *lf,
        }
 
        /* Translate security parameters to SA */
-       ret = cnxk_ot_ipsec_inb_sa_fill(sa_dptr, ipsec_xfrm, crypto_xfrm);
+       ret = cnxk_ot_ipsec_inb_sa_fill(sa_dptr, ipsec_xfrm, crypto_xfrm,
+                                       false);
        if (ret) {
                plt_err("Could not fill inbound session parameters");
                goto sa_dptr_free;
@@ -327,6 +333,8 @@ cn10k_sec_session_destroy(void *dev, struct rte_security_session *sec_sess)
        struct cn10k_ipsec_sa *sa;
        struct cnxk_cpt_qp *qp;
        struct roc_cpt_lf *lf;
+       void *sa_dptr = NULL;
+       int ret;
 
        sess = get_sec_session_private_data(sec_sess);
        if (sess == NULL)
@@ -343,16 +351,44 @@ cn10k_sec_session_destroy(void *dev, struct rte_security_session *sec_sess)
        /* Trigger CTX flush to write dirty data back to DRAM */
        roc_cpt_lf_ctx_flush(lf, &sa->in_sa, false);
 
-       /* Wait for 1 ms so that flush is complete */
-       rte_delay_ms(1);
+       ret = -1;
 
-       w2 = (union roc_ot_ipsec_sa_word2 *)&sa->in_sa.w2;
-       w2->s.valid = 0;
+       if (sa->is_outbound) {
+               sa_dptr = plt_zmalloc(sizeof(struct roc_ot_ipsec_outb_sa), 8);
+               if (sa_dptr != NULL) {
+                       roc_ot_ipsec_outb_sa_init(sa_dptr);
 
-       plt_atomic_thread_fence(__ATOMIC_SEQ_CST);
+                       ret = roc_cpt_ctx_write(
+                               lf, sa_dptr, &sa->out_sa,
+                               sizeof(struct roc_ot_ipsec_outb_sa));
+               }
+       } else {
+               sa_dptr = plt_zmalloc(sizeof(struct roc_ot_ipsec_inb_sa), 8);
+               if (sa_dptr != NULL) {
+                       roc_ot_ipsec_inb_sa_init(sa_dptr, false);
+
+                       ret = roc_cpt_ctx_write(
+                               lf, sa_dptr, &sa->in_sa,
+                               sizeof(struct roc_ot_ipsec_inb_sa));
+               }
+       }
+
+       plt_free(sa_dptr);
+
+       if (ret) {
+               /* MC write_ctx failed. Attempt reload of CTX */
 
-       /* Trigger CTX reload to fetch new data from DRAM */
-       roc_cpt_lf_ctx_reload(lf, &sa->in_sa);
+               /* Wait for 1 ms so that flush is complete */
+               rte_delay_ms(1);
+
+               w2 = (union roc_ot_ipsec_sa_word2 *)&sa->in_sa.w2;
+               w2->s.valid = 0;
+
+               plt_atomic_thread_fence(__ATOMIC_SEQ_CST);
+
+               /* Trigger CTX reload to fetch new data from DRAM */
+               roc_cpt_lf_ctx_reload(lf, &sa->in_sa);
+       }
 
        sess_mp = rte_mempool_from_obj(sess);