Commit 75674e31 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: mtk_eth_soc: use resolved link config in mac_link_up() 



Convert the mtk_eth_soc driver to use the finalised link parameters in
mac_link_up() rather than the parameters in mac_config().

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 864cefee

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+25 −20
Original line number Diff line number Diff line
@@ -344,29 +344,9 @@ static void mtk_mac_config(struct phylink_config *config, unsigned int mode, 
	/* Setup gmac */

	mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));

	mcr_new = mcr_cur;

	mcr_new &= ~(MAC_MCR_SPEED_100 | MAC_MCR_SPEED_1000 |

		     MAC_MCR_FORCE_DPX | MAC_MCR_FORCE_TX_FC |

		     MAC_MCR_FORCE_RX_FC);

	mcr_new |= MAC_MCR_MAX_RX_1536 | MAC_MCR_IPG_CFG | MAC_MCR_FORCE_MODE |

		   MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_LINK;



	switch (state->speed) {

	case SPEED_2500:

	case SPEED_1000:

		mcr_new |= MAC_MCR_SPEED_1000;

		break;

	case SPEED_100:

		mcr_new |= MAC_MCR_SPEED_100;

		break;

	}

	if (state->duplex == DUPLEX_FULL) {

		mcr_new |= MAC_MCR_FORCE_DPX;

		if (state->pause & MLO_PAUSE_TX)

			mcr_new |= MAC_MCR_FORCE_TX_FC;

		if (state->pause & MLO_PAUSE_RX)

			mcr_new |= MAC_MCR_FORCE_RX_FC;

	}



	/* Only update control register when needed! */

	if (mcr_new != mcr_cur)

		mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
@@ -443,6 +423,31 @@ static void mtk_mac_link_up(struct phylink_config *config, 
					   phylink_config);

	u32 mcr = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));



	mcr &= ~(MAC_MCR_SPEED_100 | MAC_MCR_SPEED_1000 |

		 MAC_MCR_FORCE_DPX | MAC_MCR_FORCE_TX_FC |

		 MAC_MCR_FORCE_RX_FC);



	/* Configure speed */

	switch (speed) {

	case SPEED_2500:

	case SPEED_1000:

		mcr |= MAC_MCR_SPEED_1000;

		break;

	case SPEED_100:

		mcr |= MAC_MCR_SPEED_100;

		break;

	}



	/* Configure duplex */

	if (duplex == DUPLEX_FULL)

		mcr |= MAC_MCR_FORCE_DPX;



	/* Configure pause modes - phylink will avoid these for half duplex */

	if (tx_pause)

		mcr |= MAC_MCR_FORCE_TX_FC;

	if (rx_pause)

		mcr |= MAC_MCR_FORCE_RX_FC;



	mcr |= MAC_MCR_TX_EN | MAC_MCR_RX_EN;

	mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE