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

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

net: mii: Rename mii_stat1000_to_linkmode_lpa_t 



Rename mii_stat1000_to_linkmode_lpa_t to
mii_stat1000_mod_linkmode_lpa_t to indicate it modifies the passed
linkmode bitmap, without clearing any other bits.

Add a helper to set/clear bits in a linkmode.

Use this helper to ensure bit are clear which the stat1000 indicates
should not be set.

Fixes: c0ec3c27 ("net: phy: Convert u32 phydev->lp_advertising to linkmode")
Suggested-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 5f15eed2

drivers/net/phy/marvell.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int marvell_read_status_page_an(struct phy_device *phydev, 


	if (!fiber) {

		mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa);

		mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising, lpagb);

		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, lpagb);



		if (phydev->duplex == DUPLEX_FULL) {

			phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;

drivers/net/phy/marvell10g.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int mv3310_read_status(struct phy_device *phydev) 
		if (val < 0)

			return val;



		mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising, val);

		mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);



		if (phydev->autoneg == AUTONEG_ENABLE)

			phy_resolve_aneg_linkmode(phydev);

drivers/net/phy/phy_device.c

+2 −2
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ int genphy_read_status(struct phy_device *phydev) 
				return -ENOLINK;

			}



			mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising,

			mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising,

							lpagb);

			common_adv_gb = lpagb & adv << 2;

		}

include/linux/linkmode.h

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,15 @@ static inline void linkmode_clear_bit(int nr, volatile unsigned long *addr) 
	__clear_bit(nr, addr);

}



static inline void linkmode_mod_bit(int nr, volatile unsigned long *addr,

				    int set)

{

	if (set)

		linkmode_set_bit(nr, addr);

	else

		linkmode_clear_bit(nr, addr);

}



static inline void linkmode_change_bit(int nr, volatile unsigned long *addr)

{

	__change_bit(nr, addr);

include/linux/mii.h

+10 −10
Original line number Diff line number Diff line
@@ -288,22 +288,22 @@ static inline u32 mii_stat1000_to_ethtool_lpa_t(u32 lpa) 
}



/**

 * mii_stat1000_to_linkmode_lpa_t

 * mii_stat1000_mod_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.

 * 1000Base-T mode, to linkmode advertisement settings. Other bits in

 * advertising are not changes.

 */

static inline void mii_stat1000_to_linkmode_lpa_t(unsigned long *advertising,

static inline void mii_stat1000_mod_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);

	linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,

			 advertising, lpa & LPA_1000HALF);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

			 advertising, lpa & LPA_1000FULL);

}



/**