net/bnxt: allocate rings and groups

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

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 13f9e1c..fcc4811 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -43,8 +43,10 @@
 #include "bnxt_filter.h"
 #include "bnxt_hwrm.h"
 #include "bnxt_rxq.h"
+#include "bnxt_rxr.h"
 #include "bnxt_ring.h"
 #include "bnxt_txq.h"
+#include "bnxt_txr.h"
 #include "bnxt_vnic.h"
 #include "hsi_struct_def_dpdk.h"
 
@@ -579,7 +581,11 @@ int bnxt_hwrm_ring_alloc(struct bnxt *bp,
                break;
        case HWRM_RING_ALLOC_INPUT_RING_TYPE_CMPL:
                req.ring_type = ring_type;
-               req.int_mode = HWRM_RING_ALLOC_INPUT_INT_MODE_POLL;
+               /*
+                * TODO: Some HWRM versions crash with
+                * HWRM_RING_ALLOC_INPUT_INT_MODE_POLL
+                */
+               req.int_mode = HWRM_RING_ALLOC_INPUT_INT_MODE_MSIX;
                req.length = rte_cpu_to_le_32(ring->ring_size);
                break;
        default:
@@ -1012,6 +1018,84 @@ int bnxt_free_all_hwrm_ring_grps(struct bnxt *bp)
        return rc;
 }
 
+static void bnxt_free_cp_ring(struct bnxt *bp,
+                             struct bnxt_cp_ring_info *cpr, unsigned int idx)
+{
+       struct bnxt_ring *cp_ring = cpr->cp_ring_struct;
+
+       bnxt_hwrm_ring_free(bp, cp_ring,
+                       HWRM_RING_FREE_INPUT_RING_TYPE_CMPL);
+       cp_ring->fw_ring_id = INVALID_HW_RING_ID;
+       bp->grp_info[idx].cp_fw_ring_id = INVALID_HW_RING_ID;
+       memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *
+                       sizeof(*cpr->cp_desc_ring));
+       cpr->cp_raw_cons = 0;
+}
+
+int bnxt_free_all_hwrm_rings(struct bnxt *bp)
+{
+       unsigned int i;
+       int rc = 0;
+
+       for (i = 0; i < bp->tx_cp_nr_rings; i++) {
+               struct bnxt_tx_queue *txq = bp->tx_queues[i];
+               struct bnxt_tx_ring_info *txr = txq->tx_ring;
+               struct bnxt_ring *ring = txr->tx_ring_struct;
+               struct bnxt_cp_ring_info *cpr = txq->cp_ring;
+               unsigned int idx = bp->rx_cp_nr_rings + i + 1;
+
+               if (ring->fw_ring_id != INVALID_HW_RING_ID) {
+                       bnxt_hwrm_ring_free(bp, ring,
+                                       HWRM_RING_FREE_INPUT_RING_TYPE_TX);
+                       ring->fw_ring_id = INVALID_HW_RING_ID;
+                       memset(txr->tx_desc_ring, 0,
+                                       txr->tx_ring_struct->ring_size *
+                                       sizeof(*txr->tx_desc_ring));
+                       memset(txr->tx_buf_ring, 0,
+                                       txr->tx_ring_struct->ring_size *
+                                       sizeof(*txr->tx_buf_ring));
+                       txr->tx_prod = 0;
+                       txr->tx_cons = 0;
+               }
+               if (cpr->cp_ring_struct->fw_ring_id != INVALID_HW_RING_ID)
+                       bnxt_free_cp_ring(bp, cpr, idx);
+       }
+
+       for (i = 0; i < bp->rx_cp_nr_rings; i++) {
+               struct bnxt_rx_queue *rxq = bp->rx_queues[i];
+               struct bnxt_rx_ring_info *rxr = rxq->rx_ring;
+               struct bnxt_ring *ring = rxr->rx_ring_struct;
+               struct bnxt_cp_ring_info *cpr = rxq->cp_ring;
+               unsigned int idx = i + 1;
+
+               if (ring->fw_ring_id != INVALID_HW_RING_ID) {
+                       bnxt_hwrm_ring_free(bp, ring,
+                                       HWRM_RING_FREE_INPUT_RING_TYPE_RX);
+                       ring->fw_ring_id = INVALID_HW_RING_ID;
+                       bp->grp_info[idx].rx_fw_ring_id = INVALID_HW_RING_ID;
+                       memset(rxr->rx_desc_ring, 0,
+                                       rxr->rx_ring_struct->ring_size *
+                                       sizeof(*rxr->rx_desc_ring));
+                       memset(rxr->rx_buf_ring, 0,
+                                       rxr->rx_ring_struct->ring_size *
+                                       sizeof(*rxr->rx_buf_ring));
+                       rxr->rx_prod = 0;
+               }
+               if (cpr->cp_ring_struct->fw_ring_id != INVALID_HW_RING_ID)
+                       bnxt_free_cp_ring(bp, cpr, idx);
+       }
+
+       /* Default completion ring */
+       {
+               struct bnxt_cp_ring_info *cpr = bp->def_cp_ring;
+
+               if (cpr->cp_ring_struct->fw_ring_id != INVALID_HW_RING_ID)
+                       bnxt_free_cp_ring(bp, cpr, 0);
+       }
+
+       return rc;
+}
+
 int bnxt_alloc_all_hwrm_ring_grps(struct bnxt *bp)
 {
        uint16_t i;
@@ -1085,6 +1169,32 @@ int bnxt_set_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic)
        return rc;
 }
 
+void bnxt_free_all_hwrm_resources(struct bnxt *bp)
+{
+       struct bnxt_vnic_info *vnic;
+       unsigned int i;
+
+       if (bp->vnic_info == NULL)
+               return;
+
+       vnic = &bp->vnic_info[0];
+       bnxt_hwrm_cfa_l2_clear_rx_mask(bp, vnic);
+
+       /* VNIC resources */
+       for (i = 0; i < bp->nr_vnics; i++) {
+               struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
+
+               bnxt_clear_hwrm_vnic_filters(bp, vnic);
+
+               bnxt_hwrm_vnic_ctx_free(bp, vnic);
+               bnxt_hwrm_vnic_free(bp, vnic);
+       }
+       /* Ring resources */
+       bnxt_free_all_hwrm_rings(bp);
+       bnxt_free_all_hwrm_ring_grps(bp);
+       bnxt_free_all_hwrm_stat_ctxs(bp);
+}
+
 static uint16_t bnxt_parse_eth_link_duplex(uint32_t conf_link_speed)
 {
        uint8_t hw_link_duplex = HWRM_PORT_PHY_CFG_INPUT_AUTO_DUPLEX_BOTH;