common/cnxk: move instruction queue enable to ROC

The code for enabling instruction queue is moved to ROC API.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c
index 788b28a..c001497 100644 (file)
--- a/drivers/common/cnxk/roc_cpt.c
+++ b/drivers/common/cnxk/roc_cpt.c
@@ -444,8 +444,6 @@ cpt_iq_init(struct roc_cpt_lf *lf)
 {
        union cpt_lf_q_size lf_q_size = {.u = 0x0};
        union cpt_lf_q_base lf_q_base = {.u = 0x0};
-       union cpt_lf_inprog lf_inprog;
-       union cpt_lf_ctl lf_ctl;
        uintptr_t addr;
 
        lf->io_addr = lf->rbase + CPT_LF_NQX(0);
@@ -465,19 +463,6 @@ cpt_iq_init(struct roc_cpt_lf *lf)
        lf_q_size.s.size_div40 = CPT_IQ_NB_DESC_SIZE_DIV40(lf->nb_desc);
        plt_write64(lf_q_size.u, lf->rbase + CPT_LF_Q_SIZE);
 
-       /* Enable command queue execution */
-       lf_inprog.u = plt_read64(lf->rbase + CPT_LF_INPROG);
-       lf_inprog.s.eena = 1;
-       plt_write64(lf_inprog.u, lf->rbase + CPT_LF_INPROG);
-
-       /* Enable instruction queue enqueuing */
-       lf_ctl.u = plt_read64(lf->rbase + CPT_LF_CTL);
-       lf_ctl.s.ena = 1;
-       lf_ctl.s.fc_ena = 1;
-       lf_ctl.s.fc_up_crossing = 1;
-       lf_ctl.s.fc_hyst_bits = CPT_FC_NUM_HYST_BITS;
-       plt_write64(lf_ctl.u, lf->rbase + CPT_LF_CTL);
-
        lf->fc_addr = (uint64_t *)addr;
 }
 
@@ -573,7 +558,6 @@ cpt_lf_init(struct roc_cpt_lf *lf)
        if (rc)
                goto disable_iq;
 
-       cpt_lf_dump(lf);
        return 0;
 
 disable_iq:
@@ -807,6 +791,31 @@ roc_cpt_iq_disable(struct roc_cpt_lf *lf)
        plt_write64(lf_inprog.u, lf->rbase + CPT_LF_INPROG);
 }
 
+void
+roc_cpt_iq_enable(struct roc_cpt_lf *lf)
+{
+       union cpt_lf_inprog lf_inprog;
+       union cpt_lf_ctl lf_ctl;
+
+       /* Disable command queue */
+       roc_cpt_iq_disable(lf);
+
+       /* Enable command queue execution */
+       lf_inprog.u = plt_read64(lf->rbase + CPT_LF_INPROG);
+       lf_inprog.s.eena = 1;
+       plt_write64(lf_inprog.u, lf->rbase + CPT_LF_INPROG);
+
+       /* Enable instruction queue enqueuing */
+       lf_ctl.u = plt_read64(lf->rbase + CPT_LF_CTL);
+       lf_ctl.s.ena = 1;
+       lf_ctl.s.fc_ena = 1;
+       lf_ctl.s.fc_up_crossing = 1;
+       lf_ctl.s.fc_hyst_bits = CPT_FC_NUM_HYST_BITS;
+       plt_write64(lf_ctl.u, lf->rbase + CPT_LF_CTL);
+
+       cpt_lf_dump(lf);
+}
+
 int
 roc_cpt_lmtline_init(struct roc_cpt *roc_cpt, struct roc_cpt_lmtline *lmtline,
                     int lf_id)

diff --git a/drivers/common/cnxk/roc_cpt.h b/drivers/common/cnxk/roc_cpt.h
index 8dd2b5e..3a2f5b9 100644 (file)
--- a/drivers/common/cnxk/roc_cpt.h
+++ b/drivers/common/cnxk/roc_cpt.h
@@ -139,6 +139,7 @@ int __roc_api roc_cpt_inline_ipsec_inb_cfg(struct roc_cpt *roc_cpt,
 int __roc_api roc_cpt_afs_print(struct roc_cpt *roc_cpt);
 int __roc_api roc_cpt_lfs_print(struct roc_cpt *roc_cpt);
 void __roc_api roc_cpt_iq_disable(struct roc_cpt_lf *lf);
+void __roc_api roc_cpt_iq_enable(struct roc_cpt_lf *lf);
 int __roc_api roc_cpt_lmtline_init(struct roc_cpt *roc_cpt,
                                   struct roc_cpt_lmtline *lmtline, int lf_id);
 

diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 8ea3e9f..2a28087 100644 (file)
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -54,6 +54,7 @@ INTERNAL {
        roc_cpt_inline_ipsec_cfg;
        roc_cpt_inline_ipsec_inb_cfg;
        roc_cpt_iq_disable;
+       roc_cpt_iq_enable;
        roc_cpt_lf_ctx_flush;
        roc_cpt_lf_init;
        roc_cpt_lf_fini;