net/bnxt: add Truflow flush-timer to alloc table scope

[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 6589355..05f1a25 100644 (file)
--- a/drivers/net/netvsc/hn_ethdev.c
+++ b/drivers/net/netvsc/hn_ethdev.c
@@ -42,7 +42,8 @@
                            DEV_TX_OFFLOAD_VLAN_INSERT)
 
 #define HN_RX_OFFLOAD_CAPS (DEV_RX_OFFLOAD_CHECKSUM | \
-                           DEV_RX_OFFLOAD_VLAN_STRIP)
+                           DEV_RX_OFFLOAD_VLAN_STRIP | \
+                           DEV_RX_OFFLOAD_RSS_HASH)
 
 int hn_logtype_init;
 int hn_logtype_driver;
@@ -133,8 +134,6 @@ 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);
 
@@ -256,15 +255,19 @@ static int hn_dev_info_get(struct rte_eth_dev *dev,
        dev_info->max_rx_queues = hv->max_queues;
        dev_info->max_tx_queues = hv->max_queues;
 
-       rc = hn_rndis_get_offload(hv, dev_info);
-       if (rc != 0)
-               return rc;
+       dev_info->tx_desc_lim.nb_min = 1;
+       dev_info->tx_desc_lim.nb_max = 4096;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
 
-       rc = hn_vf_info_get(hv, dev_info);
+       /* fills in rx and tx offload capability */
+       rc = hn_rndis_get_offload(hv, dev_info);
        if (rc != 0)
                return rc;
 
-       return 0;
+       /* merges the offload and queues of vf */
+       return hn_vf_info_get(hv, dev_info);
 }
 
 static int hn_rss_reta_update(struct rte_eth_dev *dev,
@@ -291,6 +294,13 @@ static int hn_rss_reta_update(struct rte_eth_dev *dev,
                        hv->rss_ind[i] = reta_conf[idx].reta[shift];
        }
 
+       err = hn_rndis_conf_rss(hv, NDIS_RSS_FLAG_DISABLE);
+       if (err) {
+               PMD_DRV_LOG(NOTICE,
+                       "rss disable failed");
+               return err;
+       }
+
        err = hn_rndis_conf_rss(hv, 0);
        if (err) {
                PMD_DRV_LOG(NOTICE,
@@ -532,7 +542,8 @@ static int hn_dev_configure(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       dev_conf->rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
+       if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+               dev_conf->rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
 
        unsupported = txmode->offloads & ~HN_TX_OFFLOAD_CAPS;
        if (unsupported) {
@@ -577,6 +588,13 @@ static int hn_dev_configure(struct rte_eth_dev *dev)
                        return err;
                }
 
+               err = hn_rndis_conf_rss(hv, NDIS_RSS_FLAG_DISABLE);
+               if (err) {
+                       PMD_DRV_LOG(NOTICE,
+                               "rss disable failed");
+                       return err;
+               }
+
                err = hn_rndis_conf_rss(hv, 0);
                if (err) {
                        PMD_DRV_LOG(NOTICE,
@@ -806,6 +824,10 @@ hn_dev_start(struct rte_eth_dev *dev)
        if (error)
                hn_rndis_set_rxfilter(hv, 0);
 
+       /* Initialize Link state */
+       if (error == 0)
+               hn_dev_link_update(dev, 0);
+
        return error;
 }
 
@@ -920,8 +942,14 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
-       /* Since Hyper-V only supports one MAC address, just use local data */
-       eth_dev->data->mac_addrs = &hv->mac_addr;
+       /* Since Hyper-V only supports one MAC address */
+       eth_dev->data->mac_addrs = rte_calloc("hv_mac", HN_MAX_MAC_ADDRS,
+                                             sizeof(struct rte_ether_addr), 0);
+       if (eth_dev->data->mac_addrs == NULL) {
+               PMD_INIT_LOG(ERR,
+                            "Failed to allocate memory store MAC addresses");
+               return -ENOMEM;
+       }
 
        hv->vmbus = vmbus;
        hv->rxbuf_res = &vmbus->resource[HV_RECV_BUF_MAP];
@@ -961,11 +989,11 @@ eth_hn_dev_init(struct rte_eth_dev *eth_dev)
        if  (err)
                goto failed;
 
-       err = hn_tx_pool_init(eth_dev);
+       err = hn_chim_init(eth_dev);
        if (err)
                goto failed;
 
-       err = hn_rndis_get_eaddr(hv, hv->mac_addr.addr_bytes);
+       err = hn_rndis_get_eaddr(hv, eth_dev->data->mac_addrs->addr_bytes);
        if (err)
                goto failed;
 
@@ -997,7 +1025,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_chim_uninit(eth_dev);
        hn_detach(hv);
        return err;
 }
@@ -1021,7 +1049,7 @@ 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);
+       hn_chim_uninit(eth_dev);
        rte_vmbus_chan_close(hv->primary->chan);
        rte_free(hv->primary);
        ret = rte_eth_dev_owner_delete(hv->owner.id);