net/bnxt: fix freeing all VNICs during port stop

[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 262cfc1..104342e 100644 (file)
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -16,7 +16,7 @@
  * VNIC Functions
  */
 
-static void prandom_bytes(void *dest_ptr, size_t len)
+void prandom_bytes(void *dest_ptr, size_t len)
 {
        char *dest = (char *)dest_ptr;
        uint64_t rb;
@@ -35,7 +35,7 @@ static void prandom_bytes(void *dest_ptr, size_t len)
        }
 }
 
-void bnxt_init_vnics(struct bnxt *bp)
+static void bnxt_init_vnics(struct bnxt *bp)
 {
        struct bnxt_vnic_info *vnic;
        uint16_t max_vnics;
@@ -51,8 +51,8 @@ void bnxt_init_vnics(struct bnxt *bp)
                vnic->lb_rule = (uint16_t)HWRM_NA_SIGNATURE;
                vnic->hash_mode =
                        HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_DEFAULT;
+               vnic->rx_queue_cnt = 0;
 
-               prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE);
                STAILQ_INIT(&vnic->filter);
                STAILQ_INIT(&vnic->flow_list);
                STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next);
@@ -75,12 +75,13 @@ struct bnxt_vnic_info *bnxt_alloc_vnic(struct bnxt *bp)
 
 void bnxt_free_all_vnics(struct bnxt *bp)
 {
-       struct bnxt_vnic_info *temp;
+       struct bnxt_vnic_info *vnic;
        unsigned int i;
 
-       for (i = 0; i < bp->nr_vnics; i++) {
-               temp = &bp->vnic_info[i];
-               STAILQ_INSERT_TAIL(&bp->free_vnic_list, temp, next);
+       for (i = 0; i < bp->max_vnics; i++) {
+               vnic = &bp->vnic_info[i];
+               STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next);
+               vnic->rx_queue_cnt = 0;
        }
 }
 
@@ -89,6 +90,9 @@ void bnxt_free_vnic_attributes(struct bnxt *bp)
        struct bnxt_vnic_info *vnic;
        unsigned int i;
 
+       if (bp->vnic_info == NULL)
+               return;
+
        for (i = 0; i < bp->max_vnics; i++) {
                vnic = &bp->vnic_info[i];
                if (vnic->rss_table) {
@@ -114,6 +118,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
        const struct rte_memzone *mz;
        char mz_name[RTE_MEMZONE_NAMESIZE];
        uint32_t entry_length;
+       size_t rss_table_size;
        uint16_t max_vnics;
        int i;
        rte_iova_t mz_phys_addr;
@@ -122,11 +127,12 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
                       BNXT_MAX_MC_ADDRS * RTE_ETHER_ADDR_LEN;
 
        if (BNXT_CHIP_THOR(bp))
-               entry_length += BNXT_RSS_TBL_SIZE_THOR *
-                               2 * sizeof(*vnic->rss_table);
+               rss_table_size = BNXT_RSS_TBL_SIZE_THOR *
+                                2 * sizeof(*vnic->rss_table);
        else
-               entry_length += HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table);
-       entry_length = RTE_CACHE_LINE_ROUNDUP(entry_length);
+               rss_table_size = HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table);
+
+       entry_length = RTE_CACHE_LINE_ROUNDUP(entry_length + rss_table_size);
 
        max_vnics = bp->max_vnics;
        snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
@@ -145,14 +151,13 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
        }
        mz_phys_addr = mz->iova;
        if ((unsigned long)mz->addr == mz_phys_addr) {
-               PMD_DRV_LOG(WARNING,
-                       "Memzone physical address same as virtual.\n");
-               PMD_DRV_LOG(WARNING,
-                       "Using rte_mem_virt2iova()\n");
+               PMD_DRV_LOG(DEBUG,
+                           "Memzone physical address same as virtual.\n");
+               PMD_DRV_LOG(DEBUG, "Using rte_mem_virt2iova()\n");
                mz_phys_addr = rte_mem_virt2iova(mz->addr);
-               if (mz_phys_addr == 0) {
+               if (mz_phys_addr == RTE_BAD_IOVA) {
                        PMD_DRV_LOG(ERR,
-                       "unable to map vnic address to physical memory\n");
+                                   "unable to map to physical memory\n");
                        return -ENOMEM;
                }
        }
@@ -167,14 +172,15 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
 
                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));
+                                             rss_table_size);
 
                vnic->rss_hash_key_dma_addr = vnic->rss_table_dma_addr +
-                            HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table);
+                                             rss_table_size;
                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;
+               prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE);
        }
 
        return 0;
@@ -216,5 +222,42 @@ int bnxt_alloc_vnic_mem(struct bnxt *bp)
                return -ENOMEM;
        }
        bp->vnic_info = vnic_mem;
+       bnxt_init_vnics(bp);
        return 0;
 }
+
+int bnxt_vnic_grp_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic)
+{
+       uint32_t size = sizeof(*vnic->fw_grp_ids) * bp->max_ring_grps;
+
+       vnic->fw_grp_ids = rte_zmalloc("vnic_fw_grp_ids", size, 0);
+       if (!vnic->fw_grp_ids) {
+               PMD_DRV_LOG(ERR,
+                           "Failed to alloc %d bytes for group ids\n",
+                           size);
+               return -ENOMEM;
+       }
+       memset(vnic->fw_grp_ids, -1, size);
+
+       return 0;
+}
+
+uint16_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type)
+{
+       uint16_t hwrm_type = 0;
+
+       if (rte_type & ETH_RSS_IPV4)
+               hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV4;
+       if (rte_type & ETH_RSS_NONFRAG_IPV4_TCP)
+               hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV4;
+       if (rte_type & ETH_RSS_NONFRAG_IPV4_UDP)
+               hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV4;
+       if (rte_type & ETH_RSS_IPV6)
+               hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6;
+       if (rte_type & ETH_RSS_NONFRAG_IPV6_TCP)
+               hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6;
+       if (rte_type & ETH_RSS_NONFRAG_IPV6_UDP)
+               hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6;
+
+       return hwrm_type;
+}