net/sfc: support initialising different Rx queue types

[dpdk.git] / drivers / net / sfc / sfc_ethdev.c

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index c50ecea..88896db 100644 (file)
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -463,26 +463,31 @@ sfc_dev_allmulti_disable(struct rte_eth_dev *dev)
 }
 
 static int
-sfc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
+sfc_rx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,
                   uint16_t nb_rx_desc, unsigned int socket_id,
                   const struct rte_eth_rxconf *rx_conf,
                   struct rte_mempool *mb_pool)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
+       struct sfc_rxq_info *rxq_info;
+       sfc_sw_index_t sw_index;
        int rc;
 
        sfc_log_init(sa, "RxQ=%u nb_rx_desc=%u socket_id=%u",
-                    rx_queue_id, nb_rx_desc, socket_id);
+                    ethdev_qid, nb_rx_desc, socket_id);
 
        sfc_adapter_lock(sa);
 
-       rc = sfc_rx_qinit(sa, rx_queue_id, nb_rx_desc, socket_id,
+       sw_index = sfc_rxq_sw_index_by_ethdev_rx_qid(sas, sfc_ethdev_qid);
+       rc = sfc_rx_qinit(sa, sw_index, nb_rx_desc, socket_id,
                          rx_conf, mb_pool);
        if (rc != 0)
                goto fail_rx_qinit;
 
-       dev->data->rx_queues[rx_queue_id] = sas->rxq_info[rx_queue_id].dp;
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
+       dev->data->rx_queues[ethdev_qid] = rxq_info->dp;
 
        sfc_adapter_unlock(sa);
 
@@ -500,7 +505,7 @@ sfc_rx_queue_release(void *queue)
        struct sfc_dp_rxq *dp_rxq = queue;
        struct sfc_rxq *rxq;
        struct sfc_adapter *sa;
-       unsigned int sw_index;
+       sfc_sw_index_t sw_index;
 
        if (dp_rxq == NULL)
                return;
@@ -519,24 +524,28 @@ sfc_rx_queue_release(void *queue)
 }
 
 static int
-sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
+sfc_tx_queue_setup(struct rte_eth_dev *dev, uint16_t ethdev_qid,
                   uint16_t nb_tx_desc, unsigned int socket_id,
                   const struct rte_eth_txconf *tx_conf)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       struct sfc_txq_info *txq_info;
+       sfc_sw_index_t sw_index;
        int rc;
 
        sfc_log_init(sa, "TxQ = %u, nb_tx_desc = %u, socket_id = %u",
-                    tx_queue_id, nb_tx_desc, socket_id);
+                    ethdev_qid, nb_tx_desc, socket_id);
 
        sfc_adapter_lock(sa);
 
-       rc = sfc_tx_qinit(sa, tx_queue_id, nb_tx_desc, socket_id, tx_conf);
+       sw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);
+       rc = sfc_tx_qinit(sa, sw_index, nb_tx_desc, socket_id, tx_conf);
        if (rc != 0)
                goto fail_tx_qinit;
 
-       dev->data->tx_queues[tx_queue_id] = sas->txq_info[tx_queue_id].dp;
+       txq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);
+       dev->data->tx_queues[ethdev_qid] = txq_info->dp;
 
        sfc_adapter_unlock(sa);
        return 0;
@@ -552,7 +561,7 @@ sfc_tx_queue_release(void *queue)
 {
        struct sfc_dp_txq *dp_txq = queue;
        struct sfc_txq *txq;
-       unsigned int sw_index;
+       sfc_sw_index_t sw_index;
        struct sfc_adapter *sa;
 
        if (dp_txq == NULL)
@@ -1182,15 +1191,14 @@ sfc_set_mc_addr_list(struct rte_eth_dev *dev,
  * use any process-local pointers from the adapter data.
  */
 static void
-sfc_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t rx_queue_id,
+sfc_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t ethdev_qid,
                      struct rte_eth_rxq_info *qinfo)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
        struct sfc_rxq_info *rxq_info;
 
-       SFC_ASSERT(rx_queue_id < sas->rxq_count);
-
-       rxq_info = &sas->rxq_info[rx_queue_id];
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
 
        qinfo->mp = rxq_info->refill_mb_pool;
        qinfo->conf.rx_free_thresh = rxq_info->refill_threshold;
@@ -1209,15 +1217,15 @@ sfc_rx_queue_info_get(struct rte_eth_dev *dev, uint16_t rx_queue_id,
  * use any process-local pointers from the adapter data.
  */
 static void
-sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id,
+sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t ethdev_qid,
                      struct rte_eth_txq_info *qinfo)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_txq_info *txq_info;
 
-       SFC_ASSERT(tx_queue_id < sas->txq_count);
+       SFC_ASSERT(ethdev_qid < sas->ethdev_txq_count);
 
-       txq_info = &sas->txq_info[tx_queue_id];
+       txq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);
 
        memset(qinfo, 0, sizeof(*qinfo));
 
@@ -1232,14 +1240,14 @@ sfc_tx_queue_info_get(struct rte_eth_dev *dev, uint16_t tx_queue_id,
  * use any process-local pointers from the adapter data.
  */
 static uint32_t
-sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+sfc_rx_queue_count(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev);
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
        struct sfc_rxq_info *rxq_info;
 
-       SFC_ASSERT(rx_queue_id < sas->rxq_count);
-       rxq_info = &sas->rxq_info[rx_queue_id];
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
 
        if ((rxq_info->state & SFC_RXQ_STARTED) == 0)
                return 0;
@@ -1293,13 +1301,16 @@ sfc_tx_descriptor_status(void *queue, uint16_t offset)
 }
 
 static int
