net: phy: add helpers for handling C45 10GBT AN register values
Subsystems (3)
Heiner Kallweit
maintainerv2 cover net: phy: add helpers for handling C45 10GBT AN register values
Similar to the existing helpers for the Clause 22 registers add helpers to deal with converting Clause 45 advertisement registers to / from link mode bitmaps.
Note that these helpers are defined in linux/mdio.h, not like the Clause 22 helpers in linux/mii.h. Reason is that the Clause 45 register constants are defined in uapi/linux/mdio.h. And uapi/linux/mdio.h includes linux/mii.h before defining the C45 register constants.
v2:
- Remove few helpers which aren't used by this series. They will follow together with the users.
Heiner Kallweit (2):
net: phy: add helper mii_10gbt_stat_mod_linkmode_lpa_t
net: phy: use mii_10gbt_stat_mod_linkmode_lpa_t in genphy_c45_read_lpa
drivers/net/phy/phy-c45.c | 10 +--------- include/linux/mdio.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-)
Signature · 1 line
2.20.1
Heiner Kallweit
maintainerPATCH v2 1/2 net: phy: add helper mii_10gbt_stat_mod_linkmode_lpa_t
Similar to the existing helpers for the Clause 22 registers add helper mii_10gbt_stat_mod_linkmode_lpa_t.
Note that this helper is defined in linux/mdio.h, not like the Clause 22 helpers in linux/mii.h. Reason is that the Clause 45 register constants are defined in uapi/linux/mdio.h. And uapi/linux/mdio.h includes linux/mii.h before defining the C45 register constants.
v2:
- remove helpers that don't have users in this series
--- include/linux/mdio.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
include/linux/mdio.h +19 -0
@@ -261,6 +261,25 @@ static inline u16 ethtool_adv_to_mmd_eee_adv_t(u32 adv)return reg; } +/** +* mii_10gbt_stat_mod_linkmode_lpa_t +* @advertising: target the linkmode advertisement settings +* @adv: value of the C45 10GBASE-T AN STATUS register +* +* A small helper function that translates C45 10GBASE-T AN STATUS register bits +* to linkmode advertisement settings. Other bits in advertising aren't changed. +*/ +static inline void mii_10gbt_stat_mod_linkmode_lpa_t (unsigned long *advertising, +u32 lpa) +{ +linkmode_mod_bit (ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + advertising, lpa &MDIO_AN_10GBT_STAT_LP2_5G ); +linkmode_mod_bit (ETHTOOL_LINK_MODE_5000baseT_Full_BIT, + advertising, lpa &MDIO_AN_10GBT_STAT_LP5G ); +linkmode_mod_bit (ETHTOOL_LINK_MODE_10000baseT_Full_BIT, + advertising, lpa &MDIO_AN_10GBT_STAT_LP10G ); +} +int __mdiobus_read (struct mii_bus *bus,int addr,u32 regnum);int __mdiobus_write (struct mii_bus *bus,int addr,u32 regnum,u16 val);
Signature · 1 line
2.20.1
Re: [PATCH net-next v2 1/2] net: phy: add helper mii_10gbt_stat_mod_linkmode_lpa_t
Quoted 7 lines · Heiner Kallweit
Similar to the existing helpers for the Clause 22 registers add helper
mii_10gbt_stat_mod_linkmode_lpa_t.Note that this helper is defined in
linux/mdio.h, not like the Clause 22 helpers inlinux/mii.h. Reason is that the Clause 45 register constants are defined inuapi/linux/mdio.h. Anduapi/linux/mdio.hincludeslinux/mii.hbefore defining the C45 register constants.
Nit: this also processes 2.5G and 5G but I can't suggest a better name, so this is as good as any.
Quoted 5 lines
v2:
- remove helpers that don't have users in this seriesSigned-off-by Heiner Kallweit <[email protected]>
Signature · 1 line
Florian
Heiner Kallweit
maintainerRe: [PATCH net-next v2 1/2] net: phy: add helper mii_10gbt_stat_mod_linkmode_lpa_t
Quoted 6 lines · Florian Fainelli
Quoted 3 lines · Heiner Kallweit
Similar to the existing helpers for the Clause 22 registers add helper
mii_10gbt_stat_mod_linkmode_lpa_t.
Quoted 8 lines
Quoted 4 lines
Note that this helper is defined in
linux/mdio.h, not like the Clause 22 helpers inlinux/mii.h. Reason is that the Clause 45 register constants are defined inuapi/linux/mdio.h. Anduapi/linux/mdio.hincludeslinux/mii.hbefore defining the C45 register constants.Nit: this also processes 2.5G and 5G but I can't suggest a better name, so this is as good as any.
I also thought about this and eventually decided to go with the register name from the Clause 45 (2015) spec. Not sure whether there's a newer version, but even if I (after 802.3bz was established) doubt that they would rename a register.
Quoted 8 lines
Quoted 5 lines
v2:
- remove helpers that don't have users in this seriesSigned-off-by Heiner Kallweit <[email protected]>Reviewed-by Florian Fainelli <[email protected]>
Heiner Kallweit
maintainerPATCH v2 2/2 net: phy: use mii_10gbt_stat_mod_linkmode_lpa_t in genphy_c45_read_lpa
In reply to Heiner KallweitUse mii_10gbt_stat_mod_linkmode_lpa_t() in genphy_c45_read_lpa() to simplify the code.
--- drivers/net/phy/phy-c45.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/net/phy/phy-c45.c +1 -9
@@ -204,15 +204,7 @@ int genphy_c45_read_lpa(struct phy_device *phydev)if (val <0 )return val; -if (val &MDIO_AN_10GBT_STAT_LP2_5G ) -linkmode_set_bit (ETHTOOL_LINK_MODE_2500baseT_Full_BIT, - phydev->lp_advertising); -if (val &MDIO_AN_10GBT_STAT_LP5G ) -linkmode_set_bit (ETHTOOL_LINK_MODE_5000baseT_Full_BIT, - phydev->lp_advertising); -if (val &MDIO_AN_10GBT_STAT_LP10G ) -linkmode_set_bit (ETHTOOL_LINK_MODE_10000baseT_Full_BIT, - phydev->lp_advertising); +mii_10gbt_stat_mod_linkmode_lpa_t (phydev->lp_advertising, val);return 0 ; }
Signature · 1 line
2.20.1
Re: [PATCH net-next v2 2/2] net: phy: use mii_10gbt_stat_mod_linkmode_lpa_t in genphy_c45_read_lpa
Quoted 4 lines · Heiner Kallweit
Use
mii_10gbt_stat_mod_linkmode_lpa_t()ingenphy_c45_read_lpa()to simplify the code.Signed-off-by Heiner Kallweit <[email protected]>
Signature · 1 line
Florian
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Sat, 16 Feb 2019 17:24:58 +0100
Quoted 4 lines
Similar to the existing helpers for the Clause 22 registers add helpers to deal with converting Clause 45 advertisement registers to / from link mode bitmaps.
Quoted 8 lines
Note that these helpers are defined in
linux/mdio.h, not like the Clause 22 helpers inlinux/mii.h. Reason is that the Clause 45 register constants are defined inuapi/linux/mdio.h. Anduapi/linux/mdio.hincludeslinux/mii.hbefore defining the C45 register constants.v2:
- Remove few helpers which aren't used by this series. They will follow together with the users.
Series applied with fuzz on patch #1 :-)))))