ath10k: stop abusing GFP_DMA

Allocations from the DMA zone were originally added for legacy ISA
stuff, or PCI devices that have specific limitations in their DMA
addressing capabilities. It has no place in ath10k, which can do
full 32-bit DMA.

Fixes memory allocation errors on some platforms.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index b84727bcf2dad7f4c30a1c92ba0306f55a69e89d..91afa3ae414cb039e198949a651c09d1294d20c3 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -536,7 +536,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
 
        size = htt->rx_ring.size * sizeof(htt->rx_ring.paddrs_ring);
 
-       vaddr = dma_alloc_coherent(htt->ar->dev, size, &paddr, GFP_DMA);
+       vaddr = dma_alloc_coherent(htt->ar->dev, size, &paddr, GFP_KERNEL);
        if (!vaddr)
                goto err_dma_ring;
 
@@ -545,7 +545,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
 
        vaddr = dma_alloc_coherent(htt->ar->dev,
                                   sizeof(*htt->rx_ring.alloc_idx.vaddr),
-                                  &paddr, GFP_DMA);
+                                  &paddr, GFP_KERNEL);
        if (!vaddr)
                goto err_dma_idx;
 

diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 5274f5bb0b457604502d047daa87f7015d2cd40e..b3adadb5f8243b616191d53ccf0c5995197f6587 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -111,7 +111,7 @@ int ath10k_htt_tx_alloc(struct ath10k_htt *htt)
        size = htt->max_num_pending_tx * sizeof(struct ath10k_htt_txbuf);
        htt->txbuf.vaddr = dma_alloc_coherent(ar->dev, size,
                                                  &htt->txbuf.paddr,
-                                                 GFP_DMA);
+                                                 GFP_KERNEL);
        if (!htt->txbuf.vaddr) {
                ath10k_err(ar, "failed to alloc tx buffer\n");
                ret = -ENOMEM;
@@ -124,7 +124,7 @@ int ath10k_htt_tx_alloc(struct ath10k_htt *htt)
        size = htt->max_num_pending_tx * sizeof(struct htt_msdu_ext_desc);
        htt->frag_desc.vaddr = dma_alloc_coherent(ar->dev, size,
                                                  &htt->frag_desc.paddr,
-                                                 GFP_DMA);
+                                                 GFP_KERNEL);
        if (!htt->frag_desc.vaddr) {
                ath10k_warn(ar, "failed to alloc fragment desc memory\n");
                ret = -ENOMEM;