i40e/i40evf: Use advertised speed settings in ethtool and refactor get_settings

Add a requested speed variable to the link_status struct to store the
last speeds we requested from the firmware (the speeds the FW will be
advertising with if autoneg is enabled).

Use the advertised speed settings in get_settings in ethtool now that
we have it.  Also set the requested speed settings in set_settings in
ethtool as they are requested and initialize them in probe based on what
the firmware remembers as the last requested speeds.

To accommodate some longer lines in this new code, and improve
readability I have added two functions i40e_get_settings_link_up
and i40e_get_settings_link_down which get_settings now calls first.
It then does all of the settings that happen regardless of link
state. Some PHY types that supported the same settings were also combined.

Also update the copyright year.

Change-ID: Ica0c5ac81b6069ea6a7406fce7482f7816d4455c
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

4 files changed, 173 insertions, 124 deletions

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 8e69caf01efe..5854460a34ff 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2015 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -228,73 +228,20 @@ static void i40e_partition_setting_complaint(struct i40e_pf *pf)
 }
 
 /**
- * i40e_get_settings - Get Link Speed and Duplex settings
+ * i40e_get_settings_link_up - Get the Link settings for when link is up
+ * @hw: hw structure
+ * @ecmd: ethtool command to fill in
  * @netdev: network interface device structure
- * @ecmd: ethtool command
  *
- * Reports speed/duplex settings based on media_type
  **/
