net/bnxt: support LRO on Thor adapters

[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 e650906..7b6d87c 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -162,18 +162,21 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
        int nq_ring_len = BNXT_CHIP_THOR(bp) ? cp_ring_len : 0;
 
        int tx_ring_start = nq_ring_start + nq_ring_len;
+       tx_ring_start = RTE_ALIGN(tx_ring_start, 4096);
        int tx_ring_len = tx_ring_info ?
            RTE_CACHE_LINE_ROUNDUP(tx_ring_info->tx_ring_struct->ring_size *
                                   sizeof(struct tx_bd_long)) : 0;
        tx_ring_len = RTE_ALIGN(tx_ring_len, 4096);
 
        int rx_ring_start = tx_ring_start + tx_ring_len;
+       rx_ring_start = RTE_ALIGN(rx_ring_start, 4096);
        int rx_ring_len =  rx_ring_info ?
                RTE_CACHE_LINE_ROUNDUP(rx_ring_info->rx_ring_struct->ring_size *
                sizeof(struct rx_prod_pkt_bd)) : 0;
        rx_ring_len = RTE_ALIGN(rx_ring_len, 4096);
 
        int ag_ring_start = rx_ring_start + rx_ring_len;
+       ag_ring_start = RTE_ALIGN(ag_ring_start, 4096);
        int ag_ring_len = rx_ring_len * AGG_RING_SIZE_FACTOR;
        ag_ring_len = RTE_ALIGN(ag_ring_len, 4096);
 
@@ -184,13 +187,17 @@ int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx,
                        AGG_RING_SIZE_FACTOR)) : 0;
 
        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 tpa_info_len = 0;
+
+       if (rx_ring_info && (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)) {
+               int tpa_max = BNXT_TPA_MAX_AGGS(bp);
+
+               tpa_info_len = tpa_max * sizeof(struct bnxt_tpa_info);
+               tpa_info_len = RTE_CACHE_LINE_ROUNDUP(tpa_info_len);
+       }
 
        int total_alloc_len = tpa_info_start;
-       if (rx_offloads & DEV_RX_OFFLOAD_TCP_LRO)
-               total_alloc_len += tpa_info_len;
+       total_alloc_len += tpa_info_len;
 
        snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
                 "bnxt_%04x:%02x:%02x:%02x-%04x_%s", pdev->addr.domain,