target/linux/generic/pending-6.6/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch

   1 From ef5976ae4e117fae9a61bb3c0f8319a917a425ea Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Mon, 11 Mar 2024 17:43:28 +0000
   4 Subject: [PATCH] net: mediatek: mtk_eth_soc: release MAC_MCR_FORCE_LINK only when MAC is up
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Clearing bit MAC_MCR_FORCE_LINK which forces the link down too early
  10 can result in MAC ending up in a broken/blocked state.
  11
  12 Fix this by handling this bit in the .mac_link_up and .mac_link_down
  13 calls instead of in .mac_finish.
  14
  15 Fixes: b8fc9f30821ec ("net: ethernet: mediatek: Add basic PHYLINK support")
  16 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  17 ---
  18  drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +++----
  19  1 file changed, 3 insertions(+), 4 deletions(-)
  20
  21 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  22 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  23 @@ -678,8 +678,7 @@ static int mtk_mac_finish(struct phylink
  24         mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
  25         mcr_new = mcr_cur;
  26         mcr_new |= MAC_MCR_IPG_CFG | MAC_MCR_FORCE_MODE |
  27 -                  MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_LINK |
  28 -                  MAC_MCR_RX_FIFO_CLR_DIS;
  29 +                  MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_RX_FIFO_CLR_DIS;
  30
  31         /* Only update control register when needed! */
  32         if (mcr_new != mcr_cur)
  33 @@ -695,7 +694,7 @@ static void mtk_mac_link_down(struct phy
  34                                            phylink_config);
  35         u32 mcr = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
  36
  37 -       mcr &= ~(MAC_MCR_TX_EN | MAC_MCR_RX_EN);
  38 +       mcr &= ~(MAC_MCR_TX_EN | MAC_MCR_RX_EN | MAC_MCR_FORCE_LINK);
  39         mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
  40  }
  41
  42 @@ -804,7 +803,7 @@ static void mtk_mac_link_up(struct phyli
  43         if (rx_pause)
  44                 mcr |= MAC_MCR_FORCE_RX_FC;
  45
  46 -       mcr |= MAC_MCR_TX_EN | MAC_MCR_RX_EN;
  47 +       mcr |= MAC_MCR_TX_EN | MAC_MCR_RX_EN | MAC_MCR_FORCE_LINK;
  48         mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
  49  }
  50