Skip to content

Commit 611e2da

Browse files
dangowrtdavem330
authored andcommitted
net: ethernet: mtk_eth_soc: reset PCS state
Reset the internal PCS state machine when changing interface mode. This prevents confusing the state machine when changing interface modes, e.g. from SGMII to 2500Base-X or vice-versa. Fixes: 7e53837 ("net: ethernet: mediatek: Re-add support SGMII") Reviewed-by: Russell King (Oracle) <[email protected]> Tested-by: Bjørn Mork <[email protected]> Signed-off-by: Daniel Golle <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent d8b2283 commit 611e2da

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

drivers/net/ethernet/mediatek/mtk_eth_soc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,10 @@
542542
#define SGMII_SEND_AN_ERROR_EN BIT(11)
543543
#define SGMII_IF_MODE_MASK GENMASK(5, 1)
544544

545+
/* Register to reset SGMII design */
546+
#define SGMII_RESERVED_0 0x34
547+
#define SGMII_SW_RESET BIT(0)
548+
545549
/* Register to set SGMII speed, ANA RG_ Control Signals III*/
546550
#define SGMSYS_ANA_RG_CS3 0x2028
547551
#define RG_PHY_SPEED_MASK (BIT(2) | BIT(3))

drivers/net/ethernet/mediatek/mtk_sgmii.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ static int mtk_pcs_config(struct phylink_pcs *pcs, unsigned int mode,
8888
regmap_update_bits(mpcs->regmap, SGMSYS_QPHY_PWR_STATE_CTRL,
8989
SGMII_PHYA_PWD, SGMII_PHYA_PWD);
9090

91+
/* Reset SGMII PCS state */
92+
regmap_update_bits(mpcs->regmap, SGMII_RESERVED_0,
93+
SGMII_SW_RESET, SGMII_SW_RESET);
94+
9195
if (interface == PHY_INTERFACE_MODE_2500BASEX)
9296
rgc3 = RG_PHY_SPEED_3_125G;
9397
else

0 commit comments

Comments
 (0)