Commit e70a5634 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by David S. Miller

net: ethernet: mtk_eth_soc: rely on txd_size in txd_to_idx

This is a preliminary patch to add mt7986 ethernet support.
Tested-by: default avatarSam Shih <sam.shih@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4fd06c2
...@@ -876,9 +876,10 @@ static struct mtk_tx_dma *qdma_to_pdma(struct mtk_tx_ring *ring, ...@@ -876,9 +876,10 @@ static struct mtk_tx_dma *qdma_to_pdma(struct mtk_tx_ring *ring,
return ring->dma_pdma - ring->dma + dma; return ring->dma_pdma - ring->dma + dma;
} }
static int txd_to_idx(struct mtk_tx_ring *ring, struct mtk_tx_dma *dma) static int txd_to_idx(struct mtk_tx_ring *ring, struct mtk_tx_dma *dma,
u32 txd_size)
{ {
return ((void *)dma - (void *)ring->dma) / sizeof(*dma); return ((void *)dma - (void *)ring->dma) / txd_size;
} }
static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf, static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf,
...@@ -1094,7 +1095,9 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, ...@@ -1094,7 +1095,9 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,
!netdev_xmit_more()) !netdev_xmit_more())
mtk_w32(eth, txd->txd2, MTK_QTX_CTX_PTR); mtk_w32(eth, txd->txd2, MTK_QTX_CTX_PTR);
} else { } else {
int next_idx = NEXT_DESP_IDX(txd_to_idx(ring, txd), int next_idx;
next_idx = NEXT_DESP_IDX(txd_to_idx(ring, txd, soc->txrx.txd_size),
ring->dma_size); ring->dma_size);
mtk_w32(eth, next_idx, MT7628_TX_CTX_IDX0); mtk_w32(eth, next_idx, MT7628_TX_CTX_IDX0);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment