Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue

Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2016-02-03

This series contains updates to i40e and i40evf only.

Kiran adds the MAC filter element to the end of the list instead of HEAD
just in case there are ever any ordering issues in the future.

Anjali fixes several RSS issues, first fixes the hash PCTYPE enable for
X722 since it supports a broader selection of PCTYPES for TCP and UDP.
Then fixes a bug in XL710, X710, and X722 support for RSS since we cannot
reduce the 4-tuple for RSS for TCP/IPv4/IPv6 or UDP/IPv4/IPv6 packets
since this requires a product feature change coming in a later release.
Cleans up the reset code where the restart-autoneg workaround is
applied, since X722 does not need the workaround, add a flag to indicate
which MAC and firmware version require the workaround to be applied.
Adds new device id's for X722 and code to add their support.  Also
adds another way to access the RSS keys and lookup table using the admin
queue for X722 devices.

Catherine updates the driver to replace the MAC check with a feature
flag check for 100M SGMII, since it is only support on X722 devices
currently.

Mitch reworks the VF driver to allow channel bonding, which was not
possible before this patch due to the asynchronous nature of the admin
queue mechanism.  Also fixes a rare case which causes a panic if the
VF driver is removed during reset recovery, resolve this by setting the
ring pointers to NULL after freeing them.

Shannon cleans up the driver where device capabilities were defined in
two different places, and neither had all the definitions, so he
consolidates the definitions in the admin queue API.  Also adds the new
proxy-wake-on-lan capability bit available with the new X722 device.
Lastly, added the new External Device Power Ability field to the
get_link_status data structure by using a reserved field at the end
of the structure.

Jesse mimics the ixgbe driver's use of a private work queue in the i40e
and i40evf drivers to avoid blocking the system work queue.

Greg cleans up the driver to limit the firmware revision checks to
properly handle DCB configurations from the firmware to the older
devices which need these checks (specifically X710 and XL710 devices
only).
====================

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

