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

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-06-24

This series contains updates to i40e and i40evf.

Greg provides a patch to stop the VF device after setting its MAC address.
This is due to if the host VMM administrator has changed the VF device's MAC
address then the i40e driver needs to halt the VF device so that the
administrator will be forced to reload the VF driver so that the VF driver
will start using the newly assigned MAC address.

Shannon provides several patches for i40e, first makes prep_for_test() a
void function since the return value was being ignored for the most part
by all its callers.  Adds a log warning when the firmware's API minor/major
number is not what we expect to assist the user by informing them they
may need to update their NVM or SW.  Cleans up a stray print message
so that it is similar to other print messages.  Ensures to set the
WoL flag when setting LAA and allow the user to set LAA again.  So do
not short-circuit the LAA assignment when the driver thinks it has
already been done as it is possible that the user might want to force
the address setting again.  Provides a couple more LAA fixes to ensure
the LAA gets restored after resets.

Neerav provides a patch for i40e to add a PF reset when a malicious driver
event for the PF occurs.  As per the specification when the PF driver
receives a malicious driver event the queue that caused the event is
already stopped and it is expected that the function that owns the queue
will reset the queue, but in some cases it may not be possible to determine
the queue, so it is suggested to reset the whole function.

Carolyn fixes ethtool coalesce settings to allow 0 as a disable value and
adds message to user about invalid values.

Jesse removes a reserved type which was not removed from the code.

Catherine provides a patch to add the ability to enable/disable link from
set_link)restart_an() which will make it easy to toggle link without
calling set_phy_config() when no other link settings need to change.

Anjali provides a patch to ensure we do a PF reset on Tx hang and that
way we avoid any Malicious Driver Detect (MDD) events because of a Tx
queue disable failure.

v2:
 - fixed the un-needed return in patch 2 based on feedback from Sergei Shtylyov
 - added punctuation to print statements and code comment based on
   feedback from Sergei Shtylyov
====================

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

11 files changed, 128 insertions, 49 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index 817e179dc3f9..2ec6e8a11ee1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -362,6 +362,7 @@ struct i40e_mac_filter {
         bool is_vf;             /* filter belongs to a VF */
         bool is_netdev;         /* filter belongs to a netdev */
         bool changed;           /* filter needs to be sync'd to the HW */
+        bool is_laa;            /* filter is a Locally Administered Address */
 };
 
 struct i40e_veb {
@@ -617,6 +618,7 @@ static inline void i40e_dbg_init(void) {}
 static inline void i40e_dbg_exit(void) {}
 #endif /* CONFIG_DEBUG_FS*/
 void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector);
