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, 65 insertions, 0 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