Skip to content

L
linux
Commit 4cf975f6 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Kalle Valo
Browse files
Options

mwifiex: switch from 'pci_' to 'dma_' API 

The wrappers in include/linux/pci-dma-compat.h should go away.

The patch has been generated with the coccinelle script below and has been
hand modified to replace GFP_ with a correct flag.
It has been compile tested.

When memory is allocated in 'mwifiex_pcie_alloc_buffers()' (see details in
the call chain below) GFP_KERNEL can be used because both
'mwifiex_register()' and 'mwifiex_reinit_sw()' already use GFP_KERNEL.
(for 'mwifiex_reinit_sw()', it is hidden in a call to 'alloc_workqueue()')

The call chain is:
  mwifiex_register
    --> mwifiex_init_pcie        (.init_if function, see mwifiex_if_ops)
   [ or ]
  mwifiex_reinit_sw
    -->mwifiex_pcie_up_dev       (.up_dev function, see mwifiex_if_ops)

    [ then in both case ]
      -->mwifiex_pcie_alloc_buffers
        --> mwifiex_pcie_create_txbd_ring
        --> mwifiex_pcie_create_rxbd_ring
        --> mwifiex_pcie_create_evtbd_ring
        --> mwifiex_pcie_alloc_sleep_cookie_buf

@@
@@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL

@@
@@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@
@@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@
@@
-    PCI_DMA_NONE
+    DMA_NONE

