mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-05-29 02:46:16 +02:00
fb2c6e9d4d
Removed because they are upstream: generic/backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=c5c0760adc260d55265c086b9efb350ea6dda38b generic/pending-5.15/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=448cc8b5f743985f6d1d98aa4efb386fef4c3bf2 generic/pending-5.15/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=9fcadd125044007351905d40c405fadc2d3bb6d6 Add new configuration symbols for tegra target. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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
|
|
@@ -856,7 +856,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;
|
|
|
|
@@ -1634,7 +1634,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;
|
|
|
|
@@ -1652,8 +1652,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;
|
|
|
|
@@ -1768,7 +1767,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;
|
|
|