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-04-06

This series contains updates to i40e and i40evf.

Deepthi adds a debug message to display the MSIx vector count for hardware
capabilities.

Shannon removed the setting of debug_mask at startup to take care of an
issue where all the device capabilities getting printed when we had not
asked for it.  Moved the NVM status out of the admin queue structure,
since it should really stay with the other NVM data structures.

Akeem added the flush routine to the end of the reset flow to avoid
problems in the pass-through routines.

Jesse moves a local variable deeper into the depths of the driver
where the light is low and the context is great.  Then cleaned up
the tx_ring argument since it was not making good arguments.  Improved
performance by not "checking for FCoE" by re-ordering the FCoE checks.

Anjali adds the support for changing a VF from non-trusted to trusted
and vice-versa.

Mitch adds opcodes and structures to support RSS configuration by PF
driver on behalf of the VF driver.  Fixed how the VLAN feature flags
are set.

Kiran added defines for RSS, flow director, flexible payload and IPv6.
====================

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

19 files changed, 311 insertions, 88 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
index df8e2fd6a649..43bb4139d896 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c
@@ -33,16 +33,6 @@
 static void i40e_resume_aq(struct i40e_hw *hw);
 
 /**
- * i40e_is_nvm_update_op - return true if this is an NVM update operation
- * @desc: API request descriptor
- **/
-static inline bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc)
-{
-        return (desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_erase)) ||
-                (desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_update));
-}
-
-/**
  *  i40e_adminq_init_regs - Initialize AdminQ registers
  *  @hw: pointer to the hardware structure
  *
@@ -624,7 +614,7 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)
 
         /* pre-emptive resource lock release */
         i40e_aq_release_resource(hw, I40E_NVM_RESOURCE_ID, 0, NULL);