14 files changed, 282 insertions, 130 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 68f2204ec6f3..53ed3bdd8363 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -339,6 +339,8 @@ struct i40e_pf {
 #define I40E_FLAG_VEB_MODE_ENABLED              BIT_ULL(40)
 #define I40E_FLAG_GENEVE_OFFLOAD_CAPABLE        BIT_ULL(41)
 #define I40E_FLAG_NO_PCI_LINK_CHECK             BIT_ULL(42)
+#define I40E_FLAG_100M_SGMII_CAPABLE            BIT_ULL(43)
+#define I40E_FLAG_RESTART_AUTONEG               BIT_ULL(44)
 #define I40E_FLAG_PF_MAC                        BIT_ULL(50)
 
         /* tracks features that get auto disabled by errors */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
index b22012a446a6..0e608d2a70d5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h
@@ -220,6 +220,7 @@ enum i40e_admin_queue_opc {
         i40e_aqc_opc_get_phy_wol_caps           = 0x0621,
         i40e_aqc_opc_set_phy_debug              = 0x0622,
         i40e_aqc_opc_upload_ext_phy_fm          = 0x0625,
+        i40e_aqc_opc_run_phy_activity           = 0x0626,
 
         /* NVM commands */
         i40e_aqc_opc_nvm_read                   = 0x0701,
@@ -402,6 +403,7 @@ struct i40e_aqc_list_capabilities_element_resp {
 #define I40E_AQ_CAP_ID_OS2BMC_CAP       0x0004
 #define I40E_AQ_CAP_ID_FUNCTIONS_VALID  0x0005
 #define I40E_AQ_CAP_ID_ALTERNATE_RAM    0x0006
+#define I40E_AQ_CAP_ID_WOL_AND_PROXY    0x0008
 #define I40E_AQ_CAP_ID_SRIOV            0x0012
 #define I40E_AQ_CAP_ID_VF               0x0013
 #define I40E_AQ_CAP_ID_VMDQ             0x0014
@@ -422,6 +424,7 @@ struct i40e_aqc_list_capabilities_element_resp {
 #define I40E_AQ_CAP_ID_LED              0x0061
 #define I40E_AQ_CAP_ID_SDP              0x0062
 #define I40E_AQ_CAP_ID_MDIO             0x0063
+#define I40E_AQ_CAP_ID_WSR_PROT         0x0064
 #define I40E_AQ_CAP_ID_FLEX10           0x00F1
 #define I40E_AQ_CAP_ID_CEM              0x00F2
 
@@ -1257,9 +1260,9 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
 
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT               9
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK                0x1E00
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_XVLAN               0
+#define I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN               0
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC          1
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_NGE                 2
+#define I40E_AQC_ADD_CLOUD_TNL_TYPE_GENEVE              2
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_IP                  3
 
         __le32  tenant_id;
@@ -1755,7 +1758,12 @@ struct i40e_aqc_get_link_status {
         u8      config;
 #define I40E_AQ_CONFIG_CRC_ENA          0x04
 #define I40E_AQ_CONFIG_PACING_MASK      0x78
-        u8      reserved[5];
+        u8      external_power_ability;
+#define I40E_AQ_LINK_POWER_CLASS_1      0x00
+#define I40E_AQ_LINK_POWER_CLASS_2      0x01
+#define I40E_AQ_LINK_POWER_CLASS_3      0x02
+#define I40E_AQ_LINK_POWER_CLASS_4      0x03
+        u8      reserved[4];
 };
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_get_link_status);
@@ -1823,6 +1831,18 @@ enum i40e_aq_phy_reg_type {
         I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3
 };
 
+/* Run PHY Activity (0x0626) */
+struct i40e_aqc_run_phy_activity {
+        __le16  activity_id;
+        u8      flags;
+        u8      reserved1;
+        __le32  control;
+        __le32  data;
+        u8      reserved2[4];
+};
+
+I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity);
+
 /* NVM Read command (indirect 0x0701)
  * NVM Erase commands (direct 0x0702)
  * NVM Update commands (indirect 0x0703)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index 6a034ddac36a..3b03a3165ca7 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -55,6 +55,8 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
                 case I40E_DEV_ID_20G_KR2_A:
                         hw->mac.type = I40E_MAC_XL710;
                         break;
+                case I40E_DEV_ID_KX_X722:
+                case I40E_DEV_ID_QSFP_X722:
                 case I40E_DEV_ID_SFP_X722:
                 case I40E_DEV_ID_1G_BASE_T_X722:
                 case I40E_DEV_ID_10G_BASE_T_X722:
@@ -2765,35 +2767,6 @@ i40e_aq_erase_nvm_exit:
         return status;
 }
 
-#define I40E_DEV_FUNC_CAP_SWITCH_MODE   0x01
-#define I40E_DEV_FUNC_CAP_MGMT_MODE     0x02
-#define I40E_DEV_FUNC_CAP_NPAR          0x03
-#define I40E_DEV_FUNC_CAP_OS2BMC        0x04
-#define I40E_DEV_FUNC_CAP_VALID_FUNC    0x05
-#define I40E_DEV_FUNC_CAP_SRIOV_1_1     0x12
-#define I40E_DEV_FUNC_CAP_VF            0x13
-#define I40E_DEV_FUNC_CAP_VMDQ          0x14
-#define I40E_DEV_FUNC_CAP_802_1_QBG     0x15
-#define I40E_DEV_FUNC_CAP_802_1_QBH     0x16
-#define I40E_DEV_FUNC_CAP_VSI           0x17
-#define I40E_DEV_FUNC_CAP_DCB           0x18
-#define I40E_DEV_FUNC_CAP_FCOE          0x21
-#define I40E_DEV_FUNC_CAP_ISCSI         0x22
-#define I40E_DEV_FUNC_CAP_RSS           0x40
-#define I40E_DEV_FUNC_CAP_RX_QUEUES     0x41
-#define I40E_DEV_FUNC_CAP_TX_QUEUES     0x42
-#define I40E_DEV_FUNC_CAP_MSIX          0x43
-#define I40E_DEV_FUNC_CAP_MSIX_VF       0x44
-#define I40E_DEV_FUNC_CAP_FLOW_DIRECTOR 0x45
-#define I40E_DEV_FUNC_CAP_IEEE_1588     0x46
-#define I40E_DEV_FUNC_CAP_FLEX10        0xF1
-#define I40E_DEV_FUNC_CAP_CEM           0xF2
-#define I40E_DEV_FUNC_CAP_IWARP         0x51
-#define I40E_DEV_FUNC_CAP_LED           0x61
-#define I40E_DEV_FUNC_CAP_SDP           0x62
-#define I40E_DEV_FUNC_CAP_MDIO          0x63
-#define I40E_DEV_FUNC_CAP_WR_CSR_PROT   0x64
-
 /**
  * i40e_parse_discover_capabilities
  * @hw: pointer to the hw struct
@@ -2832,79 +2805,79 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
                 major_rev = cap->major_rev;
 
                 switch (id) {
-                case I40E_DEV_FUNC_CAP_SWITCH_MODE:
+                case I40E_AQ_CAP_ID_SWITCH_MODE:
                         p->switch_mode = number;
                         break;
-                case I40E_DEV_FUNC_CAP_MGMT_MODE:
+                case I40E_AQ_CAP_ID_MNG_MODE:
                         p->management_mode = number;
                         break;
-                case I40E_DEV_FUNC_CAP_NPAR:
+                case I40E_AQ_CAP_ID_NPAR_ACTIVE:
                         p->npar_enable = number;
                         break;
-                case I40E_DEV_FUNC_CAP_OS2BMC:
+                case I40E_AQ_CAP_ID_OS2BMC_CAP:
                         p->os2bmc = number;
                         break;
-                case I40E_DEV_FUNC_CAP_VALID_FUNC:
+                case I40E_AQ_CAP_ID_FUNCTIONS_VALID:
                         p->valid_functions = number;
                         break;
-                case I40E_DEV_FUNC_CAP_SRIOV_1_1:
+                case I40E_AQ_CAP_ID_SRIOV:
                         if (number == 1)
                                 p->sr_iov_1_1 = true;
                         break;
-                case I40E_DEV_FUNC_CAP_VF:
+                case I40E_AQ_CAP_ID_VF:
                         p->num_vfs = number;
                         p->vf_base_id = logical_id;
                         break;
-                case I40E_DEV_FUNC_CAP_VMDQ:
+                case I40E_AQ_CAP_ID_VMDQ:
                         if (number == 1)
                                 p->vmdq = true;
                         break;
-                case I40E_DEV_FUNC_CAP_802_1_QBG:
+                case I40E_AQ_CAP_ID_8021QBG:
                         if (number == 1)
                                 p->evb_802_1_qbg = true;
                         break;
-                case I40E_DEV_FUNC_CAP_802_1_QBH:
+                case I40E_AQ_CAP_ID_8021QBR:
                         if (number == 1)
                                 p->evb_802_1_qbh = true;
                         break;
-                case I40E_DEV_FUNC_CAP_VSI:
+                case I40E_AQ_CAP_ID_VSI:
                         p->num_vsis = number;
                         break;
-                case I40E_DEV_FUNC_CAP_DCB:
+                case I40E_AQ_CAP_ID_DCB:
                         if (number == 1) {
                                 p->dcb = true;
                                 p->enabled_tcmap = logical_id;
                                 p->maxtc = phys_id;
                         }
                         break;
-                case I40E_DEV_FUNC_CAP_FCOE:
+                case I40E_AQ_CAP_ID_FCOE:
                         if (number == 1)
                                 p->fcoe = true;
                         break;
-                case I40E_DEV_FUNC_CAP_ISCSI:
+                case I40E_AQ_CAP_ID_ISCSI:
                         if (number == 1)
                                 p->iscsi = true;
                         break;
-                case I40E_DEV_FUNC_CAP_RSS:
+                case I40E_AQ_CAP_ID_RSS:
                         p->rss = true;
                         p->rss_table_size = number;
                         p->rss_table_entry_width = logical_id;
                         break;
-                case I40E_DEV_FUNC_CAP_RX_QUEUES:
+                case I40E_AQ_CAP_ID_RXQ:
                         p->num_rx_qp = number;
                         p->base_queue = phys_id;
                         break;
-                case I40E_DEV_FUNC_CAP_TX_QUEUES:
+                case I40E_AQ_CAP_ID_TXQ:
                         p->num_tx_qp = number;
                         p->base_queue = phys_id;
                         break;
-                case I40E_DEV_FUNC_CAP_MSIX:
+                case I40E_AQ_CAP_ID_MSIX:
                         p->num_msix_vectors = number;
                         break;
-                case I40E_DEV_FUNC_CAP_MSIX_VF:
+                case I40E_AQ_CAP_ID_VF_MSIX:
                         p->num_msix_vectors_vf = number;
                         break;
-                case I40E_DEV_FUNC_CAP_FLEX10:
+                case I40E_AQ_CAP_ID_FLEX10:
                         if (major_rev == 1) {
                                 if (number == 1) {
                                         p->flex10_enable = true;
@@ -2920,38 +2893,38 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
                         p->flex10_mode = logical_id;
                         p->flex10_status = phys_id;
                         break;
-                case I40E_DEV_FUNC_CAP_CEM:
+                case I40E_AQ_CAP_ID_CEM:
                         if (number == 1)
                                 p->mgmt_cem = true;
                         break;
-                case I40E_DEV_FUNC_CAP_IWARP:
+                case I40E_AQ_CAP_ID_IWARP:
                         if (number == 1)
                                 p->iwarp = true;
                         break;
-                case I40E_DEV_FUNC_CAP_LED:
+                case I40E_AQ_CAP_ID_LED:
                         if (phys_id < I40E_HW_CAP_MAX_GPIO)
                                 p->led[phys_id] = true;
                         break;
-                case I40E_DEV_FUNC_CAP_SDP:
+                case I40E_AQ_CAP_ID_SDP:
                         if (phys_id < I40E_HW_CAP_MAX_GPIO)
                                 p->sdp[phys_id] = true;
                         break;
-                case I40E_DEV_FUNC_CAP_MDIO:
+                case I40E_AQ_CAP_ID_MDIO:
                         if (number == 1) {
                                 p->mdio_port_num = phys_id;
                                 p->mdio_port_mode = logical_id;
                         }
                         break;
-                case I40E_DEV_FUNC_CAP_IEEE_1588:
+                case I40E_AQ_CAP_ID_1588:
                         if (number == 1)
                                 p->ieee_1588 = true;
                         break;
-                case I40E_DEV_FUNC_CAP_FLOW_DIRECTOR:
+                case I40E_AQ_CAP_ID_FLOW_DIRECTOR:
                         p->fd = true;
                         p->fd_filters_guaranteed = number;
                         p->fd_filters_best_effort = logical_id;
                         break;
-                case I40E_DEV_FUNC_CAP_WR_CSR_PROT:
+                case I40E_AQ_CAP_ID_WSR_PROT:
                         p->wr_csr_prot = (u64)number;
                         p->wr_csr_prot |= (u64)logical_id << 32;
                         break;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
index 2691277c0055..582daa7ad776 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
@@ -814,13 +814,15 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw)
         struct i40e_aqc_get_cee_dcb_cfg_resp cee_cfg;
         struct i40e_aqc_get_cee_dcb_cfg_v1_resp cee_v1_cfg;
 
-        /* If Firmware version < v4.33 IEEE only */
-        if (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||
-            (hw->aq.fw_maj_ver < 4))
+        /* If Firmware version < v4.33 on X710/XL710, IEEE only */
+        if ((hw->mac.type == I40E_MAC_XL710) &&
+            (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||
+              (hw->aq.fw_maj_ver < 4)))
                 return i40e_get_ieee_dcb_config(hw);
 
-        /* If Firmware version == v4.33 use old CEE struct */
-        if ((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver == 33)) {
+        /* If Firmware version == v4.33 on X710/XL710, use old CEE struct */
+        if ((hw->mac.type == I40E_MAC_XL710) &&
+            ((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver == 33))) {
                 ret = i40e_aq_get_cee_dcb_config(hw, &cee_v1_cfg,
                                                  sizeof(cee_v1_cfg), NULL);
                 if (!ret) {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_devids.h b/drivers/net/ethernet/intel/i40e/i40e_devids.h
index 448ef4c17efb..f7ce5c7c9003 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_devids.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_devids.h
@@ -41,6 +41,8 @@
 #define I40E_DEV_ID_10G_BASE_T4         0x1589
 #define I40E_DEV_ID_VF                  0x154C
 #define I40E_DEV_ID_VF_HV               0x1571
+#define I40E_DEV_ID_KX_X722             0x37CE
+#define I40E_DEV_ID_QSFP_X722           0x37CF
 #define I40E_DEV_ID_SFP_X722            0x37D0
 #define I40E_DEV_ID_1G_BASE_T_X722      0x37D1
 #define I40E_DEV_ID_10G_BASE_T_X722     0x37D2
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 29d5833e24a3..45495911c5a4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -340,7 +340,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
                                   SUPPORTED_1000baseT_Full;
                 if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
                         ecmd->advertising |= ADVERTISED_1000baseT_Full;
-                if (pf->hw.mac.type == I40E_MAC_X722) {
+                if (pf->flags & I40E_FLAG_100M_SGMII_CAPABLE) {
                         ecmd->supported |= SUPPORTED_100baseT_Full;
                         if (hw_link_info->requested_speeds &
                             I40E_LINK_SPEED_100MB)
@@ -411,6 +411,10 @@ static void i40e_get_settings_link_down(struct i40e_hw *hw,
                 if (pf->hw.mac.type == I40E_MAC_X722) {
                         ecmd->supported |= SUPPORTED_100baseT_Full;
                         ecmd->advertising |= ADVERTISED_100baseT_Full;
+                        if (pf->flags & I40E_FLAG_100M_SGMII_CAPABLE) {
+                                ecmd->supported |= SUPPORTED_100baseT_Full;
+                                ecmd->advertising |= ADVERTISED_100baseT_Full;
+                        }
                 }
         }
         if (phy_types & I40E_CAP_PHY_TYPE_XAUI ||
@@ -2166,9 +2170,12 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)
         case TCP_V4_FLOW:
                 switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
                 case 0:
-                        hena &= ~BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP);
-                        break;
+                        return -EINVAL;
                 case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                        if (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)
+                                hena |=
+                           BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK);
+
                         hena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP);
                         break;
                 default:
@@ -2178,9 +2185,12 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)
         case TCP_V6_FLOW:
                 switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
                 case 0:
-                        hena &= ~BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
-                        break;
+                        return -EINVAL;
                 case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                        if (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)
+                                hena |=
+                           BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK);
+
                         hena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
                         break;
                 default:
@@ -2190,10 +2200,13 @@ 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 &= ~(BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |
-                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4));
-                        break;
+                        return -EINVAL;
                 case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                        if (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)
+                                hena |=
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) |
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP);
+
                         hena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |
                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4));
                         break;
