net/bnxt: update copyright year

[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 bc054a8..14ad33b 100644 (file)
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2014-2018 Broadcom
+ * Copyright(c) 2014-2021 Broadcom
  * All rights reserved.
  */
 
@@ -78,6 +78,9 @@ void bnxt_free_all_vnics(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];
                STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next);
@@ -126,8 +129,8 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
        entry_length = HW_HASH_KEY_SIZE +
                       BNXT_MAX_MC_ADDRS * RTE_ETHER_ADDR_LEN;
 
-       if (BNXT_CHIP_THOR(bp))
-               rss_table_size = BNXT_RSS_TBL_SIZE_THOR *
+       if (BNXT_CHIP_P5(bp))
+               rss_table_size = BNXT_RSS_TBL_SIZE_P5 *
                                 2 * sizeof(*vnic->rss_table);
        else
                rss_table_size = HW_HASH_INDEX_SIZE * sizeof(*vnic->rss_table);
@@ -136,7 +139,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
 
        max_vnics = bp->max_vnics;
        snprintf(mz_name, RTE_MEMZONE_NAMESIZE,
-                "bnxt_%04x:%02x:%02x:%02x_vnicattr", pdev->addr.domain,
+                "bnxt_" PCI_PRI_FMT "_vnicattr", pdev->addr.domain,
                 pdev->addr.bus, pdev->addr.devid, pdev->addr.function);
        mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0;
        mz = rte_memzone_lookup(mz_name);
@@ -250,3 +253,69 @@ uint16_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type)
 
        return hwrm_type;
 }
+
+int bnxt_rte_to_hwrm_hash_level(struct bnxt *bp, uint64_t hash_f, uint32_t lvl)
+{
+       uint32_t mode = HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_DEFAULT;
+       bool l3 = (hash_f & (ETH_RSS_IPV4 | ETH_RSS_IPV6));
+       bool l4 = (hash_f & (ETH_RSS_NONFRAG_IPV4_UDP |
+                            ETH_RSS_NONFRAG_IPV6_UDP |
+                            ETH_RSS_NONFRAG_IPV4_TCP |
+                            ETH_RSS_NONFRAG_IPV6_TCP));
+       bool l3_only = l3 && !l4;
+       bool l3_and_l4 = l3 && l4;
+
+       /* If FW has not advertised capability to configure outer/inner
+        * RSS hashing , just log a message. HW will work in default RSS mode.
+        */
+       if (!(bp->vnic_cap_flags & BNXT_VNIC_CAP_OUTER_RSS)) {
+               PMD_DRV_LOG(ERR, "RSS hash level cannot be configured\n");
+               return mode;
+       }
+
+       switch (lvl) {
+       case BNXT_RSS_LEVEL_INNERMOST:
+               if (l3_and_l4 || l4)
+                       mode =
+                       HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_INNERMOST_4;
+               else if (l3_only)
+                       mode =
+                       HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_INNERMOST_2;
+               break;
+       case BNXT_RSS_LEVEL_OUTERMOST:
+               if (l3_and_l4 || l4)
+                       mode =
+                       HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_OUTERMOST_4;
+               else if (l3_only)
+                       mode =
+                       HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_OUTERMOST_2;
+               break;
+       default:
+               mode = HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_DEFAULT;
+               break;
+       }
+
+       return mode;
+}
+
+uint64_t bnxt_hwrm_to_rte_rss_level(struct bnxt *bp, uint32_t mode)
+{
+       uint64_t rss_level = 0;
+
+       /* If FW has not advertised capability to configure inner/outer RSS
+        * return default hash mode.
+        */
+       if (!(bp->vnic_cap_flags & BNXT_VNIC_CAP_OUTER_RSS))
+               return ETH_RSS_LEVEL_PMD_DEFAULT;
+
+       if (mode == HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_OUTERMOST_2 ||
+           mode == HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_OUTERMOST_4)
+               rss_level |= ETH_RSS_LEVEL_OUTERMOST;
+       else if (mode == HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_INNERMOST_2 ||
+                mode == HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_INNERMOST_4)
+               rss_level |= ETH_RSS_LEVEL_INNERMOST;
+       else
+               rss_level |= ETH_RSS_LEVEL_PMD_DEFAULT;
+
+       return rss_level;
+}