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-03-27

This series contains updates to i40e and i40evf.

Jesse adds new device IDs to handle the new 20G speed for KR2.

Mitch provides a fix for an issue that shows up as a panic or memory
corruption when the device is brought down while under heavy stress.
This is resolved by delaying the releasing of resources until we
receive acknowledgment from the PF driver that the rings have indeed
been stopped.  Also adds firmware version information to ethtool
reporting to align with ixgbevf behavior.

Akeem increases the polling loop limiter, sine we found that in
certain circumstances the firmware can take longer to be ready after
a reset.
====================

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

10 files changed, 46 insertions, 24 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c
index d9f1fcb9c2be..d596f6624025 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c
@@ -51,6 +51,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw)
                 case I40E_DEV_ID_QSFP_B:
                 case I40E_DEV_ID_QSFP_C:
                 case I40E_DEV_ID_10G_BASE_T:
+                case I40E_DEV_ID_20G_KR2:
                         hw->mac.type = I40E_MAC_XL710;
                         break;
                 case I40E_DEV_ID_VF:
@@ -841,6 +842,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)
         case I40E_PHY_TYPE_10GBASE_KX4:
         case I40E_PHY_TYPE_10GBASE_KR:
         case I40E_PHY_TYPE_40GBASE_KR4:
+        case I40E_PHY_TYPE_20GBASE_KR2:
                 media = I40E_MEDIA_TYPE_BACKPLANE;
                 break;
         case I40E_PHY_TYPE_SGMII:
@@ -857,7 +859,7 @@ static enum i40e_media_type i40e_get_media_type(struct i40e_hw *hw)
 }
 
 #define I40E_PF_RESET_WAIT_COUNT_A0     200
-#define I40E_PF_RESET_WAIT_COUNT        110
+#define I40E_PF_RESET_WAIT_COUNT        200
 /**
  * i40e_pf_reset - Reset the PF
  * @hw: pointer to the hardware structure
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index b7d0aaac5480..c848b1862512 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -274,6 +274,12 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
         case I40E_PHY_TYPE_40GBASE_LR4:
                 ecmd->supported = SUPPORTED_40000baseLR4_Full;
                 break;
+        case I40E_PHY_TYPE_20GBASE_KR2:
+                ecmd->supported = SUPPORTED_Autoneg |
+                                  SUPPORTED_20000baseKR2_Full;
+                ecmd->advertising = ADVERTISED_Autoneg |
+                                    ADVERTISED_20000baseKR2_Full;
+                break;
         case I40E_PHY_TYPE_10GBASE_KX4:
                 ecmd->supported = SUPPORTED_Autoneg |
                                   SUPPORTED_10000baseKX4_Full;
@@ -353,6 +359,9 @@ static void i40e_get_settings_link_up(struct i40e_hw *hw,
                 /* need a SPEED_40000 in ethtool.h */
                 ethtool_cmd_speed_set(ecmd, 40000);
                 break;
+        case I40E_LINK_SPEED_20GB:
+                ethtool_cmd_speed_set(ecmd, SPEED_20000);
+                break;
         case I40E_LINK_SPEED_10GB:
                 ethtool_cmd_speed_set(ecmd, SPEED_10000);
                 break;
@@ -418,6 +427,11 @@ static void i40e_get_settings_link_down(struct i40e_hw *hw,
                 if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)
                         ecmd->advertising |= ADVERTISED_100baseT_Full;
                 break;
+        case I40E_DEV_ID_20G_KR2:
+                /* backplane 20G */
+                ecmd->supported = SUPPORTED_20000baseKR2_Full;
+                ecmd->advertising = ADVERTISED_20000baseKR2_Full;
+                break;
         default:
                 /* all the rest are 10G/1G */
                 ecmd->supported = SUPPORTED_10000baseT_Full |
@@ -633,6 +647,8 @@ static int i40e_set_settings(struct net_device *netdev,
             advertise & ADVERTISED_10000baseKX4_Full ||
             advertise & ADVERTISED_10000baseKR_Full)
                 config.link_speed |= I40E_LINK_SPEED_10GB;
