Skip to content

Commit 63d78cc

Browse files
Russell Kingdavem330
authored andcommitted
net: mvpp2: set xlg flow control in mvpp2_mac_link_up()
Set the flow control settings in mvpp2_mac_link_up() for 10G links just as we do for 1G and slower links. This is now the preferred location. Signed-off-by: Russell King <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bd45f64 commit 63d78cc

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

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

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4959,17 +4959,9 @@ static void mvpp2_xlg_config(struct mvpp2_port *port, unsigned int mode,
49594959
{
49604960
u32 val;
49614961

4962-
val = MVPP22_XLG_CTRL0_MAC_RESET_DIS;
4963-
if (state->pause & MLO_PAUSE_TX)
4964-
val |= MVPP22_XLG_CTRL0_TX_FLOW_CTRL_EN;
4965-
4966-
if (state->pause & MLO_PAUSE_RX)
4967-
val |= MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN;
4968-
49694962
mvpp2_modify(port->base + MVPP22_XLG_CTRL0_REG,
4970-
MVPP22_XLG_CTRL0_MAC_RESET_DIS |
4971-
MVPP22_XLG_CTRL0_TX_FLOW_CTRL_EN |
4972-
MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN, val);
4963+
MVPP22_XLG_CTRL0_MAC_RESET_DIS,
4964+
MVPP22_XLG_CTRL0_MAC_RESET_DIS);
49734965
mvpp2_modify(port->base + MVPP22_XLG_CTRL4_REG,
49744966
MVPP22_XLG_CTRL4_MACMODSELECT_GMAC |
49754967
MVPP22_XLG_CTRL4_EN_IDLE_CHECK |
@@ -5159,10 +5151,17 @@ static void mvpp2_mac_link_up(struct phylink_config *config,
51595151

51605152
if (mvpp2_is_xlg(interface)) {
51615153
if (!phylink_autoneg_inband(mode)) {
5154+
val = MVPP22_XLG_CTRL0_FORCE_LINK_PASS;
5155+
if (tx_pause)
5156+
val |= MVPP22_XLG_CTRL0_TX_FLOW_CTRL_EN;
5157+
if (rx_pause)
5158+
val |= MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN;
5159+
51625160
mvpp2_modify(port->base + MVPP22_XLG_CTRL0_REG,
51635161
MVPP22_XLG_CTRL0_FORCE_LINK_DOWN |
5164-
MVPP22_XLG_CTRL0_FORCE_LINK_PASS,
5165-
MVPP22_XLG_CTRL0_FORCE_LINK_PASS);
5162+
MVPP22_XLG_CTRL0_FORCE_LINK_PASS |
5163+
MVPP22_XLG_CTRL0_TX_FLOW_CTRL_EN |
5164+
MVPP22_XLG_CTRL0_RX_FLOW_CTRL_EN, val);
51665165
}
51675166
} else {
51685167
if (!phylink_autoneg_inband(mode)) {

0 commit comments

Comments
 (0)