net: phy: Convert u32 phydev->lp_advertising to linkmode

Convert phy drivers to report the link partner advertised modes using
a linkmode bitmap. This allows them to report the higher speeds which
don't fit in a u32.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c
index c9e2c84..c8bb29a 100644 (file)
--- a/drivers/net/phy/lxt.c
+++ b/drivers/net/phy/lxt.c
@@ -177,7 +177,7 @@ static int lxt973a2_read_status(struct phy_device *phydev)
                        */
                } while (lpa == adv && retry--);
 
-               phydev->lp_advertising = mii_lpa_to_ethtool_lpa_t(lpa);
+               mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);
 
                lpa &= adv;
 
@@ -218,7 +218,7 @@ static int lxt973a2_read_status(struct phy_device *phydev)
                        phydev->speed = SPEED_10;
 
                phydev->pause = phydev->asym_pause = 0;
-               phydev->lp_advertising = 0;
+               linkmode_zero(phydev->lp_advertising);
        }
 
        return 0;

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 96f3383..36a0db8 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1049,22 +1049,21 @@ static int m88e1145_config_init(struct phy_device *phydev)
 }
 
 /**
- * fiber_lpa_to_ethtool_lpa_t
+ * fiber_lpa_to_linkmode_lpa_t
+ * @advertising: the linkmode advertisement settings
  * @lpa: value of the MII_LPA register for fiber link
  *
  * A small helper function that translates MII_LPA
- * bits to ethtool LP advertisement settings.
+ * bits to linkmode LP advertisement settings.
  */
-static u32 fiber_lpa_to_ethtool_lpa_t(u32 lpa)
+static void fiber_lpa_to_linkmode_lpa_t(unsigned long *advertising, u32 lpa)
 {
-       u32 result = 0;
-
        if (lpa & LPA_FIBER_1000HALF)
-               result |= ADVERTISED_1000baseT_Half;
+               linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
+                                advertising);
        if (lpa & LPA_FIBER_1000FULL)
-               result |= ADVERTISED_1000baseT_Full;
-
-       return result;
+               linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+                                advertising);
 }
 
 /**
@@ -1140,9 +1139,8 @@ static int marvell_read_status_page_an(struct phy_device *phydev,
        }
 
        if (!fiber) {
-               phydev->lp_advertising =
-                       mii_stat1000_to_ethtool_lpa_t(lpagb) |
-                       mii_lpa_to_ethtool_lpa_t(lpa);
+               mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);
+               mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising, lpagb);
 
                if (phydev->duplex == DUPLEX_FULL) {
                        phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
@@ -1150,7 +1148,7 @@ static int marvell_read_status_page_an(struct phy_device *phydev,
                }
        } else {
                /* The fiber link is only 1000M capable */
-               phydev->lp_advertising = fiber_lpa_to_ethtool_lpa_t(lpa);
+               fiber_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);
 
                if (phydev->duplex == DUPLEX_FULL) {
                        if (!(lpa & LPA_PAUSE_FIBER)) {
@@ -1189,7 +1187,7 @@ static int marvell_read_status_page_fixed(struct phy_device *phydev)
 
        phydev->pause = 0;
        phydev->asym_pause = 0;
-       phydev->lp_advertising = 0;
+       linkmode_zero(phydev->lp_advertising);
 
        return 0;
 }

diff --git a/drivers/net/phy/marvell10g.c b/drivers/net/phy/marvell10g.c
index d939dce..6f6e886 100644 (file)
--- a/drivers/net/phy/marvell10g.c
+++ b/drivers/net/phy/marvell10g.c
@@ -457,7 +457,7 @@ static int mv3310_read_status(struct phy_device *phydev)
 
        phydev->speed = SPEED_UNKNOWN;
        phydev->duplex = DUPLEX_UNKNOWN;
-       phydev->lp_advertising = 0;
+       linkmode_zero(phydev->lp_advertising);
        phydev->link = 0;
        phydev->pause = 0;
        phydev->asym_pause = 0;
@@ -490,7 +490,7 @@ static int mv3310_read_status(struct phy_device *phydev)
                if (val < 0)
                        return val;
 
-               phydev->lp_advertising |= mii_stat1000_to_ethtool_lpa_t(val);
+               mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising, val);
 
                if (phydev->autoneg == AUTONEG_ENABLE)
                        phy_resolve_aneg_linkmode(phydev);

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index a19f4df..03af927 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -181,7 +181,7 @@ int genphy_c45_read_lpa(struct phy_device *phydev)
        if (val < 0)
                return val;
 
