net/dpaa: configure frame queue on MAC ID basis

The current code has the hardcoded seq for fq allocation.
It require multiple changes, when some of the interfaces
are assigned to kernel stack. Changing it on the mac
id basis provide the flexibility to assign any interface
to kernel.

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c
index de4cf7b..c1f1bf7 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.c
+++ b/drivers/net/dpaa/dpaa_ethdev.c
@@ -1011,7 +1011,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx,
 {
        struct qm_mcc_initfq opts = {0};
        int ret;
-       u32 flags = 0;
+       u32 flags = QMAN_FQ_FLAG_NO_ENQUEUE;
        struct qm_mcc_initcgr cgr_opts = {
                .we_mask = QM_CGR_WE_CS_THRES |
                                QM_CGR_WE_CSTD_EN |
@@ -1024,15 +1024,18 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx,
 
        PMD_INIT_FUNC_TRACE();
 
-       ret = qman_reserve_fqid(fqid);
-       if (ret) {
-               DPAA_PMD_ERR("reserve rx fqid 0x%x failed with ret: %d",
-                            fqid, ret);
-               return -EINVAL;
+       if (fqid) {
+               ret = qman_reserve_fqid(fqid);
+               if (ret) {
+                       DPAA_PMD_ERR("reserve rx fqid 0x%x failed with ret: %d",
+                                    fqid, ret);
+                       return -EINVAL;
+               }
+       } else {
+               flags |= QMAN_FQ_FLAG_DYNAMIC_FQID;
        }
-
        DPAA_PMD_DEBUG("creating rx fq %p, fqid 0x%x", fq, fqid);
-       ret = qman_create_fq(fqid, QMAN_FQ_FLAG_NO_ENQUEUE, fq);
+       ret = qman_create_fq(fqid, flags, fq);
        if (ret) {
                DPAA_PMD_ERR("create rx fqid 0x%x failed with ret: %d",
                        fqid, ret);
@@ -1051,7 +1054,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx,
                if (ret) {
                        DPAA_PMD_WARN(
                                "rx taildrop init fail on rx fqid 0x%x(ret=%d)",
-                               fqid, ret);
+                               fq->fqid, ret);
                        goto without_cgr;
                }
                opts.we_mask |= QM_INITFQ_WE_CGID;
@@ -1059,7 +1062,7 @@ static int dpaa_rx_queue_init(struct qman_fq *fq, struct qman_cgr *cgr_rx,
                opts.fqd.fq_ctrl |= QM_FQCTRL_CGE;
        }
 without_cgr:
-       ret = qman_init_fq(fq, flags, &opts);
+       ret = qman_init_fq(fq, 0, &opts);
        if (ret)
                DPAA_PMD_ERR("init rx fqid 0x%x failed with ret:%d", fqid, ret);
        return ret;
@@ -1212,7 +1215,7 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev)
                if (default_q)
                        fqid = cfg->rx_def;
                else
-                       fqid = DPAA_PCD_FQID_START + dpaa_intf->ifid *
+                       fqid = DPAA_PCD_FQID_START + dpaa_intf->fif->mac_idx *
                                DPAA_PCD_FQID_MULTIPLIER + loop;
 
                if (dpaa_intf->cgr_rx)

diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h
index c79b9f8..2c38c34 100644 (file)
--- a/drivers/net/dpaa/dpaa_ethdev.h
+++ b/drivers/net/dpaa/dpaa_ethdev.h
@@ -63,7 +63,7 @@
 #define DPAA_PCD_FQID_START            0x400
 #define DPAA_PCD_FQID_MULTIPLIER       0x100
 #define DPAA_DEFAULT_NUM_PCD_QUEUES    1
-#define DPAA_MAX_NUM_PCD_QUEUES                32
+#define DPAA_MAX_NUM_PCD_QUEUES                4
 
 #define DPAA_IF_TX_PRIORITY            3
 #define DPAA_IF_RX_PRIORITY            0