f1cd144482
Deleted (upstreamed): generic/backport-5.15/702-v5.19-34-net-ethernet-mtk_eth_soc-fix-misuse-of-mem-alloc-int.patch [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.49&id=fcba12a4308143f1f1dcb0face8b3ffb51edcc5c Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
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
|
|
@@ -1264,9 +1264,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;
|
|
}
|
|
@@ -1317,7 +1320,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))
|
|
@@ -1509,7 +1512,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);
|
|
|