mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-10 08:46:28 +02:00
d59d69f9e1
Manually rebased:
backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
Removed upstreamed:
backport-5.15/060-v6.0-01-tools-build-Add-feature-test-for-init_disassemble_in.patch[1]
backport-5.15/060-v6.0-02-tools-include-add-dis-asm-compat.h-to-handle-version.patch[2]
backport-5.15/060-v6.0-03-tools-perf-Fix-compilation-error-with-new-binutils.patch[3]
backport-5.15/060-v6.0-04-tools-bpf_jit_disasm-Fix-compilation-error-with-new-.patch[4]
backport-5.15/060-v6.0-05-tools-bpftool-Fix-compilation-error-with-new-binutil.patch[5]
pending-5.15/733-02-net-ethernet-mtk_eth_soc-fix-RX-data-corruption-issu.patch[6]
bcm47xx/patches-5.15/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[7]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=51b99dc38c1a053e2e732d7f9e2740e343ae7eae
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=451c9d7b16169645ed291ebb2ca9844caa088f2d
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=97f005c0bdbaf656a7808586d234965385a06c58
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=1c27fab243333821375e4d63128d60093fdbe149
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=4441a90091931fd81607567961dc122f24f735bb
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=2adc29350a5b4669544566f71f208d2abaec60ab
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.103&id=04bfc5bcdfc0fdb73587487c71b04d63807ae15a
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
108 lines
3.0 KiB
Diff
108 lines
3.0 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Sat, 14 Jan 2023 18:01:29 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: introduce mtk_hw_warm_reset
|
|
support
|
|
|
|
Introduce mtk_hw_warm_reset utility routine. This is a preliminary patch
|
|
to align reset procedure to vendor sdk and avoid to power down the chip
|
|
during hw reset.
|
|
|
|
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
|
|
@@ -3221,7 +3221,54 @@ static void mtk_hw_reset(struct mtk_eth
|
|
0x3ffffff);
|
|
}
|
|
|
|
-static int mtk_hw_init(struct mtk_eth *eth)
|
|
+static u32 mtk_hw_reset_read(struct mtk_eth *eth)
|
|
+{
|
|
+ u32 val;
|
|
+
|
|
+ regmap_read(eth->ethsys, ETHSYS_RSTCTRL, &val);
|
|
+ return val;
|
|
+}
|
|
+
|
|
+static void mtk_hw_warm_reset(struct mtk_eth *eth)
|
|
+{
|
|
+ u32 rst_mask, val;
|
|
+
|
|
+ regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, RSTCTRL_FE,
|
|
+ RSTCTRL_FE);
|
|
+ if (readx_poll_timeout_atomic(mtk_hw_reset_read, eth, val,
|
|
+ val & RSTCTRL_FE, 1, 1000)) {
|
|
+ dev_err(eth->dev, "warm reset failed\n");
|
|
+ mtk_hw_reset(eth);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
|
|
+ rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0_V2;
|
|
+ else
|
|
+ rst_mask = RSTCTRL_ETH | RSTCTRL_PPE0;
|
|
+
|
|
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))
|
|
+ rst_mask |= RSTCTRL_PPE1;
|
|
+
|
|
+ regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, rst_mask);
|
|
+
|
|
+ udelay(1);
|
|
+ val = mtk_hw_reset_read(eth);
|
|
+ if (!(val & rst_mask))
|
|
+ dev_err(eth->dev, "warm reset stage0 failed %08x (%08x)\n",
|
|
+ val, rst_mask);
|
|
+
|
|
+ rst_mask |= RSTCTRL_FE;
|
|
+ regmap_update_bits(eth->ethsys, ETHSYS_RSTCTRL, rst_mask, ~rst_mask);
|
|
+
|
|
+ udelay(1);
|
|
+ val = mtk_hw_reset_read(eth);
|
|
+ if (val & rst_mask)
|
|
+ dev_err(eth->dev, "warm reset stage1 failed %08x (%08x)\n",
|
|
+ val, rst_mask);
|
|
+}
|
|
+
|
|
+static int mtk_hw_init(struct mtk_eth *eth, bool reset)
|
|
{
|
|
u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
|
|
ETHSYS_DMA_AG_MAP_PPE;
|
|
@@ -3260,7 +3307,12 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
return 0;
|
|
}
|
|
|
|
- mtk_hw_reset(eth);
|
|
+ msleep(100);
|
|
+
|
|
+ if (reset)
|
|
+ mtk_hw_warm_reset(eth);
|
|
+ else
|
|
+ mtk_hw_reset(eth);
|
|
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
/* Set FE to PDMAv2 if necessary */
|
|
@@ -3465,7 +3517,7 @@ static void mtk_pending_work(struct work
|
|
if (eth->dev->pins)
|
|
pinctrl_select_state(eth->dev->pins->p,
|
|
eth->dev->pins->default_state);
|
|
- mtk_hw_init(eth);
|
|
+ mtk_hw_init(eth, true);
|
|
|
|
/* restart DMA and enable IRQs */
|
|
for (i = 0; i < MTK_MAC_COUNT; i++) {
|
|
@@ -4057,7 +4109,7 @@ static int mtk_probe(struct platform_dev
|
|
eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE);
|
|
INIT_WORK(ð->pending_work, mtk_pending_work);
|
|
|
|
- err = mtk_hw_init(eth);
|
|
+ err = mtk_hw_init(eth, false);
|
|
if (err)
|
|
goto err_wed_exit;
|
|
|