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

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-04-14

This series contains updates to i40e and i40evf.

Mitch provides a fix for i40e, where VFs were gone and the associated
VSI's had been removed and the rings were not stopped, which in some
circumstances cased memory corruption or DMAR errors.  So stop all the
rings associated with each VF before releasing its resources.  Also
cleaned up a poorly indented piece of code.  Fixes VF link state, where
VF devices were assuming link is up unless told otherwise, which means
that VFs instantiated on a PF with no link, would report the wrong state.

Anjali adds support to add Flow director Sideband rules for a VF from it's
PF.  Fixes a recently discovered hardware issue, where after a VFLR
hardware might be indicating to us a reset completion little too early, so
wait another 10 msec for cache to be cleaned up.

Jesse enables the user to dump the internal hardware state for better
debugging by allowing a bash script to acquire information about the
internal hardware state.  The data output to the kernel log is collected
by the script and can then be sent to Intel.  Also fixed a possible
failure path to allocate memory that was found by smatch.  Cleaned up
unused local variables.
====================

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

13 files changed, 304 insertions, 163 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index d596f6624025..0bae22da014d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -2397,6 +2397,7 @@ i40e_aq_erase_nvm_exit:
 #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
@@ -2541,11 +2542,18 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff,
                         p->fd_filters_guaranteed = number;
                         p->fd_filters_best_effort = logical_id;
                         break;
+                case I40E_DEV_FUNC_CAP_WR_CSR_PROT:
+                        p->wr_csr_prot = (u64)number;
+                        p->wr_csr_prot |= (u64)logical_id << 32;
+                        break;
                 default:
                         break;
                 }
         }
 
+        if (p->fcoe)
+                i40e_debug(hw, I40E_DEBUG_ALL, "device is FCoE capable\n");
+
         /* Software override ensuring FCoE is disabled if npar or mfp
          * mode because it is not supported in these modes.
          */
@@ -3503,6 +3511,63 @@ void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status)
 }
 
 /**
+ * i40e_aq_debug_dump
+ * @hw: pointer to the hardware structure
+ * @cluster_id: specific cluster to dump
+ * @table_id: table id within cluster
+ * @start_index: index of line in the block to read
+ * @buff_size: dump buffer size
+ * @buff: dump buffer
+ * @ret_buff_size: actual buffer size returned
+ * @ret_next_table: next block to read
+ * @ret_next_index: next index to read
+ *
+ * Dump internal FW/HW data for debug purposes.
+ *
+ **/
+i40e_status i40e_aq_debug_dump(struct i40e_hw *hw, u8 cluster_id,
+                               u8 table_id, u32 start_index, u16 buff_size,
+                               void *buff, u16 *ret_buff_size,
+                               u8 *ret_next_table, u32 *ret_next_index,
+                               struct i40e_asq_cmd_details *cmd_details)
+{
+        struct i40e_aq_desc desc;
+        struct i40e_aqc_debug_dump_internals *cmd =
+                (struct i40e_aqc_debug_dump_internals *)&desc.params.raw;
+        struct i40e_aqc_debug_dump_internals *resp =
+                (struct i40e_aqc_debug_dump_internals *)&desc.params.raw;
+        i40e_status status;
+
+        if (buff_size == 0 || !buff)
+                return I40E_ERR_PARAM;
+
+        i40e_fill_default_direct_cmd_desc(&desc,
+                                          i40e_aqc_opc_debug_dump_internals);
+        /* Indirect Command */
+        desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);
+        if (buff_size > I40E_AQ_LARGE_BUF)
+                desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);
+
+        cmd->cluster_id = cluster_id;
+        cmd->table_id = table_id;
+        cmd->idx = cpu_to_le32(start_index);
+
+        desc.datalen = cpu_to_le16(buff_size);
+
+        status = i40e_asq_send_command(hw, &desc, buff, buff_size, cmd_details);
+        if (!status) {
+                if (ret_buff_size)
+                        *ret_buff_size = le16_to_cpu(desc.datalen);
+                if (ret_next_table)
+                        *ret_next_table = resp->table_id;
+                if (ret_next_index)
+                        *ret_next_index = le32_to_cpu(resp->idx);
+        }
+
+        return status;
+}
+
+/**
  * i40e_read_bw_from_alt_ram
  * @hw: pointer to the hardware structure
  * @max_bw: pointer for max_bw read
diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
index 6e1466756760..2547aa21b2ca 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c
@@ -419,7 +419,7 @@ static void i40e_cee_to_dcb_v1_config(
 {
         u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status);
         u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);
-        u8 i, tc, err, sync, oper;
+        u8 i, tc, err;
 
         /* CEE PG data to ETS config */
         dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;
