71 lines
2.0 KiB
Diff
71 lines
2.0 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 14 Jan 2023 18:01:28 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: introduce mtk_hw_reset utility
|
|
routine
|
|
|
|
This is a preliminary patch to add Wireless Ethernet Dispatcher reset
|
|
support.
|
|
|
|
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
|
|
Tested-by: Daniel Golle <daniel@makrotopia.org>
|
|
Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com>
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -3256,6 +3256,27 @@ static void mtk_set_mcr_max_rx(struct mt
|
|
mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
|
|
}
|
|
|
|
+static void mtk_hw_reset(struct mtk_eth *eth)
|
|
+{
|
|
+ u32 val;
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
+ regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);
|
|
+ val = RSTCTRL_PPE0_V2;
|
|
+ } else {
|
|
+ val = RSTCTRL_PPE0;
|
|
+ }
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))
|
|
+ val |= RSTCTRL_PPE1;
|
|
+
|
|
+ ethsys_reset(eth, RSTCTRL_ETH | RSTCTRL_FE | val);
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
|
|
+ regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
|
|
+ 0x3ffffff);
|
|
+}
|
|
+
|
|
static int mtk_hw_init(struct mtk_eth *eth)
|
|
{
|
|
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
|
|
@@ -3295,22 +3316,9 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
return 0;
|
|
}
|
|
|
|
- if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
- regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);
|
|
- val = RSTCTRL_PPE0_V2;
|
|
- } else {
|
|
- val = RSTCTRL_PPE0;
|
|
- }
|
|
-
|
|
- if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))
|
|
- val |= RSTCTRL_PPE1;
|
|
-
|
|
- ethsys_reset(eth, RSTCTRL_ETH | RSTCTRL_FE | val);
|
|
+ mtk_hw_reset(eth);
|
|
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
- regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,
|
|
- 0x3ffffff);
|
|
-
|
|
/* Set FE to PDMAv2 if necessary */
|
|
val = mtk_r32(eth, MTK_FE_GLO_MISC);
|
|
mtk_w32(eth, val | BIT(4), MTK_FE_GLO_MISC);
|