forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/scsi/snic/vnic_dev.c
....@@ -225,10 +225,9 @@
225225 {
226226 svnic_dev_desc_ring_size(ring, desc_count, desc_size);
227227
228
- ring->descs_unaligned = pci_alloc_consistent(vdev->pdev,
229
- ring->size_unaligned,
230
- &ring->base_addr_unaligned);
231
-
228
+ ring->descs_unaligned = dma_alloc_coherent(&vdev->pdev->dev,
229
+ ring->size_unaligned, &ring->base_addr_unaligned,
230
+ GFP_KERNEL);
232231 if (!ring->descs_unaligned) {
233232 pr_err("Failed to allocate ring (size=%d), aborting\n",
234233 (int)ring->size);
....@@ -251,7 +250,7 @@
251250 void svnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring)
252251 {
253252 if (ring->descs) {
254
- pci_free_consistent(vdev->pdev,
253
+ dma_free_coherent(&vdev->pdev->dev,
255254 ring->size_unaligned,
256255 ring->descs_unaligned,
257256 ring->base_addr_unaligned);
....@@ -470,9 +469,9 @@
470469 int err = 0;
471470
472471 if (!vdev->fw_info) {
473
- vdev->fw_info = pci_alloc_consistent(vdev->pdev,
472
+ vdev->fw_info = dma_alloc_coherent(&vdev->pdev->dev,
474473 sizeof(struct vnic_devcmd_fw_info),
475
- &vdev->fw_info_pa);
474
+ &vdev->fw_info_pa, GFP_KERNEL);
476475 if (!vdev->fw_info)
477476 return -ENOMEM;
478477
....@@ -534,8 +533,8 @@
534533 int wait = VNIC_DVCMD_TMO;
535534
536535 if (!vdev->stats) {
537
- vdev->stats = pci_alloc_consistent(vdev->pdev,
538
- sizeof(struct vnic_stats), &vdev->stats_pa);
536
+ vdev->stats = dma_alloc_coherent(&vdev->pdev->dev,
537
+ sizeof(struct vnic_stats), &vdev->stats_pa, GFP_KERNEL);
539538 if (!vdev->stats)
540539 return -ENOMEM;
541540 }
....@@ -607,9 +606,9 @@
607606 int wait = VNIC_DVCMD_TMO;
608607
609608 if (!vdev->notify) {
610
- vdev->notify = pci_alloc_consistent(vdev->pdev,
609
+ vdev->notify = dma_alloc_coherent(&vdev->pdev->dev,
611610 sizeof(struct vnic_devcmd_notify),
612
- &vdev->notify_pa);
611
+ &vdev->notify_pa, GFP_KERNEL);
613612 if (!vdev->notify)
614613 return -ENOMEM;
615614 }
....@@ -697,21 +696,21 @@
697696 {
698697 if (vdev) {
699698 if (vdev->notify)
700
- pci_free_consistent(vdev->pdev,
699
+ dma_free_coherent(&vdev->pdev->dev,
701700 sizeof(struct vnic_devcmd_notify),
702701 vdev->notify,
703702 vdev->notify_pa);
704703 if (vdev->linkstatus)
705
- pci_free_consistent(vdev->pdev,
704
+ dma_free_coherent(&vdev->pdev->dev,
706705 sizeof(u32),
707706 vdev->linkstatus,
708707 vdev->linkstatus_pa);
709708 if (vdev->stats)
710
- pci_free_consistent(vdev->pdev,
709
+ dma_free_coherent(&vdev->pdev->dev,
711710 sizeof(struct vnic_stats),
712711 vdev->stats, vdev->stats_pa);
713712 if (vdev->fw_info)
714
- pci_free_consistent(vdev->pdev,
713
+ dma_free_coherent(&vdev->pdev->dev,
715714 sizeof(struct vnic_devcmd_fw_info),
716715 vdev->fw_info, vdev->fw_info_pa);
717716 if (vdev->devcmd2)