-        hw->aq.nvm_release_on_done = false;
+        hw->nvm_release_on_done = false;
         hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;
 
         ret_code = i40e_aq_set_hmc_resource_profile(hw,
@@ -1023,26 +1013,7 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw,
         hw->aq.arq.next_to_clean = ntc;
         hw->aq.arq.next_to_use = ntu;
 
-        if (i40e_is_nvm_update_op(&e->desc)) {
-                if (hw->aq.nvm_release_on_done) {
-                        i40e_release_nvm(hw);
-                        hw->aq.nvm_release_on_done = false;
-                }
-
-                switch (hw->nvmupd_state) {
-                case I40E_NVMUPD_STATE_INIT_WAIT:
-                        hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;
-                        break;
-
-                case I40E_NVMUPD_STATE_WRITE_WAIT:
-                        hw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;
-                        break;
-
-                default:
-                        break;
-                }
-        }
-
+        i40e_nvmupd_check_wait_event(hw, le16_to_cpu(e->desc.opcode));
 clean_arq_element_out:
         /* Set pending if needed, unlock and return */
         if (pending)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.h b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
index 12fbbddea299..d92aad38afdc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.h
@@ -97,7 +97,6 @@ struct i40e_adminq_info {
         u32 fw_build;                   /* firmware build number */
         u16 api_maj_ver;                /* api major version */
         u16 api_min_ver;                /* api minor version */
-        bool nvm_release_on_done;
 
         struct mutex asq_mutex; /* Send queue lock */
         struct mutex arq_mutex; /* Receive queue lock */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index ebcc0d3ecbfb..f3c1d8890cbb 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -3080,6 +3080,9 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
                         break;
                 case I40E_AQ_CAP_ID_MSIX:
                         p->num_msix_vectors = number;
+                        i40e_debug(hw, I40E_DEBUG_INIT,
+                                   "HW Capability: MSIX vector count = %d\n",
+                                   p->num_msix_vectors);
                         break;
                 case I40E_AQ_CAP_ID_VF_MSIX:
                         p->num_msix_vectors_vf = number;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_fcoe.c b/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
index 92d2208d13c7..58e6c1570335 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_fcoe.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 - 2015 Intel Corporation.
+ * Copyright(c) 2013 - 2016 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -38,16 +38,6 @@
 #include "i40e_fcoe.h"
 
 /**
- * i40e_rx_is_fcoe - returns true if the rx packet type is FCoE
- * @ptype: the packet type field from rx descriptor write-back
- **/
-static inline bool i40e_rx_is_fcoe(u16 ptype)
-{
-        return (ptype >= I40E_RX_PTYPE_L2_FCOE_PAY3) &&
-               (ptype <= I40E_RX_PTYPE_L2_FCOE_VFT_FCOTHER);
-}
-
-/**
  * i40e_fcoe_sof_is_class2 - returns true if this is a FC Class 2 SOF
  * @sof: the FCoE start of frame delimiter
  **/
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index d6147f899062..dc3b3939dd0a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -46,7 +46,7 @@ static const char i40e_driver_string[] =
 
 #define DRV_VERSION_MAJOR 1
 #define DRV_VERSION_MINOR 5
-#define DRV_VERSION_BUILD 2
+#define DRV_VERSION_BUILD 5
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
              __stringify(DRV_VERSION_MINOR) "." \
              __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -8438,7 +8438,6 @@ static int i40e_sw_init(struct i40e_pf *pf)
 
         pf->msg_enable = netif_msg_init(I40E_DEFAULT_MSG_ENABLE,
                                 (NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK));
-        pf->hw.debug_mask = pf->msg_enable | I40E_DEBUG_DIAG;
         if (debug != -1 && debug != I40E_DEFAULT_MSG_ENABLE) {
                 if (I40E_DEBUG_USER & debug)
                         pf->hw.debug_mask = debug;
@@ -9070,6 +9069,7 @@ static const struct net_device_ops i40e_netdev_ops = {
         .ndo_get_vf_config      = i40e_ndo_get_vf_config,
         .ndo_set_vf_link_state  = i40e_ndo_set_vf_link_state,
         .ndo_set_vf_spoofchk    = i40e_ndo_set_vf_spoofchk,
+        .ndo_set_vf_trust       = i40e_ndo_set_vf_trust,
 #if IS_ENABLED(CONFIG_VXLAN)
         .ndo_add_vxlan_port     = i40e_add_vxlan_port,
         .ndo_del_vxlan_port     = i40e_del_vxlan_port,
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
index 5730f8091e1b..f2cea3d25de3 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
@@ -696,7 +696,7 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,
         i40e_debug(hw, I40E_DEBUG_NVM, "%s state %d nvm_release_on_hold %d cmd 0x%08x config 0x%08x offset 0x%08x data_size 0x%08x\n",
                    i40e_nvm_update_state_str[upd_cmd],
                    hw->nvmupd_state,
-                   hw->aq.nvm_release_on_done,
+                   hw->nvm_release_on_done,
                    cmd->command, cmd->config, cmd->offset, cmd->data_size);
 
         if (upd_cmd == I40E_NVMUPD_INVALID) {
@@ -799,7 +799,7 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,
                         if (status) {
                                 i40e_release_nvm(hw);
                         } else {
-                                hw->aq.nvm_release_on_done = true;
+                                hw->nvm_release_on_done = true;
                                 hw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;
                         }
                 }
@@ -815,7 +815,7 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,
                         if (status) {
                                 i40e_release_nvm(hw);
                         } else {
-                                hw->aq.nvm_release_on_done = true;
+                                hw->nvm_release_on_done = true;
                                 hw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;
                         }
                 }
@@ -849,7 +849,7 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,
                                    -EIO;
                                 i40e_release_nvm(hw);
                         } else {
-                                hw->aq.nvm_release_on_done = true;
+                                hw->nvm_release_on_done = true;
                                 hw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;
                         }
                 }
@@ -953,7 +953,7 @@ retry:
                                    -EIO;
                         hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;
                 } else {
-                        hw->aq.nvm_release_on_done = true;
+                        hw->nvm_release_on_done = true;
                         hw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;
                 }
                 break;
@@ -980,7 +980,7 @@ retry:
                                    -EIO;
                         hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;
                 } else {
-                        hw->aq.nvm_release_on_done = true;
+                        hw->nvm_release_on_done = true;
                         hw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;
                 }
                 break;
