Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to i40e and i40evf.

Kevin updates the i40e and i40evf driver i40e_check_asq_alive() to ensure
the length register offset is non-zero which indicates that the software
has initialized the admin queue.  Also removes PCTYPE definitions which are
now reserved.

Mitch enables descriptor prefetch for rings belonging to the virtual function.
Also configures the VF minimum transmit rate to 50 Mbps rather than 0 which was
be interpreted as no limit at all.  Mitch found in order for the VF to achieve
its programmed transmit rate, we need to set the max credit value to 4.
Lastly fixes a Tx hang and firmware crash that happens after setting the MTU
on a VF by not using the RESETTING state during reinit, this is because
the RESETTING state means that a catastrophic hardware bad thing is happening
and the driver needs to tiptoe around and not use the admin queue or registers.
A reinit is no big deal and we can use the admin queue (and we should) so
do not set the state to RESETTING during reinit to resolve the bug.

Akeem changes the declaration of the transmit and receive rings inside
several loops to eliminate declaring the same ring every time for the
duration of the loop and declares them just once before the loop.  Also fixes
the driver to clear the recovery pending bit if pf_reset fails instead of
falling through the setup process.

Anjali makes a change based on feedback from Ben Hutchings that cmd->data
needs to be reported in ETHTOOL_GRXCLSRLCNT and use a helper function to
calculate the total filter count.

Jesse removes storm control since the storm control features are not apart
of the hardware and were mistakenly left in the code.

Greg changes tx_lpi_status and rx_lpi_status from bool to u32 to avoid
sparse errors.

Shannon adds the clear_pxe AdminQ API call to tell the firmware that the
driver is taking over from PXE.  In addition, relaxes the firmware API
check to allow more flexibility in handling newer NICs and NVMs in the field.

Vasu ensures that FCoE is disabled for MFP modes since it is not supported
by overriding the hardware FCoE capability.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

16 files changed, 116 insertions, 100 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index ef5bb11557e5..581898f23223 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -534,6 +534,15 @@ static inline bool i40e_rx_is_programming_status(u64 qw)
                 (qw >> I40E_RX_PROG_STATUS_DESC_LENGTH_SHIFT);
 }
 
+/**
+ * i40e_get_fd_cnt_all - get the total FD filter space available
+ * @pf: pointer to the pf struct
+ **/
+static inline int i40e_get_fd_cnt_all(struct i40e_pf *pf)
+{
+        return pf->hw.fdir_shared_filter_count + pf->fdir_pf_filter_count;
+}
+
 /* needed by i40e_ethtool.c */
 int i40e_up(struct i40e_vsi *vsi);
 void i40e_down(struct i40e_vsi *vsi);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index 34415d342ece..ba2811be8be4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -587,8 +587,7 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)
         i40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_HI, &eetrack_hi);
         hw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo;
 
