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

Commit d3351931 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: mii: Add mii_lpa_mod_linkmode_lpa_t 



Add a _mod_ variant of mii_lpa_to_linkmode_lpa_t. Use this to fix the
genphy_read_status() where the 1G link partner features are getting
lost.

Fixes: c0ec3c27 ("net: phy: Convert u32 phydev->lp_advertising to linkmode")
Reported-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ab9cb729

drivers/net/phy/phy_device.c

+1 −1
Original line number Diff line number Diff line
@@ -1748,7 +1748,7 @@ int genphy_read_status(struct phy_device *phydev) 
		if (lpa < 0)

			return lpa;



		mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);

		mii_lpa_mod_linkmode_lpa_t(phydev->lp_advertising, lpa);



		adv = phy_read(phydev, MII_ADVERTISE);

		if (adv < 0)

include/linux/mii.h

+52 −16
Original line number Diff line number Diff line
@@ -372,6 +372,36 @@ static inline u32 mii_lpa_to_ethtool_lpa_x(u32 lpa) 
	return result | mii_adv_to_ethtool_adv_x(lpa);

}



/**

 * mii_adv_mod_linkmode_adv_t

 * @advertising:pointer to destination link mode.

 * @adv: value of the MII_ADVERTISE register

 *

 * A small helper function that translates MII_ADVERTISE bits to

 * linkmode advertisement settings. Leaves other bits unchanged.

 */

static inline void mii_adv_mod_linkmode_adv_t(unsigned long *advertising,

					      u32 adv)

{

	linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,

			 advertising, adv & ADVERTISE_10HALF);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,

			 advertising, adv & ADVERTISE_10FULL);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT,

			 advertising, adv & ADVERTISE_100HALF);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,

			 advertising, adv & ADVERTISE_100FULL);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT, advertising,

			 adv & ADVERTISE_PAUSE_CAP);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,

			 advertising, adv & ADVERTISE_PAUSE_ASYM);

}



/**

 * mii_adv_to_linkmode_adv_t

 * @advertising:pointer to destination link mode.
@@ -386,22 +416,7 @@ static inline void mii_adv_to_linkmode_adv_t(unsigned long *advertising, 
{

	linkmode_zero(advertising);



	if (adv & ADVERTISE_10HALF)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,

				 advertising);

	if (adv & ADVERTISE_10FULL)

		linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,

				 advertising);

	if (adv & ADVERTISE_100HALF)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT,

				 advertising);

	if (adv & ADVERTISE_100FULL)

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,

				 advertising);

	if (adv & ADVERTISE_PAUSE_CAP)

		linkmode_set_bit(ETHTOOL_LINK_MODE_Pause_BIT, advertising);

	if (adv & ADVERTISE_PAUSE_ASYM)

		linkmode_set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, advertising);

	mii_adv_mod_linkmode_adv_t(advertising, adv);

}



/**
@@ -423,6 +438,27 @@ static inline void mii_lpa_to_linkmode_lpa_t(unsigned long *lp_advertising, 


}



/**

 * mii_lpa_mod_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. Leaves

 * other bits unchanged.

 */

static inline void mii_lpa_mod_linkmode_lpa_t(unsigned long *lp_advertising,

					      u32 lpa)

{

	mii_adv_mod_linkmode_adv_t(lp_advertising, lpa);



	if (lpa & LPA_LPACK)

		linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

				 lp_advertising);

	else

		linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

				   lp_advertising);

}



/**

 * linkmode_adv_to_lcl_adv_t

 * @advertising:pointer to linkmode advertising