net/mlx5: replace a port lookup with ethdev API

[dpdk.git] / drivers / net / netvsc / hn_ethdev.c

diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c
index 3092066..407ee48 100644 (file)
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -118,20 +118,11 @@ eth_dev_vmbus_allocate(struct rte_vmbus_device *dev, size_t private_data_size)
 static void
 eth_dev_vmbus_release(struct rte_eth_dev *eth_dev)
 {
+       /* mac_addrs must not be freed alone because part of dev_private */
+       eth_dev->data->mac_addrs = NULL;
        /* free ether device */
        rte_eth_dev_release_port(eth_dev);
 
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_free(eth_dev->data->dev_private);
-
-       eth_dev->data->dev_private = NULL;
-
-       /*
-        * Secondary process will check the name to attach.
-        * Clear this field to avoid attaching a released ports.
-        */
-       eth_dev->data->name[0] = '\0';
-
        eth_dev->device = NULL;
        eth_dev->intr_handle = NULL;
 }
@@ -167,6 +158,7 @@ static int hn_parse_args(const struct rte_eth_dev *dev)
                NULL
        };
        struct rte_kvargs *kvlist;
+       int ret;
 
        if (!devargs)
                return 0;
@@ -180,9 +172,12 @@ static int hn_parse_args(const struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
-       rte_kvargs_process(kvlist, "latency", hn_set_latency, hv);
+       ret = rte_kvargs_process(kvlist, "latency", hn_set_latency, hv);
+       if (ret)
+               PMD_DRV_LOG(ERR, "Unable to process latency arg\n");
+
        rte_kvargs_free(kvlist);
-       return 0;
+       return ret;
 }
 
 /* Update link status.
@@ -383,6 +378,8 @@ static int hn_dev_configure(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
+       hv->vlan_strip = !!(rxmode->offloads & DEV_RX_OFFLOAD_VLAN_STRIP);
+
        err = hn_rndis_conf_offload(hv, txmode->offloads,
                                    rxmode->offloads);
        if (err) {
@@ -737,6 +734,8 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
        hv->chim_res  = &vmbus->resource[HV_SEND_BUF_MAP];
        hv->port_id = eth_dev->data->port_id;
        hv->latency = HN_CHAN_LATENCY_NS;
+       hv->max_queues = 1;
+       hv->vf_port = HN_INVALID_PORT;
 
        err = hn_parse_args(eth_dev);
        if (err)
@@ -775,6 +774,10 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
        if (err)
                goto failed;
 
+       /* Multi queue requires later versions of windows server */
+       if (hv->nvs_ver < NVS_VERSION_5)
+               return 0;
+
        max_chan = rte_vmbus_max_channels(vmbus);
        PMD_INIT_LOG(DEBUG, "VMBus max channels %d", max_chan);
        if (max_chan <= 0)
@@ -786,12 +789,12 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
        hv->max_queues = RTE_MIN(rxr_cnt, (unsigned int)max_chan);
 
        /* If VF was reported but not added, do it now */
-       if (hv->vf_present && !hv->vf_dev) {
+       if (hv->vf_present && !hn_vf_attached(hv)) {
                PMD_INIT_LOG(DEBUG, "Adding VF device");
 
                err = hn_vf_add(eth_dev, hv);
                if (err)
-                       goto failed;
+                       hv->vf_present = 0;
        }
 
        return 0;
@@ -799,6 +802,7 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
 failed:
        PMD_INIT_LOG(NOTICE, "device init failed");
 
+       hn_tx_pool_uninit(eth_dev);
        hn_detach(hv);
        return err;
 }
@@ -821,12 +825,11 @@ eth_hn_dev_uninit(struct rte_eth_dev *eth_dev)
        eth_dev->rx_pkt_burst = NULL;
 
        hn_detach(hv);
+       hn_tx_pool_uninit(eth_dev);
        rte_vmbus_chan_close(hv->primary->chan);
        rte_free(hv->primary);
        rte_eth_dev_owner_delete(hv->owner.id);
 
-       eth_dev->data->mac_addrs = NULL;
-
        return 0;
 }
 
@@ -886,9 +889,7 @@ static struct rte_vmbus_driver rte_netvsc_pmd = {
 RTE_PMD_REGISTER_VMBUS(net_netvsc, rte_netvsc_pmd);
 RTE_PMD_REGISTER_KMOD_DEP(net_netvsc, "* uio_hv_generic");
 
-RTE_INIT(hn_init_log);
-static void
-hn_init_log(void)
+RTE_INIT(hn_init_log)
 {
        hn_logtype_init = rte_log_register("pmd.net.netvsc.init");
        if (hn_logtype_init >= 0)