51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From ef5976ae4e117fae9a61bb3c0f8319a917a425ea Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 11 Mar 2024 17:43:28 +0000
|
|
Subject: [PATCH] net: mediatek: mtk_eth_soc: release MAC_MCR_FORCE_LINK only when MAC is up
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Clearing bit MAC_MCR_FORCE_LINK which forces the link down too early
|
|
can result in MAC ending up in a broken/blocked state.
|
|
|
|
Fix this by handling this bit in the .mac_link_up and .mac_link_down
|
|
calls instead of in .mac_finish.
|
|
|
|
Fixes: b8fc9f30821ec ("net: ethernet: mediatek: Add basic PHYLINK support")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -662,8 +662,7 @@ static int mtk_mac_finish(struct phylink
|
|
mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
|
|
mcr_new = mcr_cur;
|
|
mcr_new |= MAC_MCR_IPG_CFG | MAC_MCR_FORCE_MODE |
|
|
- MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_LINK |
|
|
- MAC_MCR_RX_FIFO_CLR_DIS;
|
|
+ MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_RX_FIFO_CLR_DIS;
|
|
|
|
/* Only update control register when needed! */
|
|
if (mcr_new != mcr_cur)
|
|
@@ -679,7 +678,7 @@ static void mtk_mac_link_down(struct phy
|
|
phylink_config);
|
|
u32 mcr = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
|
|
|
|
- mcr &= ~(MAC_MCR_TX_EN | MAC_MCR_RX_EN);
|
|
+ mcr &= ~(MAC_MCR_TX_EN | MAC_MCR_RX_EN | MAC_MCR_FORCE_LINK);
|
|
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
|
|
}
|
|
|
|
@@ -788,7 +787,7 @@ static void mtk_mac_link_up(struct phyli
|
|
if (rx_pause)
|
|
mcr |= MAC_MCR_FORCE_RX_FC;
|
|
|
|
- mcr |= MAC_MCR_TX_EN | MAC_MCR_RX_EN;
|
|
+ mcr |= MAC_MCR_TX_EN | MAC_MCR_RX_EN | MAC_MCR_FORCE_LINK;
|
|
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
|
|
}
|
|
|