88 lines
2.8 KiB
Diff
88 lines
2.8 KiB
Diff
From 114002bc1af6c63de4c003f8c5d3ca0bb430d987 Mon Sep 17 00:00:00 2001
|
|
From: Florian Fainelli <f.fainelli@gmail.com>
|
|
Date: Fri, 6 Dec 2013 13:01:30 -0800
|
|
Subject: [PATCH] net: phy: report link partner features through ethtool
|
|
|
|
The PHY library already reads the MII_STAT1000 and MII_LPA registers in
|
|
genphy_read_status(), so extend it to also populate the PHY device link
|
|
partner advertised features such that we can feed this back into ethtool
|
|
when asked for it in phy_ethtool_gset().
|
|
|
|
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/phy.c | 1 +
|
|
drivers/net/phy/phy_device.c | 6 ++++++
|
|
include/linux/phy.h | 5 +++--
|
|
3 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
|
|
index 36c6994..05cb8fe 100644
|
|
--- a/drivers/net/phy/phy.c
|
|
+++ b/drivers/net/phy/phy.c
|
|
@@ -289,6 +289,7 @@ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
|
|
cmd->supported = phydev->supported;
|
|
|
|
cmd->advertising = phydev->advertising;
|
|
+ cmd->lp_advertising = phydev->lp_advertising;
|
|
|
|
ethtool_cmd_speed_set(cmd, phydev->speed);
|
|
cmd->duplex = phydev->duplex;
|
|
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
|
|
index d6447b3..6db3659 100644
|
|
--- a/drivers/net/phy/phy_device.c
|
|
+++ b/drivers/net/phy/phy_device.c
|
|
@@ -839,6 +839,8 @@ int genphy_read_status(struct phy_device *phydev)
|
|
if (err)
|
|
return err;
|
|
|
|
+ phydev->lp_advertising = 0;
|
|
+
|
|
if (AUTONEG_ENABLE == phydev->autoneg) {
|
|
if (phydev->supported & (SUPPORTED_1000baseT_Half
|
|
| SUPPORTED_1000baseT_Full)) {
|
|
@@ -852,6 +854,8 @@ int genphy_read_status(struct phy_device *phydev)
|
|
if (adv < 0)
|
|
return adv;
|
|
|
|
+ phydev->lp_advertising =
|
|
+ mii_stat1000_to_ethtool_lpa_t(lpagb);
|
|
lpagb &= adv << 2;
|
|
}
|
|
|
|
@@ -860,6 +864,8 @@ int genphy_read_status(struct phy_device *phydev)
|
|
if (lpa < 0)
|
|
return lpa;
|
|
|
|
+ phydev->lp_advertising |= mii_lpa_to_ethtool_lpa_t(lpa);
|
|
+
|
|
adv = phy_read(phydev, MII_ADVERTISE);
|
|
|
|
if (adv < 0)
|
|
diff --git a/include/linux/phy.h b/include/linux/phy.h
|
|
index 7ff751a..90a666e 100644
|
|
--- a/include/linux/phy.h
|
|
+++ b/include/linux/phy.h
|
|
@@ -287,8 +287,8 @@ struct phy_c45_device_ids {
|
|
* adjust_state: Callback for the enet driver to respond to
|
|
* changes in the state machine.
|
|
*
|
|
- * speed, duplex, pause, supported, advertising, and
|
|
- * autoneg are used like in mii_if_info
|
|
+ * speed, duplex, pause, supported, advertising, lp_advertising,
|
|
+ * and autoneg are used like in mii_if_info
|
|
*
|
|
* interrupts currently only supports enabled or disabled,
|
|
* but could be changed in the future to support enabling
|
|
@@ -340,6 +340,7 @@ struct phy_device {
|
|
/* See mii.h for more info */
|
|
u32 supported;
|
|
u32 advertising;
|
|
+ u32 lp_advertising;
|
|
|
|
int autoneg;
|
|
|
|
--
|
|
2.3.5
|
|
|