-static int i40e_get_settings(struct net_device *netdev,
-                             struct ethtool_cmd *ecmd)
+static void i40e_get_settings_link_up(struct i40e_hw *hw,
+                                      struct ethtool_cmd *ecmd,
+                                      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;
         struct i40e_link_status *hw_link_info = &hw->phy.link_info;
-        bool link_up = hw_link_info->link_info & I40E_AQ_LINK_UP;
         u32 link_speed = hw_link_info->link_speed;
 
-        /* hardware is either in 40G mode or 10G mode
-         * NOTE: this section initializes supported and advertising
-         */
-        if (!link_up) {
-                /* link is down and the driver needs to fall back on
-                 * device ID to determine what kinds of info to display,
-                 * it's mostly a guess that may change when link is up
-                 */
-                switch (hw->device_id) {
-                case I40E_DEV_ID_QSFP_A:
-                case I40E_DEV_ID_QSFP_B:
-                case I40E_DEV_ID_QSFP_C:
-                        /* pluggable QSFP */
-                        ecmd->supported = SUPPORTED_40000baseSR4_Full |
-                                          SUPPORTED_40000baseCR4_Full |
-                                          SUPPORTED_40000baseLR4_Full;
-                        ecmd->advertising = ADVERTISED_40000baseSR4_Full |
-                                            ADVERTISED_40000baseCR4_Full |
-                                            ADVERTISED_40000baseLR4_Full;
-                        break;
-                case I40E_DEV_ID_KX_B:
-                        /* backplane 40G */
-                        ecmd->supported = SUPPORTED_40000baseKR4_Full;
-                        ecmd->advertising = ADVERTISED_40000baseKR4_Full;
-                        break;
-                case I40E_DEV_ID_KX_C:
-                        /* backplane 10G */
-                        ecmd->supported = SUPPORTED_10000baseKR_Full;
-                        ecmd->advertising = ADVERTISED_10000baseKR_Full;
-                        break;
-                case I40E_DEV_ID_10G_BASE_T:
-                        ecmd->supported = SUPPORTED_10000baseT_Full |
-                                          SUPPORTED_1000baseT_Full |
-                                          SUPPORTED_100baseT_Full;
-                        ecmd->advertising = ADVERTISED_10000baseT_Full |
-                                            ADVERTISED_1000baseT_Full |
-                                            ADVERTISED_100baseT_Full;
-                        break;
-                default:
-                        /* all the rest are 10G/1G */
-                        ecmd->supported = SUPPORTED_10000baseT_Full |
-                                          SUPPORTED_1000baseT_Full;
-                        ecmd->advertising = ADVERTISED_10000baseT_Full |
-                                            ADVERTISED_1000baseT_Full;
-                        break;
-                }
-
-                /* skip phy_type use as it is zero when link is down */
-                goto no_valid_phy_type;
-        }
-
+        /* Initialize supported and advertised settings based on phy settings */
         switch (hw_link_info->phy_type) {
         case I40E_PHY_TYPE_40GBASE_CR4:
         case I40E_PHY_TYPE_40GBASE_CR4_CU:
@@ -303,6 +250,10 @@ static int i40e_get_settings(struct net_device *netdev,
                 ecmd->advertising = ADVERTISED_Autoneg |
                                     ADVERTISED_40000baseCR4_Full;
                 break;
+        case I40E_PHY_TYPE_XLAUI:
+        case I40E_PHY_TYPE_XLPPI:
+                ecmd->supported = SUPPORTED_40000baseCR4_Full;
+                break;
         case I40E_PHY_TYPE_40GBASE_KR4:
                 ecmd->supported = SUPPORTED_Autoneg |
                                   SUPPORTED_40000baseKR4_Full;
@@ -310,8 +261,6 @@ static int i40e_get_settings(struct net_device *netdev,
                                     ADVERTISED_40000baseKR4_Full;
                 break;
         case I40E_PHY_TYPE_40GBASE_SR4:
-        case I40E_PHY_TYPE_XLPPI:
-        case I40E_PHY_TYPE_XLAUI:
                 ecmd->supported = SUPPORTED_40000baseSR4_Full;
                 break;
         case I40E_PHY_TYPE_40GBASE_LR4:
@@ -333,20 +282,40 @@ static int i40e_get_settings(struct net_device *netdev,
         case I40E_PHY_TYPE_10GBASE_LR:
         case I40E_PHY_TYPE_1000BASE_SX:
         case I40E_PHY_TYPE_1000BASE_LX:
-                ecmd->supported = SUPPORTED_10000baseT_Full;
-                ecmd->supported |= SUPPORTED_1000baseT_Full;
+                ecmd->supported = SUPPORTED_10000baseT_Full |
+                                  SUPPORTED_1000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)
+                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                break;
+        case I40E_PHY_TYPE_1000BASE_KX:
+                ecmd->supported = SUPPORTED_Autoneg |
+                                  SUPPORTED_1000baseKX_Full;
+                ecmd->advertising = ADVERTISED_Autoneg |
+                                    ADVERTISED_1000baseKX_Full;
                 break;
-        case I40E_PHY_TYPE_10GBASE_CR1_CU:
-        case I40E_PHY_TYPE_10GBASE_CR1:
         case I40E_PHY_TYPE_10GBASE_T:
+        case I40E_PHY_TYPE_1000BASE_T:
+        case I40E_PHY_TYPE_100BASE_TX:
                 ecmd->supported = SUPPORTED_Autoneg |
                                   SUPPORTED_10000baseT_Full |
                                   SUPPORTED_1000baseT_Full |
                                   SUPPORTED_100baseT_Full;
+                ecmd->advertising = ADVERTISED_Autoneg;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)
+                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)
+                        ecmd->advertising |= ADVERTISED_100baseT_Full;
+                break;
+        case I40E_PHY_TYPE_10GBASE_CR1_CU:
+        case I40E_PHY_TYPE_10GBASE_CR1:
+                ecmd->supported = SUPPORTED_Autoneg |
+                                  SUPPORTED_10000baseT_Full;
                 ecmd->advertising = ADVERTISED_Autoneg |
-                                    ADVERTISED_10000baseT_Full |
-                                    ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_100baseT_Full;
+                                    ADVERTISED_10000baseT_Full;
                 break;
         case I40E_PHY_TYPE_XAUI:
         case I40E_PHY_TYPE_XFI:
@@ -354,34 +323,14 @@ static int i40e_get_settings(struct net_device *netdev,
         case I40E_PHY_TYPE_10GBASE_SFPP_CU:
                 ecmd->supported = SUPPORTED_10000baseT_Full;
                 break;
-        case I40E_PHY_TYPE_1000BASE_KX:
-        case I40E_PHY_TYPE_1000BASE_T:
-                ecmd->supported = SUPPORTED_Autoneg |
-                                  SUPPORTED_10000baseT_Full |
-                                  SUPPORTED_1000baseT_Full |
-                                  SUPPORTED_100baseT_Full;
-                ecmd->advertising = ADVERTISED_Autoneg |
-                                    ADVERTISED_10000baseT_Full |
-                                    ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_100baseT_Full;
-                break;
-        case I40E_PHY_TYPE_100BASE_TX:
-                ecmd->supported = SUPPORTED_Autoneg |
-                                  SUPPORTED_10000baseT_Full |
-                                  SUPPORTED_1000baseT_Full |
-                                  SUPPORTED_100baseT_Full;
-                ecmd->advertising = ADVERTISED_Autoneg |
-                                    ADVERTISED_10000baseT_Full |
-                                    ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_100baseT_Full;
-                break;
         case I40E_PHY_TYPE_SGMII:
                 ecmd->supported = SUPPORTED_Autoneg |
                                   SUPPORTED_1000baseT_Full |
                                   SUPPORTED_100baseT_Full;
-                ecmd->advertising = ADVERTISED_Autoneg |
-                                    ADVERTISED_1000baseT_Full |
-                                    ADVERTISED_100baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)
+                        ecmd->advertising |= ADVERTISED_100baseT_Full;
                 break;
         default:
                 /* if we got here and link is up something bad is afoot */
@@ -389,8 +338,118 @@ static int i40e_get_settings(struct net_device *netdev,
                             hw_link_info->phy_type);
         }
 
-no_valid_phy_type:
-        /* this is if autoneg is enabled or disabled */
+        /* 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);
+                break;
+        case I40E_LINK_SPEED_10GB:
+                ethtool_cmd_speed_set(ecmd, SPEED_10000);
+                break;
+        case I40E_LINK_SPEED_1GB:
+                ethtool_cmd_speed_set(ecmd, SPEED_1000);
+                break;
+        case I40E_LINK_SPEED_100MB:
+                ethtool_cmd_speed_set(ecmd, SPEED_100);
+                break;
+        default:
+                break;
+        }
+        ecmd->duplex = DUPLEX_FULL;
+}
+
+/**
+ * i40e_get_settings_link_down - Get the Link settings for when link is down
+ * @hw: hw structure
+ * @ecmd: ethtool command to fill in
+ *
+ * Reports link settings that can be determined when link is down
+ **/
+static void i40e_get_settings_link_down(struct i40e_hw *hw,
+                                        struct ethtool_cmd *ecmd)
+{
+        struct i40e_link_status *hw_link_info = &hw->phy.link_info;
+
+        /* link is down and the driver needs to fall back on
+         * device ID to determine what kinds of info to display,
+         * it's mostly a guess that may change when link is up
+         */
+        switch (hw->device_id) {
+        case I40E_DEV_ID_QSFP_A:
+        case I40E_DEV_ID_QSFP_B:
+        case I40E_DEV_ID_QSFP_C:
+                /* pluggable QSFP */
+                ecmd->supported = SUPPORTED_40000baseSR4_Full |
+                                  SUPPORTED_40000baseCR4_Full |
+                                  SUPPORTED_40000baseLR4_Full;
+                ecmd->advertising = ADVERTISED_40000baseSR4_Full |
+                                    ADVERTISED_40000baseCR4_Full |
+                                    ADVERTISED_40000baseLR4_Full;
+                break;
+        case I40E_DEV_ID_KX_B:
+                /* backplane 40G */
+                ecmd->supported = SUPPORTED_40000baseKR4_Full;
+                ecmd->advertising = ADVERTISED_40000baseKR4_Full;
+                break;
+        case I40E_DEV_ID_KX_C:
+                /* backplane 10G */
+                ecmd->supported = SUPPORTED_10000baseKR_Full;
+                ecmd->advertising = ADVERTISED_10000baseKR_Full;
+                break;
+        case I40E_DEV_ID_10G_BASE_T:
+                ecmd->supported = SUPPORTED_10000baseT_Full |
+                                  SUPPORTED_1000baseT_Full |
+                                  SUPPORTED_100baseT_Full;
+                /* Figure out what has been requested */
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)
+                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_100MB)
+                        ecmd->advertising |= ADVERTISED_100baseT_Full;
+                break;
+        default:
+                /* all the rest are 10G/1G */
+                ecmd->supported = SUPPORTED_10000baseT_Full |
+                                  SUPPORTED_1000baseT_Full;
+                /* Figure out what has been requested */
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_10GB)
+                        ecmd->advertising |= ADVERTISED_10000baseT_Full;
+                if (hw_link_info->requested_speeds & I40E_LINK_SPEED_1GB)
+                        ecmd->advertising |= ADVERTISED_1000baseT_Full;
+                break;
+        }
+
+        /* With no link speed and duplex are unknown */
+        ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
+        ecmd->duplex = DUPLEX_UNKNOWN;
+}
+
+/**
+ * i40e_get_settings - Get Link Speed and Duplex settings
+ * @netdev: network interface device structure
+ * @ecmd: ethtool command
+ *
+ * Reports speed/duplex settings based on media_type
+ **/
+static int i40e_get_settings(struct net_device *netdev,
+                             struct ethtool_cmd *ecmd)
+{
+        struct i40e_netdev_priv *np = netdev_priv(netdev);
+        struct i40e_pf *pf = np->vsi->back;
+        struct i40e_hw *hw = &pf->hw;
+        struct i40e_link_status *hw_link_info = &hw->phy.link_info;
+        bool link_up = hw_link_info->link_info & I40E_AQ_LINK_UP;
+
+        if (link_up)
+                i40e_get_settings_link_up(hw, ecmd, netdev);
+        else
+                i40e_get_settings_link_down(hw, ecmd);
+
+        /* Now set the settings that don't rely on link being up/down */
+
+        /* Set autoneg settings */
         ecmd->autoneg = ((hw_link_info->an_info & I40E_AQ_AN_COMPLETED) ?
                           AUTONEG_ENABLE : AUTONEG_DISABLE);
 
@@ -423,11 +482,13 @@ no_valid_phy_type:
                 break;
         }
 
