net: phy: add helper to convert negotiation result to phy settings

Add a helper to convert the result of the autonegotiation advertisment
into the PHYs speed and duplex settings.  If the result is full duplex,
also extract the pause mode settings from the link partner advertisment.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 21f75ae244b363eb1b1aeec245e5c3cd81db566e..c0ad08fa9d2c71eb4ebb5406b028396a8a157d4b 100644 (file)
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -189,6 +189,49 @@ size_t phy_speeds(unsigned int *speeds, size_t size,
        return count;
 }
 
+/**
+ * phy_resolve_aneg_linkmode - resolve the advertisments into phy settings
+ * @phydev: The phy_device struct
+ *
+ * Resolve our and the link partner advertisments into their corresponding
+ * speed and duplex. If full duplex was negotiated, extract the pause mode
+ * from the link partner mask.
+ */
+void phy_resolve_aneg_linkmode(struct phy_device *phydev)
+{
+       u32 common = phydev->lp_advertising & phydev->advertising;
+
+       if (common & ADVERTISED_10000baseT_Full) {
+               phydev->speed = SPEED_10000;
+               phydev->duplex = DUPLEX_FULL;
+       } else if (common & ADVERTISED_1000baseT_Full) {
+               phydev->speed = SPEED_1000;
+               phydev->duplex = DUPLEX_FULL;
+       } else if (common & ADVERTISED_1000baseT_Half) {
+               phydev->speed = SPEED_1000;
+               phydev->duplex = DUPLEX_HALF;
+       } else if (common & ADVERTISED_100baseT_Full) {
+               phydev->speed = SPEED_100;
+               phydev->duplex = DUPLEX_FULL;
+       } else if (common & ADVERTISED_100baseT_Half) {
+               phydev->speed = SPEED_100;
+               phydev->duplex = DUPLEX_HALF;
+       } else if (common & ADVERTISED_10baseT_Full) {
+               phydev->speed = SPEED_10;
+               phydev->duplex = DUPLEX_FULL;
+       } else if (common & ADVERTISED_10baseT_Half) {
+               phydev->speed = SPEED_10;
+               phydev->duplex = DUPLEX_HALF;
+       }
+
+       if (phydev->duplex == DUPLEX_FULL) {
+               phydev->pause = !!(phydev->lp_advertising & ADVERTISED_Pause);
+               phydev->asym_pause = !!(phydev->lp_advertising &
+                                       ADVERTISED_Asym_Pause);
+       }
+}
+EXPORT_SYMBOL_GPL(phy_resolve_aneg_linkmode);
+
 static void mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad,
                             u16 regnum)
 {

diff --git a/include/linux/phy.h b/include/linux/phy.h
index bc379a408c4ffea000a57148731344393a13dd69..a052e37684224d99b5874c08304b1cd9bbf32be1 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -690,6 +690,8 @@ phy_lookup_setting(int speed, int duplex, const unsigned long *mask,
 size_t phy_speeds(unsigned int *speeds, size_t size,
                  unsigned long *mask, size_t maxbit);
 
+void phy_resolve_aneg_linkmode(struct phy_device *phydev);
+
 /**
  * phy_read_mmd - Convenience function for reading a register
  * from an MMD on a given PHY.