-        if (hw->aq.api_maj_ver != I40E_FW_API_VERSION_MAJOR ||
-            hw->aq.api_min_ver > I40E_FW_API_VERSION_MINOR) {
+        if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {
                 ret_code = I40E_ERR_FIRMWARE_API_VERSION;
                 goto init_adminq_free_arq;
         }
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 22eefda3a530..2329e2ff2deb 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -133,7 +133,11 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
  **/
 bool i40e_check_asq_alive(struct i40e_hw *hw)
 {
-        return !!(rd32(hw, hw->aq.asq.len) & I40E_PF_ATQLEN_ATQENABLE_MASK);
+        if (hw->aq.asq.len)
+                return !!(rd32(hw, hw->aq.asq.len) &
+                          I40E_PF_ATQLEN_ATQENABLE_MASK);
+        else
+                return false;
 }
 
 /**
@@ -789,6 +793,9 @@ void i40e_clear_pxe_mode(struct i40e_hw *hw)
 {
         u32 reg;
 
+        if (i40e_check_asq_alive(hw))
+                i40e_aq_clear_pxe_mode(hw, NULL);
+
         /* Clear single descriptor fetch/write-back mode */
         reg = rd32(hw, I40E_GLLAN_RCTL_0);
 
@@ -907,6 +914,33 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink)
 /* Admin command wrappers */
 
 /**
+ * i40e_aq_clear_pxe_mode
+ * @hw: pointer to the hw struct
+ * @cmd_details: pointer to command details structure or NULL
+ *
+ * Tell the firmware that the driver is taking over from PXE
+ **/
+i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
+                                struct i40e_asq_cmd_details *cmd_details)
+{
+        i40e_status status;
+        struct i40e_aq_desc desc;
+        struct i40e_aqc_clear_pxe *cmd =
+                (struct i40e_aqc_clear_pxe *)&desc.params.raw;
+
+        i40e_fill_default_direct_cmd_desc(&desc,
+                                          i40e_aqc_opc_clear_pxe_mode);
+
+        cmd->rx_cnt = 0x2;
+
+        status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
+
+        wr32(hw, I40E_GLLAN_RCTL_0, 0x1);
+
+        return status;
+}
+
+/**
  * i40e_aq_set_link_restart_an
  * @hw: pointer to the hw struct
  * @cmd_details: pointer to command details structure or NULL
@@ -1915,6 +1949,12 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
                 }
         }
 
+        /* Software override ensuring FCoE is disabled if npar or mfp
+         * mode because it is not supported in these modes.
+         */
+        if (p->npar_enable || p->mfp_mode_1)
+                p->fcoe = false;
+
         /* additional HW specific goodies that might
          * someday be HW version specific
          */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 861e1db47a71..354181d17612 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -633,6 +633,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
                                    struct ethtool_stats *stats, u64 *data)
 {
         struct i40e_netdev_priv *np = netdev_priv(netdev);
+        struct i40e_ring *tx_ring, *rx_ring;
         struct i40e_vsi *vsi = np->vsi;
         struct i40e_pf *pf = vsi->back;
         int i = 0;
@@ -650,8 +651,7 @@ static void i40e_get_ethtool_stats(struct net_device *netdev,
         }
         rcu_read_lock();
         for (j = 0; j < vsi->num_queue_pairs; j++) {
-                struct i40e_ring *tx_ring = ACCESS_ONCE(vsi->tx_rings[j]);
-                struct i40e_ring *rx_ring;
+                tx_ring = ACCESS_ONCE(vsi->tx_rings[j]);
 
                 if (!tx_ring)
                         continue;
@@ -1131,8 +1131,7 @@ static int i40e_get_ethtool_fdir_all(struct i40e_pf *pf,
         int cnt = 0;
 
         /* report total rule count */
-        cmd->data = pf->hw.fdir_shared_filter_count +
-                    pf->fdir_pf_filter_count;
+        cmd->data = i40e_get_fd_cnt_all(pf);
 
         hlist_for_each_entry_safe(rule, node2,
                                   &pf->fdir_filter_list, fdir_node) {
@@ -1166,10 +1165,6 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_pf *pf,
         struct i40e_fdir_filter *rule = NULL;
         struct hlist_node *node2;
 
-        /* report total rule count */
-        cmd->data = pf->hw.fdir_shared_filter_count +
-                    pf->fdir_pf_filter_count;
-
         hlist_for_each_entry_safe(rule, node2,
                                   &pf->fdir_filter_list, fdir_node) {
                 if (fsp->location <= rule->fd_id)
@@ -1220,6 +1215,8 @@ static int i40e_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
                 break;
         case ETHTOOL_GRXCLSRLCNT:
                 cmd->rule_cnt = pf->fdir_pf_active_filters;
+                /* report total rule count */
+                cmd->data = i40e_get_fd_cnt_all(pf);
                 ret = 0;
                 break;
         case ETHTOOL_GRXCLSRULE:
@@ -1288,16 +1285,12 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)
         case UDP_V4_FLOW:
                 switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
                 case 0:
-                        hena &=
-                        ~(((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) |
-                        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) |
-                        ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4));
+                        hena &= ~(((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |
+                                  ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4));
                         break;
                 case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
-                        hena |=
-                        (((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP)  |
-                        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) |
-                        ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4));
+                        hena |= (((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |
+                                  ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4));
                         break;
                 default:
                         return -EINVAL;
@@ -1306,16 +1299,12 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)
         case UDP_V6_FLOW:
                 switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
                 case 0:
-                        hena &=
-                        ~(((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) |
-                        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) |
-                        ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6));
+                        hena &= ~(((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |
+                                  ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6));
                         break;
                 case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
-                        hena |=
-                        (((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP)  |
-                        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) |
-                        ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6));
+                        hena |= (((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |
+                                 ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6));
                         break;
                 default:
                         return -EINVAL;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 8e15ced897a6..cef3db44301e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -356,6 +356,7 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct(
                                              struct rtnl_link_stats64 *stats)
 {
         struct i40e_netdev_priv *np = netdev_priv(netdev);
+        struct i40e_ring *tx_ring, *rx_ring;
         struct i40e_vsi *vsi = np->vsi;
         struct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);
         int i;
@@ -368,7 +369,6 @@ static struct rtnl_link_stats64 *i40e_get_netdev_stats_struct(
 
         rcu_read_lock();
         for (i = 0; i < vsi->num_queue_pairs; i++) {
-                struct i40e_ring *tx_ring, *rx_ring;
                 u64 bytes, packets;
                 unsigned int start;
 
@@ -2415,6 +2415,7 @@ static int i40e_vsi_configure_rx(struct i40e_vsi *vsi)
  **/
 static void i40e_vsi_config_dcb_rings(struct i40e_vsi *vsi)
 {
+        struct i40e_ring *tx_ring, *rx_ring;
         u16 qoffset, qcount;
         int i, n;
 
@@ -2428,8 +2429,8 @@ static void i40e_vsi_config_dcb_rings(struct i40e_vsi *vsi)
                 qoffset = vsi->tc_config.tc_info[n].qoffset;
                 qcount = vsi->tc_config.tc_info[n].qcount;
                 for (i = qoffset; i < (qoffset + qcount); i++) {
-                        struct i40e_ring *rx_ring = vsi->rx_rings[i];
-                        struct i40e_ring *tx_ring = vsi->tx_rings[i];
+                        rx_ring = vsi->rx_rings[i];
+                        tx_ring = vsi->tx_rings[i];
                         rx_ring->dcb_tc = n;
                         tx_ring->dcb_tc = n;
                 }
@@ -2567,7 +2568,6 @@ static void i40e_enable_misc_int_causes(struct i40e_hw *hw)
               I40E_PFINT_ICR0_ENA_PCI_EXCEPTION_MASK |
               I40E_PFINT_ICR0_ENA_GPIO_MASK          |
               I40E_PFINT_ICR0_ENA_TIMESYNC_MASK      |
-              I40E_PFINT_ICR0_ENA_STORM_DETECT_MASK  |
               I40E_PFINT_ICR0_ENA_HMC_ERR_MASK       |
               I40E_PFINT_ICR0_ENA_VFLR_MASK          |
               I40E_PFINT_ICR0_ENA_ADMINQ_MASK;
@@ -4711,8 +4711,7 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf)
             (pf->flags & I40E_FLAG_FD_SB_ENABLED))
                 return;
         fcnt_prog = i40e_get_current_fd_count(pf);
-        fcnt_avail = pf->hw.fdir_shared_filter_count +
-                                               pf->fdir_pf_filter_count;
+        fcnt_avail = i40e_get_fd_cnt_all(pf);
         if (fcnt_prog < (fcnt_avail - I40E_FDIR_BUFFER_HEAD_ROOM)) {
                 if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&
                     (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {
@@ -5368,8 +5367,10 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
          * because the reset will make them disappear.
          */
         ret = i40e_pf_reset(hw);
-        if (ret)
+        if (ret) {
                 dev_info(&pf->pdev->dev, "PF reset failed, %d\n", ret);
+                goto end_core_reset;
+        }
         pf->pfr_count++;
 
         if (test_bit(__I40E_DOWN, &pf->state))
@@ -5948,14 +5949,12 @@ static void i40e_vsi_clear_rings(struct i40e_vsi *vsi)
  **/
 static int i40e_alloc_rings(struct i40e_vsi *vsi)
 {
+        struct i40e_ring *tx_ring, *rx_ring;
         struct i40e_pf *pf = vsi->back;
         int i;
 
         /* Set basic values in the rings to be used later during open() */
         for (i = 0; i < vsi->alloc_queue_pairs; i++) {
-                struct i40e_ring *tx_ring;
-                struct i40e_ring *rx_ring;
-
                 /* allocate space for both Tx and Rx in one shot */
                 tx_ring = kzalloc(sizeof(struct i40e_ring) * 2, GFP_KERNEL);
                 if (!tx_ring)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
index d351832bf235..57172f98f9f8 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
@@ -74,6 +74,8 @@ i40e_status i40e_aq_set_phy_reset(struct i40e_hw *hw,
                                 struct i40e_asq_cmd_details *cmd_details);
 i40e_status i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,
                                 struct i40e_asq_cmd_details *cmd_details);
+i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
+                                struct i40e_asq_cmd_details *cmd_details);
 i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw,
                                 struct i40e_asq_cmd_details *cmd_details);
 i40e_status i40e_aq_get_link_info(struct i40e_hw *hw,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_register.h b/drivers/net/ethernet/intel/i40e/i40e_register.h
index 1d40f425acf1..25c928615f55 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_register.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_register.h
@@ -1340,8 +1340,6 @@
 #define I40E_PFINT_ICR0_GPIO_MASK (0x1 << I40E_PFINT_ICR0_GPIO_SHIFT)
 #define I40E_PFINT_ICR0_TIMESYNC_SHIFT 23
 #define I40E_PFINT_ICR0_TIMESYNC_MASK (0x1 << I40E_PFINT_ICR0_TIMESYNC_SHIFT)
-#define I40E_PFINT_ICR0_STORM_DETECT_SHIFT 24
-#define I40E_PFINT_ICR0_STORM_DETECT_MASK (0x1 << I40E_PFINT_ICR0_STORM_DETECT_SHIFT)
 #define I40E_PFINT_ICR0_LINK_STAT_CHANGE_SHIFT 25
 #define I40E_PFINT_ICR0_LINK_STAT_CHANGE_MASK (0x1 << I40E_PFINT_ICR0_LINK_STAT_CHANGE_SHIFT)
 #define I40E_PFINT_ICR0_HMC_ERR_SHIFT 26
@@ -1367,8 +1365,6 @@
 #define I40E_PFINT_ICR0_ENA_GPIO_MASK (0x1 << I40E_PFINT_ICR0_ENA_GPIO_SHIFT)
 #define I40E_PFINT_ICR0_ENA_TIMESYNC_SHIFT 23
 #define I40E_PFINT_ICR0_ENA_TIMESYNC_MASK (0x1 << I40E_PFINT_ICR0_ENA_TIMESYNC_SHIFT)
-#define I40E_PFINT_ICR0_ENA_STORM_DETECT_SHIFT 24
-#define I40E_PFINT_ICR0_ENA_STORM_DETECT_MASK (0x1 << I40E_PFINT_ICR0_ENA_STORM_DETECT_SHIFT)
 #define I40E_PFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT 25
 #define I40E_PFINT_ICR0_ENA_LINK_STAT_CHANGE_MASK (0x1 << I40E_PFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT)
 #define I40E_PFINT_ICR0_ENA_HMC_ERR_SHIFT 26
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 8d0ef445fa44..5a2218762db1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -184,7 +184,6 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi,
         struct iphdr *ip;
         bool err = false;
         int ret;
-        int i;
         static char packet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0,
                 0x45, 0, 0, 0x1c, 0, 0, 0x40, 0, 0x40, 0x11, 0, 0, 0, 0, 0, 0,
                 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -200,21 +199,17 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi,
         ip->saddr = fd_data->src_ip[0];
         udp->source = fd_data->src_port;
 
-        for (i = I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP;
-             i <= I40E_FILTER_PCTYPE_NONF_IPV4_UDP; i++) {
-                fd_data->pctype = i;
-                ret = i40e_program_fdir_filter(fd_data, raw_packet, pf, add);
-
-                if (ret) {
-                        dev_info(&pf->pdev->dev,
-                                 "Filter command send failed for PCTYPE %d (ret = %d)\n",
-                                 fd_data->pctype, ret);
-                        err = true;
-                } else {
-                        dev_info(&pf->pdev->dev,
-                                 "Filter OK for PCTYPE %d (ret = %d)\n",
-                                 fd_data->pctype, ret);
-                }
+        fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;
+        ret = i40e_program_fdir_filter(fd_data, raw_packet, pf, add);
+        if (ret) {
+                dev_info(&pf->pdev->dev,
+                         "Filter command send failed for PCTYPE %d (ret = %d)\n",
+                         fd_data->pctype, ret);
+                err = true;
+        } else {
+                dev_info(&pf->pdev->dev,
+                         "Filter OK for PCTYPE %d (ret = %d)\n",
+                         fd_data->pctype, ret);
         }
 
         return err ? -EOPNOTSUPP : 0;
@@ -263,7 +258,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi,
                 }
         }
 
-        fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN;
+        fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP;
         ret = i40e_program_fdir_filter(fd_data, raw_packet, pf, add);
 
         if (ret) {
@@ -456,9 +451,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring,
 
                 /* filter programming failed most likely due to table full */
                 fcnt_prog = i40e_get_current_fd_count(pf);
-                fcnt_avail = pf->hw.fdir_shared_filter_count +
-                                                       pf->fdir_pf_filter_count;
-
+                fcnt_avail = i40e_get_fd_cnt_all(pf);
                 /* If ATR is running fcnt_prog can quickly change,
                  * if we are very close to full, it makes sense to disable
                  * FD ATR/SB and then re-enable it when there is room.
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index d5349698e513..d5e3f5430284 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -27,7 +27,7 @@
 #ifndef _I40E_TXRX_H_
 #define _I40E_TXRX_H_
 
-/* Interrupt Throttling and Rate Limiting (storm control) Goodies */
+/* Interrupt Throttling and Rate Limiting Goodies */
 
 #define I40E_MAX_ITR               0x0FF0  /* reg uses 2 usec resolution */
 #define I40E_MIN_ITR               0x0004  /* reg uses 2 usec resolution */
@@ -69,16 +69,11 @@ enum i40e_dyn_idx_t {
 
 /* Supported RSS offloads */
 #define I40E_DEFAULT_RSS_HENA ( \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_SCTP) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_OTHER) | \
         ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP) | \
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index c4df8bac2db1..71f9718caf0a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -866,18 +866,14 @@ struct i40e_filter_program_desc {
 
 /* Packet Classifier Types for filters */
 enum i40e_filter_pctype {
-        /* Note: Values 0-28 are reserved for future use */
-        I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP        = 29,
-        I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP      = 30,
+        /* Note: Values 0-30 are reserved for future use */
         I40E_FILTER_PCTYPE_NONF_IPV4_UDP                = 31,
-        I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN            = 32,
+        /* Note: Value 32 is reserved for future use */
         I40E_FILTER_PCTYPE_NONF_IPV4_TCP                = 33,
         I40E_FILTER_PCTYPE_NONF_IPV4_SCTP               = 34,
         I40E_FILTER_PCTYPE_NONF_IPV4_OTHER              = 35,
         I40E_FILTER_PCTYPE_FRAG_IPV4                    = 36,
-        /* Note: Values 37-38 are reserved for future use */
-        I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP        = 39,
-        I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP      = 40,
+        /* Note: Values 37-40 are reserved for future use */
         I40E_FILTER_PCTYPE_NONF_IPV6_UDP                = 41,
         I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN            = 42,
         I40E_FILTER_PCTYPE_NONF_IPV6_TCP                = 43,
@@ -1020,8 +1016,8 @@ struct i40e_hw_port_stats {
         u64 mac_short_packet_dropped;   /* mspdc */
         u64 checksum_error;             /* xec */
         /* EEE LPI */
-        bool tx_lpi_status;
-        bool rx_lpi_status;
+        u32 tx_lpi_status;
+        u32 rx_lpi_status;
         u64 tx_lpi_count;               /* etlpic */
         u64 rx_lpi_count;               /* erlpic */
 };
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 8564b0939dc4..4e7634c83685 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -354,6 +354,7 @@ static int i40e_config_vsi_rx_queue(struct i40e_vf *vf, u16 vsi_idx,
         rx_ctx.tphhead_ena = 1;
         rx_ctx.lrxqthresh = 2;
         rx_ctx.crcstrip = 1;
+        rx_ctx.prefena = 1;
 
         /* clear the context in the HMC */
         ret = i40e_clear_lan_rx_queue_context(hw, pf_queue_id);
@@ -2197,6 +2198,8 @@ error_pvid:
         return ret;
 }
 
+#define I40E_BW_CREDIT_DIVISOR 50     /* 50Mbps per BW credit */
+#define I40E_MAX_BW_INACTIVE_ACCUM 4  /* device can accumulate 4 credits max */
 /**
  * i40e_ndo_set_vf_bw
  * @netdev: network interface device structure
@@ -2257,9 +2260,15 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
                 goto error;
         }
 
+        if ((max_tx_rate < 50) && (max_tx_rate > 0)) {
+                dev_warn(&pf->pdev->dev, "Setting max Tx rate to minimum usable value of 50Mbps.\n");
+                max_tx_rate = 50;
+        }
+
         /* Tx rate credits are in values of 50Mbps, 0 is disabled*/
-        ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid, max_tx_rate / 50,
-                                          0, NULL);
+        ret = i40e_aq_config_vsi_bw_limit(&pf->hw, vsi->seid,
+                                          max_tx_rate / I40E_BW_CREDIT_DIVISOR,
+                                          I40E_MAX_BW_INACTIVE_ACCUM, NULL);
         if (ret) {
                 dev_err(&pf->pdev->dev, "Unable to set max tx rate, error code %d.\n",
                         ret);
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index ac660963b8b7..ea0f2001cc20 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -133,7 +133,11 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,
  **/
 bool i40evf_check_asq_alive(struct i40e_hw *hw)
 {
-        return !!(rd32(hw, hw->aq.asq.len) & I40E_PF_ATQLEN_ATQENABLE_MASK);
+        if (hw->aq.asq.len)
+                return !!(rd32(hw, hw->aq.asq.len) &
+                          I40E_PF_ATQLEN_ATQENABLE_MASK);
+        else
+                return false;
 }
 
 /**
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_register.h b/drivers/net/ethernet/intel/i40evf/i40e_register.h
index aa4a92e3b125..7977205b1e04 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_register.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_register.h
@@ -1340,8 +1340,6 @@
 #define I40E_PFINT_ICR0_GPIO_MASK (0x1 << I40E_PFINT_ICR0_GPIO_SHIFT)
 #define I40E_PFINT_ICR0_TIMESYNC_SHIFT 23
 #define I40E_PFINT_ICR0_TIMESYNC_MASK (0x1 << I40E_PFINT_ICR0_TIMESYNC_SHIFT)
-#define I40E_PFINT_ICR0_STORM_DETECT_SHIFT 24
-#define I40E_PFINT_ICR0_STORM_DETECT_MASK (0x1 << I40E_PFINT_ICR0_STORM_DETECT_SHIFT)
 #define I40E_PFINT_ICR0_LINK_STAT_CHANGE_SHIFT 25
 #define I40E_PFINT_ICR0_LINK_STAT_CHANGE_MASK (0x1 << I40E_PFINT_ICR0_LINK_STAT_CHANGE_SHIFT)
 #define I40E_PFINT_ICR0_HMC_ERR_SHIFT 26
@@ -1367,8 +1365,6 @@
 #define I40E_PFINT_ICR0_ENA_GPIO_MASK (0x1 << I40E_PFINT_ICR0_ENA_GPIO_SHIFT)
 #define I40E_PFINT_ICR0_ENA_TIMESYNC_SHIFT 23
 #define I40E_PFINT_ICR0_ENA_TIMESYNC_MASK (0x1 << I40E_PFINT_ICR0_ENA_TIMESYNC_SHIFT)
-#define I40E_PFINT_ICR0_ENA_STORM_DETECT_SHIFT 24
-#define I40E_PFINT_ICR0_ENA_STORM_DETECT_MASK (0x1 << I40E_PFINT_ICR0_ENA_STORM_DETECT_SHIFT)
 #define I40E_PFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT 25
 #define I40E_PFINT_ICR0_ENA_LINK_STAT_CHANGE_MASK (0x1 << I40E_PFINT_ICR0_ENA_LINK_STAT_CHANGE_SHIFT)
 #define I40E_PFINT_ICR0_ENA_HMC_ERR_SHIFT 26
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
index d0119d0a9fcf..af639d8608a5 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
@@ -27,7 +27,7 @@
 #ifndef _I40E_TXRX_H_
 #define _I40E_TXRX_H_
 
-/* Interrupt Throttling and Rate Limiting (storm control) Goodies */
+/* Interrupt Throttling and Rate Limiting Goodies */
 
 #define I40E_MAX_ITR               0x0FF0  /* reg uses 2 usec resolution */
 #define I40E_MIN_ITR               0x0004  /* reg uses 2 usec resolution */
@@ -69,16 +69,11 @@ enum i40e_dyn_idx_t {
 
 /* Supported RSS offloads */
 #define I40E_DEFAULT_RSS_HENA ( \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_SCTP) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_OTHER) | \
         ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \
-        ((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN) | \
         ((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP) | \
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index fb5371ad1cb9..67082f7bfcef 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -866,18 +866,14 @@ struct i40e_filter_program_desc {
 
 /* Packet Classifier Types for filters */
 enum i40e_filter_pctype {
-        /* Note: Values 0-28 are reserved for future use */
-        I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP        = 29,
-        I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP      = 30,
+        /* Note: Values 0-30 are reserved for future use */
         I40E_FILTER_PCTYPE_NONF_IPV4_UDP                = 31,
-        I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN            = 32,
+        /* Note: Value 32 is reserved for future use */
         I40E_FILTER_PCTYPE_NONF_IPV4_TCP                = 33,
         I40E_FILTER_PCTYPE_NONF_IPV4_SCTP               = 34,
         I40E_FILTER_PCTYPE_NONF_IPV4_OTHER              = 35,
         I40E_FILTER_PCTYPE_FRAG_IPV4                    = 36,
-        /* Note: Values 37-38 are reserved for future use */
-        I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP        = 39,
-        I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP      = 40,
+        /* Note: Values 37-40 are reserved for future use */
         I40E_FILTER_PCTYPE_NONF_IPV6_UDP                = 41,
         I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN            = 42,
         I40E_FILTER_PCTYPE_NONF_IPV6_TCP                = 43,
@@ -1020,8 +1016,8 @@ struct i40e_hw_port_stats {
         u64 mac_short_packet_dropped;   /* mspdc */
         u64 checksum_error;             /* xec */
         /* EEE LPI */
-        bool tx_lpi_status;
-        bool rx_lpi_status;
+        u32 tx_lpi_status;
+        u32 rx_lpi_status;
         u64 tx_lpi_count;               /* etlpic */
         u64 rx_lpi_count;               /* erlpic */
 };
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 23c9ff6698bc..632c2b32afa1 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1844,8 +1844,6 @@ void i40evf_reinit_locked(struct i40evf_adapter *adapter)
 
         WARN_ON(in_interrupt());
 
-        adapter->state = __I40EVF_RESETTING;
-
         i40evf_down(adapter);
 
         /* allocate transmit descriptors */