.. | .. |
---|
225 | 225 | { |
---|
226 | 226 | svnic_dev_desc_ring_size(ring, desc_count, desc_size); |
---|
227 | 227 | |
---|
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); |
---|
232 | 231 | if (!ring->descs_unaligned) { |
---|
233 | 232 | pr_err("Failed to allocate ring (size=%d), aborting\n", |
---|
234 | 233 | (int)ring->size); |
---|
.. | .. |
---|
251 | 250 | void svnic_dev_free_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring) |
---|
252 | 251 | { |
---|
253 | 252 | if (ring->descs) { |
---|
254 | | - pci_free_consistent(vdev->pdev, |
---|
| 253 | + dma_free_coherent(&vdev->pdev->dev, |
---|
255 | 254 | ring->size_unaligned, |
---|
256 | 255 | ring->descs_unaligned, |
---|
257 | 256 | ring->base_addr_unaligned); |
---|
.. | .. |
---|
470 | 469 | int err = 0; |
---|
471 | 470 | |
---|
472 | 471 | if (!vdev->fw_info) { |
---|
473 | | - vdev->fw_info = pci_alloc_consistent(vdev->pdev, |
---|
| 472 | + vdev->fw_info = dma_alloc_coherent(&vdev->pdev->dev, |
---|
474 | 473 | sizeof(struct vnic_devcmd_fw_info), |
---|
475 | | - &vdev->fw_info_pa); |
---|
| 474 | + &vdev->fw_info_pa, GFP_KERNEL); |
---|
476 | 475 | if (!vdev->fw_info) |
---|
477 | 476 | return -ENOMEM; |
---|
478 | 477 | |
---|
.. | .. |
---|
534 | 533 | int wait = VNIC_DVCMD_TMO; |
---|
535 | 534 | |
---|
536 | 535 | 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); |
---|
539 | 538 | if (!vdev->stats) |
---|
540 | 539 | return -ENOMEM; |
---|
541 | 540 | } |
---|
.. | .. |
---|
607 | 606 | int wait = VNIC_DVCMD_TMO; |
---|
608 | 607 | |
---|
609 | 608 | if (!vdev->notify) { |
---|
610 | | - vdev->notify = pci_alloc_consistent(vdev->pdev, |
---|
| 609 | + vdev->notify = dma_alloc_coherent(&vdev->pdev->dev, |
---|
611 | 610 | sizeof(struct vnic_devcmd_notify), |
---|
612 | | - &vdev->notify_pa); |
---|
| 611 | + &vdev->notify_pa, GFP_KERNEL); |
---|
613 | 612 | if (!vdev->notify) |
---|
614 | 613 | return -ENOMEM; |
---|
615 | 614 | } |
---|
.. | .. |
---|
697 | 696 | { |
---|
698 | 697 | if (vdev) { |
---|
699 | 698 | if (vdev->notify) |
---|
700 | | - pci_free_consistent(vdev->pdev, |
---|
| 699 | + dma_free_coherent(&vdev->pdev->dev, |
---|
701 | 700 | sizeof(struct vnic_devcmd_notify), |
---|
702 | 701 | vdev->notify, |
---|
703 | 702 | vdev->notify_pa); |
---|
704 | 703 | if (vdev->linkstatus) |
---|
705 | | - pci_free_consistent(vdev->pdev, |
---|
| 704 | + dma_free_coherent(&vdev->pdev->dev, |
---|
706 | 705 | sizeof(u32), |
---|
707 | 706 | vdev->linkstatus, |
---|
708 | 707 | vdev->linkstatus_pa); |
---|
709 | 708 | if (vdev->stats) |
---|
710 | | - pci_free_consistent(vdev->pdev, |
---|
| 709 | + dma_free_coherent(&vdev->pdev->dev, |
---|
711 | 710 | sizeof(struct vnic_stats), |
---|
712 | 711 | vdev->stats, vdev->stats_pa); |
---|
713 | 712 | if (vdev->fw_info) |
---|
714 | | - pci_free_consistent(vdev->pdev, |
---|
| 713 | + dma_free_coherent(&vdev->pdev->dev, |
---|
715 | 714 | sizeof(struct vnic_devcmd_fw_info), |
---|
716 | 715 | vdev->fw_info, vdev->fw_info_pa); |
---|
717 | 716 | if (vdev->devcmd2) |
---|