+        if (advertise & ADVERTISED_20000baseKR2_Full)
+                config.link_speed |= I40E_LINK_SPEED_20GB;
         if (advertise & ADVERTISED_40000baseKR4_Full ||
             advertise & ADVERTISED_40000baseCR4_Full ||
             advertise & ADVERTISED_40000baseSR4_Full ||
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index bc87968098d9..845bceeda645 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 2
-#define DRV_VERSION_BUILD 37
+#define DRV_VERSION_BUILD 43
 #define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \
              __stringify(DRV_VERSION_MINOR) "." \
              __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -75,6 +75,7 @@ static const struct pci_device_id i40e_pci_tbl[] = {
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_B), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_C), 0},
         {PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T), 0},
+        {PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},
         /* required last entry */
         {0, }
 };
@@ -4639,6 +4640,9 @@ static void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
         case I40E_LINK_SPEED_40GB:
                 strlcpy(speed, "40 Gbps", SPEED_SIZE);
                 break;
+        case I40E_LINK_SPEED_20GB:
+                strncpy(speed, "20 Gbps", SPEED_SIZE);
+                break;
         case I40E_LINK_SPEED_10GB:
                 strlcpy(speed, "10 Gbps", SPEED_SIZE);
                 break;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 83032d2c2275..67c7bc9e9c21 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -44,6 +44,7 @@
 #define I40E_DEV_ID_QSFP_B              0x1584
 #define I40E_DEV_ID_QSFP_C              0x1585
 #define I40E_DEV_ID_10G_BASE_T          0x1586
+#define I40E_DEV_ID_20G_KR2             0x1587
 #define I40E_DEV_ID_VF                  0x154C
 #define I40E_DEV_ID_VF_HV               0x1571
 
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c
index f07b9ff2b823..39fcb1dc4ea6 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_common.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c
@@ -51,6 +51,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)
                 case I40E_DEV_ID_QSFP_B:
                 case I40E_DEV_ID_QSFP_C:
                 case I40E_DEV_ID_10G_BASE_T:
+                case I40E_DEV_ID_20G_KR2:
                         hw->mac.type = I40E_MAC_XL710;
                         break;
                 case I40E_DEV_ID_VF:
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index eba6e4b34f70..9c79cb6abb2b 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -44,7 +44,8 @@
 #define I40E_DEV_ID_QSFP_B              0x1584
 #define I40E_DEV_ID_QSFP_C              0x1585
 #define I40E_DEV_ID_10G_BASE_T          0x1586
-#define I40E_DEV_ID_VF          0x154C
+#define I40E_DEV_ID_20G_KR2             0x1587
+#define I40E_DEV_ID_VF                  0x154C
 #define I40E_DEV_ID_VF_HV               0x1571
 
 #define i40e_is_40G_device(d)           ((d) == I40E_DEV_ID_QSFP_A  || \
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h
index 981224743c73..34c8565031f6 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf.h
+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h
@@ -272,6 +272,8 @@ void i40evf_update_stats(struct i40evf_adapter *adapter);
 void i40evf_reset_interrupt_capability(struct i40evf_adapter *adapter);
 int i40evf_init_interrupt_scheme(struct i40evf_adapter *adapter);
 void i40evf_irq_enable_queues(struct i40evf_adapter *adapter, u32 mask);
+void i40evf_free_all_tx_resources(struct i40evf_adapter *adapter);
+void i40evf_free_all_rx_resources(struct i40evf_adapter *adapter);
 
 void i40e_napi_add_all(struct i40evf_adapter *adapter);
 void i40e_napi_del_all(struct i40evf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
index b68b73163311..f4e77665bc54 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
@@ -209,7 +209,7 @@ static void i40evf_get_drvinfo(struct net_device *netdev,
 
         strlcpy(drvinfo->driver, i40evf_driver_name, 32);
         strlcpy(drvinfo->version, i40evf_driver_version, 32);
-
+        strlcpy(drvinfo->fw_version, "N/A", 4);
         strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
 }
 
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index 812b1200f35c..b08efafee1ae 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -28,8 +28,6 @@
 #include "i40e_prototype.h"
 static int i40evf_setup_all_tx_resources(struct i40evf_adapter *adapter);
 static int i40evf_setup_all_rx_resources(struct i40evf_adapter *adapter);
-static void i40evf_free_all_tx_resources(struct i40evf_adapter *adapter);
-static void i40evf_free_all_rx_resources(struct i40evf_adapter *adapter);
 static int i40evf_close(struct net_device *netdev);
 
 char i40evf_driver_name[] = "i40evf";
@@ -973,8 +971,10 @@ void i40evf_down(struct i40evf_adapter *adapter)
                                 &adapter->crit_section))
                 usleep_range(500, 1000);
 
