net/bnxt: return error in stats if init is not complete

[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 478eab4..aa9f3f4 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -24,6 +24,9 @@
 
 void bnxt_free_ring(struct bnxt_ring *ring)
 {
+       if (!ring)
+               return;
+
        if (ring->vmem_size && *ring->vmem) {
                memset((char *)*ring->vmem, 0, ring->vmem_size);
                *ring->vmem = NULL;
@@ -261,7 +264,6 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
  */
 int bnxt_alloc_hwrm_rings(struct bnxt *bp)
 {
-       struct rte_pci_device *pci_dev = bp->pdev;
        unsigned int i;
        int rc = 0;
 
@@ -283,8 +285,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                                        HWRM_NA_SIGNATURE);
                if (rc)
                        goto err_out;
-               cpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr +
-                   idx * 0x80;
+               cpr->cp_doorbell = (char *)bp->doorbell_base + idx * 0x80;
                bp->grp_info[i].cp_fw_ring_id = cp_ring->fw_ring_id;
                B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
 
@@ -296,8 +297,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                if (rc)
                        goto err_out;
                rxr->rx_prod = 0;
-               rxr->rx_doorbell = (char *)pci_dev->mem_resource[2].addr +
-                   idx * 0x80;
+               rxr->rx_doorbell = (char *)bp->doorbell_base + idx * 0x80;
                bp->grp_info[i].rx_fw_ring_id = ring->fw_ring_id;
                B_RX_DB(rxr->rx_doorbell, rxr->rx_prod);
 
@@ -316,9 +316,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                        goto err_out;
                PMD_DRV_LOG(DEBUG, "Alloc AGG Done!\n");
                rxr->ag_prod = 0;
-               rxr->ag_doorbell =
-                   (char *)pci_dev->mem_resource[2].addr +
-                   map_idx * 0x80;
+               rxr->ag_doorbell = (char *)bp->doorbell_base + map_idx * 0x80;
                bp->grp_info[i].ag_fw_ring_id = ring->fw_ring_id;
                B_RX_DB(rxr->ag_doorbell, rxr->ag_prod);
 
@@ -350,8 +348,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                if (rc)
                        goto err_out;
 
-               cpr->cp_doorbell = (char *)pci_dev->mem_resource[2].addr +
-                   idx * 0x80;
+               cpr->cp_doorbell = (char *)bp->doorbell_base + idx * 0x80;
                B_CP_DIS_DB(cpr, cpr->cp_raw_cons);
 
                /* Tx ring */
@@ -362,8 +359,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                if (rc)
                        goto err_out;
 
-               txr->tx_doorbell = (char *)pci_dev->mem_resource[2].addr +
-                   idx * 0x80;
+               txr->tx_doorbell = (char *)bp->doorbell_base + idx * 0x80;
                txq->index = idx;
        }