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>
69 lines
2.0 KiB
Diff
69 lines
2.0 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 20 May 2022 20:11:34 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: rely on rxd_size field in
|
|
mtk_rx_alloc/mtk_rx_clean
|
|
|
|
Remove mtk_rx_dma structure layout dependency in mtk_rx_alloc/mtk_rx_clean.
|
|
Initialize to 0 rxd3 and rxd4 in mtk_rx_alloc.
|
|
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
|
|
@@ -1785,18 +1785,25 @@ static int mtk_rx_alloc(struct mtk_eth *
|
|
return -ENOMEM;
|
|
|
|
for (i = 0; i < rx_dma_size; i++) {
|
|
+ struct mtk_rx_dma *rxd;
|
|
+
|
|
dma_addr_t dma_addr = dma_map_single(eth->dma_dev,
|
|
ring->data[i] + NET_SKB_PAD + eth->ip_align,
|
|
ring->buf_size,
|
|
DMA_FROM_DEVICE);
|
|
if (unlikely(dma_mapping_error(eth->dma_dev, dma_addr)))
|
|
return -ENOMEM;
|
|
- ring->dma[i].rxd1 = (unsigned int)dma_addr;
|
|
+
|
|
+ rxd = (void *)ring->dma + i * eth->soc->txrx.rxd_size;
|
|
+ rxd->rxd1 = (unsigned int)dma_addr;
|
|
|
|
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
|
|
- ring->dma[i].rxd2 = RX_DMA_LSO;
|
|
+ rxd->rxd2 = RX_DMA_LSO;
|
|
else
|
|
- ring->dma[i].rxd2 = RX_DMA_PLEN0(ring->buf_size);
|
|
+ rxd->rxd2 = RX_DMA_PLEN0(ring->buf_size);
|
|
+
|
|
+ rxd->rxd3 = 0;
|
|
+ rxd->rxd4 = 0;
|
|
}
|
|
ring->dma_size = rx_dma_size;
|
|
ring->calc_idx_update = false;
|
|
@@ -1821,14 +1828,17 @@ static void mtk_rx_clean(struct mtk_eth
|
|
|
|
if (ring->data && ring->dma) {
|
|
for (i = 0; i < ring->dma_size; i++) {
|
|
+ struct mtk_rx_dma *rxd;
|
|
+
|
|
if (!ring->data[i])
|
|
continue;
|
|
- if (!ring->dma[i].rxd1)
|
|
+
|
|
+ rxd = (void *)ring->dma + i * eth->soc->txrx.rxd_size;
|
|
+ if (!rxd->rxd1)
|
|
continue;
|
|
- dma_unmap_single(eth->dma_dev,
|
|
- ring->dma[i].rxd1,
|
|
- ring->buf_size,
|
|
- DMA_FROM_DEVICE);
|
|
+
|
|
+ dma_unmap_single(eth->dma_dev, rxd->rxd1,
|
|
+ ring->buf_size, DMA_FROM_DEVICE);
|
|
skb_free_frag(ring->data[i]);
|
|
}
|
|
kfree(ring->data);
|