Skip to content

Commit

Permalink
net: ethernet: mtk_eth_soc: only read the full RX descriptor if DMA i…
Browse files Browse the repository at this point in the history
…s done

Uncached memory access is expensive, and there is no need to access all
descriptor words if we can't process them anyway

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Felix Fietkau authored and David S. Miller committed Apr 23, 2021
1 parent 4e6bf60 commit 816ac3e
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions drivers/net/ethernet/mediatek/mtk_eth_soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -777,13 +777,18 @@ static inline int mtk_max_buf_size(int frag_size)
return buf_size;
}

static inline void mtk_rx_get_desc(struct mtk_rx_dma *rxd,
static inline bool mtk_rx_get_desc(struct mtk_rx_dma *rxd,
struct mtk_rx_dma *dma_rxd)
{
rxd->rxd1 = READ_ONCE(dma_rxd->rxd1);
rxd->rxd2 = READ_ONCE(dma_rxd->rxd2);
if (!(rxd->rxd2 & RX_DMA_DONE))
return false;

rxd->rxd1 = READ_ONCE(dma_rxd->rxd1);
rxd->rxd3 = READ_ONCE(dma_rxd->rxd3);
rxd->rxd4 = READ_ONCE(dma_rxd->rxd4);

return true;
}

/* the qdma core needs scratch memory to be setup */
Expand Down Expand Up @@ -1255,8 +1260,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget,
rxd = &ring->dma[idx];
data = ring->data[idx];

mtk_rx_get_desc(&trxd, rxd);
if (!(trxd.rxd2 & RX_DMA_DONE))
if (!mtk_rx_get_desc(&trxd, rxd))
break;

/* find out which mac the packet come from. values start at 1 */
Expand Down

0 comments on commit 816ac3e

Please sign in to comment.