@@ -2204,10 +2217,13 @@ 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 &= ~(BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |
-                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6));
-                        break;
+                        return -EINVAL;
                 case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                        if (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE)
+                                hena |=
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) |
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP);
+
                         hena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |
                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6));
                         break;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 8f3b53e0dc46..320b0491abd9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -51,7 +51,7 @@ static const char i40e_driver_string[] =
 
 #define DRV_VERSION_MAJOR 1
 #define DRV_VERSION_MINOR 4
-#define DRV_VERSION_BUILD 8
+#define DRV_VERSION_BUILD 10
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
              __stringify(DRV_VERSION_MINOR) "." \
              __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -90,6 +90,8 @@ static const struct pci_device_id i40e_pci_tbl[] = {
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T4), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},
+        {PCI_VDEVICE(INTEL, I40E_DEV_ID_KX_X722), 0},
+        {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_X722), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_X722), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0},
@@ -110,6 +112,8 @@ MODULE_DESCRIPTION("Intel(R) Ethernet Connection XL710 Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static struct workqueue_struct *i40e_wq;
+
 /**
  * i40e_allocate_dma_mem_d - OS specific memory alloc for shared code
  * @hw:   pointer to the HW structure
@@ -295,7 +299,7 @@ static void i40e_service_event_schedule(struct i40e_pf *pf)
         if (!test_bit(__I40E_DOWN, &pf->state) &&
             !test_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state) &&
             !test_and_set_bit(__I40E_SERVICE_SCHED, &pf->state))
-                schedule_work(&pf->service_task);
+                queue_work(i40e_wq, &pf->service_task);
 }
 
 /**
@@ -1368,7 +1372,7 @@ struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,
                 f->changed = true;
 
                 INIT_LIST_HEAD(&f->list);
-                list_add(&f->list, &vsi->mac_filter_list);
+                list_add_tail(&f->list, &vsi->mac_filter_list);
         }
 
         /* increment counter and add a new flag if needed */
@@ -6889,8 +6893,7 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit)
                 wr32(hw, I40E_REG_MSS, val);
         }
 
