53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 20 May 2022 20:11:26 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: rely on GFP_KERNEL for
|
|
dma_alloc_coherent whenever possible
|
|
|
|
Rely on GFP_KERNEL for dma descriptors mappings in mtk_tx_alloc(),
|
|
mtk_rx_alloc() and mtk_init_fq_dma() since they are run in non-irq
|
|
context.
|
|
|
|
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
|
|
@@ -845,7 +845,7 @@ static int mtk_init_fq_dma(struct mtk_et
|
|
eth->scratch_ring = dma_alloc_coherent(eth->dma_dev,
|
|
cnt * sizeof(struct mtk_tx_dma),
|
|
ð->phy_scratch_ring,
|
|
- GFP_ATOMIC);
|
|
+ GFP_KERNEL);
|
|
if (unlikely(!eth->scratch_ring))
|
|
return -ENOMEM;
|
|
|
|
@@ -1623,7 +1623,7 @@ static int mtk_tx_alloc(struct mtk_eth *
|
|
goto no_tx_mem;
|
|
|
|
ring->dma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz,
|
|
- &ring->phys, GFP_ATOMIC);
|
|
+ &ring->phys, GFP_KERNEL);
|
|
if (!ring->dma)
|
|
goto no_tx_mem;
|
|
|
|
@@ -1641,8 +1641,7 @@ static int mtk_tx_alloc(struct mtk_eth *
|
|
*/
|
|
if (!MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
|
|
ring->dma_pdma = dma_alloc_coherent(eth->dma_dev, MTK_DMA_SIZE * sz,
|
|
- &ring->phys_pdma,
|
|
- GFP_ATOMIC);
|
|
+ &ring->phys_pdma, GFP_KERNEL);
|
|
if (!ring->dma_pdma)
|
|
goto no_tx_mem;
|
|
|
|
@@ -1757,7 +1756,7 @@ static int mtk_rx_alloc(struct mtk_eth *
|
|
|
|
ring->dma = dma_alloc_coherent(eth->dma_dev,
|
|
rx_dma_size * sizeof(*ring->dma),
|
|
- &ring->phys, GFP_ATOMIC);
|
|
+ &ring->phys, GFP_KERNEL);
|
|
if (!ring->dma)
|
|
return -ENOMEM;
|
|
|