| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879 |
- From 0e37ad71b2ff772009595002da2860999e98e14e Mon Sep 17 00:00:00 2001
- From: "Russell King (Oracle)" <[email protected]>
- Date: Wed, 18 May 2022 15:55:12 +0100
- Subject: [PATCH 09/12] net: mtk_eth_soc: move MAC_MCR setting to mac_finish()
- Move the setting of the MTK_MAC_MCR register from the end of mac_config
- into the phylink mac_finish() method, to keep it as the very last write
- that is done during configuration.
- Signed-off-by: Russell King (Oracle) <[email protected]>
- Signed-off-by: Jakub Kicinski <[email protected]>
- ---
- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 33 ++++++++++++++-------
- 1 file changed, 22 insertions(+), 11 deletions(-)
- --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
- @@ -316,8 +316,8 @@ static void mtk_mac_config(struct phylin
- struct mtk_mac *mac = container_of(config, struct mtk_mac,
- phylink_config);
- struct mtk_eth *eth = mac->hw;
- - u32 mcr_cur, mcr_new, sid, i;
- int val, ge_mode, err = 0;
- + u32 sid, i;
-
- /* MT76x8 has no hardware settings between for the MAC */
- if (!MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628) &&
- @@ -455,6 +455,25 @@ static void mtk_mac_config(struct phylin
- return;
- }
-
- + return;
- +
- +err_phy:
- + dev_err(eth->dev, "%s: GMAC%d mode %s not supported!\n", __func__,
- + mac->id, phy_modes(state->interface));
- + return;
- +
- +init_err:
- + dev_err(eth->dev, "%s: GMAC%d mode %s err: %d!\n", __func__,
- + mac->id, phy_modes(state->interface), err);
- +}
- +
- +static int mtk_mac_finish(struct phylink_config *config, unsigned int mode,
- + phy_interface_t interface)
- +{
- + struct mtk_mac *mac = container_of(config, struct mtk_mac,
- + phylink_config);
- + u32 mcr_cur, mcr_new;
- +
- /* Setup gmac */
- mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
- mcr_new = mcr_cur;
- @@ -466,16 +485,7 @@ static void mtk_mac_config(struct phylin
- if (mcr_new != mcr_cur)
- mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
-
- - return;
- -
- -err_phy:
- - dev_err(eth->dev, "%s: GMAC%d mode %s not supported!\n", __func__,
- - mac->id, phy_modes(state->interface));
- - return;
- -
- -init_err:
- - dev_err(eth->dev, "%s: GMAC%d mode %s err: %d!\n", __func__,
- - mac->id, phy_modes(state->interface), err);
- + return 0;
- }
-
- static void mtk_mac_pcs_get_state(struct phylink_config *config,
- @@ -582,6 +592,7 @@ static const struct phylink_mac_ops mtk_
- .mac_pcs_get_state = mtk_mac_pcs_get_state,
- .mac_an_restart = mtk_mac_an_restart,
- .mac_config = mtk_mac_config,
- + .mac_finish = mtk_mac_finish,
- .mac_link_down = mtk_mac_link_down,
- .mac_link_up = mtk_mac_link_up,
- };
|