+void i40e_irq_dynamic_disable(struct i40e_vsi *vsi, int vector);
 void i40e_irq_dynamic_disable_icr0(struct i40e_pf *pf);
 void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf);
 int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index a51bba634718..bbace40bd114 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -971,12 +971,14 @@ i40e_status i40e_aq_clear_pxe_mode(struct i40e_hw *hw,
 /**
  * i40e_aq_set_link_restart_an
  * @hw: pointer to the hw struct
+ * @enable_link: if true: enable link, if false: disable link
  * @cmd_details: pointer to command details structure or NULL
  *
  * Sets up the link and restarts the Auto-Negotiation over the link.
  **/
 i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw,
-                                struct i40e_asq_cmd_details *cmd_details)
+                                        bool enable_link,
+                                        struct i40e_asq_cmd_details *cmd_details)
 {
         struct i40e_aq_desc desc;
         struct i40e_aqc_set_link_restart_an *cmd =
@@ -987,6 +989,10 @@ i40e_status i40e_aq_set_link_restart_an(struct i40e_hw *hw,
                                           i40e_aqc_opc_set_link_restart_an);
 
         cmd->command = I40E_AQ_PHY_RESTART_AN;
+        if (enable_link)
+                cmd->command |= I40E_AQ_PHY_LINK_ENABLE;
+        else
+                cmd->command &= ~I40E_AQ_PHY_LINK_ENABLE;
 
         status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 4a488ffcd6b0..df89b6c3db41 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1027,9 +1027,10 @@ static int i40e_nway_reset(struct net_device *netdev)
         struct i40e_netdev_priv *np = netdev_priv(netdev);
         struct i40e_pf *pf = np->vsi->back;
         struct i40e_hw *hw = &pf->hw;
+        bool link_up = hw->phy.link_info.link_info & I40E_AQ_LINK_UP;
         i40e_status ret = 0;
 
-        ret = i40e_aq_set_link_restart_an(hw, NULL);
+        ret = i40e_aq_set_link_restart_an(hw, link_up, NULL);
         if (ret) {
                 netdev_info(netdev, "link restart failed, aq_err=%d\n",
                             pf->hw.aq.asq_last_status);
@@ -1105,17 +1106,36 @@ static int i40e_set_coalesce(struct net_device *netdev,
         if (ec->tx_max_coalesced_frames_irq || ec->rx_max_coalesced_frames_irq)
                 vsi->work_limit = ec->tx_max_coalesced_frames_irq;
 
+        vector = vsi->base_vector;
         if ((ec->rx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&
-            (ec->rx_coalesce_usecs <= (I40E_MAX_ITR << 1)))
+            (ec->rx_coalesce_usecs <= (I40E_MAX_ITR << 1))) {
                 vsi->rx_itr_setting = ec->rx_coalesce_usecs;
-        else
+        } else if (ec->rx_coalesce_usecs == 0) {
+                vsi->rx_itr_setting = ec->rx_coalesce_usecs;
+                i40e_irq_dynamic_disable(vsi, vector);
+                if (ec->use_adaptive_rx_coalesce)
+                        netif_info(pf, drv, netdev,
+                                   "Rx-secs=0, need to disable adaptive-Rx for a complete disable\n");
+        } else {
+                netif_info(pf, drv, netdev,
+                           "Invalid value, Rx-usecs range is 0, 8-8160\n");
                 return -EINVAL;
+        }
 
         if ((ec->tx_coalesce_usecs >= (I40E_MIN_ITR << 1)) &&
-            (ec->tx_coalesce_usecs <= (I40E_MAX_ITR << 1)))
+            (ec->tx_coalesce_usecs <= (I40E_MAX_ITR << 1))) {
                 vsi->tx_itr_setting = ec->tx_coalesce_usecs;
-        else
+        } else if (ec->tx_coalesce_usecs == 0) {
+                vsi->tx_itr_setting = ec->tx_coalesce_usecs;
+                i40e_irq_dynamic_disable(vsi, vector);
+                if (ec->use_adaptive_tx_coalesce)
+                        netif_info(pf, drv, netdev,
+                                   "Tx-secs=0, need to disable adaptive-Tx for a complete disable\n");
+        } else {
+                netif_info(pf, drv, netdev,
+                           "Invalid value, Tx-usecs range is 0, 8-8160\n");
                 return -EINVAL;
+        }
 
         if (ec->use_adaptive_rx_coalesce)
                 vsi->rx_itr_setting |= I40E_ITR_DYNAMIC;
@@ -1127,7 +1147,6 @@ static int i40e_set_coalesce(struct net_device *netdev,
         else
                 vsi->tx_itr_setting &= ~I40E_ITR_DYNAMIC;
 
-        vector = vsi->base_vector;
         for (i = 0; i < vsi->num_q_vectors; i++, vector++) {
                 q_vector = vsi->q_vectors[i];
                 q_vector->rx.itr = ITR_TO_REG(vsi->rx_itr_setting);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index b167fc2c4abe..5980d6b3fb1a 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 0
 #define DRV_VERSION_MINOR 4
-#define DRV_VERSION_BUILD 13
+#define DRV_VERSION_BUILD 17
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
              __stringify(DRV_VERSION_MINOR) "." \
              __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -278,7 +278,7 @@ static void i40e_tx_timeout(struct net_device *netdev)