net/ice/base: init boost TCAM table for parser

[dpdk.git] / drivers / net / iavf / iavf_ethdev.c

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index d054e41..c131461 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1487,23 +1487,13 @@ iavf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
        if (ret)
                PMD_DRV_LOG(ERR, "Fail to delete old MAC:"
                            RTE_ETHER_ADDR_PRT_FMT,
-                           old_addr->addr_bytes[0],
-                           old_addr->addr_bytes[1],
-                           old_addr->addr_bytes[2],
-                           old_addr->addr_bytes[3],
-                           old_addr->addr_bytes[4],
-                           old_addr->addr_bytes[5]);
+                               RTE_ETHER_ADDR_BYTES(old_addr));
 
        ret = iavf_add_del_eth_addr(adapter, mac_addr, true, VIRTCHNL_ETHER_ADDR_PRIMARY);
        if (ret)
                PMD_DRV_LOG(ERR, "Fail to add new MAC:"
                            RTE_ETHER_ADDR_PRT_FMT,
-                           mac_addr->addr_bytes[0],
-                           mac_addr->addr_bytes[1],
-                           mac_addr->addr_bytes[2],
-                           mac_addr->addr_bytes[3],
-                           mac_addr->addr_bytes[4],
-                           mac_addr->addr_bytes[5]);
+                               RTE_ETHER_ADDR_BYTES(mac_addr));
 
        if (ret)
                return -EIO;
@@ -2186,6 +2176,30 @@ err:
        return -1;
 }
 
+static void
+iavf_uninit_vf(struct rte_eth_dev *dev)
+{
+       struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+
+       iavf_shutdown_adminq(hw);
+
+       rte_free(vf->vf_res);
+       vf->vsi_res = NULL;
+       vf->vf_res = NULL;
+
+       rte_free(vf->aq_resp);
+       vf->aq_resp = NULL;
+
+       rte_free(vf->qos_cap);
+       vf->qos_cap = NULL;
+
+       rte_free(vf->rss_lut);
+       vf->rss_lut = NULL;
+       rte_free(vf->rss_key);
+       vf->rss_key = NULL;
+}
+
 /* Enable default admin queue interrupt setting */
 static inline void
 iavf_enable_irq0(struct iavf_hw *hw)
@@ -2314,7 +2328,8 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
                PMD_INIT_LOG(ERR, "Failed to allocate %d bytes needed to"
                             " store MAC addresses",
                             RTE_ETHER_ADDR_LEN * IAVF_NUM_MACADDR_MAX);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto init_vf_err;
        }
        /* If the MAC address is not configured by host,
         * generate a random one.
@@ -2339,12 +2354,21 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
        ret = iavf_flow_init(adapter);
        if (ret) {
                PMD_INIT_LOG(ERR, "Failed to initialize flow");
-               return ret;
+               goto flow_init_err;
        }
 
        iavf_default_rss_disable(adapter);
 
        return 0;
+
+flow_init_err:
+       rte_free(eth_dev->data->mac_addrs);
+       eth_dev->data->mac_addrs = NULL;
+
+init_vf_err:
+       iavf_uninit_vf(eth_dev);
+
+       return ret;
 }
 
 static int