net: add rte prefix to ether structures

[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 b67cce1..35503df 100644 (file)
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -112,26 +112,20 @@ eth_dev_vmbus_allocate(struct rte_vmbus_device *dev, size_t private_data_size)
        eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
        eth_dev->intr_handle = &dev->intr_handle;
 
+       /* allow ethdev to remove on close */
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
        return eth_dev;
 }
 
 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 +161,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 +175,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.
@@ -255,6 +253,7 @@ hn_dev_promiscuous_enable(struct rte_eth_dev *dev)
        struct hn_data *hv = dev->data->dev_private;
 
        hn_rndis_set_rxfilter(hv, NDIS_PACKET_TYPE_PROMISCUOUS);
+       hn_vf_promiscuous_enable(dev);
 }
 
 static void
@@ -267,6 +266,7 @@ hn_dev_promiscuous_disable(struct rte_eth_dev *dev)
        if (dev->data->all_multicast)
                filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
        hn_rndis_set_rxfilter(hv, filter);
+       hn_vf_promiscuous_disable(dev);
 }
 
 static void
@@ -277,6 +277,7 @@ hn_dev_allmulticast_enable(struct rte_eth_dev *dev)
        hn_rndis_set_rxfilter(hv, NDIS_PACKET_TYPE_DIRECTED |
                              NDIS_PACKET_TYPE_ALL_MULTICAST |
                        NDIS_PACKET_TYPE_BROADCAST);
+       hn_vf_allmulticast_enable(dev);
 }
 
 static void
@@ -286,6 +287,16 @@ hn_dev_allmulticast_disable(struct rte_eth_dev *dev)
 
        hn_rndis_set_rxfilter(hv, NDIS_PACKET_TYPE_DIRECTED |
                             NDIS_PACKET_TYPE_BROADCAST);
+       hn_vf_allmulticast_disable(dev);
+}
+
+static int
+hn_dev_mc_addr_list(struct rte_eth_dev *dev,
+                    struct rte_ether_addr *mc_addr_set,
+                    uint32_t nb_mc_addr)
+{
+       /* No filtering on the synthetic path, but can do it on VF */
+       return hn_vf_mc_addr_list(dev, mc_addr_set, nb_mc_addr);
 }
 
 /* Setup shared rx/tx queue data */
@@ -370,6 +381,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) {
@@ -622,11 +635,12 @@ hn_dev_stop(struct rte_eth_dev *dev)
 }
 
 static void
-hn_dev_close(struct rte_eth_dev *dev __rte_unused)
+hn_dev_close(struct rte_eth_dev *dev)
 {
-       PMD_INIT_LOG(DEBUG, "close");
+       PMD_INIT_FUNC_TRACE();
 
        hn_vf_close(dev);
+       hn_dev_free_queues(dev);
 }
 
 static const struct eth_dev_ops hn_eth_dev_ops = {
@@ -640,6 +654,7 @@ static const struct eth_dev_ops hn_eth_dev_ops = {
        .promiscuous_disable    = hn_dev_promiscuous_disable,
        .allmulticast_enable    = hn_dev_allmulticast_enable,
        .allmulticast_disable   = hn_dev_allmulticast_disable,
+       .set_mc_addr_list       = hn_dev_mc_addr_list,
        .tx_queue_setup         = hn_dev_tx_queue_setup,
        .tx_queue_release       = hn_dev_tx_queue_release,
        .tx_done_cleanup        = hn_dev_tx_done_cleanup,
@@ -723,6 +738,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)
@@ -761,6 +778,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)
@@ -772,12 +793,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;
@@ -785,6 +806,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;
 }
@@ -807,12 +829,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;
 }
 
@@ -872,9 +893,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)