114 lines
3.7 KiB
Diff
114 lines
3.7 KiB
Diff
From b16fe6d82b71fa0dd5c957bc22d66a694976d6eb Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Wed, 27 Jul 2022 23:20:50 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: introduce mtk_xdp_frame_map
|
|
utility routine
|
|
|
|
This is a preliminary patch to add xdp multi-frag support to mtk_eth_soc
|
|
driver
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 68 +++++++++++++--------
|
|
1 file changed, 42 insertions(+), 26 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1479,6 +1479,41 @@ static void mtk_rx_put_buff(struct mtk_r
|
|
skb_free_frag(data);
|
|
}
|
|
|
|
+static int mtk_xdp_frame_map(struct mtk_eth *eth, struct net_device *dev,
|
|
+ struct mtk_tx_dma_desc_info *txd_info,
|
|
+ struct mtk_tx_dma *txd, struct mtk_tx_buf *tx_buf,
|
|
+ void *data, u16 headroom, int index, bool dma_map)
|
|
+{
|
|
+ struct mtk_tx_ring *ring = ð->tx_ring;
|
|
+ struct mtk_mac *mac = netdev_priv(dev);
|
|
+ struct mtk_tx_dma *txd_pdma;
|
|
+
|
|
+ if (dma_map) { /* ndo_xdp_xmit */
|
|
+ txd_info->addr = dma_map_single(eth->dma_dev, data,
|
|
+ txd_info->size, DMA_TO_DEVICE);
|
|
+ if (unlikely(dma_mapping_error(eth->dma_dev, txd_info->addr)))
|
|
+ return -ENOMEM;
|
|
+
|
|
+ tx_buf->flags |= MTK_TX_FLAGS_SINGLE0;
|
|
+ } else {
|
|
+ struct page *page = virt_to_head_page(data);
|
|
+
|
|
+ txd_info->addr = page_pool_get_dma_addr(page) +
|
|
+ sizeof(struct xdp_frame) + headroom;
|
|
+ dma_sync_single_for_device(eth->dma_dev, txd_info->addr,
|
|
+ txd_info->size, DMA_BIDIRECTIONAL);
|
|
+ }
|
|
+ mtk_tx_set_dma_desc(dev, txd, txd_info);
|
|
+
|
|
+ tx_buf->flags |= !mac->id ? MTK_TX_FLAGS_FPORT0 : MTK_TX_FLAGS_FPORT1;
|
|
+
|
|
+ txd_pdma = qdma_to_pdma(ring, txd);
|
|
+ setup_tx_buf(eth, tx_buf, txd_pdma, txd_info->addr, txd_info->size,
|
|
+ index);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int mtk_xdp_submit_frame(struct mtk_eth *eth, struct xdp_frame *xdpf,
|
|
struct net_device *dev, bool dma_map)
|
|
{
|
|
@@ -1489,9 +1524,8 @@ static int mtk_xdp_submit_frame(struct m
|
|
.first = true,
|
|
.last = true,
|
|
};
|
|
- struct mtk_mac *mac = netdev_priv(dev);
|
|
- struct mtk_tx_dma *txd, *txd_pdma;
|
|
int err = 0, index = 0, n_desc = 1;
|
|
+ struct mtk_tx_dma *txd, *txd_pdma;
|
|
struct mtk_tx_buf *tx_buf;
|
|
|
|
if (unlikely(test_bit(MTK_RESETTING, ð->state)))
|
|
@@ -1511,36 +1545,18 @@ static int mtk_xdp_submit_frame(struct m
|
|
tx_buf = mtk_desc_to_tx_buf(ring, txd, soc->txrx.txd_size);
|
|
memset(tx_buf, 0, sizeof(*tx_buf));
|
|
|
|
- if (dma_map) { /* ndo_xdp_xmit */
|
|
- txd_info.addr = dma_map_single(eth->dma_dev, xdpf->data,
|
|
- txd_info.size, DMA_TO_DEVICE);
|
|
- if (unlikely(dma_mapping_error(eth->dma_dev, txd_info.addr))) {
|
|
- err = -ENOMEM;
|
|
- goto out;
|
|
- }
|
|
- tx_buf->flags |= MTK_TX_FLAGS_SINGLE0;
|
|
- } else {
|
|
- struct page *page = virt_to_head_page(xdpf->data);
|
|
-
|
|
- txd_info.addr = page_pool_get_dma_addr(page) +
|
|
- sizeof(*xdpf) + xdpf->headroom;
|
|
- dma_sync_single_for_device(eth->dma_dev, txd_info.addr,
|
|
- txd_info.size,
|
|
- DMA_BIDIRECTIONAL);
|
|
- }
|
|
- mtk_tx_set_dma_desc(dev, txd, &txd_info);
|
|
-
|
|
- tx_buf->flags |= !mac->id ? MTK_TX_FLAGS_FPORT0 : MTK_TX_FLAGS_FPORT1;
|
|
-
|
|
- txd_pdma = qdma_to_pdma(ring, txd);
|
|
- setup_tx_buf(eth, tx_buf, txd_pdma, txd_info.addr, txd_info.size,
|
|
- index++);
|
|
+ err = mtk_xdp_frame_map(eth, dev, &txd_info, txd, tx_buf,
|
|
+ xdpf->data, xdpf->headroom, index,
|
|
+ dma_map);
|
|
+ if (err < 0)
|
|
+ goto out;
|
|
|
|
/* store xdpf for cleanup */
|
|
tx_buf->type = dma_map ? MTK_TYPE_XDP_NDO : MTK_TYPE_XDP_TX;
|
|
tx_buf->data = xdpf;
|
|
|
|
if (!MTK_HAS_CAPS(soc->caps, MTK_QDMA)) {
|
|
+ txd_pdma = qdma_to_pdma(ring, txd);
|
|
if (index & 1)
|
|
txd_pdma->txd2 |= TX_DMA_LS0;
|
|
else
|