net/bnxt: use dynamic log type

[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 a12c0aa..8fb8972 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -31,6 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <rte_bitmap.h>
 #include <rte_memzone.h>
 #include <unistd.h>
 
@@ -62,13 +63,15 @@ void bnxt_free_ring(struct bnxt_ring *ring)
  * Ring groups
  */
 
-void bnxt_init_ring_grps(struct bnxt *bp)
+int bnxt_init_ring_grps(struct bnxt *bp)
 {
        unsigned int i;
 
        for (i = 0; i < bp->max_ring_grps; i++)
                memset(&bp->grp_info[i], (uint8_t)HWRM_NA_SIGNATURE,
                       sizeof(struct bnxt_ring_grp_info));
+
+       return 0;
 }
 
 /*
@@ -97,7 +100,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
        struct rte_pci_device *pdev = bp->pdev;
        const struct rte_memzone *mz = NULL;
        char mz_name[RTE_MEMZONE_NAMESIZE];
-       phys_addr_t mz_phys_addr;
+       rte_iova_t mz_phys_addr;
        int sz;
 
        int stats_len = (tx_ring_info || rx_ring_info) ?
@@ -137,11 +140,23 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                RTE_CACHE_LINE_ROUNDUP(rx_ring_info->rx_ring_struct->ring_size *
                sizeof(struct rx_prod_pkt_bd)) : 0;
 
-       int total_alloc_len = rx_ring_start + rx_ring_len;
-       int ag_ring_start = 0;
+       int ag_ring_start = rx_ring_start + rx_ring_len;
+       int ag_ring_len = rx_ring_len * AGG_RING_SIZE_FACTOR;
+
+       int ag_bitmap_start = ag_ring_start + ag_ring_len;
+       int ag_bitmap_len =  rx_ring_info ?
+               RTE_CACHE_LINE_ROUNDUP(rte_bitmap_get_memory_footprint(
+                       rx_ring_info->rx_ring_struct->ring_size *
+                       AGG_RING_SIZE_FACTOR)) : 0;
 
-       ag_ring_start = rx_ring_start + rx_ring_len;
-       total_alloc_len = ag_ring_start + rx_ring_len * AGG_RING_SIZE_FACTOR;
+       int tpa_info_start = ag_bitmap_start + ag_bitmap_len;
+       int tpa_info_len = rx_ring_info ?
+               RTE_CACHE_LINE_ROUNDUP(BNXT_TPA_MAX *
+                                      sizeof(struct bnxt_tpa_info)) : 0;
+
+       int total_alloc_len = tpa_info_start;
+       if (bp->eth_dev->data->dev_conf.rxmode.enable_lro)
+               total_alloc_len += tpa_info_len;
 
        snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
                 "bnxt_%04x:%02x:%02x:%02x-%04x_%s", pdev->addr.domain,
@@ -159,17 +174,17 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                        return -ENOMEM;
        }
        memset(mz->addr, 0, mz->len);
-       mz_phys_addr = mz->phys_addr;
+       mz_phys_addr = mz->iova;
        if ((unsigned long)mz->addr == mz_phys_addr) {
-               RTE_LOG(WARNING, PMD,
+               PMD_DRV_LOG(WARNING,
                        "Memzone physical address same as virtual.\n");
-               RTE_LOG(WARNING, PMD,
-                       "Using rte_mem_virt2phy()\n");
+               PMD_DRV_LOG(WARNING,
+                       "Using rte_mem_virt2iova()\n");
                for (sz = 0; sz < total_alloc_len; sz += getpagesize())
                        rte_mem_lock_page(((char *)mz->addr) + sz);
-               mz_phys_addr = rte_mem_virt2phy(mz->addr);
+               mz_phys_addr = rte_mem_virt2iova(mz->addr);
                if (mz_phys_addr == 0) {
-                       RTE_LOG(ERR, PMD,
+                       PMD_DRV_LOG(ERR,
                        "unable to map ring address to physical memory\n");
                        return -ENOMEM;
                }
@@ -218,7 +233,7 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                rx_ring->bd = ((char *)mz->addr + ag_ring_start);
                rx_ring_info->ag_desc_ring =
                    (struct rx_prod_pkt_bd *)rx_ring->bd;
-               rx_ring->bd_dma = mz->phys_addr + ag_ring_start;
+               rx_ring->bd_dma = mz->iova + ag_ring_start;
                rx_ring_info->ag_desc_mapping = rx_ring->bd_dma;
                rx_ring->mem_zone = (const void *)mz;
 
@@ -230,6 +245,17 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                        rx_ring_info->ag_buf_ring =
                            (struct bnxt_sw_rx_bd *)rx_ring->vmem;
                }
+
+               rx_ring_info->ag_bitmap =
+                   rte_bitmap_init(rx_ring_info->rx_ring_struct->ring_size *
+                                   AGG_RING_SIZE_FACTOR, (uint8_t *)mz->addr +
+                                   ag_bitmap_start, ag_bitmap_len);
+
+               /* TPA info */
+               if (bp->eth_dev->data->dev_conf.rxmode.enable_lro)
+                       rx_ring_info->tpa_info =
+                               ((struct bnxt_tpa_info *)((char *)mz->addr +
+                                                         tpa_info_start));
        }
 
        cp_ring->bd = ((char *)mz->addr + cp_ring_start);
@@ -299,8 +325,10 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
 
                ring = rxr->ag_ring_struct;
                /* Agg ring */
-               if (ring == NULL)
-                       RTE_LOG(ERR, PMD, "Alloc AGG Ring is NULL!\n");
+               if (ring == NULL) {
+                       PMD_DRV_LOG(ERR, "Alloc AGG Ring is NULL!\n");
+                       goto err_out;
+               }
 
                rc = bnxt_hwrm_ring_alloc(bp, ring,
                                HWRM_RING_ALLOC_INPUT_RING_TYPE_RX,
@@ -308,7 +336,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                                cp_ring->fw_ring_id);
                if (rc)
                        goto err_out;
-               RTE_LOG(DEBUG, PMD, "Alloc AGG Done!\n");
+               PMD_DRV_LOG(DEBUG, "Alloc AGG Done!\n");
                rxr->ag_prod = 0;
                rxr->ag_doorbell =
                    (char *)pci_dev->mem_resource[2].addr +
@@ -319,7 +347,7 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                rxq->rx_buf_use_size = BNXT_MAX_MTU + ETHER_HDR_LEN +
                                        ETHER_CRC_LEN + (2 * VLAN_TAG_SIZE);
                if (bnxt_init_one_rx_ring(rxq)) {
-                       RTE_LOG(ERR, PMD, "bnxt_init_one_rx_ring failed!\n");
+                       PMD_DRV_LOG(ERR, "bnxt_init_one_rx_ring failed!\n");
                        bnxt_rx_queue_release_op(rxq);
                        return -ENOMEM;
                }
@@ -336,9 +364,6 @@ int bnxt_alloc_hwrm_rings(struct bnxt *bp)
                struct bnxt_ring *ring = txr->tx_ring_struct;
                unsigned int idx = i + 1 + bp->rx_cp_nr_rings;
 
-               /* Account for AGG Rings. AGG ring cnt = Rx Cmpl ring cnt */
-               idx += bp->rx_cp_nr_rings;
-
                /* Tx cmpl */
                rc = bnxt_hwrm_ring_alloc(bp, cp_ring,
                                        HWRM_RING_ALLOC_INPUT_RING_TYPE_L2_CMPL,