New upstream version 18.02

[deb_dpdk.git] / drivers / net / bnxt / bnxt_rxq.c

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index c4da474..d49f354 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -75,7 +75,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
        if (bp->rx_cp_nr_rings < 2) {
                vnic = bnxt_alloc_vnic(bp);
                if (!vnic) {
-                       RTE_LOG(ERR, PMD, "VNIC alloc failed\n");
+                       PMD_DRV_LOG(ERR, "VNIC alloc failed\n");
                        rc = -ENOMEM;
                        goto err_out;
                }
@@ -92,7 +92,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
                vnic->end_grp_id = vnic->start_grp_id;
                filter = bnxt_alloc_filter(bp);
                if (!filter) {
-                       RTE_LOG(ERR, PMD, "L2 filter alloc failed\n");
+                       PMD_DRV_LOG(ERR, "L2 filter alloc failed\n");
                        rc = -ENOMEM;
                        goto err_out;
                }
@@ -118,10 +118,10 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
                                pools = max_pools;
                        break;
                case ETH_MQ_RX_RSS:
-                       pools = bp->rx_cp_nr_rings;
+                       pools = 1;
                        break;
                default:
-                       RTE_LOG(ERR, PMD, "Unsupported mq_mod %d\n",
+                       PMD_DRV_LOG(ERR, "Unsupported mq_mod %d\n",
                                dev_conf->rxmode.mq_mode);
                        rc = -EINVAL;
                        goto err_out;
@@ -135,7 +135,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
        for (i = 0; i < pools; i++) {
                vnic = bnxt_alloc_vnic(bp);
                if (!vnic) {
-                       RTE_LOG(ERR, PMD, "VNIC alloc failed\n");
+                       PMD_DRV_LOG(ERR, "VNIC alloc failed\n");
                        rc = -ENOMEM;
                        goto err_out;
                }
@@ -166,7 +166,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
                }
                filter = bnxt_alloc_filter(bp);
                if (!filter) {
-                       RTE_LOG(ERR, PMD, "L2 filter alloc failed\n");
+                       PMD_DRV_LOG(ERR, "L2 filter alloc failed\n");
                        rc = -ENOMEM;
                        goto err_out;
                }
@@ -311,8 +311,15 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        struct bnxt_rx_queue *rxq;
        int rc = 0;
 
+       if (queue_idx >= bp->max_rx_rings) {
+               PMD_DRV_LOG(ERR,
+                       "Cannot create Rx ring %d. Only %d rings available\n",
+                       queue_idx, bp->max_rx_rings);
+               return -ENOSPC;
+       }
+
        if (!nb_desc || nb_desc > MAX_RX_DESC_CNT) {
-               RTE_LOG(ERR, PMD, "nb_desc %d is invalid\n", nb_desc);
+               PMD_DRV_LOG(ERR, "nb_desc %d is invalid\n", nb_desc);
                rc = -EINVAL;
                goto out;
        }
@@ -325,7 +332,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        rxq = rte_zmalloc_socket("bnxt_rx_queue", sizeof(struct bnxt_rx_queue),
                                 RTE_CACHE_LINE_SIZE, socket_id);
        if (!rxq) {
-               RTE_LOG(ERR, PMD, "bnxt_rx_queue allocation failed!\n");
+               PMD_DRV_LOG(ERR, "bnxt_rx_queue allocation failed!\n");
                rc = -ENOMEM;
                goto out;
        }
@@ -334,8 +341,8 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        rxq->nb_rx_desc = nb_desc;
        rxq->rx_free_thresh = rx_conf->rx_free_thresh;
 
-       RTE_LOG(DEBUG, PMD, "RX Buf size is %d\n", rxq->rx_buf_use_size);
-       RTE_LOG(DEBUG, PMD, "RX Buf MTU %d\n", eth_dev->data->mtu);
+       PMD_DRV_LOG(DEBUG, "RX Buf size is %d\n", rxq->rx_buf_use_size);
+       PMD_DRV_LOG(DEBUG, "RX Buf MTU %d\n", eth_dev->data->mtu);
 
        rc = bnxt_init_rx_ring_struct(rxq, socket_id);
        if (rc)
@@ -350,7 +357,7 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,
        /* Allocate RX ring hardware descriptors */
        if (bnxt_alloc_rings(bp, queue_idx, NULL, rxq->rx_ring, rxq->cp_ring,
                        "rxr")) {
-               RTE_LOG(ERR, PMD,
+               PMD_DRV_LOG(ERR,
                        "ring_dma_zone_reserve for rx_ring failed!\n");
                bnxt_rx_queue_release_op(rxq);
                rc = -ENOMEM;
@@ -398,3 +405,56 @@ bnxt_rx_queue_intr_disable_op(struct rte_eth_dev *eth_dev, uint16_t queue_id)
        }
        return rc;
 }
+
+int bnxt_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+       struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
+       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct bnxt_rx_queue *rxq = bp->rx_queues[rx_queue_id];
+       struct bnxt_vnic_info *vnic = NULL;
+
+       if (rxq == NULL) {
+               PMD_DRV_LOG(ERR, "Invalid Rx queue %d\n", rx_queue_id);
+               return -EINVAL;
+       }
+
+       dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STARTED;
+       rxq->rx_deferred_start = false;
+       PMD_DRV_LOG(INFO, "Rx queue started %d\n", rx_queue_id);
+       if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
+               vnic = rxq->vnic;
+               if (vnic->fw_grp_ids[rx_queue_id] != INVALID_HW_RING_ID)
+                       return 0;
+               PMD_DRV_LOG(DEBUG, "vnic = %p fw_grp_id = %d\n",
+                       vnic, bp->grp_info[rx_queue_id + 1].fw_grp_id);
+               vnic->fw_grp_ids[rx_queue_id] =
+                                       bp->grp_info[rx_queue_id + 1].fw_grp_id;
+               return bnxt_vnic_rss_configure(bp, vnic);
+       }
+
+       return 0;
+}
+
+int bnxt_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id)
+{
+       struct bnxt *bp = (struct bnxt *)dev->data->dev_private;
+       struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct bnxt_rx_queue *rxq = bp->rx_queues[rx_queue_id];
+       struct bnxt_vnic_info *vnic = NULL;
+
+       if (rxq == NULL) {
+               PMD_DRV_LOG(ERR, "Invalid Rx queue %d\n", rx_queue_id);
+               return -EINVAL;
+       }
+
+       dev->data->rx_queue_state[rx_queue_id] = RTE_ETH_QUEUE_STATE_STOPPED;
+       rxq->rx_deferred_start = true;
+       PMD_DRV_LOG(DEBUG, "Rx queue stopped\n");
+
+       if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
+               vnic = rxq->vnic;
+               vnic->fw_grp_ids[rx_queue_id] = INVALID_HW_RING_ID;
+               return bnxt_vnic_rss_configure(bp, vnic);
+       }
+       return 0;
+}