-        i40evf_irq_disable(adapter);
+        netif_carrier_off(netdev);
+        netif_tx_disable(netdev);
         i40evf_napi_disable_all(adapter);
+        i40evf_irq_disable(adapter);
 
         /* remove all MAC filters */
         list_for_each_entry(f, &adapter->mac_filter_list, list) {
@@ -997,13 +997,7 @@ void i40evf_down(struct i40evf_adapter *adapter)
                 adapter->aq_required |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;
                 adapter->aq_required |= I40EVF_FLAG_AQ_DISABLE_QUEUES;
         }
-        netif_tx_disable(netdev);
-
-        netif_tx_stop_all_queues(netdev);
 
-        msleep(20);
-
-        netif_carrier_off(netdev);
         clear_bit(__I40EVF_IN_CRITICAL_TASK, &adapter->crit_section);
 }
 
@@ -1358,6 +1352,11 @@ static void i40evf_watchdog_task(struct work_struct *work)
                 goto watchdog_done;
         }
 
+        if (adapter->aq_required & I40EVF_FLAG_AQ_DISABLE_QUEUES) {
+                i40evf_disable_queues(adapter);
+                goto watchdog_done;
+        }
+
         if (adapter->aq_required & I40EVF_FLAG_AQ_MAP_VECTORS) {
                 i40evf_map_queues(adapter);
                 goto watchdog_done;
@@ -1383,11 +1382,6 @@ static void i40evf_watchdog_task(struct work_struct *work)
                 goto watchdog_done;
         }
 
-        if (adapter->aq_required & I40EVF_FLAG_AQ_DISABLE_QUEUES) {
-                i40evf_disable_queues(adapter);
-                goto watchdog_done;
-        }
-
         if (adapter->aq_required & I40EVF_FLAG_AQ_CONFIGURE_QUEUES) {
                 i40evf_configure_queues(adapter);
                 goto watchdog_done;
@@ -1724,7 +1718,7 @@ out:
  *
  * Free all transmit software resources
  **/
-static void i40evf_free_all_tx_resources(struct i40evf_adapter *adapter)
+void i40evf_free_all_tx_resources(struct i40evf_adapter *adapter)
 {
         int i;
 
@@ -1794,7 +1788,7 @@ static int i40evf_setup_all_rx_resources(struct i40evf_adapter *adapter)
  *
  * Free all receive software resources
  **/
-static void i40evf_free_all_rx_resources(struct i40evf_adapter *adapter)
+void i40evf_free_all_rx_resources(struct i40evf_adapter *adapter)
 {
         int i;
 
@@ -1824,7 +1818,7 @@ static int i40evf_open(struct net_device *netdev)
                 dev_err(&adapter->pdev->dev, "Unable to open device due to PF driver failure.\n");
                 return -EIO;
         }
-        if (adapter->state != __I40EVF_DOWN)
+        if (adapter->state != __I40EVF_DOWN || adapter->aq_required)
                 return -EBUSY;
 
         /* allocate transmit descriptors */
@@ -1888,9 +1882,6 @@ static int i40evf_close(struct net_device *netdev)
         adapter->state = __I40EVF_DOWN;
         i40evf_free_traffic_irqs(adapter);
 
-        i40evf_free_all_tx_resources(adapter);
-        i40evf_free_all_rx_resources(adapter);
-
         return 0;
 }
 
@@ -2504,6 +2495,8 @@ static void i40evf_remove(struct pci_dev *pdev)
         iounmap(hw->hw_addr);
         pci_release_regions(pdev);
 
+        i40evf_free_all_tx_resources(adapter);
+        i40evf_free_all_rx_resources(adapter);
         i40evf_free_queues(adapter);
         kfree(adapter->vf_res);
         /* If we got removed before an up/down sequence, we've got a filter
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
index 3f0c85ecbca6..4240a496dc50 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_virtchnl.c
@@ -761,6 +761,8 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter,
                 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);