-       phydev->lp_advertising = mii_lpa_to_ethtool_lpa_t(val);
+       mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, val);
        phydev->pause = val & LPA_PAUSE_CAP ? 1 : 0;
        phydev->asym_pause = val & LPA_PAUSE_ASYM ? 1 : 0;
 
@@ -191,7 +191,8 @@ int genphy_c45_read_lpa(struct phy_device *phydev)
                return val;
 
        if (val & MDIO_AN_10GBT_STAT_LP10G)
-               phydev->lp_advertising |= ADVERTISED_10000baseT_Full;
+               linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
+                                phydev->lp_advertising);
 
        return 0;
 }

diff --git a/drivers/net/phy/phy-core.c b/drivers/net/phy/phy-core.c
index 9d192b6..2c3a13d 100644 (file)
--- a/drivers/net/phy/phy-core.c
+++ b/drivers/net/phy/phy-core.c
@@ -199,11 +199,8 @@ size_t phy_speeds(unsigned int *speeds, size_t size,
 void phy_resolve_aneg_linkmode(struct phy_device *phydev)
 {
        __ETHTOOL_DECLARE_LINK_MODE_MASK(common);
-       __ETHTOOL_DECLARE_LINK_MODE_MASK(lp);
 
-       ethtool_convert_legacy_u32_to_link_mode(lp, phydev->lp_advertising);
-
-       linkmode_and(common, lp, phydev->advertising);
+       linkmode_and(common, phydev->lp_advertising, phydev->advertising);
 
        if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT, common)) {
                phydev->speed = SPEED_10000;
@@ -235,9 +232,11 @@ void phy_resolve_aneg_linkmode(struct phy_device *phydev)
        }
 
        if (phydev->duplex == DUPLEX_FULL) {
-               phydev->pause = !!(phydev->lp_advertising & ADVERTISED_Pause);
-               phydev->asym_pause = !!(phydev->lp_advertising &
-                                       ADVERTISED_Asym_Pause);
+               phydev->pause = linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
+                                                 phydev->lp_advertising);
+               phydev->asym_pause = linkmode_test_bit(
+                       ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+                       phydev->lp_advertising);
        }
 }
 EXPORT_SYMBOL_GPL(phy_resolve_aneg_linkmode);

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index ecc8a7d..d738733 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -368,9 +368,7 @@ void phy_ethtool_ksettings_get(struct phy_device *phydev,
 {
        linkmode_copy(cmd->link_modes.supported, phydev->supported);
        linkmode_copy(cmd->link_modes.advertising, phydev->advertising);
-
-       ethtool_convert_legacy_u32_to_link_mode(cmd->link_modes.lp_advertising,
-                                               phydev->lp_advertising);
+       linkmode_copy(cmd->link_modes.lp_advertising, phydev->lp_advertising);
 
        cmd->base.speed = phydev->speed;
        cmd->base.duplex = phydev->duplex;
@@ -549,7 +547,7 @@ int phy_start_aneg(struct phy_device *phydev)
                phy_sanitize_settings(phydev);
 
        /* Invalidate LP advertising flags */
-       phydev->lp_advertising = 0;
+       linkmode_zero(phydev->lp_advertising);
 
        err = phy_config_aneg(phydev);
        if (err < 0)
@@ -610,7 +608,7 @@ int phy_speed_down(struct phy_device *phydev, bool sync)
                return 0;
 
        linkmode_copy(adv_old, phydev->advertising);
-       ethtool_convert_legacy_u32_to_link_mode(adv, phydev->lp_advertising);
+       linkmode_copy(adv, phydev->lp_advertising);
        linkmode_and(adv, adv, phydev->supported);
 
        if (linkmode_test_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, adv) ||

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 09a1c2d..55202a0 100644 (file)
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1702,7 +1702,7 @@ int genphy_read_status(struct phy_device *phydev)
        if (err)
                return err;
 
-       phydev->lp_advertising = 0;
+       linkmode_zero(phydev->lp_advertising);
 
        if (AUTONEG_ENABLE == phydev->autoneg) {
                if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
@@ -1725,8 +1725,8 @@ int genphy_read_status(struct phy_device *phydev)
                                return -ENOLINK;
                        }
 
-                       phydev->lp_advertising =
-                               mii_stat1000_to_ethtool_lpa_t(lpagb);
+                       mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising,
+                                                      lpagb);
                        common_adv_gb = lpagb & adv << 2;
                }
 