-sfc_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+sfc_rx_queue_start(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
+       struct sfc_rxq_info *rxq_info;
+       sfc_sw_index_t sw_index;
        int rc;
 
-       sfc_log_init(sa, "RxQ=%u", rx_queue_id);
+       sfc_log_init(sa, "RxQ=%u", ethdev_qid);
 
        sfc_adapter_lock(sa);
 
@@ -1307,14 +1318,16 @@ sfc_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
        if (sa->state != SFC_ADAPTER_STARTED)
                goto fail_not_started;
 
-       if (sas->rxq_info[rx_queue_id].state != SFC_RXQ_INITIALIZED)
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
+       if (rxq_info->state != SFC_RXQ_INITIALIZED)
                goto fail_not_setup;
 
-       rc = sfc_rx_qstart(sa, rx_queue_id);
+       sw_index = sfc_rxq_sw_index_by_ethdev_rx_qid(sas, sfc_ethdev_qid);
+       rc = sfc_rx_qstart(sa, sw_index);
        if (rc != 0)
                goto fail_rx_qstart;
 
-       sas->rxq_info[rx_queue_id].deferred_started = B_TRUE;
+       rxq_info->deferred_started = B_TRUE;
 
        sfc_adapter_unlock(sa);
 
@@ -1329,17 +1342,23 @@ fail_not_started:
 }
 
 static int
-sfc_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+sfc_rx_queue_stop(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
+       struct sfc_rxq_info *rxq_info;
+       sfc_sw_index_t sw_index;
 
-       sfc_log_init(sa, "RxQ=%u", rx_queue_id);
+       sfc_log_init(sa, "RxQ=%u", ethdev_qid);
 
        sfc_adapter_lock(sa);
-       sfc_rx_qstop(sa, rx_queue_id);
 
-       sas->rxq_info[rx_queue_id].deferred_started = B_FALSE;
+       sw_index = sfc_rxq_sw_index_by_ethdev_rx_qid(sas, sfc_ethdev_qid);
+       sfc_rx_qstop(sa, sw_index);
+
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
+       rxq_info->deferred_started = B_FALSE;
 
        sfc_adapter_unlock(sa);
 
@@ -1347,13 +1366,15 @@ sfc_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 }
 
 static int
-sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
+sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       struct sfc_txq_info *txq_info;
+       sfc_sw_index_t sw_index;
        int rc;
 
-       sfc_log_init(sa, "TxQ = %u", tx_queue_id);
+       sfc_log_init(sa, "TxQ = %u", ethdev_qid);
 
        sfc_adapter_lock(sa);
 
@@ -1361,14 +1382,16 @@ sfc_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id)
        if (sa->state != SFC_ADAPTER_STARTED)
                goto fail_not_started;
 
-       if (sas->txq_info[tx_queue_id].state != SFC_TXQ_INITIALIZED)
+       txq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);
+       if (txq_info->state != SFC_TXQ_INITIALIZED)
                goto fail_not_setup;
 
-       rc = sfc_tx_qstart(sa, tx_queue_id);
+       sw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);
+       rc = sfc_tx_qstart(sa, sw_index);
        if (rc != 0)
                goto fail_tx_qstart;
 
-       sas->txq_info[tx_queue_id].deferred_started = B_TRUE;
+       txq_info->deferred_started = B_TRUE;
 
        sfc_adapter_unlock(sa);
        return 0;
@@ -1383,18 +1406,22 @@ fail_not_started:
 }
 
 static int
-sfc_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)
+sfc_tx_queue_stop(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
        struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+       struct sfc_txq_info *txq_info;
+       sfc_sw_index_t sw_index;
 
-       sfc_log_init(sa, "TxQ = %u", tx_queue_id);
+       sfc_log_init(sa, "TxQ = %u", ethdev_qid);
 
        sfc_adapter_lock(sa);
 
-       sfc_tx_qstop(sa, tx_queue_id);
+       sw_index = sfc_txq_sw_index_by_ethdev_tx_qid(sas, ethdev_qid);
+       sfc_tx_qstop(sa, sw_index);
 
-       sas->txq_info[tx_queue_id].deferred_started = B_FALSE;
+       txq_info = sfc_txq_info_by_ethdev_qid(sas, ethdev_qid);
+       txq_info->deferred_started = B_FALSE;
 
        sfc_adapter_unlock(sa);
        return 0;
@@ -1766,27 +1793,27 @@ sfc_pool_ops_supported(struct rte_eth_dev *dev, const char *pool)
 }
 
 static int
-sfc_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)
+sfc_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev);
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
        struct sfc_rxq_info *rxq_info;
 
-       SFC_ASSERT(queue_id < sas->rxq_count);
-       rxq_info = &sas->rxq_info[queue_id];
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
 
        return sap->dp_rx->intr_enable(rxq_info->dp);
 }
 
 static int
-sfc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id)
+sfc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t ethdev_qid)
 {
        const struct sfc_adapter_priv *sap = sfc_adapter_priv_by_eth_dev(dev);
        struct sfc_adapter_shared *sas = sfc_adapter_shared_by_eth_dev(dev);
+       sfc_ethdev_qid_t sfc_ethdev_qid = ethdev_qid;
        struct sfc_rxq_info *rxq_info;
 
-       SFC_ASSERT(queue_id < sas->rxq_count);
-       rxq_info = &sas->rxq_info[queue_id];
+       rxq_info = sfc_rxq_info_by_ethdev_qid(sas, sfc_ethdev_qid);
 
        return sap->dp_rx->intr_disable(rxq_info->dp);
 }