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
|
|
@@ -1624,8 +1624,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);
|
|
@@ -1641,8 +1643,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
|
|
@@ -1664,7 +1668,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;
|
|
|
|
@@ -1697,6 +1701,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;
|
|
|
|
@@ -1709,17 +1714,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;
|
|
}
|
|
}
|