@@ -1734,7 +1734,7 @@ int genphy_read_status(struct phy_device *phydev)
                if (lpa < 0)
                        return lpa;
 
-               phydev->lp_advertising |= mii_lpa_to_ethtool_lpa_t(lpa);
+               mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);
 
                adv = phy_read(phydev, MII_ADVERTISE);
                if (adv < 0)

diff --git a/drivers/net/phy/uPD60620.c b/drivers/net/phy/uPD60620.c
index 55f48ee..1e4fc42 100644 (file)
--- a/drivers/net/phy/uPD60620.c
+++ b/drivers/net/phy/uPD60620.c
@@ -47,7 +47,7 @@ static int upd60620_read_status(struct phy_device *phydev)
                return phy_state;
 
        phydev->link = 0;
-       phydev->lp_advertising = 0;
+       linkmode_zero(phydev->lp_advertising);
        phydev->pause = 0;
        phydev->asym_pause = 0;
 
@@ -70,8 +70,8 @@ static int upd60620_read_status(struct phy_device *phydev)
                        if (phy_state < 0)
                                return phy_state;
 
-                       phydev->lp_advertising
-                               = mii_lpa_to_ethtool_lpa_t(phy_state);
+                       mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising,
+                                                 phy_state);
 
                        if (phydev->duplex == DUPLEX_FULL) {
                                if (phy_state & LPA_PAUSE_CAP)

diff --git a/include/linux/mii.h b/include/linux/mii.h
index aaa458b..e7112e8 100644 (file)
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -288,6 +288,25 @@ static inline u32 mii_stat1000_to_ethtool_lpa_t(u32 lpa)
 }
 
 /**
+ * mii_stat1000_to_linkmode_lpa_t
+ * @advertising: target the linkmode advertisement settings
+ * @adv: value of the MII_STAT1000 register
+ *
+ * A small helper function that translates MII_STAT1000 bits, when in
+ * 1000Base-T mode, to linkmode advertisement settings.
+ */
+static inline void mii_stat1000_to_linkmode_lpa_t(unsigned long *advertising,
+                                                 u32 lpa)
+{
+       if (lpa & LPA_1000HALF)
+               linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
+                                advertising);
+       if (lpa & LPA_1000FULL)
+               linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
+                                advertising);
+}
+
+/**
  * ethtool_adv_to_mii_adv_x
  * @ethadv: the ethtool advertisement settings
  *
@@ -385,6 +404,23 @@ static inline void mii_adv_to_linkmode_adv_t(unsigned long *advertising,
 }
 
 /**
+ * mii_lpa_to_linkmode_lpa_t
+ * @adv: value of the MII_LPA register
+ *
+ * A small helper function that translates MII_LPA bits, when in
+ * 1000Base-T mode, to linkmode LP advertisement settings.
+ */
+static inline void mii_lpa_to_linkmode_lpa_t(unsigned long *lp_advertising,
+                                            u32 lpa)
+{
+       if (lpa & LPA_LPACK)
+               linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+                                lp_advertising);
+
+       mii_adv_to_linkmode_adv_t(lp_advertising, lpa);
+}
+
+/**
  * linkmode_adv_to_lcl_adv_t
  * @advertising:pointer to linkmode advertising
  *

diff --git a/include/linux/phy.h b/include/linux/phy.h
index cbc66ac..8f92724 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -414,8 +414,7 @@ struct phy_device {
        /* See ethtool.h for more info */
        __ETHTOOL_DECLARE_LINK_MODE_MASK(supported);
        __ETHTOOL_DECLARE_LINK_MODE_MASK(advertising);
-
-       u32 lp_advertising;
+       __ETHTOOL_DECLARE_LINK_MODE_MASK(lp_advertising);
 
        /* Energy efficient ethernet modes which should be prohibited */
        u32 eee_broken_modes;