@@ -456,9 +456,7 @@ static void i40e_cee_to_dcb_v1_config(
         status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >>
                   I40E_AQC_CEE_APP_STATUS_SHIFT;
         err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;
-        sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;
-        oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;
-        /* Add APPs if Error is False and Oper/Sync is True */
+        /* Add APPs if Error is False */
         if (!err) {
                 /* CEE operating configuration supports FCoE/iSCSI/FIP only */
                 dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index daa88263af66..34170eabca7d 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -1388,6 +1388,50 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
                                          r_cfg->app[i].selector,
                                          r_cfg->app[i].protocolid);
                         }
+                } else if (strncmp(&cmd_buf[5], "debug fwdata", 12) == 0) {
+                        int cluster_id, table_id;
+                        int index, ret;
+                        u16 buff_len = 4096;
+                        u32 next_index;
+                        u8 next_table;
+                        u8 *buff;
+                        u16 rlen;
+
+                        cnt = sscanf(&cmd_buf[18], "%i %i %i",
+                                     &cluster_id, &table_id, &index);
+                        if (cnt != 3) {
+                                dev_info(&pf->pdev->dev,
+                                         "dump debug fwdata <cluster_id> <table_id> <index>\n");
+                                goto command_write_done;
+                        }
+
+                        dev_info(&pf->pdev->dev,
+                                 "AQ debug dump fwdata params %x %x %x %x\n",
+                                 cluster_id, table_id, index, buff_len);
+                        buff = kzalloc(buff_len, GFP_KERNEL);
+                        if (!buff)
+                                goto command_write_done;
+
+                        ret = i40e_aq_debug_dump(&pf->hw, cluster_id, table_id,
+                                                 index, buff_len, buff, &rlen,
+                                                 &next_table, &next_index,
+                                                 NULL);
+                        if (ret) {
+                                dev_info(&pf->pdev->dev,
+                                         "debug dump fwdata AQ Failed %d 0x%x\n",
+                                         ret, pf->hw.aq.asq_last_status);
+                                kfree(buff);
+                                buff = NULL;
+                                goto command_write_done;
+                        }
+                        dev_info(&pf->pdev->dev,
+                                 "AQ debug dump fwdata rlen=0x%x next_table=0x%x next_index=0x%x\n",
+                                 rlen, next_table, next_index);
+                        print_hex_dump(KERN_INFO, "AQ buffer WB: ",
+                                       DUMP_PREFIX_OFFSET, 16, 1,
+                                       buff, rlen, true);
+                        kfree(buff);
+                        buff = NULL;
                 } else {
                         dev_info(&pf->pdev->dev,
                                  "dump desc tx <vsi_seid> <ring_id> [<desc_n>], dump desc rx <vsi_seid> <ring_id> [<desc_n>],\n");
@@ -1903,6 +1947,7 @@ static ssize_t i40e_dbg_command_write(struct file *filp,
                 dev_info(&pf->pdev->dev, "  dump desc rx <vsi_seid> <ring_id> [<desc_n>]\n");
                 dev_info(&pf->pdev->dev, "  dump desc aq\n");
                 dev_info(&pf->pdev->dev, "  dump reset stats\n");
+                dev_info(&pf->pdev->dev, "  dump debug fwdata <cluster_id> <table_id> <index>\n");
                 dev_info(&pf->pdev->dev, "  msg_enable [level]\n");
                 dev_info(&pf->pdev->dev, "  read <reg>\n");
                 dev_info(&pf->pdev->dev, "  write <reg> <value>\n");
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index c848b1862512..4cbaaeb902c4 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -356,8 +356,7 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
         /* Set speed and duplex */
         switch (link_speed) {
         case I40E_LINK_SPEED_40GB:
-                /* need a SPEED_40000 in ethtool.h */
-                ethtool_cmd_speed_set(ecmd, 40000);
+                ethtool_cmd_speed_set(ecmd, SPEED_40000);
                 break;
         case I40E_LINK_SPEED_20GB:
                 ethtool_cmd_speed_set(ecmd, SPEED_20000);
@@ -1914,6 +1913,16 @@ static int i40e_get_ethtool_fdir_entry(struct i40e_pf *pf,
         else
                 fsp->ring_cookie = rule->q_index;
 
+        if (rule->dest_vsi != pf->vsi[pf->lan_vsi]->id) {
+                struct i40e_vsi *vsi;
+
+                vsi = i40e_find_vsi_from_id(pf, rule->dest_vsi);
+                if (vsi && vsi->type == I40E_VSI_SRIOV) {
+                        fsp->h_ext.data[1] = htonl(vsi->vf_id);
+                        fsp->m_ext.data[1] = htonl(0x1);
+                }
+        }
+
         return 0;
 }
 
@@ -2207,6 +2216,7 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
         struct i40e_fdir_filter *input;
         struct i40e_pf *pf;
         int ret = -EINVAL;
+        u16 vf_id;
 
         if (!vsi)
                 return -EINVAL;
@@ -2267,7 +2277,22 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
         input->dst_ip[0] = fsp->h_u.tcp_ip4_spec.ip4src;
         input->src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;
 
+        if (ntohl(fsp->m_ext.data[1])) {
+                if (ntohl(fsp->h_ext.data[1]) >= pf->num_alloc_vfs) {
+                        netif_info(pf, drv, vsi->netdev, "Invalid VF id\n");
+                        goto free_input;
+                }
+                vf_id = ntohl(fsp->h_ext.data[1]);
+                /* Find vsi id from vf id and override dest vsi */
+                input->dest_vsi = pf->vf[vf_id].lan_vsi_id;
+                if (input->q_index >= pf->vf[vf_id].num_queue_pairs) {
+                        netif_info(pf, drv, vsi->netdev, "Invalid queue id\n");
+                        goto free_input;
+                }
+        }
+
         ret = i40e_add_del_fdir(vsi, input, true);
+free_input:
         if (ret)
                 kfree(input);
         else
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 63de3f4b7a94..24481cd7e59a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] =
 
 #define DRV_VERSION_MAJOR 1
 #define DRV_VERSION_MINOR 3
-#define DRV_VERSION_BUILD 1
+#define DRV_VERSION_BUILD 2
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
              __stringify(DRV_VERSION_MINOR) "." \
              __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -7301,7 +7301,7 @@ err_out:
  * i40e_init_interrupt_scheme - Determine proper interrupt scheme
  * @pf: board private structure to initialize
  **/
-static void i40e_init_interrupt_scheme(struct i40e_pf *pf)
+static int i40e_init_interrupt_scheme(struct i40e_pf *pf)
 {
         int vectors = 0;
         ssize_t size;
@@ -7343,11 +7343,17 @@ static void i40e_init_interrupt_scheme(struct i40e_pf *pf)
         /* set up vector assignment tracking */
         size = sizeof(struct i40e_lump_tracking) + (sizeof(u16) * vectors);
         pf->irq_pile = kzalloc(size, GFP_KERNEL);
+        if (!pf->irq_pile) {
+                dev_err(&pf->pdev->dev, "error allocating irq_pile memory\n");
+                return -ENOMEM;
+        }
         pf->irq_pile->num_entries = vectors;
         pf->irq_pile->search_hint = 0;
 
-        /* track first vector for misc interrupts */
+        /* track first vector for misc interrupts, ignore return */
         (void)i40e_get_lump(pf, pf->irq_pile, 1, I40E_PILE_VALID_BIT - 1);
+
+        return 0;
 }
 
 /**
@@ -9827,7 +9833,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* set up the main switch operations */
         i40e_determine_queue_usage(pf);
-        i40e_init_interrupt_scheme(pf);
+        err = i40e_init_interrupt_scheme(pf);
+        if (err)
+                goto err_switch_setup;
 
         /* The number of VSIs reported by the FW is the minimum guaranteed
          * to us; HW supports far more and we share the remaining pool with
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
index e49acd2accd3..554e49d02683 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c
@@ -821,13 +821,12 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,
                                                  int *errno)
 {
         enum i40e_nvmupd_cmd upd_cmd;
-        u8 transaction, module;
+        u8 transaction;
 
         /* anything that doesn't match a recognized case is an error */
         upd_cmd = I40E_NVMUPD_INVALID;
 
         transaction = i40e_nvmupd_get_transaction(cmd->config);
-        module = i40e_nvmupd_get_module(cmd->config);
 
         /* limits on data size */
         if ((cmd->data_size < 1) ||
diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
index fea0d37ecc72..7b34f1e660ea 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h
@@ -303,4 +303,9 @@ i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw,
                                 u16 vsi_seid, u16 queue, bool is_add,
                                 struct i40e_control_filter_stats *stats,
                                 struct i40e_asq_cmd_details *cmd_details);
+i40e_status i40e_aq_debug_dump(struct i40e_hw *hw, u8 cluster_id,
+                               u8 table_id, u32 start_index, u16 buff_size,
+                               void *buff, u16 *ret_buff_size,
+                               u8 *ret_next_table, u32 *ret_next_index,
+                               struct i40e_asq_cmd_details *cmd_details);
 #endif /* _I40E_PROTOTYPE_H_ */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 67c7bc9e9c21..568e855da0f3 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -242,6 +242,7 @@ struct i40e_hw_capabilities {
         u8 rx_buf_chain_len;
         u32 enabled_tcmap;
         u32 maxtc;
+        u64 wr_csr_prot;
 };
 
 struct i40e_mac_info {
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index 4d69e1f04901..78d1c4ff565e 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -26,6 +26,129 @@
 
 #include "i40e.h"
 
+/*********************notification routines***********************/
+
+/**
+ * i40e_vc_vf_broadcast
+ * @pf: pointer to the PF structure
+ * @opcode: operation code
+ * @retval: return value
+ * @msg: pointer to the msg buffer
+ * @msglen: msg length
+ *
+ * send a message to all VFs on a given PF
+ **/
+static void i40e_vc_vf_broadcast(struct i40e_pf *pf,
+                                 enum i40e_virtchnl_ops v_opcode,
+                                 i40e_status v_retval, u8 *msg,
+                                 u16 msglen)
+{
+        struct i40e_hw *hw = &pf->hw;
+        struct i40e_vf *vf = pf->vf;
+        int i;
+
+        for (i = 0; i < pf->num_alloc_vfs; i++, vf++) {
+                int abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;
+                /* Not all vfs are enabled so skip the ones that are not */
+                if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states) &&
+                    !test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))
+                        continue;
+
+                /* Ignore return value on purpose - a given VF may fail, but
+                 * we need to keep going and send to all of them
+                 */
+                i40e_aq_send_msg_to_vf(hw, abs_vf_id, v_opcode, v_retval,
+                                       msg, msglen, NULL);
+        }
+}
+
+/**
+ * i40e_vc_notify_link_state
+ * @vf: pointer to the VF structure
+ *
+ * send a link status message to a single VF
+ **/
+static void i40e_vc_notify_vf_link_state(struct i40e_vf *vf)
+{
+        struct i40e_virtchnl_pf_event pfe;
+        struct i40e_pf *pf = vf->pf;
+        struct i40e_hw *hw = &pf->hw;
+        struct i40e_link_status *ls = &pf->hw.phy.link_info;
+        int abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;
+
+        pfe.event = I40E_VIRTCHNL_EVENT_LINK_CHANGE;
+        pfe.severity = I40E_PF_EVENT_SEVERITY_INFO;
+        if (vf->link_forced) {
+                pfe.event_data.link_event.link_status = vf->link_up;
+                pfe.event_data.link_event.link_speed =
+                        (vf->link_up ? I40E_LINK_SPEED_40GB : 0);
+        } else {
+                pfe.event_data.link_event.link_status =
+                        ls->link_info & I40E_AQ_LINK_UP;
+                pfe.event_data.link_event.link_speed = ls->link_speed;
+        }
+        i40e_aq_send_msg_to_vf(hw, abs_vf_id, I40E_VIRTCHNL_OP_EVENT,
+                               0, (u8 *)&pfe, sizeof(pfe), NULL);
+}
+
+/**
+ * i40e_vc_notify_link_state
+ * @pf: pointer to the PF structure
+ *
+ * send a link status message to all VFs on a given PF
+ **/
+void i40e_vc_notify_link_state(struct i40e_pf *pf)
+{
+        int i;
+
+        for (i = 0; i < pf->num_alloc_vfs; i++)
+                i40e_vc_notify_vf_link_state(&pf->vf[i]);
+}
+
+/**
+ * i40e_vc_notify_reset
+ * @pf: pointer to the PF structure
+ *
+ * indicate a pending reset to all VFs on a given PF
+ **/
+void i40e_vc_notify_reset(struct i40e_pf *pf)
+{
+        struct i40e_virtchnl_pf_event pfe;
+
+        pfe.event = I40E_VIRTCHNL_EVENT_RESET_IMPENDING;
+        pfe.severity = I40E_PF_EVENT_SEVERITY_CERTAIN_DOOM;
+        i40e_vc_vf_broadcast(pf, I40E_VIRTCHNL_OP_EVENT, 0,
+                             (u8 *)&pfe, sizeof(struct i40e_virtchnl_pf_event));
+}
+
+/**
+ * i40e_vc_notify_vf_reset
+ * @vf: pointer to the VF structure
+ *
+ * indicate a pending reset to the given VF
+ **/
+void i40e_vc_notify_vf_reset(struct i40e_vf *vf)
+{
+        struct i40e_virtchnl_pf_event pfe;
+        int abs_vf_id;
+
+        /* validate the request */
+        if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs)
+                return;
+
+        /* verify if the VF is in either init or active before proceeding */
+        if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states) &&
+            !test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))
+                return;
+
+        abs_vf_id = vf->vf_id + vf->pf->hw.func_caps.vf_base_id;
+
+        pfe.event = I40E_VIRTCHNL_EVENT_RESET_IMPENDING;
+        pfe.severity = I40E_PF_EVENT_SEVERITY_CERTAIN_DOOM;
+        i40e_aq_send_msg_to_vf(&vf->pf->hw, abs_vf_id, I40E_VIRTCHNL_OP_EVENT,
+                               0, (u8 *)&pfe,
+                               sizeof(struct i40e_virtchnl_pf_event), NULL);
+}
 /***********************misc routines*****************************/
 
 /**
@@ -689,6 +812,9 @@ void i40e_reset_vf(struct i40e_vf *vf, bool flr)
                 }
         }
 
+        if (flr)
+                usleep_range(10000, 20000);
+
         if (!rsd)
                 dev_err(&pf->pdev->dev, "VF reset check timeout on VF %d\n",
                         vf->vf_id);
@@ -733,6 +859,11 @@ void i40e_free_vfs(struct i40e_pf *pf)
         while (test_and_set_bit(__I40E_VF_DISABLE, &pf->state))
                 usleep_range(1000, 2000);
 
+        for (i = 0; i < pf->num_alloc_vfs; i++)
+                if (test_bit(I40E_VF_STAT_INIT, &pf->vf[i].vf_states))
+                        i40e_vsi_control_rings(pf->vsi[pf->vf[i].lan_vsi_idx],
+                                               false);
+
         /* Disable IOV before freeing resources. This lets any VF drivers
          * running in the host get themselves cleaned up before we yank
          * the carpet out from underneath their feet.
@@ -1762,6 +1893,7 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, u16 vf_id, u32 v_opcode,
                 break;
         case I40E_VIRTCHNL_OP_ENABLE_QUEUES:
                 ret = i40e_vc_enable_queues_msg(vf, msg, msglen);
+                i40e_vc_notify_vf_link_state(vf);
                 break;
         case I40E_VIRTCHNL_OP_DISABLE_QUEUES:
                 ret = i40e_vc_disable_queues_msg(vf, msg, msglen);
@@ -1835,118 +1967,6 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf)
 }
 
 /**
- * i40e_vc_vf_broadcast
- * @pf: pointer to the PF structure
- * @opcode: operation code
- * @retval: return value
- * @msg: pointer to the msg buffer
- * @msglen: msg length
- *
- * send a message to all VFs on a given PF
- **/
-static void i40e_vc_vf_broadcast(struct i40e_pf *pf,
-                                 enum i40e_virtchnl_ops v_opcode,
-                                 i40e_status v_retval, u8 *msg,
-                                 u16 msglen)
-{
-        struct i40e_hw *hw = &pf->hw;
-        struct i40e_vf *vf = pf->vf;
-        int i;
-
-        for (i = 0; i < pf->num_alloc_vfs; i++, vf++) {
-                int abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;
-                /* Not all VFs are enabled so skip the ones that are not */
-                if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states) &&
-                    !test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))
-                        continue;
-
-                /* Ignore return value on purpose - a given VF may fail, but
-                 * we need to keep going and send to all of them
-                 */
-                i40e_aq_send_msg_to_vf(hw, abs_vf_id, v_opcode, v_retval,
-                                       msg, msglen, NULL);
-        }
-}
-
-/**
- * i40e_vc_notify_link_state
- * @pf: pointer to the PF structure
- *
- * send a link status message to all VFs on a given PF
- **/
-void i40e_vc_notify_link_state(struct i40e_pf *pf)
-{
-        struct i40e_virtchnl_pf_event pfe;
-        struct i40e_hw *hw = &pf->hw;
-        struct i40e_vf *vf = pf->vf;
-        struct i40e_link_status *ls = &pf->hw.phy.link_info;
-        int i;
-
-        pfe.event = I40E_VIRTCHNL_EVENT_LINK_CHANGE;
-        pfe.severity = I40E_PF_EVENT_SEVERITY_INFO;
-        for (i = 0; i < pf->num_alloc_vfs; i++, vf++) {
-                int abs_vf_id = vf->vf_id + hw->func_caps.vf_base_id;
-                if (vf->link_forced) {
-                        pfe.event_data.link_event.link_status = vf->link_up;
-                        pfe.event_data.link_event.link_speed =
-                                (vf->link_up ? I40E_LINK_SPEED_40GB : 0);
-                } else {
-                        pfe.event_data.link_event.link_status =
-                                ls->link_info & I40E_AQ_LINK_UP;
-                        pfe.event_data.link_event.link_speed = ls->link_speed;
-                }
-                i40e_aq_send_msg_to_vf(hw, abs_vf_id, I40E_VIRTCHNL_OP_EVENT,
-                                       0, (u8 *)&pfe, sizeof(pfe),
-                                       NULL);
-        }
-}
-
-/**
- * i40e_vc_notify_reset
- * @pf: pointer to the PF structure
- *
- * indicate a pending reset to all VFs on a given PF
- **/
-void i40e_vc_notify_reset(struct i40e_pf *pf)
-{
-        struct i40e_virtchnl_pf_event pfe;
-
-        pfe.event = I40E_VIRTCHNL_EVENT_RESET_IMPENDING;
-        pfe.severity = I40E_PF_EVENT_SEVERITY_CERTAIN_DOOM;
-        i40e_vc_vf_broadcast(pf, I40E_VIRTCHNL_OP_EVENT, I40E_SUCCESS,
-                             (u8 *)&pfe, sizeof(struct i40e_virtchnl_pf_event));
-}
-
-/**
- * i40e_vc_notify_vf_reset
- * @vf: pointer to the VF structure
- *
- * indicate a pending reset to the given VF
- **/
-void i40e_vc_notify_vf_reset(struct i40e_vf *vf)
-{
-        struct i40e_virtchnl_pf_event pfe;
-        int abs_vf_id;
-
-        /* validate the request */
-        if (!vf || vf->vf_id >= vf->pf->num_alloc_vfs)
-                return;
-
-        /* verify if the VF is in either init or active before proceeding */
-        if (!test_bit(I40E_VF_STAT_INIT, &vf->vf_states) &&
-            !test_bit(I40E_VF_STAT_ACTIVE, &vf->vf_states))
-                return;
-
-        abs_vf_id = vf->vf_id + vf->pf->hw.func_caps.vf_base_id;
-
-        pfe.event = I40E_VIRTCHNL_EVENT_RESET_IMPENDING;
-        pfe.severity = I40E_PF_EVENT_SEVERITY_CERTAIN_DOOM;
-        i40e_aq_send_msg_to_vf(&vf->pf->hw, abs_vf_id, I40E_VIRTCHNL_OP_EVENT,
-                               I40E_SUCCESS, (u8 *)&pfe,
-                               sizeof(struct i40e_virtchnl_pf_event), NULL);
-}
-
-/**
  * i40e_ndo_set_vf_mac
  * @netdev: network interface device structure
  * @vf_id: VF identifier
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index 9c79cb6abb2b..ec9d83a93379 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -242,6 +242,7 @@ struct i40e_hw_capabilities {
         u8 rx_buf_chain_len;
         u32 enabled_tcmap;
         u32 maxtc;
+        u64 wr_csr_prot;
 };
 
 struct i40e_mac_info {
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h
index 34c8565031f6..1b98c25b3092 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf.h
+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h
@@ -225,7 +225,6 @@ struct i40evf_adapter {
 #define I40E_FLAG_RX_CSUM_ENABLED                I40EVF_FLAG_RX_CSUM_ENABLED
         /* flags for admin queue service task */
         u32 aq_required;
