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>
64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Thu, 17 Nov 2022 15:29:53 +0100
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: fix RSTCTRL_PPE{0,1} definitions
|
|
|
|
Fix RSTCTRL_PPE0 and RSTCTRL_PPE1 register mask definitions for
|
|
MTK_NETSYS_V2.
|
|
Remove duplicated definitions.
|
|
|
|
Fixes: 160d3a9b1929 ("net: ethernet: mtk_eth_soc: introduce MTK_NETSYS_V2 support")
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -3239,16 +3239,17 @@ static int mtk_hw_init(struct mtk_eth *e
|
|
return 0;
|
|
}
|
|
|
|
- val = RSTCTRL_FE | RSTCTRL_PPE;
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
|
|
regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);
|
|
-
|
|
- val |= RSTCTRL_ETH;
|
|
- if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))
|
|
- val |= RSTCTRL_PPE1;
|
|
+ val = RSTCTRL_PPE0_V2;
|
|
+ } else {
|
|
+ val = RSTCTRL_PPE0;
|
|
}
|
|
|
|
- ethsys_reset(eth, val);
|
|
+ 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,
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -445,18 +445,14 @@
|
|
/* ethernet reset control register */
|
|
#define ETHSYS_RSTCTRL 0x34
|
|
#define RSTCTRL_FE BIT(6)
|
|
-#define RSTCTRL_PPE BIT(31)
|
|
-#define RSTCTRL_PPE1 BIT(30)
|
|
+#define RSTCTRL_PPE0 BIT(31)
|
|
+#define RSTCTRL_PPE0_V2 BIT(30)
|
|
+#define RSTCTRL_PPE1 BIT(31)
|
|
#define RSTCTRL_ETH BIT(23)
|
|
|
|
/* ethernet reset check idle register */
|
|
#define ETHSYS_FE_RST_CHK_IDLE_EN 0x28
|
|
|
|
-/* ethernet reset control register */
|
|
-#define ETHSYS_RSTCTRL 0x34
|
|
-#define RSTCTRL_FE BIT(6)
|
|
-#define RSTCTRL_PPE BIT(31)
|
|
-
|
|
/* ethernet dma channel agent map */
|
|
#define ETHSYS_DMA_AG_MAP 0x408
|
|
#define ETHSYS_DMA_AG_MAP_PDMA BIT(0)
|