Skip to content

Commit 829e757

Browse files
baruchsiachdavem330
authored andcommitted
net: phy: marvell10g: limit soft reset to 88x3310
The MV_V2_PORT_CTRL_SWRST bit in MV_V2_PORT_CTRL is reserved on 88E2110. Setting SWRST on 88E2110 breaks packets transfer after interface down/up cycle. Fixes: 8f48c2a ("net: marvell10g: soft-reset the PHY when coming out of low power") Signed-off-by: Baruch Siach <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7c74b0b commit 829e757

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/phy/marvell10g.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ static int mv3310_power_up(struct phy_device *phydev)
246246
ret = phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,
247247
MV_V2_PORT_CTRL_PWRDOWN);
248248

249-
if (priv->firmware_ver < 0x00030000)
249+
if (phydev->drv->phy_id != MARVELL_PHY_ID_88X3310 ||
250+
priv->firmware_ver < 0x00030000)
250251
return ret;
251252

252253
return phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_PORT_CTRL,

0 commit comments

Comments
 (0)