-        u32 aq_pending;
 #define I40EVF_FLAG_AQ_ENABLE_QUEUES            (u32)(1)
 #define I40EVF_FLAG_AQ_DISABLE_QUEUES           (u32)(1 << 1)
 #define I40EVF_FLAG_AQ_ADD_MAC_FILTER           (u32)(1 << 2)
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 6d5f3b21c68a..7c53aca4b5a6 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1008,7 +1008,6 @@ void i40evf_down(struct i40evf_adapter *adapter)
             adapter->state != __I40EVF_RESETTING) {
                 /* cancel any current operation */
                 adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
-                adapter->aq_pending = 0;
                 /* Schedule operations to close down the HW. Don't wait
                  * here for this to complete. The watchdog is still running
                  * and it will take care of this.
@@ -1335,7 +1334,6 @@ static void i40evf_watchdog_task(struct work_struct *work)
                          */
                         return;
                 }
-                adapter->aq_pending = 0;
                 adapter->aq_required = 0;
                 adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
                 goto watchdog_done;
@@ -1355,7 +1353,6 @@ static void i40evf_watchdog_task(struct work_struct *work)
                 adapter->flags |= I40EVF_FLAG_RESET_PENDING;
                 dev_err(&adapter->pdev->dev, "Hardware reset detected\n");
                 schedule_work(&adapter->reset_task);
