<html><head><meta name="color-scheme" content="light dark"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">From: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;
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 &lt;sam.shih@mediatek.com&gt;
Signed-off-by: Lorenzo Bianconi &lt;lorenzo@kernel.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
---

--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1275,9 +1275,12 @@ static struct mtk_rx_ring *mtk_get_rx_ri
 		return &amp;eth-&gt;rx_ring[0];
 
 	for (i = 0; i &lt; MTK_MAX_RX_RING_NUM; i++) {
+		struct mtk_rx_dma *rxd;
+
 		ring = &amp;eth-&gt;rx_ring[i];
 		idx = NEXT_DESP_IDX(ring-&gt;calc_idx, ring-&gt;dma_size);
-		if (ring-&gt;dma[idx].rxd2 &amp; RX_DMA_DONE) {
+		rxd = (void *)ring-&gt;dma + idx * eth-&gt;soc-&gt;txrx.rxd_size;
+		if (rxd-&gt;rxd2 &amp; RX_DMA_DONE) {
 			ring-&gt;calc_idx_update = true;
 			return ring;
 		}
@@ -1328,7 +1331,7 @@ static int mtk_poll_rx(struct napi_struc
 			goto rx_done;
 
 		idx = NEXT_DESP_IDX(ring-&gt;calc_idx, ring-&gt;dma_size);
-		rxd = &amp;ring-&gt;dma[idx];
+		rxd = (void *)ring-&gt;dma + idx * eth-&gt;soc-&gt;txrx.rxd_size;
 		data = ring-&gt;data[idx];
 
 		if (!mtk_rx_get_desc(&amp;trxd, rxd))
@@ -1520,7 +1523,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
 
 		mtk_tx_unmap(eth, tx_buf, true);
 
-		desc = &amp;ring-&gt;dma[cpu];
+		desc = (void *)ring-&gt;dma + cpu * eth-&gt;soc-&gt;txrx.txd_size;
 		ring-&gt;last_free = desc;
 		atomic_inc(&amp;ring-&gt;free_count);
 
</pre></body></html>