net/qede: accept bigger RSS table

[dpdk.git] / drivers / net / bnxt / bnxt_ring.c

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index adddf9b..e4055fa 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2018 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -230,7 +230,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                        tx_ring->vmem =
                            (void **)((char *)mz->addr + tx_vmem_start);
                        tx_ring_info->tx_buf_ring =
-                           (struct bnxt_sw_tx_bd *)tx_ring->vmem;
+                           (struct rte_mbuf **)tx_ring->vmem;
                }
        }
 
@@ -346,10 +346,7 @@ static void bnxt_set_db(struct bnxt *bp,
                        uint32_t ring_mask)
 {
        if (BNXT_CHIP_P5(bp)) {
-               if (BNXT_PF(bp))
-                       db->doorbell = (char *)bp->doorbell_base + 0x10000;
-               else
-                       db->doorbell = (char *)bp->doorbell_base + 0x4000;
+               int db_offset = DB_PF_OFFSET;
                switch (ring_type) {
                case HWRM_RING_ALLOC_INPUT_RING_TYPE_TX:
                        db->db_key64 = DBR_PATH_L2 | DBR_TYPE_SQ;
@@ -365,6 +362,14 @@ static void bnxt_set_db(struct bnxt *bp,
                        db->db_key64 = DBR_PATH_L2;
                        break;
                }
+               if (BNXT_CHIP_SR2(bp)) {
+                       db->db_key64 |= DBR_VALID;
+                       db_offset = bp->legacy_db_size;
+               } else if (BNXT_VF(bp)) {
+                       db_offset = DB_VF_OFFSET;
+               }
+
+               db->doorbell = (char *)bp->doorbell_base + db_offset;
                db->db_key64 |= (uint64_t)fid << DBR_XID_SFT;
                db->db_64 = true;
        } else {
@@ -383,6 +388,12 @@ static void bnxt_set_db(struct bnxt *bp,
                db->db_64 = false;
        }
        db->db_ring_mask = ring_mask;
+
+       if (BNXT_CHIP_SR2(bp)) {
+               db->db_epoch_mask = db->db_ring_mask + 1;
+               db->db_epoch_shift = DBR_EPOCH_SFT -
+                                       rte_log2_u32(db->db_epoch_mask);
+       }
 }
 
 static int bnxt_alloc_cmpl_ring(struct bnxt *bp, int queue_index,
@@ -570,8 +581,20 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)
        struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
        struct bnxt_ring *cp_ring = cpr->cp_ring_struct;
        struct bnxt_rx_ring_info *rxr = rxq->rx_ring;
+       struct bnxt_coal coal;
        int rc;
 
+       /*
+        * Storage for the cp ring is allocated based on worst-case
+        * usage, the actual size to be used by hw is computed here.
+        */
+       cp_ring->ring_size = rxr->rx_ring_struct->ring_size * 2;
+
+       if (bp->eth_dev->data->scattered_rx)
+               cp_ring->ring_size *= AGG_RING_SIZE_FACTOR;
+
+       cp_ring->ring_mask = cp_ring->ring_size - 1;
+
        rc = bnxt_alloc_cmpl_ring(bp, queue_index, cpr);
        if (rc)
                goto err_out;
@@ -581,6 +604,9 @@ int bnxt_alloc_hwrm_rx_ring(struct bnxt *bp, int queue_index)
                bp->grp_info[queue_index].cp_fw_ring_id = cp_ring->fw_ring_id;
        }
 
+       bnxt_init_dflt_coal(&coal);
+       bnxt_hwrm_set_ring_coal(bp, &coal, cp_ring->fw_ring_id);
+
        if (!BNXT_NUM_ASYNC_CPR(bp) && !queue_index) {
                /*
                 * If a dedicated async event completion ring is not enabled,
@@ -677,49 +703,9 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
        bnxt_init_all_rings(bp);
 
        for (i = 0; i < bp->rx_cp_nr_rings; i++) {
-               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
-               struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
-               struct bnxt_ring *cp_ring = cpr->cp_ring_struct;
-               struct bnxt_rx_ring_info *rxr = rxq->rx_ring;
-
-               if (bnxt_alloc_cmpl_ring(bp, i, cpr))
-                       goto err_out;
-
-               if (BNXT_HAS_RING_GRPS(bp)) {
-                       bp->grp_info[i].fw_stats_ctx = cpr->hw_stats_ctx_id;
-                       bp->grp_info[i].cp_fw_ring_id = cp_ring->fw_ring_id;
-               }
-
-               bnxt_hwrm_set_ring_coal(bp, &coal, cp_ring->fw_ring_id);
-               if (!BNXT_NUM_ASYNC_CPR(bp) && !i) {
-                       /*
-                        * If a dedicated async event completion ring is not
-                        * enabled, use the first completion ring as the default
-                        * completion ring for async event handling.
-                        */
-                       bp->async_cp_ring = cpr;
-                       rc = bnxt_hwrm_set_async_event_cr(bp);
-                       if (rc)
-                               goto err_out;
-               }
-
-               if (bnxt_alloc_rx_ring(bp, i))
-                       goto err_out;
-
-               if (bnxt_alloc_rx_agg_ring(bp, i))
+               rc = bnxt_alloc_hwrm_rx_ring(bp, i);
+               if (rc)
                        goto err_out;
-
-               if (bnxt_init_one_rx_ring(rxq)) {
-                       PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring failed!\n");
-                       bnxt_rx_queue_release_op(rxq);
-                       return -ENOMEM;
-               }
-               bnxt_db_write(&rxr->rx_db, rxr->rx_raw_prod);
-               bnxt_db_write(&rxr->ag_db, rxr->ag_raw_prod);
-               rxq->index = i;
-#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64)
-               bnxt_rxq_vec_setup(rxq);
-#endif
        }
 
        for (i = 0; i < bp->tx_cp_nr_rings; i++) {