-        if (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||
-            (pf->hw.aq.fw_maj_ver < 4)) {
+        if (pf->flags & I40E_FLAG_RESTART_AUTONEG) {
                 msleep(75);
                 ret = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);
                 if (ret)
@@ -7936,6 +7939,52 @@ static int i40e_vsi_config_rss(struct i40e_vsi *vsi)
 }
 
 /**
+ * i40e_get_rss_aq - Get RSS keys and lut by using AQ commands
+ * @vsi: Pointer to vsi structure
+ * @seed: Buffter to store the hash keys
+ * @lut: Buffer to store the lookup table entries
+ * @lut_size: Size of buffer to store the lookup table entries
+ *
+ * Return 0 on success, negative on failure
+ */
+static int i40e_get_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
+                           u8 *lut, u16 lut_size)
+{
+        struct i40e_pf *pf = vsi->back;
+        struct i40e_hw *hw = &pf->hw;
+        int ret = 0;
+
+        if (seed) {
+                ret = i40e_aq_get_rss_key(hw, vsi->id,
+                        (struct i40e_aqc_get_set_rss_key_data *)seed);
+                if (ret) {
+                        dev_info(&pf->pdev->dev,
+                                 "Cannot get RSS key, err %s aq_err %s\n",
+                                 i40e_stat_str(&pf->hw, ret),
+                                 i40e_aq_str(&pf->hw,
+                                             pf->hw.aq.asq_last_status));
+                        return ret;
+                }
+        }
+
+        if (lut) {
+                bool pf_lut = vsi->type == I40E_VSI_MAIN ? true : false;
+
+                ret = i40e_aq_get_rss_lut(hw, vsi->id, pf_lut, lut, lut_size);
+                if (ret) {
+                        dev_info(&pf->pdev->dev,
+                                 "Cannot get RSS lut, err %s aq_err %s\n",
+                                 i40e_stat_str(&pf->hw, ret),
+                                 i40e_aq_str(&pf->hw,
+                                             pf->hw.aq.asq_last_status));
+                        return ret;
+                }
+        }
+
+        return ret;
+}
+
+/**
  * i40e_config_rss_reg - Configure RSS keys and lut by writing registers
  * @vsi: Pointer to vsi structure
  * @seed: RSS hash seed
@@ -8037,7 +8086,12 @@ int i40e_config_rss(struct i40e_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)
  */
 int i40e_get_rss(struct i40e_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)
 {
-        return i40e_get_rss_reg(vsi, seed, lut, lut_size);
+        struct i40e_pf *pf = vsi->back;
+
+        if (pf->flags & I40E_FLAG_RSS_AQ_CAPABLE)
+                return i40e_get_rss_aq(vsi, seed, lut, lut_size);
+        else
+                return i40e_get_rss_reg(vsi, seed, lut, lut_size);
 }
 
 /**
@@ -8367,6 +8421,12 @@ static int i40e_sw_init(struct i40e_pf *pf)
                                  pf->hw.func_caps.fd_filters_best_effort;
         }
 
+        if (((pf->hw.mac.type == I40E_MAC_X710) ||
+             (pf->hw.mac.type == I40E_MAC_XL710)) &&
+            (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||
+            (pf->hw.aq.fw_maj_ver < 4)))
+                pf->flags |= I40E_FLAG_RESTART_AUTONEG;
+
         if (pf->hw.func_caps.vmdq) {
                 pf->num_vmdq_vsis = I40E_DEFAULT_NUM_VMDQ_VSI;
                 pf->flags |= I40E_FLAG_VMDQ_ENABLED;
@@ -8393,6 +8453,7 @@ static int i40e_sw_init(struct i40e_pf *pf)
                              I40E_FLAG_OUTER_UDP_CSUM_CAPABLE |
                              I40E_FLAG_WB_ON_ITR_CAPABLE |
                              I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE |
+                             I40E_FLAG_100M_SGMII_CAPABLE |
                              I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;
         }
         pf->eeprom_version = 0xDEAD;
@@ -8942,11 +9003,11 @@ static int i40e_config_netdev(struct i40e_vsi *vsi)
         np = netdev_priv(netdev);
         np->vsi = vsi;
 
-        netdev->hw_enc_features |= NETIF_F_IP_CSUM       |
-                                  NETIF_F_RXCSUM         |
-                                  NETIF_F_GSO_UDP_TUNNEL |
-                                  NETIF_F_GSO_GRE        |
-                                  NETIF_F_TSO;
+        netdev->hw_enc_features |= NETIF_F_IP_CSUM        |
+                                   NETIF_F_GSO_UDP_TUNNEL |
+                                   NETIF_F_GSO_GRE        |
+                                   NETIF_F_TSO            |
+                                   0;
 
         netdev->features = NETIF_F_SG                  |
                            NETIF_F_IP_CSUM             |
@@ -10904,8 +10965,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 wr32(hw, I40E_REG_MSS, val);
         }
 
-        if (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||
-            (pf->hw.aq.fw_maj_ver < 4)) {
+        if (pf->flags & I40E_FLAG_RESTART_AUTONEG) {
                 msleep(75);
                 err = i40e_aq_set_link_restart_an(&pf->hw, true, NULL);
                 if (err)
@@ -11413,6 +11473,16 @@ static int __init i40e_init_module(void)
                 i40e_driver_string, i40e_driver_version_str);
         pr_info("%s: %s\n", i40e_driver_name, i40e_copyright);
 
+        /* we will see if single thread per module is enough for now,
+         * it can't be any worse than using the system workqueue which
+         * was already single threaded
+         */
+        i40e_wq = create_singlethread_workqueue(i40e_driver_name);
+        if (!i40e_wq) {
+                pr_err("%s: Failed to create workqueue\n", i40e_driver_name);
+                return -ENOMEM;
+        }
+
         i40e_dbg_init();
         return pci_register_driver(&i40e_driver);
 }