@@ -1030,6 +1030,37 @@ retry:
 }
 
 /**
+ * i40e_nvmupd_check_wait_event - handle NVM update operation events
+ * @hw: pointer to the hardware structure
+ * @opcode: the event that just happened
+ **/
+void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, u16 opcode)
+{
+        if (opcode == i40e_aqc_opc_nvm_erase ||
+            opcode == i40e_aqc_opc_nvm_update) {
+                i40e_debug(hw, I40E_DEBUG_NVM,
+                           "NVMUPD: clearing wait on opcode 0x%04x\n", opcode);
+                if (hw->nvm_release_on_done) {
+                        i40e_release_nvm(hw);
+                        hw->nvm_release_on_done = false;
+                }
+
+                switch (hw->nvmupd_state) {
+                case I40E_NVMUPD_STATE_INIT_WAIT:
+                        hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;
+                        break;
+
+                case I40E_NVMUPD_STATE_WRITE_WAIT:
+                        hw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;
+                        break;
+
+                default:
+                        break;
+                }
+        }
+}
+
+/**
  * i40e_nvmupd_validate_command - Validate given command
  * @hw: pointer to hardware structure
  * @cmd: pointer to nvm update command buffer
diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
index d51eee5bf79a..134035f53f2c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
@@ -308,6 +308,7 @@ i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw,
 i40e_status i40e_nvmupd_command(struct i40e_hw *hw,
                                 struct i40e_nvm_access *cmd,
                                 u8 *bytes, int *);
+void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, u16 opcode);
 void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status);
 
 extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 5d5fa5359a1d..29ffed27e5a9 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1703,7 +1703,9 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, const int budget)
                          ? le16_to_cpu(rx_desc->wb.qword0.lo_dword.l2tag1)
                          : 0;
 #ifdef I40E_FCOE
-                if (!i40e_fcoe_handle_offload(rx_ring, rx_desc, skb)) {
+                if (unlikely(
+                    i40e_rx_is_fcoe(rx_ptype) &&
+                    !i40e_fcoe_handle_offload(rx_ring, rx_desc, skb))) {
                         dev_kfree_skb_any(skb);
                         continue;
                 }
@@ -1834,7 +1836,9 @@ static int i40e_clean_rx_irq_1buf(struct i40e_ring *rx_ring, int budget)
                          ? le16_to_cpu(rx_desc->wb.qword0.lo_dword.l2tag1)
                          : 0;
 #ifdef I40E_FCOE
-                if (!i40e_fcoe_handle_offload(rx_ring, rx_desc, skb)) {
+                if (unlikely(
+                    i40e_rx_is_fcoe(rx_ptype) &&
+                    !i40e_fcoe_handle_offload(rx_ring, rx_desc, skb))) {
                         dev_kfree_skb_any(skb);
                         continue;
                 }
@@ -2252,15 +2256,13 @@ out:
 
 /**
  * i40e_tso - set up the tso context descriptor
- * @tx_ring:  ptr to the ring to send
  * @skb:      ptr to the skb we're sending
  * @hdr_len:  ptr to the size of the packet header
  * @cd_type_cmd_tso_mss: Quad Word 1
  *
  * Returns 0 if no TSO can happen, 1 if tso is going, or error
  **/