-                adapter->aq_pending = 0;
                 adapter->aq_required = 0;
                 adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;
                 goto watchdog_done;
@@ -1364,7 +1361,7 @@ static void i40evf_watchdog_task(struct work_struct *work)
         /* Process admin queue tasks. After init, everything gets done
          * here so we don't race on the admin queue.
          */
-        if (adapter->aq_pending) {
+        if (adapter->current_op) {
                 if (!i40evf_asq_done(hw)) {
                         dev_dbg(&adapter->pdev->dev, "Admin queue timeout\n");
                         i40evf_send_api_ver(adapter);
@@ -2029,7 +2026,7 @@ static void i40evf_init_task(struct work_struct *work)
                 if (err) {
                         dev_err(&pdev->dev, "Failed to set MAC type (%d)\n",
                                 err);
-                goto err;
+                        goto err;
                 }
                 err = i40evf_check_reset_complete(hw);
                 if (err) {
@@ -2249,7 +2246,6 @@ static void i40evf_shutdown(struct pci_dev *pdev)
         /* Prevent the watchdog from running. */
         adapter->state = __I40EVF_REMOVE;
         adapter->aq_required = 0;
-        adapter->aq_pending = 0;
 
 #ifdef CONFIG_PM
         pci_save_state(pdev);
@@ -2467,7 +2463,6 @@ static void i40evf_remove(struct pci_dev *pdev)
         /* Shut down all the garbage mashers on the detention level */
         adapter->state = __I40EVF_REMOVE;
         adapter->aq_required = 0;
-        adapter->aq_pending = 0;
         i40evf_request_reset(adapter);
         msleep(20);
         /* If the FW isn't responding, kick it once, but only once. */
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index 4240a496dc50..61e090558f31 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -250,7 +250,6 @@ void i40evf_configure_queues(struct i40evf_adapter *adapter)
                 vqpi++;
         }
 
-        adapter->aq_pending |= I40EVF_FLAG_AQ_CONFIGURE_QUEUES;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_CONFIGURE_QUEUES;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES,
                            (u8 *)vqci, len);
@@ -277,7 +276,6 @@ void i40evf_enable_queues(struct i40evf_adapter *adapter)
         vqs.vsi_id = adapter->vsi_res->vsi_id;
         vqs.tx_queues = (1 << adapter->num_active_queues) - 1;
         vqs.rx_queues = vqs.tx_queues;
-        adapter->aq_pending |= I40EVF_FLAG_AQ_ENABLE_QUEUES;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_ENABLE_QUEUES;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_ENABLE_QUEUES,
                            (u8 *)&vqs, sizeof(vqs));
@@ -303,7 +301,6 @@ void i40evf_disable_queues(struct i40evf_adapter *adapter)
         vqs.vsi_id = adapter->vsi_res->vsi_id;
         vqs.tx_queues = (1 << adapter->num_active_queues) - 1;
         vqs.rx_queues = vqs.tx_queues;
-        adapter->aq_pending |= I40EVF_FLAG_AQ_DISABLE_QUEUES;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_DISABLE_QUEUES;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_DISABLE_QUEUES,
                            (u8 *)&vqs, sizeof(vqs));
