forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-04 1543e317f1da31b75942316931e8f491a8920811 
 kernel/drivers/net/wireless/intersil/p54/p54pci.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 
23 /*
34  * Linux device driver for PCI based Prism54
....@@ -7,10 +8,6 @@
78  *
89  * Based on the islsm (softmac prism54) driver, which is:
910  * Copyright 2004-2006 Jean-Baptiste Note <jean-baptiste.note@m4x.org>, et al.
10
- *
11
- * This program is free software; you can redistribute it and/or modify
12
- * it under the terms of the GNU General Public License version 2 as
13
- * published by the Free Software Foundation.
1411  */
1512 
1613 #include <linux/pci.h>
....@@ -156,12 +153,12 @@
156153 			if (!skb)
157154 				break;
158155 
159
-			mapping = pci_map_single(priv->pdev,
156
+			mapping = dma_map_single(&priv->pdev->dev,
160157 						 skb_tail_pointer(skb),
161158 						 priv->common.rx_mtu + 32,
162
-						 PCI_DMA_FROMDEVICE);
159
+						 DMA_FROM_DEVICE);
163160 
164
-			if (pci_dma_mapping_error(priv->pdev, mapping)) {
161
+			if (dma_mapping_error(&priv->pdev->dev, mapping)) {
165162 				dev_kfree_skb_any(skb);
166163 				dev_err(&priv->pdev->dev,
167164 					"RX DMA Mapping error\n");
....@@ -218,19 +215,22 @@
218215 			len = priv->common.rx_mtu;
219216 		}
220217 		dma_addr = le32_to_cpu(desc->host_addr);
221
-		pci_dma_sync_single_for_cpu(priv->pdev, dma_addr,
222
-			priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);
218
+		dma_sync_single_for_cpu(&priv->pdev->dev, dma_addr,
219
+					priv->common.rx_mtu + 32,
220
+					DMA_FROM_DEVICE);
223221 		skb_put(skb, len);
224222 
225223 		if (p54_rx(dev, skb)) {
226
-			pci_unmap_single(priv->pdev, dma_addr,
227
-				priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);
224
+			dma_unmap_single(&priv->pdev->dev, dma_addr,
225
+					 priv->common.rx_mtu + 32,
226
+					 DMA_FROM_DEVICE);
228227 			rx_buf[i] = NULL;
229228 			desc->host_addr = cpu_to_le32(0);
230229 		} else {
231230 			skb_trim(skb, 0);
232
-			pci_dma_sync_single_for_device(priv->pdev, dma_addr,
233
-				priv->common.rx_mtu + 32, PCI_DMA_FROMDEVICE);
231
+			dma_sync_single_for_device(&priv->pdev->dev, dma_addr,
232
+						   priv->common.rx_mtu + 32,
233
+						   DMA_FROM_DEVICE);
234234 			desc->len = cpu_to_le16(priv->common.rx_mtu + 32);
235235 		}
236236 
....@@ -261,8 +261,9 @@
261261 		skb = tx_buf[i];
262262 		tx_buf[i] = NULL;
263263 
264
-		pci_unmap_single(priv->pdev, le32_to_cpu(desc->host_addr),
265
-				 le16_to_cpu(desc->len), PCI_DMA_TODEVICE);
264
+		dma_unmap_single(&priv->pdev->dev,
265
+				 le32_to_cpu(desc->host_addr),
266
+				 le16_to_cpu(desc->len), DMA_TO_DEVICE);
266267 
267268 		desc->host_addr = 0;
268269 		desc->device_addr = 0;
....@@ -277,10 +278,10 @@
277278 	}
278279 }
279280 
280
-static void p54p_tasklet(unsigned long dev_id)
281
+static void p54p_tasklet(struct tasklet_struct *t)
281282 {
282
-	struct ieee80211_hw *dev = (struct ieee80211_hw *)dev_id;
283
-	struct p54p_priv *priv = dev->priv;
283
+	struct p54p_priv *priv = from_tasklet(priv, t, tasklet);
284
+	struct ieee80211_hw *dev = pci_get_drvdata(priv->pdev);
284285 	struct p54p_ring_control *ring_control = priv->ring_control;
285286 
286287 	p54p_check_tx_ring(dev, &priv->tx_idx_mgmt, 3, ring_control->tx_mgmt,
....@@ -339,9 +340,9 @@
339340 	i = idx % ARRAY_SIZE(ring_control->tx_data);
340341 	device_addr = ((struct p54_hdr *)skb->data)->req_id;
341342 
342
-	mapping = pci_map_single(priv->pdev, skb->data, skb->len,
343
-				 PCI_DMA_TODEVICE);
344
-	if (pci_dma_mapping_error(priv->pdev, mapping)) {
343
+	mapping = dma_map_single(&priv->pdev->dev, skb->data, skb->len,
344
+				 DMA_TO_DEVICE);
345
+	if (dma_mapping_error(&priv->pdev->dev, mapping)) {
345346 		spin_unlock_irqrestore(&priv->lock, flags);
346347 		p54_free_skb(dev, skb);
347348 		dev_err(&priv->pdev->dev, "TX DMA mapping error\n");
....@@ -383,10 +384,10 @@
383384 	for (i = 0; i < ARRAY_SIZE(priv->rx_buf_data); i++) {
384385 		desc = &ring_control->rx_data[i];
385386 		if (desc->host_addr)
386
-			pci_unmap_single(priv->pdev,
387
+			dma_unmap_single(&priv->pdev->dev,
387388 					 le32_to_cpu(desc->host_addr),
388389 					 priv->common.rx_mtu + 32,
389
-					 PCI_DMA_FROMDEVICE);
390
+					 DMA_FROM_DEVICE);
390391 		kfree_skb(priv->rx_buf_data[i]);
391392 		priv->rx_buf_data[i] = NULL;
392393 	}
....@@ -394,10 +395,10 @@
394395 	for (i = 0; i < ARRAY_SIZE(priv->rx_buf_mgmt); i++) {
395396 		desc = &ring_control->rx_mgmt[i];
396397 		if (desc->host_addr)
397
-			pci_unmap_single(priv->pdev,
398
+			dma_unmap_single(&priv->pdev->dev,
398399 					 le32_to_cpu(desc->host_addr),
399400 					 priv->common.rx_mtu + 32,
400
-					 PCI_DMA_FROMDEVICE);
401
+					 DMA_FROM_DEVICE);
401402 		kfree_skb(priv->rx_buf_mgmt[i]);
402403 		priv->rx_buf_mgmt[i] = NULL;
403404 	}
....@@ -405,10 +406,10 @@
405406 	for (i = 0; i < ARRAY_SIZE(priv->tx_buf_data); i++) {
406407 		desc = &ring_control->tx_data[i];
407408 		if (desc->host_addr)
408
-			pci_unmap_single(priv->pdev,
409
+			dma_unmap_single(&priv->pdev->dev,
409410 					 le32_to_cpu(desc->host_addr),
410411 					 le16_to_cpu(desc->len),
411
-					 PCI_DMA_TODEVICE);
412
+					 DMA_TO_DEVICE);
412413 
413414 		p54_free_skb(dev, priv->tx_buf_data[i]);
414415 		priv->tx_buf_data[i] = NULL;
....@@ -417,10 +418,10 @@
417418 	for (i = 0; i < ARRAY_SIZE(priv->tx_buf_mgmt); i++) {
418419 		desc = &ring_control->tx_mgmt[i];
419420 		if (desc->host_addr)
420
-			pci_unmap_single(priv->pdev,
421
+			dma_unmap_single(&priv->pdev->dev,
421422 					 le32_to_cpu(desc->host_addr),
422423 					 le16_to_cpu(desc->len),
423
-					 PCI_DMA_TODEVICE);
424
+					 DMA_TO_DEVICE);
424425 
425426 		p54_free_skb(dev, priv->tx_buf_mgmt[i]);
426427 		priv->tx_buf_mgmt[i] = NULL;
....@@ -573,9 +574,9 @@
573574 		goto err_disable_dev;
574575 	}
575576 
576
-	err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
577
+	err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
577578 	if (!err)
578
-		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
579
+		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
579580 	if (err) {
580581 		dev_err(&pdev->dev, "No suitable DMA available\n");
581582 		goto err_free_reg;
....@@ -608,8 +609,9 @@
608609 		goto err_free_dev;
609610 	}
610611 
611
-	priv->ring_control = pci_alloc_consistent(pdev, sizeof(*priv->ring_control),
612
-						  &priv->ring_control_dma);
612
+	priv->ring_control = dma_alloc_coherent(&pdev->dev,
613
+						sizeof(*priv->ring_control),
614
+						&priv->ring_control_dma, GFP_KERNEL);
613615 	if (!priv->ring_control) {
614616 		dev_err(&pdev->dev, "Cannot allocate rings\n");
615617 		err = -ENOMEM;
....@@ -620,7 +622,7 @@
620622 	priv->common.tx = p54p_tx;
621623 
622624 	spin_lock_init(&priv->lock);
623
-	tasklet_init(&priv->tasklet, p54p_tasklet, (unsigned long)dev);
625
+	tasklet_setup(&priv->tasklet, p54p_tasklet);
624626 
625627 	err = request_firmware_nowait(THIS_MODULE, 1, "isl3886pci",
626628 				      &priv->pdev->dev, GFP_KERNEL,
....@@ -628,8 +630,8 @@
628630 	if (!err)
629631 		return 0;
630632 
631
-	pci_free_consistent(pdev, sizeof(*priv->ring_control),
632
-			    priv->ring_control, priv->ring_control_dma);
633
+	dma_free_coherent(&pdev->dev, sizeof(*priv->ring_control),
634
+			  priv->ring_control, priv->ring_control_dma);
633635 
634636  err_iounmap:
635637 	iounmap(priv->map);
....@@ -658,8 +660,8 @@
658660 	wait_for_completion(&priv->fw_loaded);
659661 	p54_unregister_common(dev);
660662 	release_firmware(priv->firmware);
661
-	pci_free_consistent(pdev, sizeof(*priv->ring_control),
662
-			    priv->ring_control, priv->ring_control_dma);
663
+	dma_free_coherent(&pdev->dev, sizeof(*priv->ring_control),
664
+			  priv->ring_control, priv->ring_control_dma);
663665 	iounmap(priv->map);
664666 	pci_release_regions(pdev);
665667 	pci_disable_device(pdev);