-static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
-                    u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
+static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
 {
         u64 cd_cmd, cd_tso_len, cd_mss;
         union {
@@ -2408,7 +2410,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
                 unsigned char *hdr;
         } l4;
         unsigned char *exthdr;
-        u32 offset, cmd = 0, tunnel = 0;
+        u32 offset, cmd = 0;
         __be16 frag_off;
         u8 l4_proto = 0;
 
@@ -2422,6 +2424,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
         offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
 
         if (skb->encapsulation) {
+                u32 tunnel = 0;
                 /* define outer network header type */
                 if (*tx_flags & I40E_TX_FLAGS_IPV4) {
                         tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ?
@@ -2931,7 +2934,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
         else if (protocol == htons(ETH_P_IPV6))
                 tx_flags |= I40E_TX_FLAGS_IPV6;
 
-        tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);
+        tso = i40e_tso(skb, &hdr_len, &cd_type_cmd_tso_mss);
 
         if (tso < 0)
                 goto out_drop;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index 9e654e611642..77ccdde56c0c 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -448,4 +448,14 @@ static inline bool i40e_chk_linearize(struct sk_buff *skb, int count)
 
         return __i40e_chk_linearize(skb);
 }
+
+/**
+ * i40e_rx_is_fcoe - returns true if the Rx packet type is FCoE
+ * @ptype: the packet type field from Rx descriptor write-back
+ **/
+static inline bool i40e_rx_is_fcoe(u16 ptype)
+{
+        return (ptype >= I40E_RX_PTYPE_L2_FCOE_PAY3) &&
+               (ptype <= I40E_RX_PTYPE_L2_FCOE_VFT_FCOTHER);
+}
 #endif /* _I40E_TXRX_H_ */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 3335f9d13374..793036b259e5 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -549,6 +549,7 @@ struct i40e_hw {
         enum i40e_nvmupd_state nvmupd_state;
         struct i40e_aq_desc nvm_wb_desc;
         struct i40e_virt_mem nvm_buff;
+        bool nvm_release_on_done;
 
         /* HMC info */
         struct i40e_hmc_info hmc; /* HMC info struct */
@@ -1533,4 +1534,37 @@ struct i40e_lldp_variables {
 
 /* RSS Hash Table Size */
 #define I40E_PFQF_CTL_0_HASHLUTSIZE_512 0x00010000
+
+/* INPUT SET MASK for RSS, flow director, and flexible payload */
+#define I40E_L3_SRC_SHIFT               47
+#define I40E_L3_SRC_MASK                (0x3ULL << I40E_L3_SRC_SHIFT)
+#define I40E_L3_V6_SRC_SHIFT            43
+#define I40E_L3_V6_SRC_MASK             (0xFFULL << I40E_L3_V6_SRC_SHIFT)
+#define I40E_L3_DST_SHIFT               35
+#define I40E_L3_DST_MASK                (0x3ULL << I40E_L3_DST_SHIFT)
+#define I40E_L3_V6_DST_SHIFT            35
+#define I40E_L3_V6_DST_MASK             (0xFFULL << I40E_L3_V6_DST_SHIFT)
+#define I40E_L4_SRC_SHIFT               34
+#define I40E_L4_SRC_MASK                (0x1ULL << I40E_L4_SRC_SHIFT)
+#define I40E_L4_DST_SHIFT               33
+#define I40E_L4_DST_MASK                (0x1ULL << I40E_L4_DST_SHIFT)
+#define I40E_VERIFY_TAG_SHIFT           31
+#define I40E_VERIFY_TAG_MASK            (0x3ULL << I40E_VERIFY_TAG_SHIFT)
+
+#define I40E_FLEX_50_SHIFT              13
+#define I40E_FLEX_50_MASK               (0x1ULL << I40E_FLEX_50_SHIFT)
+#define I40E_FLEX_51_SHIFT              12
+#define I40E_FLEX_51_MASK               (0x1ULL << I40E_FLEX_51_SHIFT)
+#define I40E_FLEX_52_SHIFT              11
+#define I40E_FLEX_52_MASK               (0x1ULL << I40E_FLEX_52_SHIFT)
+#define I40E_FLEX_53_SHIFT              10
+#define I40E_FLEX_53_MASK               (0x1ULL << I40E_FLEX_53_SHIFT)
+#define I40E_FLEX_54_SHIFT              9
+#define I40E_FLEX_54_MASK               (0x1ULL << I40E_FLEX_54_SHIFT)
+#define I40E_FLEX_55_SHIFT              8
+#define I40E_FLEX_55_MASK               (0x1ULL << I40E_FLEX_55_SHIFT)
+#define I40E_FLEX_56_SHIFT              7
+#define I40E_FLEX_56_MASK               (0x1ULL << I40E_FLEX_56_SHIFT)
+#define I40E_FLEX_57_SHIFT              6
+#define I40E_FLEX_57_MASK               (0x1ULL << I40E_FLEX_57_SHIFT)
 #endif /* _I40E_TYPE_H_ */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
index ab866cf3dc18..c92a3bdee229 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
@@ -80,10 +80,15 @@ enum i40e_virtchnl_ops {
         I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE = 14,
         I40E_VIRTCHNL_OP_GET_STATS = 15,
         I40E_VIRTCHNL_OP_FCOE = 16,
-        I40E_VIRTCHNL_OP_EVENT = 17,
+        I40E_VIRTCHNL_OP_EVENT = 17, /* must ALWAYS be 17 */
         I40E_VIRTCHNL_OP_IWARP = 20,
         I40E_VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP = 21,
         I40E_VIRTCHNL_OP_RELEASE_IWARP_IRQ_MAP = 22,
+        I40E_VIRTCHNL_OP_CONFIG_RSS_KEY = 23,
+        I40E_VIRTCHNL_OP_CONFIG_RSS_LUT = 24,
+        I40E_VIRTCHNL_OP_GET_RSS_HENA_CAPS = 25,
+        I40E_VIRTCHNL_OP_SET_RSS_HENA = 26,
+
 };
 
 /* Virtual channel message descriptor. This overlays the admin queue
@@ -157,6 +162,7 @@ struct i40e_virtchnl_vsi_resource {
 #define I40E_VIRTCHNL_VF_OFFLOAD_VLAN           0x00010000
 #define I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING     0x00020000
 #define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2  0x00040000
+#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF         0X00080000
 
 struct i40e_virtchnl_vf_resource {
         u16 num_vsis;
@@ -165,8 +171,8 @@ struct i40e_virtchnl_vf_resource {
         u16 max_mtu;
 
         u32 vf_offload_flags;
-        u32 max_fcoe_contexts;
-        u32 max_fcoe_filters;
+        u32 rss_key_size;
+        u32 rss_lut_size;
 
         struct i40e_virtchnl_vsi_resource vsi_res[1];
 };
@@ -325,6 +331,39 @@ struct i40e_virtchnl_promisc_info {
  * PF replies with struct i40e_eth_stats in an external buffer.
  */
 
+/* I40E_VIRTCHNL_OP_CONFIG_RSS_KEY
+ * I40E_VIRTCHNL_OP_CONFIG_RSS_LUT
+ * VF sends these messages to configure RSS. Only supported if both PF
+ * and VF drivers set the I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF bit during
+ * configuration negotiation. If this is the case, then the RSS fields in
+ * the VF resource struct are valid.
+ * Both the key and LUT are initialized to 0 by the PF, meaning that
+ * RSS is effectively disabled until set up by the VF.
+ */
+struct i40e_virtchnl_rss_key {
+        u16 vsi_id;
+        u16 key_len;
+        u8 key[1];         /* RSS hash key, packed bytes */
+};
+
+struct i40e_virtchnl_rss_lut {
+        u16 vsi_id;
+        u16 lut_entries;
+        u8 lut[1];        /* RSS lookup table*/
+};
+
+/* I40E_VIRTCHNL_OP_GET_RSS_HENA_CAPS
+ * I40E_VIRTCHNL_OP_SET_RSS_HENA
+ * VF sends these messages to get and set the hash filter enable bits for RSS.
+ * By default, the PF sets these to all possible traffic types that the
+ * hardware supports. The VF can query this value if it wants to change the
+ * traffic types that are hashed by the hardware.
+ * Traffic types are defined in the i40e_filter_pctype enum in i40e_type.h
+ */
+struct i40e_virtchnl_rss_hena {
+        u64 hena;
+};
+
 /* I40E_VIRTCHNL_OP_EVENT
  * PF sends this message to inform the VF driver of events that may affect it.
  * No direct response is expected from the VF, though it may generate other
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 9924503c88f5..30f8cbe6b54b 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -941,6 +941,7 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
         reg_idx = (hw->func_caps.vf_base_id + vf->vf_id) / 32;
         bit_idx = (hw->func_caps.vf_base_id + vf->vf_id) % 32;
         wr32(hw, I40E_GLGEN_VFLRSTAT(reg_idx), BIT(bit_idx));
+        i40e_flush(hw);
 
         if (i40e_quiesce_vf_pci(vf))
                 dev_err(&pf->pdev->dev, "VF %d PCI transactions stuck\n",
@@ -1361,8 +1362,16 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg)
                                 I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2;
         }
 
-        if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING)
+        if (vf->driver_caps & I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING) {
+                if (pf->flags & I40E_FLAG_MFP_ENABLED) {
+                        dev_err(&pf->pdev->dev,
+                                "VF %d requested polling mode: this feature is supported only when the device is running in single function per port (SFP) mode\n",
+                                 vf->vf_id);
+                        ret = I40E_ERR_PARAM;
+                        goto err;
+                }
                 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)
@@ -2762,3 +2771,45 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable)
 out:
         return ret;
 }
+
+/**
+ * i40e_ndo_set_vf_trust
+ * @netdev: network interface device structure of the pf
+ * @vf_id: VF identifier
+ * @setting: trust setting
+ *
+ * Enable or disable VF trust setting
+ **/
+int i40e_ndo_set_vf_trust(struct net_device *netdev, int vf_id, bool setting)
+{
+        struct i40e_netdev_priv *np = netdev_priv(netdev);
+        struct i40e_pf *pf = np->vsi->back;
+        struct i40e_vf *vf;
+        int ret = 0;
+
+        /* validate the request */
+        if (vf_id >= pf->num_alloc_vfs) {
+                dev_err(&pf->pdev->dev, "Invalid VF Identifier %d\n", vf_id);
+                return -EINVAL;
+        }
+
+        if (pf->flags & I40E_FLAG_MFP_ENABLED) {
+                dev_err(&pf->pdev->dev, "Trusted VF not supported in MFP mode.\n");
+                return -EINVAL;
+        }
+
+        vf = &pf->vf[vf_id];
+
+        if (!vf)
+                return -EINVAL;
+        if (setting == vf->trusted)
+                goto out;
+
+        vf->trusted = setting;
+        i40e_vc_notify_vf_reset(vf);
+        i40e_reset_vf(vf, false);
+        dev_info(&pf->pdev->dev, "VF %u is now %strusted\n",
+                 vf_id, setting ? "" : "un");
+out:
+        return ret;
+}
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
index e7b2fba0309e..838cbd2299a4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -88,6 +88,7 @@ struct i40e_vf {
         struct i40e_virtchnl_ether_addr default_fcoe_addr;
         u16 port_vlan_id;
         bool pf_set_mac;        /* The VMM admin set the VF MAC address */
+        bool trusted;
 
         /* VSI indices - actual VSI pointers are maintained in the PF structure
          * When assigned, these will be non-zero, because VSI 0 is always
@@ -127,6 +128,7 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev,
                               int vf_id, u16 vlan_id, u8 qos);
 int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int min_tx_rate,
                        int max_tx_rate);
+int i40e_ndo_set_vf_trust(struct net_device *netdev, int vf_id, bool setting);
 int i40e_ndo_get_vf_config(struct net_device *netdev,
                            int vf_id, struct ifla_vf_info *ivi);
 int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link);
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq.h b/drivers/net/ethernet/intel/i40evf/i40e_adminq.h
index a3eae5d9a2bd..1f9b3b5d946d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq.h
@@ -97,7 +97,6 @@ struct i40e_adminq_info {
         u32 fw_build;                   /* firmware build number */
         u16 api_maj_ver;                /* api major version */
         u16 api_min_ver;                /* api minor version */
-        bool nvm_release_on_done;
 
         struct mutex asq_mutex; /* Send queue lock */
         struct mutex arq_mutex; /* Receive queue lock */
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 04aabc52ba0d..0c912a4999db 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1160,7 +1160,9 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, const int budget)
                          ? le16_to_cpu(rx_desc->wb.qword0.lo_dword.l2tag1)
                          : 0;
 #ifdef I40E_FCOE
-                if (!i40e_fcoe_handle_offload(rx_ring, rx_desc, skb)) {
+                if (unlikely(
+                    i40e_rx_is_fcoe(rx_ptype) &&
+                    !i40e_fcoe_handle_offload(rx_ring, rx_desc, skb))) {
                         dev_kfree_skb_any(skb);
                         continue;
                 }
@@ -1519,15 +1521,13 @@ out:
 
 /**
  * i40e_tso - set up the tso context descriptor
- * @tx_ring:  ptr to the ring to send
  * @skb:      ptr to the skb we're sending
  * @hdr_len:  ptr to the size of the packet header
  * @cd_type_cmd_tso_mss: Quad Word 1
  *
  * Returns 0 if no TSO can happen, 1 if tso is going, or error
  **/
-static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
-                    u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
+static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
 {
         u64 cd_cmd, cd_tso_len, cd_mss;
         union {
@@ -1633,7 +1633,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
                 unsigned char *hdr;
         } l4;
         unsigned char *exthdr;
-        u32 offset, cmd = 0, tunnel = 0;
+        u32 offset, cmd = 0;
         __be16 frag_off;
         u8 l4_proto = 0;
 
@@ -1647,6 +1647,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
         offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
 
         if (skb->encapsulation) {
+                u32 tunnel = 0;
                 /* define outer network header type */
                 if (*tx_flags & I40E_TX_FLAGS_IPV4) {
                         tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ?
@@ -2149,7 +2150,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
         else if (protocol == htons(ETH_P_IPV6))
                 tx_flags |= I40E_TX_FLAGS_IPV6;
 
-        tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);
+        tso = i40e_tso(skb, &hdr_len, &cd_type_cmd_tso_mss);
 
         if (tso < 0)
                 goto out_drop;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
index 3ec0ea5ea3db..84c28aa64fdf 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
@@ -430,4 +430,14 @@ static inline bool i40e_chk_linearize(struct sk_buff *skb, int count)
 
         return __i40evf_chk_linearize(skb);
 }
+
+/**
+ * i40e_rx_is_fcoe - returns true if the Rx packet type is FCoE
+ * @ptype: the packet type field from Rx descriptor write-back
+ **/
+static inline bool i40e_rx_is_fcoe(u16 ptype)
+{
+        return (ptype >= I40E_RX_PTYPE_L2_FCOE_PAY3) &&
+               (ptype <= I40E_RX_PTYPE_L2_FCOE_VFT_FCOTHER);
+}
 #endif /* _I40E_TXRX_H_ */
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index 301fe2b6dd03..4a78c18e0b7b 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -522,6 +522,7 @@ struct i40e_hw {
         enum i40e_nvmupd_state nvmupd_state;
         struct i40e_aq_desc nvm_wb_desc;
         struct i40e_virt_mem nvm_buff;
+        bool nvm_release_on_done;
 
         /* HMC info */
         struct i40e_hmc_info hmc; /* HMC info struct */
@@ -1329,4 +1330,46 @@ enum i40e_reset_type {
 
 /* RSS Hash Table Size */
 #define I40E_PFQF_CTL_0_HASHLUTSIZE_512 0x00010000
+
+/* INPUT SET MASK for RSS, flow director and flexible payload */
+#define I40E_FD_INSET_L3_SRC_SHIFT              47
+#define I40E_FD_INSET_L3_SRC_WORD_MASK          (0x3ULL << \
+                                                 I40E_FD_INSET_L3_SRC_SHIFT)
+#define I40E_FD_INSET_L3_DST_SHIFT              35
+#define I40E_FD_INSET_L3_DST_WORD_MASK          (0x3ULL << \
+                                                 I40E_FD_INSET_L3_DST_SHIFT)
+#define I40E_FD_INSET_L4_SRC_SHIFT              34
+#define I40E_FD_INSET_L4_SRC_WORD_MASK          (0x1ULL << \
+                                                 I40E_FD_INSET_L4_SRC_SHIFT)
+#define I40E_FD_INSET_L4_DST_SHIFT              33
+#define I40E_FD_INSET_L4_DST_WORD_MASK          (0x1ULL << \
+                                                 I40E_FD_INSET_L4_DST_SHIFT)
+#define I40E_FD_INSET_VERIFY_TAG_SHIFT          31
+#define I40E_FD_INSET_VERIFY_TAG_WORD_MASK      (0x3ULL << \
+                                                 I40E_FD_INSET_VERIFY_TAG_SHIFT)
+
+#define I40E_FD_INSET_FLEX_WORD50_SHIFT         17
+#define I40E_FD_INSET_FLEX_WORD50_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD50_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD51_SHIFT         16
+#define I40E_FD_INSET_FLEX_WORD51_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD51_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD52_SHIFT         15
+#define I40E_FD_INSET_FLEX_WORD52_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD52_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD53_SHIFT         14
+#define I40E_FD_INSET_FLEX_WORD53_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD53_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD54_SHIFT         13
+#define I40E_FD_INSET_FLEX_WORD54_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD54_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD55_SHIFT         12
+#define I40E_FD_INSET_FLEX_WORD55_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD55_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD56_SHIFT         11
+#define I40E_FD_INSET_FLEX_WORD56_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD56_SHIFT)
+#define I40E_FD_INSET_FLEX_WORD57_SHIFT         10
+#define I40E_FD_INSET_FLEX_WORD57_MASK          (0x1ULL << \
+                                        I40E_FD_INSET_FLEX_WORD57_SHIFT)
 #endif /* _I40E_TYPE_H_ */
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h b/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
index 3b9d2037456c..f04ce6cb70dc 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
@@ -80,7 +80,12 @@ enum i40e_virtchnl_ops {
         I40E_VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE = 14,
         I40E_VIRTCHNL_OP_GET_STATS = 15,
         I40E_VIRTCHNL_OP_FCOE = 16,
-        I40E_VIRTCHNL_OP_EVENT = 17,
+        I40E_VIRTCHNL_OP_EVENT = 17, /* must ALWAYS be 17 */
+        I40E_VIRTCHNL_OP_CONFIG_RSS_KEY = 23,
+        I40E_VIRTCHNL_OP_CONFIG_RSS_LUT = 24,
+        I40E_VIRTCHNL_OP_GET_RSS_HENA_CAPS = 25,
+        I40E_VIRTCHNL_OP_SET_RSS_HENA = 26,
+
 };
 
 /* Virtual channel message descriptor. This overlays the admin queue
@@ -154,6 +159,7 @@ struct i40e_virtchnl_vsi_resource {
 #define I40E_VIRTCHNL_VF_OFFLOAD_VLAN           0x00010000
 #define I40E_VIRTCHNL_VF_OFFLOAD_RX_POLLING     0x00020000
 #define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2  0x00040000
+#define I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF         0X00080000
 
 struct i40e_virtchnl_vf_resource {
         u16 num_vsis;
@@ -162,8 +168,8 @@ struct i40e_virtchnl_vf_resource {
         u16 max_mtu;
 
         u32 vf_offload_flags;
-        u32 max_fcoe_contexts;
-        u32 max_fcoe_filters;
+        u32 rss_key_size;
+        u32 rss_lut_size;
 
         struct i40e_virtchnl_vsi_resource vsi_res[1];
 };
@@ -322,6 +328,39 @@ struct i40e_virtchnl_promisc_info {
  * PF replies with struct i40e_eth_stats in an external buffer.
  */
 