@@ -354,7 +351,6 @@ void i40evf_map_queues(struct i40evf_adapter *adapter)
         vimi->vecmap[v_idx].txq_map = 0;
         vimi->vecmap[v_idx].rxq_map = 0;
 
-        adapter->aq_pending |= I40EVF_FLAG_AQ_MAP_VECTORS;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_MAP_VECTORS;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP,
                            (u8 *)vimi, len);
@@ -415,7 +411,6 @@ void i40evf_add_ether_addrs(struct i40evf_adapter *adapter)
                         f->add = false;
                 }
         }
-        adapter->aq_pending |= I40EVF_FLAG_AQ_ADD_MAC_FILTER;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_ADD_MAC_FILTER;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS,
                            (u8 *)veal, len);
@@ -476,7 +471,6 @@ void i40evf_del_ether_addrs(struct i40evf_adapter *adapter)
                         kfree(f);
                 }
         }
-        adapter->aq_pending |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_DEL_MAC_FILTER;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS,
                            (u8 *)veal, len);
@@ -537,7 +531,6 @@ void i40evf_add_vlans(struct i40evf_adapter *adapter)
                         f->add = false;
                 }
         }
-        adapter->aq_pending |= I40EVF_FLAG_AQ_ADD_VLAN_FILTER;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_ADD_VLAN_FILTER;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_ADD_VLAN, (u8 *)vvfl, len);
         kfree(vvfl);
