projects / openwrt / staging / hauke.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
mwlwifi: update to version 10.4.10-20231120
[openwrt/staging/hauke.git] / package / kernel / mwlwifi / patches / 007-replace-usage-of-the-deprecated-pci-dma-compat.h-API.patch
1 From 61c75dce424c180b633c64613a1948df5a41cf1e Mon Sep 17 00:00:00 2001
2 From: Stefan Kalscheuer <stefan@stklcode.de>
3 Date: Sun, 18 Jun 2023 17:59:07 +0200
4 Subject: [PATCH 2/2] replace usage of the deprecated "pci-dma-compat.h" API
5
6 The pci-dma-compat API has been legacy for quite a while and was removed
7 with 5.18 [1]. Migrate all calls, so the module can be compiled against
8 modern kernel versions.
9
10 Replace some compat calls:
11 * pci_set_dma_mask with dma_set_mask
12 * pci_(un)map_single with dma_(un)map_single
13 * pci_dma_mapping_error with dma_mapping_error
14 * PCI_DMA_{FROM,TO}DEVICE with DMA_{FOM,TO}_DEVICE
15
16 [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7968778914e53788a01c2dee2692cab157de9ac0
17
18 Signed-off-by: Stefan Kalscheuer <stefan@stklcode.de>
19 ---
20 hif/pcie/pcie.c | 2 +-
21 hif/pcie/rx.c | 20 ++++++++++----------
22 hif/pcie/rx_ndp.c | 20 ++++++++++----------
23 hif/pcie/tx.c | 22 +++++++++++-----------
24 hif/pcie/tx_ndp.c | 14 +++++++-------
25 5 files changed, 39 insertions(+), 39 deletions(-)
26
27 --- a/hif/pcie/pcie.c
28 +++ b/hif/pcie/pcie.c
29 @@ -1701,7 +1701,7 @@ static int pcie_probe(struct pci_dev *pd
30 return rc;
31 }
32
33 - rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
34 + rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
35 if (rc) {
36 pr_err("%s: 32-bit PCI DMA not supported\n",
37 PCIE_DRV_NAME);
38 --- a/hif/pcie/8864/rx.c
39 +++ b/hif/pcie/8864/rx.c
40 @@ -107,11 +107,11 @@ static int pcie_rx_ring_init(struct mwl_
41 desc->prx_ring[i].rssi = 0x00;
42 desc->prx_ring[i].pkt_len =
43 cpu_to_le16(SYSADPT_MAX_AGGR_SIZE);
44 - dma = pci_map_single(pcie_priv->pdev,
45 + dma = dma_map_single(&(pcie_priv->pdev)->dev,
46 rx_hndl->psk_buff->data,
47 desc->rx_buf_size,
48 - PCI_DMA_FROMDEVICE);
49 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
50 + DMA_FROM_DEVICE);
51 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
52 wiphy_err(priv->hw->wiphy,
53 "failed to map pci memory!\n");
54 return -ENOMEM;
55 @@ -153,11 +153,11 @@ static void pcie_rx_ring_cleanup(struct
56 if (!rx_hndl->psk_buff)
57 continue;
58
59 - pci_unmap_single(pcie_priv->pdev,
60 + dma_unmap_single(&(pcie_priv->pdev)->dev,
61 le32_to_cpu
62 (rx_hndl->pdesc->pphys_buff_data),
63 desc->rx_buf_size,
64 - PCI_DMA_FROMDEVICE);
65 + DMA_FROM_DEVICE);
66
67 dev_kfree_skb_any(rx_hndl->psk_buff);
68
69 @@ -332,11 +332,11 @@ static inline int pcie_rx_refill(struct
70 rx_hndl->pdesc->rssi = 0x00;
71 rx_hndl->pdesc->pkt_len = cpu_to_le16(desc->rx_buf_size);
72
73 - dma = pci_map_single(pcie_priv->pdev,
74 + dma = dma_map_single(&pcie_priv->pdev->dev,
75 rx_hndl->psk_buff->data,
76 desc->rx_buf_size,
77 - PCI_DMA_FROMDEVICE);
78 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
79 + DMA_FROM_DEVICE);
80 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
81 dev_kfree_skb_any(rx_hndl->psk_buff);
82 wiphy_err(priv->hw->wiphy,
83 "failed to map pci memory!\n");
84 @@ -410,10 +410,10 @@ void pcie_8864_rx_recv(unsigned long dat
85 prx_skb = curr_hndl->psk_buff;
86 if (!prx_skb)
87 goto out;
88 - pci_unmap_single(pcie_priv->pdev,
89 + dma_unmap_single(&(pcie_priv->pdev)->dev,
90 le32_to_cpu(curr_hndl->pdesc->pphys_buff_data),
91 desc->rx_buf_size,
92 - PCI_DMA_FROMDEVICE);
93 + DMA_FROM_DEVICE);
94 pkt_len = le16_to_cpu(curr_hndl->pdesc->pkt_len);
95
96 if (skb_tailroom(prx_skb) < pkt_len) {
97 --- a/hif/pcie/8864/tx.c
98 +++ b/hif/pcie/8864/tx.c
99 @@ -171,11 +171,11 @@ static void pcie_tx_ring_cleanup(struct
100 desc->tx_hndl[i].psk_buff->data,
101 le32_to_cpu(
102 desc->ptx_ring[i].pkt_ptr));
103 - pci_unmap_single(pcie_priv->pdev,
104 + dma_unmap_single(&(pcie_priv->pdev)->dev,
105 le32_to_cpu(
106 desc->ptx_ring[i].pkt_ptr),
107 desc->tx_hndl[i].psk_buff->len,
108 - PCI_DMA_TODEVICE);
109 + DMA_TO_DEVICE);
110 dev_kfree_skb_any(desc->tx_hndl[i].psk_buff);
111 desc->ptx_ring[i].status =
112 cpu_to_le32(EAGLE_TXD_STATUS_IDLE);
113 @@ -291,9 +291,9 @@ static inline void pcie_tx_skb(struct mw
114 tx_desc->type = tx_ctrl->type;
115 tx_desc->xmit_control = tx_ctrl->xmit_control;
116 tx_desc->sap_pkt_info = 0;
117 - dma = pci_map_single(pcie_priv->pdev, tx_skb->data,
118 - tx_skb->len, PCI_DMA_TODEVICE);
119 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
120 + dma = dma_map_single(&(pcie_priv->pdev)->dev, tx_skb->data,
121 + tx_skb->len, DMA_TO_DEVICE);
122 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
123 dev_kfree_skb_any(tx_skb);
124 wiphy_err(priv->hw->wiphy,
125 "failed to map pci memory!\n");
126 @@ -447,10 +447,10 @@ static void pcie_non_pfu_tx_done(struct
127 (tx_desc->status & cpu_to_le32(EAGLE_TXD_STATUS_OK)) &&
128 (!(tx_desc->status &
129 cpu_to_le32(EAGLE_TXD_STATUS_FW_OWNED)))) {
130 - pci_unmap_single(pcie_priv->pdev,
131 + dma_unmap_single(&(pcie_priv->pdev)->dev,
132 le32_to_cpu(tx_desc->pkt_ptr),
133 le16_to_cpu(tx_desc->pkt_len),
134 - PCI_DMA_TODEVICE);
135 + DMA_TO_DEVICE);
136 done_skb = tx_hndl->psk_buff;
137 rate = le32_to_cpu(tx_desc->rate_info);
138 tx_desc->pkt_ptr = 0;
139 @@ -925,4 +925,4 @@ void pcie_8864_tx_del_sta_amsdu_pkts(str
140 }
141 }
142 spin_unlock_bh(&sta_info->amsdu_lock);
143 -}
144 \ No newline at end of file
145 +}
146 --- a/hif/pcie/8964/rx_ndp.c
147 +++ b/hif/pcie/8964/rx_ndp.c
148 @@ -86,11 +86,11 @@ static int pcie_rx_ring_init_ndp(struct
149 }
150 skb_reserve(psk_buff, MIN_BYTES_RX_HEADROOM);
151
152 - dma = pci_map_single(pcie_priv->pdev,
153 + dma = dma_map_single(&(pcie_priv->pdev)->dev,
154 psk_buff->data,
155 desc->rx_buf_size,
156 - PCI_DMA_FROMDEVICE);
157 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
158 + DMA_FROM_DEVICE);
159 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
160 wiphy_err(priv->hw->wiphy,
161 "failed to map pci memory!\n");
162 return -ENOMEM;
163 @@ -120,11 +120,11 @@ static void pcie_rx_ring_cleanup_ndp(str
164 if (desc->prx_ring) {
165 for (i = 0; i < MAX_NUM_RX_DESC; i++) {
166 if (desc->rx_vbuflist[i]) {
167 - pci_unmap_single(pcie_priv->pdev,
168 + dma_unmap_single(&(pcie_priv->pdev)->dev,
169 le32_to_cpu(
170 desc->prx_ring[i].data),
171 desc->rx_buf_size,
172 - PCI_DMA_FROMDEVICE);
173 + DMA_FROM_DEVICE);
174 desc->rx_vbuflist[i] = NULL;
175 }
176 }
177 @@ -411,11 +411,11 @@ static inline int pcie_rx_refill_ndp(str
178 return -ENOMEM;
179 skb_reserve(psk_buff, MIN_BYTES_RX_HEADROOM);
180
181 - dma = pci_map_single(pcie_priv->pdev,
182 + dma = dma_map_single(&(pcie_priv->pdev)->dev,
183 psk_buff->data,
184 desc->rx_buf_size,
185 - PCI_DMA_FROMDEVICE);
186 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
187 + DMA_FROM_DEVICE);
188 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
189 wiphy_err(priv->hw->wiphy,
190 "refill: failed to map pci memory!\n");
191 return -ENOMEM;
192 @@ -520,10 +520,10 @@ recheck:
193 break;
194 }
195
196 - pci_unmap_single(pcie_priv->pdev,
197 + dma_unmap_single(&(pcie_priv->pdev)->dev,
198 le32_to_cpu(prx_desc->data),
199 desc->rx_buf_size,
200 - PCI_DMA_FROMDEVICE);
201 + DMA_FROM_DEVICE);
202
203 bad_mic = false;
204 ctrl = le32_to_cpu(prx_ring_done->ctrl);
205 --- a/hif/pcie/8964/tx_ndp.c
206 +++ b/hif/pcie/8964/tx_ndp.c
207 @@ -132,10 +132,10 @@ static void pcie_tx_ring_cleanup_ndp(str
208 for (i = 0; i < MAX_TX_RING_SEND_SIZE; i++) {
209 tx_skb = desc->tx_vbuflist[i];
210 if (tx_skb) {
211 - pci_unmap_single(pcie_priv->pdev,
212 + dma_unmap_single(&(pcie_priv->pdev)->dev,
213 desc->pphys_tx_buflist[i],
214 tx_skb->len,
215 - PCI_DMA_TODEVICE);
216 + DMA_TO_DEVICE);
217 dev_kfree_skb_any(tx_skb);
218 desc->pphys_tx_buflist[i] = 0;
219 desc->tx_vbuflist[i] = NULL;
220 @@ -267,9 +267,9 @@ static inline int pcie_tx_skb_ndp(struct
221 (TXRING_CTRL_TAG_MGMT << TXRING_CTRL_TAG_SHIFT));
222 }
223
224 - dma = pci_map_single(pcie_priv->pdev, tx_skb->data,
225 - tx_skb->len, PCI_DMA_TODEVICE);
226 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
227 + dma = dma_map_single(&(pcie_priv->pdev)->dev, tx_skb->data,
228 + tx_skb->len, DMA_TO_DEVICE);
229 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
230 dev_kfree_skb_any(tx_skb);
231 wiphy_err(priv->hw->wiphy,
232 "failed to map pci memory!\n");
233 @@ -451,10 +451,10 @@ void pcie_tx_done_ndp(struct ieee80211_h
234 "buffer is NULL for tx done ring\n");
235 break;
236 }
237 - pci_unmap_single(pcie_priv->pdev,
238 + dma_unmap_single(&(pcie_priv->pdev)->dev,
239 desc->pphys_tx_buflist[index],
240 skb->len,
241 - PCI_DMA_TODEVICE);
242 + DMA_TO_DEVICE);
243 desc->pphys_tx_buflist[index] = 0;
244 desc->tx_vbuflist[index] = NULL;
245
246 --- a/hif/pcie/8997/rx.c
247 +++ b/hif/pcie/8997/rx.c
248 @@ -107,11 +107,11 @@ static int pcie_rx_ring_init(struct mwl_
249 desc->prx_ring[i].rssi = 0x00;
250 desc->prx_ring[i].pkt_len =
251 cpu_to_le16(SYSADPT_MAX_AGGR_SIZE);
252 - dma = pci_map_single(pcie_priv->pdev,
253 + dma = dma_map_single(&(pcie_priv->pdev)->dev,
254 rx_hndl->psk_buff->data,
255 desc->rx_buf_size,
256 - PCI_DMA_FROMDEVICE);
257 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
258 + DMA_FROM_DEVICE);
259 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
260 wiphy_err(priv->hw->wiphy,
261 "failed to map pci memory!\n");
262 return -ENOMEM;
263 @@ -153,11 +153,11 @@ static void pcie_rx_ring_cleanup(struct
264 if (!rx_hndl->psk_buff)
265 continue;
266
267 - pci_unmap_single(pcie_priv->pdev,
268 + dma_unmap_single(&(pcie_priv->pdev)->dev,
269 le32_to_cpu
270 (rx_hndl->pdesc->pphys_buff_data),
271 desc->rx_buf_size,
272 - PCI_DMA_FROMDEVICE);
273 + DMA_FROM_DEVICE);
274
275 dev_kfree_skb_any(rx_hndl->psk_buff);
276
277 @@ -332,11 +332,11 @@ static inline int pcie_rx_refill(struct
278 rx_hndl->pdesc->rssi = 0x00;
279 rx_hndl->pdesc->pkt_len = cpu_to_le16(desc->rx_buf_size);
280
281 - dma = pci_map_single(pcie_priv->pdev,
282 + dma = dma_map_single(&pcie_priv->pdev->dev,
283 rx_hndl->psk_buff->data,
284 desc->rx_buf_size,
285 - PCI_DMA_FROMDEVICE);
286 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
287 + DMA_FROM_DEVICE);
288 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
289 dev_kfree_skb_any(rx_hndl->psk_buff);
290 wiphy_err(priv->hw->wiphy,
291 "failed to map pci memory!\n");
292 @@ -410,10 +410,10 @@ void pcie_8997_rx_recv(unsigned long dat
293 prx_skb = curr_hndl->psk_buff;
294 if (!prx_skb)
295 goto out;
296 - pci_unmap_single(pcie_priv->pdev,
297 + dma_unmap_single(&(pcie_priv->pdev)->dev,
298 le32_to_cpu(curr_hndl->pdesc->pphys_buff_data),
299 desc->rx_buf_size,
300 - PCI_DMA_FROMDEVICE);
301 + DMA_FROM_DEVICE);
302 pkt_len = le16_to_cpu(curr_hndl->pdesc->pkt_len);
303
304 if (skb_tailroom(prx_skb) < pkt_len) {
305 --- a/hif/pcie/8997/tx.c
306 +++ b/hif/pcie/8997/tx.c
307 @@ -139,10 +139,10 @@ static void pcie_txbd_ring_delete(struct
308 skb = pcie_priv->tx_buf_list[num];
309 tx_desc = (struct pcie_tx_desc *)skb->data;
310
311 - pci_unmap_single(pcie_priv->pdev,
312 + dma_unmap_single(&(pcie_priv->pdev)->dev,
313 le32_to_cpu(tx_desc->pkt_ptr),
314 skb->len,
315 - PCI_DMA_TODEVICE);
316 + DMA_TO_DEVICE);
317 dev_kfree_skb_any(skb);
318 }
319 pcie_priv->tx_buf_list[num] = NULL;
320 @@ -222,9 +222,9 @@ static inline void pcie_tx_skb(struct mw
321 tx_desc->type = tx_ctrl->type;
322 tx_desc->xmit_control = tx_ctrl->xmit_control;
323 tx_desc->sap_pkt_info = 0;
324 - dma = pci_map_single(pcie_priv->pdev, tx_skb->data,
325 - tx_skb->len, PCI_DMA_TODEVICE);
326 - if (pci_dma_mapping_error(pcie_priv->pdev, dma)) {
327 + dma = dma_map_single(&(pcie_priv->pdev)->dev, tx_skb->data,
328 + tx_skb->len, DMA_TO_DEVICE);
329 + if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) {
330 dev_kfree_skb_any(tx_skb);
331 wiphy_err(priv->hw->wiphy,
332 "failed to map pci memory!\n");
333 @@ -401,10 +401,10 @@ static void pcie_pfu_tx_done(struct mwl_
334 pfu_dma = (struct pcie_pfu_dma_data *)done_skb->data;
335 tx_desc = &pfu_dma->tx_desc;
336 dma_data = &pfu_dma->dma_data;
337 - pci_unmap_single(pcie_priv->pdev,
338 + dma_unmap_single(&(pcie_priv->pdev)->dev,
339 le32_to_cpu(data_buf->paddr),
340 le16_to_cpu(data_buf->len),
341 - PCI_DMA_TODEVICE);
342 + DMA_TO_DEVICE);
343 tx_desc->pkt_ptr = 0;
344 tx_desc->pkt_len = 0;
345 tx_desc->status = cpu_to_le32(EAGLE_TXD_STATUS_IDLE);
346 @@ -875,4 +875,4 @@ void pcie_8997_tx_del_sta_amsdu_pkts(str
347 }
348 }
349 spin_unlock_bh(&sta_info->amsdu_lock);
350 -}
351 \ No newline at end of file
352 +}
Hauke Mehrtens staging tree