+/* I40E_VIRTCHNL_OP_CONFIG_RSS_KEY
+ * I40E_VIRTCHNL_OP_CONFIG_RSS_LUT
+ * VF sends these messages to configure RSS. Only supported if both PF
+ * and VF drivers set the I40E_VIRTCHNL_VF_OFFLOAD_RSS_PF bit during
+ * configuration negotiation. If this is the case, then the RSS fields in
+ * the VF resource struct are valid.
+ * Both the key and LUT are initialized to 0 by the PF, meaning that
+ * RSS is effectively disabled until set up by the VF.
+ */
+struct i40e_virtchnl_rss_key {
+        u16 vsi_id;
+        u16 key_len;
+        u8 key[1];         /* RSS hash key, packed bytes */
+};
+
+struct i40e_virtchnl_rss_lut {
+        u16 vsi_id;
+        u16 lut_entries;
+        u8 lut[1];        /* RSS lookup table*/
+};
+
+/* I40E_VIRTCHNL_OP_GET_RSS_HENA_CAPS
+ * I40E_VIRTCHNL_OP_SET_RSS_HENA
+ * VF sends these messages to get and set the hash filter enable bits for RSS.
+ * By default, the PF sets these to all possible traffic types that the
+ * hardware supports. The VF can query this value if it wants to change the
+ * traffic types that are hashed by the hardware.
+ * Traffic types are defined in the i40e_filter_pctype enum in i40e_type.h
+ */
+struct i40e_virtchnl_rss_hena {
+        u64 hena;
+};
+
 /* I40E_VIRTCHNL_OP_EVENT
  * PF sends this message to inform the VF driver of events that may affect it.
  * No direct response is expected from the VF, though it may generate other
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index f4dada02bbcf..9110319a8f00 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -38,7 +38,7 @@ static const char i40evf_driver_string[] =
 
 #define DRV_VERSION_MAJOR 1
 #define DRV_VERSION_MINOR 5
-#define DRV_VERSION_BUILD 2
+#define DRV_VERSION_BUILD 5
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
              __stringify(DRV_VERSION_MINOR) "." \
              __stringify(DRV_VERSION_BUILD) \
@@ -2323,29 +2323,20 @@ static int i40evf_check_reset_complete(struct i40e_hw *hw)
  **/
 int i40evf_process_config(struct i40evf_adapter *adapter)
 {
+        struct i40e_virtchnl_vf_resource *vfres = adapter->vf_res;
         struct net_device *netdev = adapter->netdev;
         int i;
 
         /* got VF config message back from PF, now we can parse it */
-        for (i = 0; i < adapter->vf_res->num_vsis; i++) {
-                if (adapter->vf_res->vsi_res[i].vsi_type == I40E_VSI_SRIOV)
-                        adapter->vsi_res = &adapter->vf_res->vsi_res[i];
+        for (i = 0; i < vfres->num_vsis; i++) {
+                if (vfres->vsi_res[i].vsi_type == I40E_VSI_SRIOV)
+                        adapter->vsi_res = &vfres->vsi_res[i];
         }
         if (!adapter->vsi_res) {
                 dev_err(&adapter->pdev->dev, "No LAN VSI found\n");
                 return -ENODEV;
         }
 
-        if (adapter->vf_res->vf_offload_flags
-            & I40E_VIRTCHNL_VF_OFFLOAD_VLAN) {
-                netdev->vlan_features = netdev->features &
-                                        ~(NETIF_F_HW_VLAN_CTAG_TX |
-                                          NETIF_F_HW_VLAN_CTAG_RX |
-                                          NETIF_F_HW_VLAN_CTAG_FILTER);
-                netdev->features |= NETIF_F_HW_VLAN_CTAG_TX |
-                                    NETIF_F_HW_VLAN_CTAG_RX |
-                                    NETIF_F_HW_VLAN_CTAG_FILTER;
-        }
         netdev->features |= NETIF_F_HIGHDMA |
                             NETIF_F_SG |
                             NETIF_F_IP_CSUM |
@@ -2354,7 +2345,7 @@ int i40evf_process_config(struct i40evf_adapter *adapter)
                             NETIF_F_TSO |
                             NETIF_F_TSO6 |
                             NETIF_F_TSO_ECN |
-                            NETIF_F_GSO_GRE            |
+                            NETIF_F_GSO_GRE |
                             NETIF_F_GSO_UDP_TUNNEL |
                             NETIF_F_RXCSUM |
                             NETIF_F_GRO;
@@ -2371,9 +2362,15 @@ int i40evf_process_config(struct i40evf_adapter *adapter)
         if (adapter->flags & I40EVF_FLAG_OUTER_UDP_CSUM_CAPABLE)
                 netdev->features |= NETIF_F_GSO_UDP_TUNNEL_CSUM;
 
+        /* always clear VLAN features because they can change at every reset */
+        netdev->features &= ~(I40EVF_VLAN_FEATURES);
         /* copy netdev features into list of user selectable features */
         netdev->hw_features |= netdev->features;
-        netdev->hw_features &= ~NETIF_F_RXCSUM;
+
+        if (vfres->vf_offload_flags & I40E_VIRTCHNL_VF_OFFLOAD_VLAN) {
+                netdev->vlan_features = netdev->features;
+                netdev->features |= I40EVF_VLAN_FEATURES;
+        }
 
         adapter->vsi.id = adapter->vsi_res->vsi_id;