Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 778a57d9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-phy-add-helpers-for-handling-C45-10GBT-AN-register-values' 



Heiner Kallweit says:

====================
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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bf9d787b 96c2be34

drivers/net/phy/phy-c45.c

+1 −9
Original line number Diff line number Diff line
@@ -248,15 +248,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;

}

include/linux/mdio.h

+19 −0
Original line number Diff line number Diff line
@@ -286,6 +286,25 @@ static inline u32 linkmode_adv_to_mii_10gbt_adv_t(unsigned long *advertising) 
	return result;

}



/**

 * 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);