@@ -598,7 +591,6 @@ void i40evf_del_vlans(struct i40evf_adapter *adapter)
                         kfree(f);
                 }
         }
-        adapter->aq_pending |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;
         adapter->aq_required &= ~I40EVF_FLAG_AQ_DEL_VLAN_FILTER;
         i40evf_send_pf_msg(adapter, I40E_VIRTCHNL_OP_DEL_VLAN, (u8 *)vvfl, len);
         kfree(vvfl);
@@ -720,9 +712,6 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                         __func__, v_retval, v_opcode);
         }
         switch (v_opcode) {
-        case I40E_VIRTCHNL_OP_VERSION:
-                /* no action, but also not an error */
-                break;
         case I40E_VIRTCHNL_OP_GET_STATS: {
                 struct i40e_eth_stats *stats =
                         (struct i40e_eth_stats *)msg;
@@ -740,39 +729,30 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                 adapter->current_stats = *stats;
                 }
                 break;
-        case I40E_VIRTCHNL_OP_ADD_ETHER_ADDRESS:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_ADD_MAC_FILTER);
-                break;
-        case I40E_VIRTCHNL_OP_DEL_ETHER_ADDRESS:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_DEL_MAC_FILTER);
-                break;
-        case I40E_VIRTCHNL_OP_ADD_VLAN:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_ADD_VLAN_FILTER);
-                break;
-        case I40E_VIRTCHNL_OP_DEL_VLAN:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_DEL_VLAN_FILTER);
-                break;
         case I40E_VIRTCHNL_OP_ENABLE_QUEUES:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_ENABLE_QUEUES);
                 /* enable transmits */
                 i40evf_irq_enable(adapter, true);
                 netif_tx_start_all_queues(adapter->netdev);
                 netif_carrier_on(adapter->netdev);
                 break;
         case I40E_VIRTCHNL_OP_DISABLE_QUEUES:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_DISABLE_QUEUES);
                 i40evf_free_all_tx_resources(adapter);
                 i40evf_free_all_rx_resources(adapter);
                 break;
-        case I40E_VIRTCHNL_OP_CONFIG_VSI_QUEUES:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_CONFIGURE_QUEUES);
-                break;
+        case I40E_VIRTCHNL_OP_VERSION:
+        case I40E_VIRTCHNL_OP_GET_VF_RESOURCES:
         case I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP:
-                adapter->aq_pending &= ~(I40EVF_FLAG_AQ_MAP_VECTORS);
+                /* Don't display an error if we get these out of sequence.
+                 * If the firmware needed to get kicked, we'll get these and
+                 * it's no problem.
+                 */
+                if (v_opcode != adapter->current_op)
+                        return;
                 break;
         default:
-                dev_info(&adapter->pdev->dev, "Received unexpected message %d from PF\n",
-                         v_opcode);
+                if (v_opcode != adapter->current_op)
+                        dev_warn(&adapter->pdev->dev, "Expected response %d from PF, received %d\n",
+                                 adapter->current_op, v_opcode);
                 break;
         } /* switch v_opcode */
         adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;