@@
expression e1, e2, e3;
@@
-    pci_alloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3;
@@
-    pci_zalloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3, e4;
@@
-    pci_free_consistent(e1, e2, e3, e4)
+    dma_free_coherent(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_single(e1, e2, e3, e4)
+    dma_map_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_single(e1, e2, e3, e4)
+    dma_unmap_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4, e5;
@@
-    pci_map_page(e1, e2, e3, e4, e5)
+    dma_map_page(&e1->dev, e2, e3, e4, e5)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_page(e1, e2, e3, e4)
+    dma_unmap_page(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_sg(e1, e2, e3, e4)
+    dma_map_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_sg(e1, e2, e3, e4)
+    dma_unmap_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_cpu(e1, e2, e3, e4)
+    dma_sync_single_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_device(e1, e2, e3, e4)
+    dma_sync_single_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_cpu(e1, e2, e3, e4)
+    dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_device(e1, e2, e3, e4)
+    dma_sync_sg_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2;
@@
-    pci_dma_mapping_error(e1, e2)
+    dma_mapping_error(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_dma_mask(e1, e2)
+    dma_set_mask(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_consistent_dma_mask(e1, e2)
+    dma_set_coherent_mask(&e1->dev, e2)
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200819070152.111522-1-christophe.jaillet@wanadoo.fr
parent eb77802e
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 75 deletions
drivers/net/wireless/marvell/mwifiex/pcie.c
View file @ 4cf975f6
...@@ -58,8 +58,8 @@ mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb, ...@@ -58,8 +58,8 @@ mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
struct pcie_service_card *card = adapter->card; struct pcie_service_card *card = adapter->card;
struct mwifiex_dma_mapping mapping; struct mwifiex_dma_mapping mapping;
mapping.addr = pci_map_single(card->dev, skb->data, size, flags); mapping.addr = dma_map_single(&card->dev->dev, skb->data, size, flags);
if (pci_dma_mapping_error(card->dev, mapping.addr)) { if (dma_mapping_error(&card->dev->dev, mapping.addr)) {
mwifiex_dbg(adapter, ERROR, "failed to map pci memory!\n"); mwifiex_dbg(adapter, ERROR, "failed to map pci memory!\n");
return -1; return -1;
} }
...@@ -75,7 +75,7 @@ static void mwifiex_unmap_pci_memory(struct mwifiex_adapter *adapter, ...@@ -75,7 +75,7 @@ static void mwifiex_unmap_pci_memory(struct mwifiex_adapter *adapter,
struct mwifiex_dma_mapping mapping; struct mwifiex_dma_mapping mapping;
mwifiex_get_mapping(skb, &mapping); mwifiex_get_mapping(skb, &mapping);
pci_unmap_single(card->dev, mapping.addr, mapping.len, flags); dma_unmap_single(&card->dev->dev, mapping.addr, mapping.len, flags);
} }
/* /*
...@@ -461,10 +461,9 @@ static void mwifiex_delay_for_sleep_cookie(struct mwifiex_adapter *adapter, ...@@ -461,10 +461,9 @@ static void mwifiex_delay_for_sleep_cookie(struct mwifiex_adapter *adapter,
struct sk_buff *cmdrsp = card->cmdrsp_buf; struct sk_buff *cmdrsp = card->cmdrsp_buf;
for (count = 0; count < max_delay_loop_cnt; count++) { for (count = 0; count < max_delay_loop_cnt; count++) {
pci_dma_sync_single_for_cpu(card->dev, dma_sync_single_for_cpu(&card->dev->dev,
MWIFIEX_SKB_DMA_ADDR(cmdrsp), MWIFIEX_SKB_DMA_ADDR(cmdrsp),
sizeof(sleep_cookie), sizeof(sleep_cookie), DMA_FROM_DEVICE);
PCI_DMA_FROMDEVICE);
buffer = cmdrsp->data; buffer = cmdrsp->data;
sleep_cookie = get_unaligned_le32(buffer); sleep_cookie = get_unaligned_le32(buffer);
...@@ -473,10 +472,10 @@ static void mwifiex_delay_for_sleep_cookie(struct mwifiex_adapter *adapter, ...@@ -473,10 +472,10 @@ static void mwifiex_delay_for_sleep_cookie(struct mwifiex_adapter *adapter,
"sleep cookie found at count %d\n", count); "sleep cookie found at count %d\n", count);
break; break;
} }
pci_dma_sync_single_for_device(card->dev, dma_sync_single_for_device(&card->dev->dev,
MWIFIEX_SKB_DMA_ADDR(cmdrsp), MWIFIEX_SKB_DMA_ADDR(cmdrsp),
sizeof(sleep_cookie), sizeof(sleep_cookie),
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
usleep_range(20, 30); usleep_range(20, 30);
} }
...@@ -630,7 +629,7 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter) ...@@ -630,7 +629,7 @@ static int mwifiex_init_rxq_ring(struct mwifiex_adapter *adapter)
if (mwifiex_map_pci_memory(adapter, skb, if (mwifiex_map_pci_memory(adapter, skb,
MWIFIEX_RX_DATA_BUF_SIZE, MWIFIEX_RX_DATA_BUF_SIZE,
PCI_DMA_FROMDEVICE)) DMA_FROM_DEVICE))
return -1; return -1;
buf_pa = MWIFIEX_SKB_DMA_ADDR(skb); buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);
...@@ -687,7 +686,7 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter) ...@@ -687,7 +686,7 @@ static int mwifiex_pcie_init_evt_ring(struct mwifiex_adapter *adapter)
skb_put(skb, MAX_EVENT_SIZE); skb_put(skb, MAX_EVENT_SIZE);
if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE, if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE,
PCI_DMA_FROMDEVICE)) { DMA_FROM_DEVICE)) {
kfree_skb(skb); kfree_skb(skb);
kfree(card->evtbd_ring_vbase); kfree(card->evtbd_ring_vbase);
return -1; return -1;
...@@ -730,7 +729,7 @@ static void mwifiex_cleanup_txq_ring(struct mwifiex_adapter *adapter) ...@@ -730,7 +729,7 @@ static void mwifiex_cleanup_txq_ring(struct mwifiex_adapter *adapter)
if (card->tx_buf_list[i]) { if (card->tx_buf_list[i]) {
skb = card->tx_buf_list[i]; skb = card->tx_buf_list[i];
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
memset(desc2, 0, sizeof(*desc2)); memset(desc2, 0, sizeof(*desc2));
...@@ -739,7 +738,7 @@ static void mwifiex_cleanup_txq_ring(struct mwifiex_adapter *adapter) ...@@ -739,7 +738,7 @@ static void mwifiex_cleanup_txq_ring(struct mwifiex_adapter *adapter)
if (card->tx_buf_list[i]) { if (card->tx_buf_list[i]) {
skb = card->tx_buf_list[i]; skb = card->tx_buf_list[i];
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
memset(desc, 0, sizeof(*desc)); memset(desc, 0, sizeof(*desc));
...@@ -769,7 +768,7 @@ static void mwifiex_cleanup_rxq_ring(struct mwifiex_adapter *adapter) ...@@ -769,7 +768,7 @@ static void mwifiex_cleanup_rxq_ring(struct mwifiex_adapter *adapter)
if (card->rx_buf_list[i]) { if (card->rx_buf_list[i]) {
skb = card->rx_buf_list[i]; skb = card->rx_buf_list[i];
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
memset(desc2, 0, sizeof(*desc2)); memset(desc2, 0, sizeof(*desc2));
...@@ -778,7 +777,7 @@ static void mwifiex_cleanup_rxq_ring(struct mwifiex_adapter *adapter) ...@@ -778,7 +777,7 @@ static void mwifiex_cleanup_rxq_ring(struct mwifiex_adapter *adapter)
if (card->rx_buf_list[i]) { if (card->rx_buf_list[i]) {
skb = card->rx_buf_list[i]; skb = card->rx_buf_list[i];
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
memset(desc, 0, sizeof(*desc)); memset(desc, 0, sizeof(*desc));
...@@ -804,7 +803,7 @@ static void mwifiex_cleanup_evt_ring(struct mwifiex_adapter *adapter) ...@@ -804,7 +803,7 @@ static void mwifiex_cleanup_evt_ring(struct mwifiex_adapter *adapter)
if (card->evt_buf_list[i]) { if (card->evt_buf_list[i]) {
skb = card->evt_buf_list[i]; skb = card->evt_buf_list[i];
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
} }
card->evt_buf_list[i] = NULL; card->evt_buf_list[i] = NULL;
...@@ -845,9 +844,10 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter) ...@@ -845,9 +844,10 @@ static int mwifiex_pcie_create_txbd_ring(struct mwifiex_adapter *adapter)
mwifiex_dbg(adapter, INFO, mwifiex_dbg(adapter, INFO,
"info: txbd_ring: Allocating %d bytes\n", "info: txbd_ring: Allocating %d bytes\n",
card->txbd_ring_size); card->txbd_ring_size);
card->txbd_ring_vbase = pci_alloc_consistent(card->dev, card->txbd_ring_vbase = dma_alloc_coherent(&card->dev->dev,
card->txbd_ring_size, card->txbd_ring_size,
&card->txbd_ring_pbase); &card->txbd_ring_pbase,
GFP_KERNEL);
if (!card->txbd_ring_vbase) { if (!card->txbd_ring_vbase) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"allocate consistent memory (%d bytes) failed!\n", "allocate consistent memory (%d bytes) failed!\n",
...@@ -871,7 +871,7 @@ static int mwifiex_pcie_delete_txbd_ring(struct mwifiex_adapter *adapter) ...@@ -871,7 +871,7 @@ static int mwifiex_pcie_delete_txbd_ring(struct mwifiex_adapter *adapter)
mwifiex_cleanup_txq_ring(adapter); mwifiex_cleanup_txq_ring(adapter);
if (card->txbd_ring_vbase) if (card->txbd_ring_vbase)
pci_free_consistent(card->dev, card->txbd_ring_size, dma_free_coherent(&card->dev->dev, card->txbd_ring_size,
card->txbd_ring_vbase, card->txbd_ring_vbase,
card->txbd_ring_pbase); card->txbd_ring_pbase);
card->txbd_ring_size = 0; card->txbd_ring_size = 0;
...@@ -909,9 +909,10 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter) ...@@ -909,9 +909,10 @@ static int mwifiex_pcie_create_rxbd_ring(struct mwifiex_adapter *adapter)
mwifiex_dbg(adapter, INFO, mwifiex_dbg(adapter, INFO,
"info: rxbd_ring: Allocating %d bytes\n", "info: rxbd_ring: Allocating %d bytes\n",
card->rxbd_ring_size); card->rxbd_ring_size);
card->rxbd_ring_vbase = pci_alloc_consistent(card->dev, card->rxbd_ring_vbase = dma_alloc_coherent(&card->dev->dev,
card->rxbd_ring_size, card->rxbd_ring_size,
&card->rxbd_ring_pbase); &card->rxbd_ring_pbase,
GFP_KERNEL);
if (!card->rxbd_ring_vbase) { if (!card->rxbd_ring_vbase) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"allocate consistent memory (%d bytes) failed!\n", "allocate consistent memory (%d bytes) failed!\n",
...@@ -939,7 +940,7 @@ static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter) ...@@ -939,7 +940,7 @@ static int mwifiex_pcie_delete_rxbd_ring(struct mwifiex_adapter *adapter)
mwifiex_cleanup_rxq_ring(adapter); mwifiex_cleanup_rxq_ring(adapter);
if (card->rxbd_ring_vbase) if (card->rxbd_ring_vbase)
pci_free_consistent(card->dev, card->rxbd_ring_size, dma_free_coherent(&card->dev->dev, card->rxbd_ring_size,
card->rxbd_ring_vbase, card->rxbd_ring_vbase,
card->rxbd_ring_pbase); card->rxbd_ring_pbase);
card->rxbd_ring_size = 0; card->rxbd_ring_size = 0;
...@@ -973,9 +974,10 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter) ...@@ -973,9 +974,10 @@ static int mwifiex_pcie_create_evtbd_ring(struct mwifiex_adapter *adapter)
mwifiex_dbg(adapter, INFO, mwifiex_dbg(adapter, INFO,
"info: evtbd_ring: Allocating %d bytes\n", "info: evtbd_ring: Allocating %d bytes\n",
card->evtbd_ring_size); card->evtbd_ring_size);
card->evtbd_ring_vbase = pci_alloc_consistent(card->dev, card->evtbd_ring_vbase = dma_alloc_coherent(&card->dev->dev,
card->evtbd_ring_size, card->evtbd_ring_size,
&card->evtbd_ring_pbase); &card->evtbd_ring_pbase,
GFP_KERNEL);
if (!card->evtbd_ring_vbase) { if (!card->evtbd_ring_vbase) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"allocate consistent memory (%d bytes) failed!\n", "allocate consistent memory (%d bytes) failed!\n",
...@@ -1003,7 +1005,7 @@ static int mwifiex_pcie_delete_evtbd_ring(struct mwifiex_adapter *adapter) ...@@ -1003,7 +1005,7 @@ static int mwifiex_pcie_delete_evtbd_ring(struct mwifiex_adapter *adapter)
mwifiex_cleanup_evt_ring(adapter); mwifiex_cleanup_evt_ring(adapter);
if (card->evtbd_ring_vbase) if (card->evtbd_ring_vbase)
pci_free_consistent(card->dev, card->evtbd_ring_size, dma_free_coherent(&card->dev->dev, card->evtbd_ring_size,
card->evtbd_ring_vbase, card->evtbd_ring_vbase,
card->evtbd_ring_pbase); card->evtbd_ring_pbase);
card->evtbd_wrptr = 0; card->evtbd_wrptr = 0;
...@@ -1032,7 +1034,7 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter) ...@@ -1032,7 +1034,7 @@ static int mwifiex_pcie_alloc_cmdrsp_buf(struct mwifiex_adapter *adapter)
} }
skb_put(skb, MWIFIEX_UPLD_SIZE); skb_put(skb, MWIFIEX_UPLD_SIZE);
if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE, if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
PCI_DMA_FROMDEVICE)) { DMA_FROM_DEVICE)) {
kfree_skb(skb); kfree_skb(skb);
return -1; return -1;
} }
...@@ -1056,14 +1058,14 @@ static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter) ...@@ -1056,14 +1058,14 @@ static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter)
if (card && card->cmdrsp_buf) { if (card && card->cmdrsp_buf) {
mwifiex_unmap_pci_memory(adapter, card->cmdrsp_buf, mwifiex_unmap_pci_memory(adapter, card->cmdrsp_buf,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
dev_kfree_skb_any(card->cmdrsp_buf); dev_kfree_skb_any(card->cmdrsp_buf);
card->cmdrsp_buf = NULL; card->cmdrsp_buf = NULL;
} }
if (card && card->cmd_buf) { if (card && card->cmd_buf) {
mwifiex_unmap_pci_memory(adapter, card->cmd_buf, mwifiex_unmap_pci_memory(adapter, card->cmd_buf,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(card->cmd_buf); dev_kfree_skb_any(card->cmd_buf);
card->cmd_buf = NULL; card->cmd_buf = NULL;
} }
...@@ -1078,8 +1080,10 @@ static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter) ...@@ -1078,8 +1080,10 @@ static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter)
struct pcie_service_card *card = adapter->card; struct pcie_service_card *card = adapter->card;
u32 tmp; u32 tmp;
card->sleep_cookie_vbase = pci_alloc_consistent(card->dev, sizeof(u32), card->sleep_cookie_vbase = dma_alloc_coherent(&card->dev->dev,
&card->sleep_cookie_pbase); sizeof(u32),
&card->sleep_cookie_pbase,
GFP_KERNEL);
if (!card->sleep_cookie_vbase) { if (!card->sleep_cookie_vbase) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"pci_alloc_consistent failed!\n"); "pci_alloc_consistent failed!\n");
...@@ -1109,7 +1113,7 @@ static int mwifiex_pcie_delete_sleep_cookie_buf(struct mwifiex_adapter *adapter) ...@@ -1109,7 +1113,7 @@ static int mwifiex_pcie_delete_sleep_cookie_buf(struct mwifiex_adapter *adapter)
card = adapter->card; card = adapter->card;
if (card && card->sleep_cookie_vbase) { if (card && card->sleep_cookie_vbase) {
pci_free_consistent(card->dev, sizeof(u32), dma_free_coherent(&card->dev->dev, sizeof(u32),
card->sleep_cookie_vbase, card->sleep_cookie_vbase,
card->sleep_cookie_pbase); card->sleep_cookie_pbase);
card->sleep_cookie_vbase = NULL; card->sleep_cookie_vbase = NULL;
...@@ -1183,7 +1187,7 @@ static int mwifiex_pcie_send_data_complete(struct mwifiex_adapter *adapter) ...@@ -1183,7 +1187,7 @@ static int mwifiex_pcie_send_data_complete(struct mwifiex_adapter *adapter)
"SEND COMP: Detach skb %p at txbd_rdidx=%d\n", "SEND COMP: Detach skb %p at txbd_rdidx=%d\n",
skb, wrdoneidx); skb, wrdoneidx);
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
unmap_count++; unmap_count++;
...@@ -1276,7 +1280,7 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb, ...@@ -1276,7 +1280,7 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,
put_unaligned_le16(MWIFIEX_TYPE_DATA, payload + 2); put_unaligned_le16(MWIFIEX_TYPE_DATA, payload + 2);
if (mwifiex_map_pci_memory(adapter, skb, skb->len, if (mwifiex_map_pci_memory(adapter, skb, skb->len,
PCI_DMA_TODEVICE)) DMA_TO_DEVICE))
return -1; return -1;
wrindx = (card->txbd_wrptr & reg->tx_mask) >> reg->tx_start_ptr; wrindx = (card->txbd_wrptr & reg->tx_mask) >> reg->tx_start_ptr;
...@@ -1358,7 +1362,7 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb, ...@@ -1358,7 +1362,7 @@ mwifiex_pcie_send_data(struct mwifiex_adapter *adapter, struct sk_buff *skb,
return -EINPROGRESS; return -EINPROGRESS;
done_unmap: done_unmap:
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_TODEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);
card->tx_buf_list[wrindx] = NULL; card->tx_buf_list[wrindx] = NULL;
atomic_dec(&adapter->tx_hw_pending); atomic_dec(&adapter->tx_hw_pending);
if (reg->pfu_enabled) if (reg->pfu_enabled)
...@@ -1412,7 +1416,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) ...@@ -1412,7 +1416,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
if (!skb_data) if (!skb_data)
return -ENOMEM; return -ENOMEM;
mwifiex_unmap_pci_memory(adapter, skb_data, PCI_DMA_FROMDEVICE); mwifiex_unmap_pci_memory(adapter, skb_data, DMA_FROM_DEVICE);
card->rx_buf_list[rd_index] = NULL; card->rx_buf_list[rd_index] = NULL;
/* Get data length from interface header - /* Get data length from interface header -
...@@ -1450,7 +1454,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter) ...@@ -1450,7 +1454,7 @@ static int mwifiex_pcie_process_recv_data(struct mwifiex_adapter *adapter)
if (mwifiex_map_pci_memory(adapter, skb_tmp, if (mwifiex_map_pci_memory(adapter, skb_tmp,
MWIFIEX_RX_DATA_BUF_SIZE, MWIFIEX_RX_DATA_BUF_SIZE,
PCI_DMA_FROMDEVICE)) DMA_FROM_DEVICE))
return -1; return -1;
buf_pa = MWIFIEX_SKB_DMA_ADDR(skb_tmp); buf_pa = MWIFIEX_SKB_DMA_ADDR(skb_tmp);
...@@ -1527,7 +1531,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) ...@@ -1527,7 +1531,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
return -1; return -1;
} }
if (mwifiex_map_pci_memory(adapter, skb, skb->len, PCI_DMA_TODEVICE)) if (mwifiex_map_pci_memory(adapter, skb, skb->len, DMA_TO_DEVICE))
return -1; return -1;
buf_pa = MWIFIEX_SKB_DMA_ADDR(skb); buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);
...@@ -1539,7 +1543,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) ...@@ -1539,7 +1543,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"%s: failed to write download command to boot code.\n", "%s: failed to write download command to boot code.\n",
__func__); __func__);
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_TODEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);
return -1; return -1;
} }
...@@ -1551,7 +1555,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) ...@@ -1551,7 +1555,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"%s: failed to write download command to boot code.\n", "%s: failed to write download command to boot code.\n",
__func__); __func__);
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_TODEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);
return -1; return -1;
} }
...@@ -1560,7 +1564,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) ...@@ -1560,7 +1564,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"%s: failed to write command len to cmd_size scratch reg\n", "%s: failed to write command len to cmd_size scratch reg\n",
__func__); __func__);
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_TODEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);
return -1; return -1;
} }
...@@ -1569,7 +1573,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) ...@@ -1569,7 +1573,7 @@ mwifiex_pcie_send_boot_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
CPU_INTR_DOOR_BELL)) { CPU_INTR_DOOR_BELL)) {
mwifiex_dbg(adapter, ERROR, mwifiex_dbg(adapter, ERROR,
"%s: failed to assert door-bell intr\n", __func__); "%s: failed to assert door-bell intr\n", __func__);
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_TODEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);
return -1; return -1;
} }
...@@ -1628,7 +1632,7 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb) ...@@ -1628,7 +1632,7 @@ mwifiex_pcie_send_cmd(struct mwifiex_adapter *adapter, struct sk_buff *skb)
put_unaligned_le16((u16)skb->len, &payload[0]); put_unaligned_le16((u16)skb->len, &payload[0]);
put_unaligned_le16(MWIFIEX_TYPE_CMD, &payload[2]); put_unaligned_le16(MWIFIEX_TYPE_CMD, &payload[2]);
if (mwifiex_map_pci_memory(adapter, skb, skb->len, PCI_DMA_TODEVICE)) if (mwifiex_map_pci_memory(adapter, skb, skb->len, DMA_TO_DEVICE))
return -1; return -1;
card->cmd_buf = skb; card->cmd_buf = skb;
...@@ -1728,17 +1732,16 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) ...@@ -1728,17 +1732,16 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
"info: Rx CMD Response\n"); "info: Rx CMD Response\n");
if (adapter->curr_cmd) if (adapter->curr_cmd)
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_FROMDEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_FROM_DEVICE);
else else
pci_dma_sync_single_for_cpu(card->dev, dma_sync_single_for_cpu(&card->dev->dev,
MWIFIEX_SKB_DMA_ADDR(skb), MWIFIEX_SKB_DMA_ADDR(skb),
MWIFIEX_UPLD_SIZE, MWIFIEX_UPLD_SIZE, DMA_FROM_DEVICE);
PCI_DMA_FROMDEVICE);
/* Unmap the command as a response has been received. */ /* Unmap the command as a response has been received. */
if (card->cmd_buf) { if (card->cmd_buf) {
mwifiex_unmap_pci_memory(adapter, card->cmd_buf, mwifiex_unmap_pci_memory(adapter, card->cmd_buf,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
dev_kfree_skb_any(card->cmd_buf); dev_kfree_skb_any(card->cmd_buf);
card->cmd_buf = NULL; card->cmd_buf = NULL;
} }
...@@ -1749,10 +1752,10 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) ...@@ -1749,10 +1752,10 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
if (!adapter->curr_cmd) { if (!adapter->curr_cmd) {
if (adapter->ps_state == PS_STATE_SLEEP_CFM) { if (adapter->ps_state == PS_STATE_SLEEP_CFM) {
pci_dma_sync_single_for_device(card->dev, dma_sync_single_for_device(&card->dev->dev,
MWIFIEX_SKB_DMA_ADDR(skb), MWIFIEX_SKB_DMA_ADDR(skb),
MWIFIEX_SLEEP_COOKIE_SIZE, MWIFIEX_SLEEP_COOKIE_SIZE,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
if (mwifiex_write_reg(adapter, if (mwifiex_write_reg(adapter,
PCIE_CPU_INT_EVENT, PCIE_CPU_INT_EVENT,
CPU_INTR_SLEEP_CFM_DONE)) { CPU_INTR_SLEEP_CFM_DONE)) {
...@@ -1763,7 +1766,7 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) ...@@ -1763,7 +1766,7 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
mwifiex_delay_for_sleep_cookie(adapter, mwifiex_delay_for_sleep_cookie(adapter,
MWIFIEX_MAX_DELAY_COUNT); MWIFIEX_MAX_DELAY_COUNT);
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_FROMDEVICE); DMA_FROM_DEVICE);
skb_pull(skb, adapter->intf_hdr_len); skb_pull(skb, adapter->intf_hdr_len);
while (reg->sleep_cookie && (count++ < 10) && while (reg->sleep_cookie && (count++ < 10) &&
mwifiex_pcie_ok_to_access_hw(adapter)) mwifiex_pcie_ok_to_access_hw(adapter))
...@@ -1779,7 +1782,7 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter) ...@@ -1779,7 +1782,7 @@ static int mwifiex_pcie_process_cmd_complete(struct mwifiex_adapter *adapter)
min_t(u32, MWIFIEX_SIZE_OF_CMD_BUFFER, skb->len)); min_t(u32, MWIFIEX_SIZE_OF_CMD_BUFFER, skb->len));
skb_push(skb, adapter->intf_hdr_len); skb_push(skb, adapter->intf_hdr_len);
if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE, if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
PCI_DMA_FROMDEVICE)) DMA_FROM_DEVICE))
return -1; return -1;
} else if (mwifiex_pcie_ok_to_access_hw(adapter)) { } else if (mwifiex_pcie_ok_to_access_hw(adapter)) {
skb_pull(skb, adapter->intf_hdr_len); skb_pull(skb, adapter->intf_hdr_len);
...@@ -1821,7 +1824,7 @@ static int mwifiex_pcie_cmdrsp_complete(struct mwifiex_adapter *adapter, ...@@ -1821,7 +1824,7 @@ static int mwifiex_pcie_cmdrsp_complete(struct mwifiex_adapter *adapter,
card->cmdrsp_buf = skb; card->cmdrsp_buf = skb;
skb_push(card->cmdrsp_buf, adapter->intf_hdr_len); skb_push(card->cmdrsp_buf, adapter->intf_hdr_len);
if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE, if (mwifiex_map_pci_memory(adapter, skb, MWIFIEX_UPLD_SIZE,
PCI_DMA_FROMDEVICE)) DMA_FROM_DEVICE))
return -1; return -1;
} }
...@@ -1876,7 +1879,7 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter) ...@@ -1876,7 +1879,7 @@ static int mwifiex_pcie_process_event_ready(struct mwifiex_adapter *adapter)
mwifiex_dbg(adapter, INFO, mwifiex_dbg(adapter, INFO,
"info: Read Index: %d\n", rdptr); "info: Read Index: %d\n", rdptr);
skb_cmd = card->evt_buf_list[rdptr]; skb_cmd = card->evt_buf_list[rdptr];
mwifiex_unmap_pci_memory(adapter, skb_cmd, PCI_DMA_FROMDEVICE); mwifiex_unmap_pci_memory(adapter, skb_cmd, DMA_FROM_DEVICE);
/* Take the pointer and set it to event pointer in adapter /* Take the pointer and set it to event pointer in adapter
and will return back after event handling callback */ and will return back after event handling callback */
...@@ -1956,7 +1959,7 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter, ...@@ -1956,7 +1959,7 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
skb_put(skb, MAX_EVENT_SIZE - skb->len); skb_put(skb, MAX_EVENT_SIZE - skb->len);
if (mwifiex_map_pci_memory(adapter, skb, if (mwifiex_map_pci_memory(adapter, skb,
MAX_EVENT_SIZE, MAX_EVENT_SIZE,
PCI_DMA_FROMDEVICE)) DMA_FROM_DEVICE))
return -1; return -1;
card->evt_buf_list[rdptr] = skb; card->evt_buf_list[rdptr] = skb;
desc = card->evtbd_ring[rdptr]; desc = card->evtbd_ring[rdptr];
...@@ -2238,7 +2241,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter, ...@@ -2238,7 +2241,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
"interrupt status during fw dnld.\n", "interrupt status during fw dnld.\n",
__func__); __func__);
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
ret = -1; ret = -1;
goto done; goto done;
} }
...@@ -2250,12 +2253,12 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter, ...@@ -2250,12 +2253,12 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
mwifiex_dbg(adapter, ERROR, "%s: Card failed to ACK download\n", mwifiex_dbg(adapter, ERROR, "%s: Card failed to ACK download\n",
__func__); __func__);
mwifiex_unmap_pci_memory(adapter, skb, mwifiex_unmap_pci_memory(adapter, skb,
PCI_DMA_TODEVICE); DMA_TO_DEVICE);
ret = -1; ret = -1;
goto done; goto done;
} }
mwifiex_unmap_pci_memory(adapter, skb, PCI_DMA_TODEVICE); mwifiex_unmap_pci_memory(adapter, skb, DMA_TO_DEVICE);
offset += txlen; offset += txlen;
} while (true); } while (true);
...@@ -2925,13 +2928,13 @@ static int mwifiex_init_pcie(struct mwifiex_adapter *adapter) ...@@ -2925,13 +2928,13 @@ static int mwifiex_init_pcie(struct mwifiex_adapter *adapter)
pci_set_master(pdev); pci_set_master(pdev);
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret) { if (ret) {
pr_err("set_dma_mask(32) failed: %d\n", ret); pr_err("set_dma_mask(32) failed: %d\n", ret);
goto err_set_dma_mask; goto err_set_dma_mask;
} }
ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
if (ret) { if (ret) {
pr_err("set_consistent_dma_mask(64) failed\n"); pr_err("set_consistent_dma_mask(64) failed\n");
goto err_set_dma_mask; goto err_set_dma_mask;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7