mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-02 12:56:20 +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>
79 lines
2.4 KiB
Diff
79 lines
2.4 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 20 May 2022 20:11:29 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: rely on txd_size in
|
|
mtk_tx_alloc/mtk_tx_clean
|
|
|
|
This is a preliminary patch to add mt7986 ethernet support.
|
|
|
|
Tested-by: Sam Shih <sam.shih@mediatek.com>
|
|
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
|
|
@@ -1625,8 +1625,10 @@ static int mtk_napi_rx(struct napi_struc
|
|
|
|
static int mtk_tx_alloc(struct mtk_eth *eth)
|
|
{
|
|
+ const struct mtk_soc_data *soc = eth->soc;
|
|
struct mtk_tx_ring *ring = ð->tx_ring;
|
|
- int i, sz = sizeof(*ring->dma);
|
|
+ int i, sz = soc->txrx.txd_size;
|
|
+ struct mtk_tx_dma *txd;
|
|
|
|
ring->buf = kcalloc(MTK_DMA_SIZE, sizeof(*ring->buf),
|
|
GFP_KERNEL);
|
|
@@ -1642,8 +1644,10 @@ static int mtk_tx_alloc(struct mtk_eth *
|
|
int next = (i + 1) % MTK_DMA_SIZE;
|
|
u32 next_ptr = ring->phys + next * sz;
|
|
|
|
- ring->dma[i].txd2 = next_ptr;
|
|
- ring->dma[i].txd3 = TX_DMA_LS0 | TX_DMA_OWNER_CPU;
|
|
+ txd = (void *)ring->dma + i * sz;
|
|
+ txd->txd2 = next_ptr;
|
|
+ txd->txd3 = TX_DMA_LS0 | TX_DMA_OWNER_CPU;
|
|
+ txd->txd4 = 0;
|
|
}
|
|
|
|
/* On MT7688 (PDMA only) this driver uses the ring->dma structs
|
|
@@ -1665,7 +1669,7 @@ static int mtk_tx_alloc(struct mtk_eth *
|
|
ring->dma_size = MTK_DMA_SIZE;
|
|
atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);
|
|
ring->next_free = &ring->dma[0];
|
|
- ring->last_free = &ring->dma[MTK_DMA_SIZE - 1];
|
|
+ ring->last_free = (void *)txd;
|
|
ring->last_free_ptr = (u32)(ring->phys + ((MTK_DMA_SIZE - 1) * sz));
|
|
ring->thresh = MAX_SKB_FRAGS;
|
|
|
|
@@ -1698,6 +1702,7 @@ no_tx_mem:
|
|
|
|
static void mtk_tx_clean(struct mtk_eth *eth)
|
|
{
|
|
+ const struct mtk_soc_data *soc = eth->soc;
|
|
struct mtk_tx_ring *ring = ð->tx_ring;
|
|
int i;
|
|
|
|
@@ -1710,17 +1715,15 @@ static void mtk_tx_clean(struct mtk_eth
|
|
|
|
if (ring->dma) {
|
|
dma_free_coherent(eth->dma_dev,
|
|
- MTK_DMA_SIZE * sizeof(*ring->dma),
|
|
- ring->dma,
|
|
- ring->phys);
|
|
+ MTK_DMA_SIZE * soc->txrx.txd_size,
|
|
+ ring->dma, ring->phys);
|
|
ring->dma = NULL;
|
|
}
|
|
|
|
if (ring->dma_pdma) {
|
|
dma_free_coherent(eth->dma_dev,
|
|
- MTK_DMA_SIZE * sizeof(*ring->dma_pdma),
|
|
- ring->dma_pdma,
|
|
- ring->phys_pdma);
|
|
+ MTK_DMA_SIZE * soc->txrx.txd_size,
|
|
+ ring->dma_pdma, ring->phys_pdma);
|
|
ring->dma_pdma = NULL;
|
|
}
|
|
}
|