@@ -11427,6 +11497,7 @@ module_init(i40e_init_module);
 static void __exit i40e_exit_module(void)
 {
         pci_unregister_driver(&i40e_driver);
+        destroy_workqueue(i40e_wq);
         i40e_dbg_exit();
 }
 module_exit(i40e_exit_module);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 63e62f9aec6e..659d78270fdb 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1213,9 +1213,21 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
                 vfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_RSS_REG;
         }
 
+        if (pf->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) {
+                if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)
+                        vfres->vf_offload_flags |=
+                                I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2;
+        }
+
         if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING)
                 vfres->vf_offload_flags |= I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING;
 
+        if (pf->flags & I40E_FLAG_WB_ON_ITR_CAPABLE) {
+                if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR)
+                        vfres->vf_offload_flags |=
+                                        I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR;
+        }
+
         vfres->num_vsis = num_vsis;
         vfres->num_queue_pairs = vf->num_queue_pairs;
         vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
index f5b2b369dc7c..578b1780fb08 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq_cmd.h
@@ -220,6 +220,7 @@ enum i40e_admin_queue_opc {
         i40e_aqc_opc_get_phy_wol_caps           = 0x0621,
         i40e_aqc_opc_set_phy_debug              = 0x0622,
         i40e_aqc_opc_upload_ext_phy_fm          = 0x0625,
+        i40e_aqc_opc_run_phy_activity           = 0x0626,
 
         /* NVM commands */
         i40e_aqc_opc_nvm_read                   = 0x0701,
@@ -399,6 +400,7 @@ struct i40e_aqc_list_capabilities_element_resp {
 #define I40E_AQ_CAP_ID_OS2BMC_CAP       0x0004
 #define I40E_AQ_CAP_ID_FUNCTIONS_VALID  0x0005
 #define I40E_AQ_CAP_ID_ALTERNATE_RAM    0x0006
+#define I40E_AQ_CAP_ID_WOL_AND_PROXY    0x0008
 #define I40E_AQ_CAP_ID_SRIOV            0x0012
 #define I40E_AQ_CAP_ID_VF               0x0013
 #define I40E_AQ_CAP_ID_VMDQ             0x0014
@@ -419,6 +421,7 @@ struct i40e_aqc_list_capabilities_element_resp {
 #define I40E_AQ_CAP_ID_LED              0x0061
 #define I40E_AQ_CAP_ID_SDP              0x0062
 #define I40E_AQ_CAP_ID_MDIO             0x0063
+#define I40E_AQ_CAP_ID_WSR_PROT         0x0064
 #define I40E_AQ_CAP_ID_FLEX10           0x00F1
 #define I40E_AQ_CAP_ID_CEM              0x00F2
 
@@ -1254,9 +1257,9 @@ struct i40e_aqc_add_remove_cloud_filters_element_data {
 
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT               9
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK                0x1E00
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_XVLAN               0
+#define I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN               0
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC          1
-#define I40E_AQC_ADD_CLOUD_TNL_TYPE_NGE                 2
+#define I40E_AQC_ADD_CLOUD_TNL_TYPE_GENEVE              2
 #define I40E_AQC_ADD_CLOUD_TNL_TYPE_IP                  3
 
         __le32  tenant_id;
@@ -1752,7 +1755,12 @@ struct i40e_aqc_get_link_status {
         u8      config;
 #define I40E_AQ_CONFIG_CRC_ENA          0x04
 #define I40E_AQ_CONFIG_PACING_MASK      0x78
-        u8      reserved[5];
+        u8      external_power_ability;
+#define I40E_AQ_LINK_POWER_CLASS_1      0x00
+#define I40E_AQ_LINK_POWER_CLASS_2      0x01
+#define I40E_AQ_LINK_POWER_CLASS_3      0x02
+#define I40E_AQ_LINK_POWER_CLASS_4      0x03
+        u8      reserved[4];
 };
 
 I40E_CHECK_CMD_LENGTH(i40e_aqc_get_link_status);
@@ -1820,6 +1828,18 @@ enum i40e_aq_phy_reg_type {
         I40E_AQC_PHY_REG_EXERNAL_MODULE = 0x3
 };
 
+/* Run PHY Activity (0x0626) */
+struct i40e_aqc_run_phy_activity {
+        __le16  activity_id;
+        u8      flags;
+        u8      reserved1;
+        __le32  control;
+        __le32  data;
+        u8      reserved2[4];
+};
+
+I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity);
+
 /* NVM Read command (indirect 0x0701)
  * NVM Erase commands (direct 0x0702)
  * NVM Update commands (indirect 0x0703)
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 7a00657dacda..7d663fb61927 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -252,6 +252,22 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget)
         tx_ring->q_vector->tx.total_bytes += total_bytes;
         tx_ring->q_vector->tx.total_packets += total_packets;
 
+        if (tx_ring->flags & I40E_TXR_FLAGS_WB_ON_ITR) {
+                unsigned int j = 0;
+                /* check to see if there are < 4 descriptors
+                 * waiting to be written back, then kick the hardware to force
+                 * them to be written back in case we stay in NAPI.
+                 * In this mode on X722 we do not enable Interrupt.
+                 */
+                j = i40evf_get_tx_pending(tx_ring);
+
+                if (budget &&
+                    ((j / (WB_STRIDE + 1)) == 0) && (j > 0) &&
+                    !test_bit(__I40E_DOWN, &tx_ring->vsi->state) &&
+                    (I40E_DESC_UNUSED(tx_ring) != tx_ring->count))
+                        tx_ring->arm_wb = true;
+        }
+
         netdev_tx_completed_queue(netdev_get_tx_queue(tx_ring->netdev,
                                                       tx_ring->queue_index),
                                   total_packets, total_bytes);
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h
index be1b72b93888..9e15f68d9ddd 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf.h
+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h
@@ -173,6 +173,7 @@ enum i40evf_state_t {
         __I40EVF_RESETTING,             /* in reset */
         /* Below here, watchdog is running */
         __I40EVF_DOWN,                  /* ready, can be opened */
+        __I40EVF_DOWN_PENDING,          /* descending, waiting for watchdog */
         __I40EVF_TESTING,               /* in ethtool self-test */
         __I40EVF_RUNNING,               /* opened, working */
 };
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
index a4c9feb589e7..bd1c2728bc5c 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
@@ -459,6 +459,7 @@ static int i40evf_set_rss_hash_opt(struct i40evf_adapter *adapter,
                                    struct ethtool_rxnfc *nfc)
 {
         struct i40e_hw *hw = &adapter->hw;
+        u32 flags = adapter->vf_res->vf_offload_flags;
 
         u64 hena = (u64)rd32(hw, I40E_VFQF_HENA(0)) |
                    ((u64)rd32(hw, I40E_VFQF_HENA(1)) << 32);
@@ -477,54 +478,50 @@ static int i40evf_set_rss_hash_opt(struct i40evf_adapter *adapter,
 
         switch (nfc->flow_type) {
         case TCP_V4_FLOW:
-                switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
-                case 0:
-                        hena &= ~BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP);
-                        break;
-                case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                if (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
+                        if (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)
+                                hena |=
+                           BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK);
+
                         hena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP);
-                        break;
-                default:
+                } else {
                         return -EINVAL;
                 }
                 break;
         case TCP_V6_FLOW:
-                switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
-                case 0:
-                        hena &= ~BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
-                        break;
-                case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                if (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
+                        if (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)
+                                hena |=
+                           BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK);
+
                         hena |= BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP);
-                        break;
-                default:
+                } else {
                         return -EINVAL;
                 }
                 break;
         case UDP_V4_FLOW:
