Skip to content

Commit bba1831

Browse files
minimaxwelldavem330
authored andcommitted
net: mvpp2: Don't check for 3 consecutive Idle frames for 10G links
PPv2's XLGMAC can wait for 3 idle frames before triggering a link up event. This can cause the link to be stuck low when there's traffic on the interface, so disable this feature. Fixes: 4bb0432 ("net: mvpp2: phylink support") Signed-off-by: Maxime Chevallier <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 12185df commit bba1831

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4739,9 +4739,9 @@ static void mvpp2_xlg_config(struct mvpp2_port *port, unsigned int mode,
47394739
else
47404740
ctrl0 &= ~MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN;
47414741

4742-
ctrl4 &= ~MVPP22_XLG_CTRL4_MACMODSELECT_GMAC;
4743-
ctrl4 |= MVPP22_XLG_CTRL4_FWD_FC | MVPP22_XLG_CTRL4_FWD_PFC |
4744-
MVPP22_XLG_CTRL4_EN_IDLE_CHECK;
4742+
ctrl4 &= ~(MVPP22_XLG_CTRL4_MACMODSELECT_GMAC |
4743+
MVPP22_XLG_CTRL4_EN_IDLE_CHECK);
4744+
ctrl4 |= MVPP22_XLG_CTRL4_FWD_FC | MVPP22_XLG_CTRL4_FWD_PFC;
47454745

47464746
if (old_ctrl0 != ctrl0)
47474747
writel(ctrl0, port->base + MVPP22_XLG_CTRL0_REG);

0 commit comments

Comments
 (0)