net/bnxt: fix VF probe when MAC address is zero

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

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 38220c5..3f46065 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3753,6 +3753,46 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)
        return 0;
 }
 
+static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev)
+{
+       struct bnxt *bp = eth_dev->data->dev_private;
+       int rc = 0;
+
+       eth_dev->data->mac_addrs = rte_zmalloc("bnxt_mac_addr_tbl",
+                                              RTE_ETHER_ADDR_LEN *
+                                              bp->max_l2_ctx,
+                                              0);
+       if (eth_dev->data->mac_addrs == NULL) {
+               PMD_DRV_LOG(ERR, "Failed to alloc MAC addr tbl\n");
+               return -ENOMEM;
+       }
+
+       if (bnxt_check_zero_bytes(bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN)) {
+               if (BNXT_PF(bp))
+                       return -EINVAL;
+
+               /* Generate a random MAC address, if none was assigned by PF */
+               PMD_DRV_LOG(INFO, "VF MAC address not assigned by Host PF\n");
+               bnxt_eth_hw_addr_random(bp->mac_addr);
+               PMD_DRV_LOG(INFO,
+                           "Assign random MAC:%02X:%02X:%02X:%02X:%02X:%02X\n",
+                           bp->mac_addr[0], bp->mac_addr[1], bp->mac_addr[2],
+                           bp->mac_addr[3], bp->mac_addr[4], bp->mac_addr[5]);
+
+               rc = bnxt_hwrm_set_mac(bp);
+               if (!rc)
+                       memcpy(&bp->eth_dev->data->mac_addrs[0], bp->mac_addr,
+                              RTE_ETHER_ADDR_LEN);
+               return rc;
+       }
+
+       /* Copy the permanent MAC from the FUNC_QCAPS response */
+       memcpy(bp->mac_addr, bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN);
+       memcpy(&eth_dev->data->mac_addrs[0], bp->mac_addr, RTE_ETHER_ADDR_LEN);
+
+       return rc;
+}
+
 #define ALLOW_FUNC(x)  \
        { \
                uint32_t arg = (x); \
@@ -3840,28 +3880,10 @@ skip_init:
                rc = -EBUSY;
                goto error_free;
        }
-       eth_dev->data->mac_addrs = rte_zmalloc("bnxt_mac_addr_tbl",
-                                       RTE_ETHER_ADDR_LEN * bp->max_l2_ctx, 0);
-       if (eth_dev->data->mac_addrs == NULL) {
-               PMD_DRV_LOG(ERR,
-                       "Failed to alloc %u bytes needed to store MAC addr tbl",
-                       RTE_ETHER_ADDR_LEN * bp->max_l2_ctx);
-               rc = -ENOMEM;
-               goto error_free;
-       }
 
-       if (bnxt_check_zero_bytes(bp->dflt_mac_addr, RTE_ETHER_ADDR_LEN)) {
-               PMD_DRV_LOG(ERR,
-                           "Invalid MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
-                           bp->dflt_mac_addr[0], bp->dflt_mac_addr[1],
-                           bp->dflt_mac_addr[2], bp->dflt_mac_addr[3],
-                           bp->dflt_mac_addr[4], bp->dflt_mac_addr[5]);
-               rc = -EINVAL;
+       rc = bnxt_setup_mac_addr(eth_dev);
+       if (rc)
                goto error_free;
-       }
-       /* Copy the permanent MAC from the qcap response address now. */
-       memcpy(bp->mac_addr, bp->dflt_mac_addr, sizeof(bp->mac_addr));
-       memcpy(&eth_dev->data->mac_addrs[0], bp->mac_addr, RTE_ETHER_ADDR_LEN);
 
        /* THOR does not support ring groups.
         * But we will use the array to save RSS context IDs.