-                switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
-                case 0:
-                        hena &= ~(BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |
-                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4));
-                        break;
-                case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                if (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
+                        if (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)
+                                hena |=
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) |
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP);
+
                         hena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |
                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4));
-                        break;
-                default:
+                } else {
                         return -EINVAL;
                 }
                 break;
         case UDP_V6_FLOW:
-                switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
-                case 0:
-                        hena &= ~(BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |
-                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6));
-                        break;
-                case (RXH_L4_B_0_1 | RXH_L4_B_2_3):
+                if (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {
+                        if (flags & I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)
+                                hena |=
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) |
+                            BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP);
+
                         hena |= (BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |
                                  BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6));
-                        break;
-                default:
+                } else {
                         return -EINVAL;
                 }
                 break;
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 94da913b151d..66964eb6b7de 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -69,6 +69,8 @@ MODULE_DESCRIPTION("Intel(R) XL710 X710 Virtual Function Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
+static struct workqueue_struct *i40evf_wq;
+
 /**
  * i40evf_allocate_dma_mem_d - OS specific memory alloc for shared code
  * @hw:   pointer to the HW structure
@@ -182,7 +184,7 @@ static void i40evf_tx_timeout(struct net_device *netdev)
         if (!(adapter->flags & (I40EVF_FLAG_RESET_PENDING |
                                 I40EVF_FLAG_RESET_NEEDED))) {
                 adapter->flags |= I40EVF_FLAG_RESET_NEEDED;
-                schedule_work(&adapter->reset_task);
+                queue_work(i40evf_wq, &adapter->reset_task);
         }
 }
 
@@ -1032,7 +1034,7 @@ void i40evf_down(struct i40evf_adapter *adapter)
         struct net_device *netdev = adapter->netdev;
         struct i40evf_mac_filter *f;
 
-        if (adapter->state == __I40EVF_DOWN)
+        if (adapter->state <= __I40EVF_DOWN_PENDING)
                 return;
 
         while (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK,
@@ -1122,7 +1124,9 @@ static void i40evf_free_queues(struct i40evf_adapter *adapter)
         if (!adapter->vsi_res)
                 return;
         kfree(adapter->tx_rings);
+        adapter->tx_rings = NULL;
         kfree(adapter->rx_rings);
+        adapter->rx_rings = NULL;
 }
 
 /**
@@ -1454,7 +1458,11 @@ static int i40evf_init_rss(struct i40evf_adapter *adapter)
         int ret;
 
         /* Enable PCTYPES for RSS, TCP/UDP with IPv4/IPv6 */
-        hena = I40E_DEFAULT_RSS_HENA;
+        if (adapter->vf_res->vf_offload_flags &
+                                        I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2)
+                hena = I40E_DEFAULT_RSS_HENA_EXPANDED;
+        else
+                hena = I40E_DEFAULT_RSS_HENA;
         wr32(hw, I40E_VFQF_HENA(0), (u32)hena);
         wr32(hw, I40E_VFQF_HENA(1), (u32)(hena >> 32));
 
@@ -2142,7 +2150,8 @@ static int i40evf_open(struct net_device *netdev)
                 dev_err(&adapter->pdev->dev, "Unable to open device due to PF driver failure.\n");
                 return -EIO;
         }
