net/qede/base: fix macros to check chip revision/metal

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

diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index 4e378a9..db9fb07 100644 (file)
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -170,9 +170,11 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
        char mz_name[RTE_MEMZONE_NAMESIZE];
        uint32_t entry_length = RTE_CACHE_LINE_ROUNDUP(
                                HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table) +
-                               HW_HASH_KEY_SIZE);
+                               HW_HASH_KEY_SIZE +
+                               BNXT_MAX_MC_ADDRS * ETHER_ADDR_LEN);
        uint16_t max_vnics;
        int i;
+       phys_addr_t mz_phys_addr;
 
        max_vnics = bp->max_vnics;
        snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
@@ -189,6 +191,19 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
                if (!mz)
                        return -ENOMEM;
        }
+       mz_phys_addr = mz->phys_addr;
+       if ((unsigned long)mz->addr == mz_phys_addr) {
+               RTE_LOG(WARNING, PMD,
+                       "Memzone physical address same as virtual.\n");
+               RTE_LOG(WARNING, PMD,
+                       "Using rte_mem_virt2phy()\n");
+               mz_phys_addr = rte_mem_virt2phy(mz->addr);
+               if (mz_phys_addr == 0) {
+                       RTE_LOG(ERR, PMD,
+                       "unable to map vnic address to physical memory\n");
+                       return -ENOMEM;
+               }
+       }
 
        for (i = 0; i < max_vnics; i++) {
                vnic = &bp->vnic_info[i];
@@ -198,12 +213,16 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
                        (void *)((char *)mz->addr + (entry_length * i));
                memset(vnic->rss_table, -1, entry_length);
 
-               vnic->rss_table_dma_addr = mz->phys_addr + (entry_length * i);
+               vnic->rss_table_dma_addr = mz_phys_addr + (entry_length * i);
                vnic->rss_hash_key = (void *)((char *)vnic->rss_table +
                             HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table));
 
                vnic->rss_hash_key_dma_addr = vnic->rss_table_dma_addr +
                             HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table);
+               vnic->mc_list = (void *)((char *)vnic->rss_hash_key +
+                               HW_HASH_KEY_SIZE);
+               vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr +
+                               HW_HASH_KEY_SIZE;
        }
 
        return 0;