![John Audia](/assets/img/avatar_default.png)
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>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 20 May 2022 20:11:33 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: rely on txd_size field in
|
|
mtk_poll_tx/mtk_poll_rx
|
|
|
|
This is a preliminary to ad 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
|
|
@@ -1265,9 +1265,12 @@ static struct mtk_rx_ring *mtk_get_rx_ri
|
|
return ð->rx_ring[0];
|
|
|
|
for (i = 0; i < MTK_MAX_RX_RING_NUM; i++) {
|
|
+ struct mtk_rx_dma *rxd;
|
|
+
|
|
ring = ð->rx_ring[i];
|
|
idx = NEXT_DESP_IDX(ring->calc_idx, ring->dma_size);
|
|
- if (ring->dma[idx].rxd2 & RX_DMA_DONE) {
|
|
+ rxd = (void *)ring->dma + idx * eth->soc->txrx.rxd_size;
|
|
+ if (rxd->rxd2 & RX_DMA_DONE) {
|
|
ring->calc_idx_update = true;
|
|
return ring;
|
|
}
|
|
@@ -1318,7 +1321,7 @@ static int mtk_poll_rx(struct napi_struc
|
|
goto rx_done;
|
|
|
|
idx = NEXT_DESP_IDX(ring->calc_idx, ring->dma_size);
|
|
- rxd = &ring->dma[idx];
|
|
+ rxd = (void *)ring->dma + idx * eth->soc->txrx.rxd_size;
|
|
data = ring->data[idx];
|
|
|
|
if (!mtk_rx_get_desc(&trxd, rxd))
|
|
@@ -1510,7 +1513,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
|
|
|
|
mtk_tx_unmap(eth, tx_buf, true);
|
|
|
|
- desc = &ring->dma[cpu];
|
|
+ desc = (void *)ring->dma + cpu * eth->soc->txrx.txd_size;
|
|
ring->last_free = desc;
|
|
atomic_inc(&ring->free_count);
|
|
|