-        if (adapter->state != __I40EVF_DOWN || adapter->aq_required)
+
+        if (adapter->state != __I40EVF_DOWN)
                 return -EBUSY;
 
         /* allocate transmit descriptors */
@@ -2197,14 +2206,14 @@ static int i40evf_close(struct net_device *netdev)
 {
         struct i40evf_adapter *adapter = netdev_priv(netdev);
 
-        if (adapter->state <= __I40EVF_DOWN)
+        if (adapter->state <= __I40EVF_DOWN_PENDING)
                 return 0;
 
 
         set_bit(__I40E_DOWN, &adapter->vsi.state);
 
         i40evf_down(adapter);
-        adapter->state = __I40EVF_DOWN;
+        adapter->state = __I40EVF_DOWN_PENDING;
         i40evf_free_traffic_irqs(adapter);
 
         return 0;
@@ -2504,8 +2513,11 @@ static void i40evf_init_task(struct work_struct *work)
         if (adapter->vf_res->vf_offload_flags &
                     I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR)
                 adapter->flags |= I40EVF_FLAG_WB_ON_ITR_CAPABLE;
-        if (!RSS_AQ(adapter))
-                i40evf_init_rss(adapter);
+
+        if (adapter->vf_res->vf_offload_flags &
+            I40E_VIRTCHNL_VF_OFFLOAD_WB_ON_ITR)
+                adapter->flags |= I40EVF_FLAG_WB_ON_ITR_CAPABLE;
+
         err = i40evf_request_misc_irq(adapter);
         if (err)
                 goto err_sw_init;
@@ -2885,6 +2897,11 @@ static int __init i40evf_init_module(void)
 
         pr_info("%s\n", i40evf_copyright);
 
+        i40evf_wq = create_singlethread_workqueue(i40evf_driver_name);
+        if (!i40evf_wq) {
+                pr_err("%s: Failed to create workqueue\n", i40evf_driver_name);
+                return -ENOMEM;
+        }
         ret = pci_register_driver(&i40evf_driver);
         return ret;
 }
@@ -2900,6 +2917,7 @@ module_init(i40evf_init_module);
 static void __exit i40evf_exit_module(void)
 {
         pci_unregister_driver(&i40evf_driver);
+        destroy_workqueue(i40evf_wq);
 }
 
 module_exit(i40evf_exit_module);
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index c1c526283757..d3739cc5b608 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -804,6 +804,8 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
         case I40E_VIRTCHNL_OP_DISABLE_QUEUES:
                 i40evf_free_all_tx_resources(adapter);
                 i40evf_free_all_rx_resources(adapter);
+                if (adapter->state == __I40EVF_DOWN_PENDING)
+                        adapter->state = __I40EVF_DOWN;
                 break;
         case I40E_VIRTCHNL_OP_VERSION:
         case I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP: