i40e: Add Energy Efficient Ethernet ability for X710 Base-T/KR/KX cards

Add "EEE: Enabled/Disabled" to dmesg for supported X710 Base-T/KR/KX
cards. According to the IEEE standard report the EEE ability and the
EEE Link Partner ability. Use the kernel's 'ethtool_keee' structure
and report EEE link modes.

Example:
dmesg | grep 'NIC Link is'
ethtool --show-eee <device>

Before:
	NIC Link is Up, 10 Gbps Full Duplex, Flow Control: None

        Supported EEE link modes:  Not reported
        Advertised EEE link modes:  Not reported
        Link partner advertised EEE link modes:  Not reported

After:
	NIC Link is Up, 10 Gbps Full Duplex, Flow Control: None, EEE: Enabled

        Supported EEE link modes:  100baseT/Full
                                   1000baseT/Full
                                   10000baseT/Full
        Advertised EEE link modes:  100baseT/Full
                                    1000baseT/Full
                                    10000baseT/Full
        Link partner advertised EEE link modes:  100baseT/Full
                                                 1000baseT/Full
                                                 10000baseT/Full

Reviewed-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h
index d546567e0286e404af63dba393559e0fff2396b8..2089a0e172bfaf88eb8e85e230de8addfdd90391 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e.h
+++ b/drivers/net/ethernet/intel/i40e/i40e.h
@@ -4,6 +4,7 @@
 #ifndef _I40E_H_
 #define _I40E_H_
 
+#include <linux/linkmode.h>
 #include <linux/pci.h>
 #include <linux/ptp_clock_kernel.h>
 #include <linux/types.h>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 1d0d2e526adb4503d6ef1c28687c200f3cba53be..3a6bece623f4d5b28b357ed4422474338c3eb5f0 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -5641,6 +5641,26 @@ static int i40e_get_module_eeprom(struct net_device *netdev,
        return 0;
 }
 
+static void i40e_eee_capability_to_kedata_supported(__le16 eee_capability_,
+                                                   unsigned long *supported)
+{
+       const int eee_capability = le16_to_cpu(eee_capability_);
+       static const int lut[] = {
+               ETHTOOL_LINK_MODE_100baseT_Full_BIT,
+               ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+               ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
+               ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,
+               ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT,
+               ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,
+               ETHTOOL_LINK_MODE_40000baseKR4_Full_BIT,
+       };
+
+       linkmode_zero(supported);
+       for (unsigned int i = ARRAY_SIZE(lut); i--; )
+               if (eee_capability & BIT(i + 1))
+                       linkmode_set_bit(lut[i], supported);
+}
+
 static int i40e_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
 {
        struct i40e_netdev_priv *np = netdev_priv(netdev);
@@ -5648,7 +5668,7 @@ static int i40e_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
        struct i40e_vsi *vsi = np->vsi;
        struct i40e_pf *pf = vsi->back;
        struct i40e_hw *hw = &pf->hw;
-       int status = 0;
+       int status;
 
        /* Get initial PHY capabilities */
        status = i40e_aq_get_phy_capabilities(hw, false, true, &phy_cfg, NULL);
@@ -5661,11 +5681,18 @@ static int i40e_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
        if (phy_cfg.eee_capability == 0)
                return -EOPNOTSUPP;
 
+       i40e_eee_capability_to_kedata_supported(phy_cfg.eee_capability,
+                                               edata->supported);
+       linkmode_copy(edata->lp_advertised, edata->supported);
+
        /* Get current configuration */
        status = i40e_aq_get_phy_capabilities(hw, false, false, &phy_cfg, NULL);
        if (status)
                return -EAGAIN;
 
+       linkmode_zero(edata->advertised);
+       if (phy_cfg.eee_capability)
+               linkmode_copy(edata->advertised, edata->supported);
        edata->eee_enabled = !!phy_cfg.eee_capability;
        edata->tx_lpi_enabled = pf->stats.tx_lpi_status;
 
@@ -5681,10 +5708,11 @@ static int i40e_is_eee_param_supported(struct net_device *netdev,
        struct i40e_vsi *vsi = np->vsi;
        struct i40e_pf *pf = vsi->back;
        struct i40e_ethtool_not_used {
-               u32 value;
+               bool value;
                const char *name;
        } param[] = {
-               {edata->tx_lpi_timer, "tx-timer"},
+               {!!(edata->advertised[0] & ~edata->supported[0]), "advertise"},
+               {!!edata->tx_lpi_timer, "tx-timer"},
                {edata->tx_lpi_enabled != pf->stats.tx_lpi_status, "tx-lpi"}
        };
        int i;
@@ -5710,7 +5738,7 @@ static int i40e_set_eee(struct net_device *netdev, struct ethtool_keee *edata)
        struct i40e_pf *pf = vsi->back;
        struct i40e_hw *hw = &pf->hw;
        __le16 eee_capability;
-       int status = 0;
+       int status;
 
        /* Deny parameters we don't support */
        if (i40e_is_eee_param_supported(netdev, edata))

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index cbcfada7b357a81c5acb894c9fa4c146407a6f1a..03205eb9f925f3cf851976e5bc436cf24e2c5243 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -7264,6 +7264,26 @@ out:
 }
 #endif /* CONFIG_I40E_DCB */
 
+static void i40e_print_link_message_eee(struct i40e_vsi *vsi,
+                                       const char *speed, const char *fc)
+{
+       struct ethtool_keee kedata;
+
+       memzero_explicit(&kedata, sizeof(kedata));
+       if (vsi->netdev->ethtool_ops->get_eee)
+               vsi->netdev->ethtool_ops->get_eee(vsi->netdev, &kedata);
+
+       if (!linkmode_empty(kedata.supported))
+               netdev_info(vsi->netdev,
+                           "NIC Link is Up, %sbps Full Duplex, Flow Control: %s, EEE: %s\n",
+                           speed, fc,
+                           kedata.eee_enabled ? "Enabled" : "Disabled");
+       else
+               netdev_info(vsi->netdev,
+                           "NIC Link is Up, %sbps Full Duplex, Flow Control: %s\n",
+                           speed, fc);
+}
+
 /**
  * i40e_print_link_message - print link up or down
  * @vsi: the VSI for which link needs a message
@@ -7395,9 +7415,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
                            "NIC Link is Up, %sbps Full Duplex, Requested FEC: %s, Negotiated FEC: %s, Autoneg: %s, Flow Control: %s\n",
                            speed, req_fec, fec, an, fc);
        } else {
-               netdev_info(vsi->netdev,
-                           "NIC Link is Up, %sbps Full Duplex, Flow Control: %s\n",
-                           speed, fc);
+               i40e_print_link_message_eee(vsi, speed, fc);
        }
 
 }