p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: c0ec3c2736 ("net: phy: Convert u32 phydev->lp_advertising to linkmode")
Suggested-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2018-12-05 21:49:41 +01:00 committed by David S. Miller
parent 5f15eed245
commit 78a24df370
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/phy/marvell.c
View File

@ -1138,7 +1138,7 @@ static int marvell_read_status_page_an(struct phy_device *phydev,
if (!fiber) { if (!fiber) {
mii_lpa_to_linkmode_lpa_t(phydev->lp_advertising, lpa); 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) { if (phydev->duplex == DUPLEX_FULL) {
phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0; phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;

2
drivers/net/phy/marvell10g.c
View File

@ -490,7 +490,7 @@ static int mv3310_read_status(struct phy_device *phydev)
if (val < 0) if (val < 0)
return val; 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) if (phydev->autoneg == AUTONEG_ENABLE)
phy_resolve_aneg_linkmode(phydev); phy_resolve_aneg_linkmode(phydev);

4
drivers/net/phy/phy_device.c
View File

@ -1739,8 +1739,8 @@ int genphy_read_status(struct phy_device *phydev)
return -ENOLINK; return -ENOLINK;
} }
mii_stat1000_to_linkmode_lpa_t(phydev->lp_advertising, mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising,
lpagb); lpagb);
common_adv_gb = lpagb & adv << 2; common_adv_gb = lpagb & adv << 2;
} }

9
include/linux/linkmode.h
View File

@ -57,6 +57,15 @@ static inline void linkmode_clear_bit(int nr, volatile unsigned long *addr)
__clear_bit(nr, 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) static inline void linkmode_change_bit(int nr, volatile unsigned long *addr)
{ {
__change_bit(nr, addr); __change_bit(nr, addr);

20
include/linux/mii.h
View File

@ -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 * @advertising: target the linkmode advertisement settings
* @adv: value of the MII_STAT1000 register * @adv: value of the MII_STAT1000 register
* *
* A small helper function that translates MII_STAT1000 bits, when in * 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) u32 lpa)
{ {
if (lpa & LPA_1000HALF) linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, advertising, lpa & LPA_1000HALF);
advertising);
if (lpa & LPA_1000FULL) linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, advertising, lpa & LPA_1000FULL);
advertising);
} }
/** /**