+        /* Set transceiver */
         ecmd->transceiver = XCVR_EXTERNAL;
 
+        /* Set flow control settings */
         ecmd->supported |= SUPPORTED_Pause;
 
-        switch (hw->fc.current_mode) {
+        switch (hw->fc.requested_mode) {
         case I40E_FC_FULL:
                 ecmd->advertising |= ADVERTISED_Pause;
                 break;
@@ -444,30 +505,6 @@ no_valid_phy_type:
                 break;
         }
 
-        if (link_up) {
-                switch (link_speed) {
-                case I40E_LINK_SPEED_40GB:
-                        /* need a SPEED_40000 in ethtool.h */
-                        ethtool_cmd_speed_set(ecmd, 40000);
-                        break;
-                case I40E_LINK_SPEED_10GB:
-                        ethtool_cmd_speed_set(ecmd, SPEED_10000);
-                        break;
-                case I40E_LINK_SPEED_1GB:
-                        ethtool_cmd_speed_set(ecmd, SPEED_1000);
-                        break;
-                case I40E_LINK_SPEED_100MB:
-                        ethtool_cmd_speed_set(ecmd, SPEED_100);
-                        break;
-                default:
-                        break;
-                }
-                ecmd->duplex = DUPLEX_FULL;
-        } else {
-                ethtool_cmd_speed_set(ecmd, SPEED_UNKNOWN);
-                ecmd->duplex = DUPLEX_UNKNOWN;
-        }
-
         return 0;
 }
 
