examples/l3fwd: share queue size variables

[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 231e130..d6190ac 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -240,6 +240,91 @@ iavf_tm_ops_get(struct rte_eth_dev *dev __rte_unused,
        return 0;
 }
 
+__rte_unused
+static int
+iavf_vfr_inprogress(struct iavf_hw *hw)
+{
+       int inprogress = 0;
+
+       if ((IAVF_READ_REG(hw, IAVF_VFGEN_RSTAT) &
+               IAVF_VFGEN_RSTAT_VFR_STATE_MASK) ==
+               VIRTCHNL_VFR_INPROGRESS)
+               inprogress = 1;
+
+       if (inprogress)
+               PMD_DRV_LOG(INFO, "Watchdog detected VFR in progress");
+
+       return inprogress;
+}
+
+__rte_unused
+static void
+iavf_dev_watchdog(void *cb_arg)
+{
+       struct iavf_adapter *adapter = cb_arg;
+       struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
+       int vfr_inprogress = 0, rc = 0;
+
+       /* check if watchdog has been disabled since last call */
+       if (!adapter->vf.watchdog_enabled)
+               return;
+
+       /* If in reset then poll vfr_inprogress register for completion */
+       if (adapter->vf.vf_reset) {
+               vfr_inprogress = iavf_vfr_inprogress(hw);
+
+               if (!vfr_inprogress) {
+                       PMD_DRV_LOG(INFO, "VF \"%s\" reset has completed",
+                               adapter->vf.eth_dev->data->name);
+                       adapter->vf.vf_reset = false;
+               }
+       /* If not in reset then poll vfr_inprogress register for VFLR event */
+       } else {
+               vfr_inprogress = iavf_vfr_inprogress(hw);
+
+               if (vfr_inprogress) {
+                       PMD_DRV_LOG(INFO,
+                               "VF \"%s\" reset event detected by watchdog",
+                               adapter->vf.eth_dev->data->name);
+
+                       /* enter reset state with VFLR event */
+                       adapter->vf.vf_reset = true;
+
+                       rte_eth_dev_callback_process(adapter->vf.eth_dev,
+                               RTE_ETH_EVENT_INTR_RESET, NULL);
+               }
+       }
+
+       /* re-alarm watchdog */
+       rc = rte_eal_alarm_set(IAVF_DEV_WATCHDOG_PERIOD,
+                       &iavf_dev_watchdog, cb_arg);
+
+       if (rc)
+               PMD_DRV_LOG(ERR, "Failed \"%s\" to reset device watchdog alarm",
+                       adapter->vf.eth_dev->data->name);
+}
+
+static void
+iavf_dev_watchdog_enable(struct iavf_adapter *adapter __rte_unused)
+{
+#if (IAVF_DEV_WATCHDOG_PERIOD > 0)
+       PMD_DRV_LOG(INFO, "Enabling device watchdog");
+       adapter->vf.watchdog_enabled = true;
+       if (rte_eal_alarm_set(IAVF_DEV_WATCHDOG_PERIOD,
+                       &iavf_dev_watchdog, (void *)adapter))
+               PMD_DRV_LOG(ERR, "Failed to enabled device watchdog");
+#endif
+}
+
+static void
+iavf_dev_watchdog_disable(struct iavf_adapter *adapter __rte_unused)
+{
+#if (IAVF_DEV_WATCHDOG_PERIOD > 0)
+       PMD_DRV_LOG(INFO, "Disabling device watchdog");
+       adapter->vf.watchdog_enabled = false;
+#endif
+}
+
 static int
 iavf_set_mc_addr_list(struct rte_eth_dev *dev,
                        struct rte_ether_addr *mc_addrs,
@@ -431,7 +516,7 @@ iavf_init_rss(struct iavf_adapter *adapter)
                        j = 0;
                vf->rss_lut[i] = j;
        }
-       /* send virtchnnl ops to configure rss*/
+       /* send virtchnl ops to configure RSS */
        ret = iavf_configure_rss_lut(adapter);
        if (ret)
                return ret;
@@ -746,7 +831,7 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,
                                    "vector %u are mapping to all Rx queues",
                                    vf->msix_base);
                } else {
-                       /* If Rx interrupt is reuquired, and we can use
+                       /* If Rx interrupt is required, and we can use
                         * multi interrupts, then the vec is from 1
                         */
                        vf->nb_msix =
@@ -971,6 +1056,7 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->reta_size = vf->vf_res->rss_lut_size;
        dev_info->flow_type_rss_offloads = IAVF_RSS_OFFLOAD_ALL;
        dev_info->max_mac_addrs = IAVF_NUM_MACADDR_MAX;
+       dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
        dev_info->rx_offload_capa =
                RTE_ETH_RX_OFFLOAD_VLAN_STRIP |
                RTE_ETH_RX_OFFLOAD_QINQ_STRIP |
@@ -1334,7 +1420,7 @@ iavf_dev_rss_reta_update(struct rte_eth_dev *dev,
        }
 
        rte_memcpy(vf->rss_lut, lut, reta_size);
-       /* send virtchnnl ops to configure rss*/
+       /* send virtchnl ops to configure RSS */
        ret = iavf_configure_rss_lut(adapter);
        if (ret) /* revert back */
                rte_memcpy(vf->rss_lut, lut, reta_size);
@@ -1615,10 +1701,9 @@ static int
 iavf_dev_xstats_reset(struct rte_eth_dev *dev)
 {
        struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
-
        iavf_dev_stats_reset(dev);
-       memset(&vf->vsi.eth_stats_offset, 0, sizeof(struct iavf_eth_xstats));
-
+       memset(&vf->vsi.eth_stats_offset.ips_stats, 0,
+                       sizeof(struct iavf_ipsec_crypto_stats));
        return 0;
 }
 
@@ -2193,6 +2278,9 @@ iavf_init_vf(struct rte_eth_dev *dev)
                }
        }
 
+       if (vf->vsi_res->num_queue_pairs > IAVF_MAX_NUM_QUEUES_DFLT)
+               vf->lv_enabled = true;
+
        if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC) {
                if (iavf_get_supported_rxdid(adapter) != 0) {
                        PMD_INIT_LOG(ERR, "failed to do get supported rxdid");
@@ -2466,6 +2554,11 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
 
        iavf_default_rss_disable(adapter);
 
+
+       /* Start device watchdog */
+       iavf_dev_watchdog_enable(adapter);
+
+
        return 0;
 
 flow_init_err:
@@ -2549,6 +2642,9 @@ iavf_dev_close(struct rte_eth_dev *dev)
        if (vf->vf_reset && !rte_pci_set_bus_master(pci_dev, true))
                vf->vf_reset = false;
 
+       /* disable watchdog */
+       iavf_dev_watchdog_disable(adapter);
+
        return ret;
 }