net/ionic: remove unused field from queue structure

This will conserve resources.

Signed-off-by: Andrew Boyer <aboyer@pensando.io>

diff --git a/drivers/net/ionic/ionic_dev.c b/drivers/net/ionic/ionic_dev.c
index 74ac2e67a556ac8f420b4e3d65b67c34c61274c0..97fb8acf9b260f94b2d1a303ea9465e850353962 100644 (file)
--- a/drivers/net/ionic/ionic_dev.c
+++ b/drivers/net/ionic/ionic_dev.c
@@ -383,12 +383,6 @@ ionic_cq_map(struct ionic_cq *cq, void *base, rte_iova_t base_pa)
        cq->base_pa = base_pa;
 }
 
-void
-ionic_cq_bind(struct ionic_cq *cq, struct ionic_queue *q)
-{
-       q->bound_cq = cq;
-}
-
 uint32_t
 ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do,
                 ionic_cq_cb cb, void *cb_arg)

diff --git a/drivers/net/ionic/ionic_dev.h b/drivers/net/ionic/ionic_dev.h
index c51c2a9ae551c6cc00c4457715cd0426de0a4427..a777695d6439d11838b5675c57b636bd59203c1d 100644 (file)
--- a/drivers/net/ionic/ionic_dev.h
+++ b/drivers/net/ionic/ionic_dev.h
@@ -137,7 +137,6 @@ struct ionic_dev {
 struct ionic_queue {
        struct ionic_dev *idev;
        struct ionic_lif *lif;
-       struct ionic_cq *bound_cq;
        uint32_t index;
        uint32_t type;
        uint32_t hw_index;
@@ -221,7 +220,6 @@ struct ionic_doorbell __iomem *ionic_db_map(struct ionic_lif *lif,
 
 int ionic_cq_init(struct ionic_cq *cq, uint16_t num_descs);
 void ionic_cq_map(struct ionic_cq *cq, void *base, rte_iova_t base_pa);
-void ionic_cq_bind(struct ionic_cq *cq, struct ionic_queue *q);
 typedef bool (*ionic_cq_cb)(struct ionic_cq *cq, uint32_t cq_desc_index,
                void *cb_arg);
 uint32_t ionic_cq_service(struct ionic_cq *cq, uint32_t work_to_do,

diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index 52bc0b178df8fbf789ecce5129002818e3be753b..1ca6e050ad7ecf98ad600e25996890db55d5e4f8 100644 (file)
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -695,7 +695,6 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
 
        ionic_q_map(&new->q, q_base, q_base_pa);
        ionic_cq_map(&new->cq, cq_base, cq_base_pa);
-       ionic_cq_bind(&new->cq, &new->q);
 
        *qcq = new;
 

diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c
index d736e24b02944ad7798ae95991d96e5d8e73996a..d615e5c4e1b267a71844795627092ed05ff152cc 100644 (file)
--- a/drivers/net/ionic/ionic_rxtx.c
+++ b/drivers/net/ionic/ionic_rxtx.c
@@ -741,14 +741,15 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
 }
 
 static __rte_always_inline void
-ionic_rx_clean(struct ionic_queue *q,
+ionic_rx_clean(struct ionic_qcq *rxq,
                uint32_t q_desc_index, uint32_t cq_desc_index,
                void *service_cb_arg)
 {
-       struct ionic_rxq_comp *cq_desc_base = q->bound_cq->base;
+       struct ionic_queue *q = &rxq->q;
+       struct ionic_cq *cq = &rxq->cq;
+       struct ionic_rxq_comp *cq_desc_base = cq->base;
        struct ionic_rxq_comp *cq_desc = &cq_desc_base[cq_desc_index];
        struct rte_mbuf *rxm, *rxm_seg;
-       struct ionic_qcq *rxq = IONIC_Q_TO_QCQ(q);
        uint32_t max_frame_size =
                rxq->lif->eth_dev->data->dev_conf.rxmode.max_rx_pkt_len;
        uint64_t pkt_flags = 0;
@@ -1061,7 +1062,7 @@ ionic_rxq_service(struct ionic_qcq *rxq, uint32_t work_to_do,
                                /* q desc info */
                                rte_prefetch0(&q->info[q->tail_idx]);
 
-                       ionic_rx_clean(q, curr_q_tail_idx, curr_cq_tail_idx,
+                       ionic_rx_clean(rxq, curr_q_tail_idx, curr_cq_tail_idx,
                                service_cb_arg);
 
                } while (more);