@@ -600,6 +637,8 @@ static int i40e_set_settings(struct net_device *netdev,
                 config.eeer = abilities.eeer_val;
                 config.low_power_ctrl = abilities.d3_lpan;
 
+                /* save the requested speeds */
+                hw->phy.link_info.requested_speeds = config.link_speed;
                 /* set link and auto negotiation so changes take effect */
                 config.abilities |= I40E_AQ_PHY_ENABLE_ATOMIC_LINK;
                 /* If link is up put link down */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index d3416a4a8f5a..bb876e310908 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2015 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -9099,6 +9099,7 @@ static void i40e_print_features(struct i40e_pf *pf)
  **/
 static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        struct i40e_aq_get_phy_abilities_resp abilities;
         struct i40e_pf *pf;
         struct i40e_hw *hw;
         static u16 pfs_found;
@@ -9454,6 +9455,13 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_warn(&pdev->dev, "Please move the device to a different PCI-e link with more lanes and/or higher transfer rate.\n");
         }
 
+        /* get the requested speeds from the fw */
+        err = i40e_aq_get_phy_capabilities(hw, false, false, &abilities, NULL);
+        if (err)
+                dev_info(&pf->pdev->dev, "get phy abilities failed, aq_err %d, advertised speed settings may not be correct\n",
+                         err);
+        pf->hw.phy.link_info.requested_speeds = abilities.link_speed;
+
         /* print a string summarizing features */
         i40e_print_features(pf);
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h
index 86a927b88ef4..17f1647ab1d6 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2015 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -180,6 +180,7 @@ struct i40e_link_status {
         u16 max_frame_size;
         bool crc_enable;
         u8 pacing;
+        u8 requested_speeds;
 };
 
 struct i40e_phy_info {
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h
index c8cd8afdbf8f..a2693865594a 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
  *
  * Intel Ethernet Controller XL710 Family Linux Virtual Function Driver
- * Copyright(c) 2013 - 2014 Intel Corporation.
+ * Copyright(c) 2013 - 2015 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -180,6 +180,7 @@ struct i40e_link_status {
         u16 max_frame_size;
         bool crc_enable;
         u8 pacing;
+        u8 requested_speeds;
 };
 
 struct i40e_phy_info {