mirror of
https://github.com/hzyitc/openwrt-redmi-ax3000.git
synced 2025-12-17 08:52:53 +00:00
7efec0acca
Manually rebased:
bcm4908/patches-5.15/071-v6.1-0001-net-broadcom-bcm4908_enet-handle-EPROBE_DEFER-when-g.patch
bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch[*]
bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
Removed upstreamed:
backport-5.15/735-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch[1]
backport-5.15/817-v6.5-01-leds-trigger-netdev-Recheck-NETDEV_LED_MODE_LINKUP-o.patch[2]
pending-5.15/143-jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsys.patch[3]
pending-5.15/160-workqueue-fix-enum-type-for-gcc-13.patch[4]
bcm53xx/patches-5.15/036-v6.5-0003-ARM-dts-BCM5301X-Drop-clock-names-from-the-SPI-node.patch[5]
bcm53xx/patches-5.15/036-v6.5-0015-ARM-dts-BCM5301X-fix-duplex-full-full-duplex.patch[6]
ipq807x/patches-5.15/0048-v6.1-clk-qcom-reset-Allow-specifying-custom-reset-delay.patch[7]
ipq807x/patches-5.15/0049-v6.2-clk-qcom-reset-support-resetting-multiple-bits.patch[8]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=02474292a44205c1eb5a03634ead155a3c9134f4
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=86b93cbfe104e99fd3d25a49748b99fb88101573
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=79b9ab357b6f5675007f4c02ff8765cbd8dc06a2
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=d528faa9e828b9fc46dfb684a2a9fd8c2e860ed8
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=5899bc4058e89d5110a23797ff94439c53b77c25
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=95afd2c7c7d26087730dc938709e025a303e5499
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=40844343a8853a08b049d50c967e2a1e28f0ece6
8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=6ad5ded420f5d96f7c65b68135f5787a1c7e58d7
Build system: x86/64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John Audia <therealgraysky@proton.me>
[rebased ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 8590531048)
[Refreshed on top of openwrt-23.05]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
From 0dcbe607cec32ccae23b02a641b8bd6191a328ae Mon Sep 17 00:00:00 2001
|
|
Message-Id: <0dcbe607cec32ccae23b02a641b8bd6191a328ae.1662243796.git.lorenzo@kernel.org>
|
|
In-Reply-To: <43a21841ce0175d29f23c34a65ceaaf9dd7eb8b7.1662243796.git.lorenzo@kernel.org>
|
|
References: <43a21841ce0175d29f23c34a65ceaaf9dd7eb8b7.1662243796.git.lorenzo@kernel.org>
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Tue, 23 Aug 2022 23:09:05 +0200
|
|
Subject: [PATCH net-next 2/4] net: ethernet: mtk_eth_soc: move wdma_base
|
|
definitions in mtk register map
|
|
|
|
This is a preliminary patch to introduce mt7986 wed support.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 ++++++++++------
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 +---
|
|
2 files changed, 11 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -75,6 +75,10 @@ static const struct mtk_reg_map mtk_reg_
|
|
.gdm1_cnt = 0x2400,
|
|
.gdma_to_ppe0 = 0x4444,
|
|
.ppe_base = 0x0c00,
|
|
+ .wdma_base = {
|
|
+ [0] = 0x2800,
|
|
+ [1] = 0x2c00,
|
|
+ },
|
|
};
|
|
|
|
static const struct mtk_reg_map mt7628_reg_map = {
|
|
@@ -130,6 +134,10 @@ static const struct mtk_reg_map mt7986_r
|
|
.gdm1_cnt = 0x1c00,
|
|
.gdma_to_ppe0 = 0x3333,
|
|
.ppe_base = 0x2000,
|
|
+ .wdma_base = {
|
|
+ [0] = 0x4800,
|
|
+ [1] = 0x4c00,
|
|
+ },
|
|
};
|
|
|
|
/* strings used by ethtool */
|
|
@@ -3963,16 +3971,12 @@ static int mtk_probe(struct platform_dev
|
|
for (i = 0;; i++) {
|
|
struct device_node *np = of_parse_phandle(pdev->dev.of_node,
|
|
"mediatek,wed", i);
|
|
- static const u32 wdma_regs[] = {
|
|
- MTK_WDMA0_BASE,
|
|
- MTK_WDMA1_BASE
|
|
- };
|
|
void __iomem *wdma;
|
|
|
|
- if (!np || i >= ARRAY_SIZE(wdma_regs))
|
|
+ if (!np || i >= ARRAY_SIZE(eth->soc->reg_map->wdma_base))
|
|
break;
|
|
|
|
- wdma = eth->base + wdma_regs[i];
|
|
+ wdma = eth->base + eth->soc->reg_map->wdma_base[i];
|
|
mtk_wed_add_hw(np, eth, wdma, i);
|
|
}
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -268,9 +268,6 @@
|
|
#define TX_DMA_FPORT_MASK_V2 0xf
|
|
#define TX_DMA_SWC_V2 BIT(30)
|
|
|
|
-#define MTK_WDMA0_BASE 0x2800
|
|
-#define MTK_WDMA1_BASE 0x2c00
|
|
-
|
|
/* QDMA descriptor txd4 */
|
|
#define TX_DMA_CHKSUM (0x7 << 29)
|
|
#define TX_DMA_TSO BIT(28)
|
|
@@ -954,6 +951,7 @@ struct mtk_reg_map {
|
|
u32 gdm1_cnt;
|
|
u32 gdma_to_ppe0;
|
|
u32 ppe_base;
|
|
+ u32 wdma_base[2];
|
|
};
|
|
|
|
/* struct mtk_eth_data - This is the structure holding all differences
|