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>

1 files changed, 132 insertions, 112 deletions

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