github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: phy: marvell: fix m88e1011_set_downshift

Browse Source 
[ Upstream commit 990875b299 ]

Changing downshift params without software reset has no effect,
so call genphy_soft_reset() after change downshift params.

As the datasheet says:
Changes to these bits are disruptive to the normal operation therefore,
any changes to these registers must be followed by software reset
to take effect.

Fixes: 911af5e149 ("net: phy: marvell: fix downshift function naming")
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Maxim Kochetkov 2021-04-22 13:46:43 +03:00 committed by Greg Kroah-Hartman
parent be63182565
commit 1157d01e04
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,22 +919,28 @@ static int m88e1011_get_downshift(struct phy_device *phydev, u8 *data)
static int m88e1011_set_downshift(struct phy_device *phydev, u8 cnt) static int m88e1011_set_downshift(struct phy_device *phydev, u8 cnt)
{ {
int val; int val, err;
if (cnt > MII_M1011_PHY_SCR_DOWNSHIFT_MAX) if (cnt > MII_M1011_PHY_SCR_DOWNSHIFT_MAX)
return -E2BIG; return -E2BIG;
if (!cnt) if (!cnt) {
return phy_clear_bits(phydev, MII_M1011_PHY_SCR, err = phy_clear_bits(phydev, MII_M1011_PHY_SCR,
MII_M1011_PHY_SCR_DOWNSHIFT_EN); MII_M1011_PHY_SCR_DOWNSHIFT_EN);
} else {
val = MII_M1011_PHY_SCR_DOWNSHIFT_EN;
val |= FIELD_PREP(MII_M1011_PHY_SCR_DOWNSHIFT_MASK, cnt - 1);
val = MII_M1011_PHY_SCR_DOWNSHIFT_EN; err = phy_modify(phydev, MII_M1011_PHY_SCR,
val |= FIELD_PREP(MII_M1011_PHY_SCR_DOWNSHIFT_MASK, cnt - 1); MII_M1011_PHY_SCR_DOWNSHIFT_EN |
MII_M1011_PHY_SCR_DOWNSHIFT_MASK,
val);
}
return phy_modify(phydev, MII_M1011_PHY_SCR, if (err < 0)
MII_M1011_PHY_SCR_DOWNSHIFT_EN | return err;
MII_M1011_PHY_SCR_DOWNSHIFT_MASK,
val); return genphy_soft_reset(phydev);
} }
static int m88e1011_get_tunable(struct phy_device *phydev, static int m88e1011_get_tunable(struct phy_device *phydev,