Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iommu/virtio: Use accessor functions for iommu private data

Make use of dev_iommu_priv_set/get() functions.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Link: https://lore.kernel.org/r/20200326150841.10083-16-joro@8bytes.org

+5 -6
+5 -6
drivers/iommu/virtio-iommu.c
··· 466 466 struct virtio_iommu_req_probe *probe; 467 467 struct virtio_iommu_probe_property *prop; 468 468 struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); 469 - struct viommu_endpoint *vdev = fwspec->iommu_priv; 469 + struct viommu_endpoint *vdev = dev_iommu_priv_get(dev); 470 470 471 471 if (!fwspec->num_ids) 472 472 return -EINVAL; ··· 648 648 int ret = 0; 649 649 struct virtio_iommu_req_attach req; 650 650 struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); 651 - struct viommu_endpoint *vdev = fwspec->iommu_priv; 651 + struct viommu_endpoint *vdev = dev_iommu_priv_get(dev); 652 652 struct viommu_domain *vdomain = to_viommu_domain(domain); 653 653 654 654 mutex_lock(&vdomain->mutex); ··· 807 807 static void viommu_get_resv_regions(struct device *dev, struct list_head *head) 808 808 { 809 809 struct iommu_resv_region *entry, *new_entry, *msi = NULL; 810 - struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); 811 - struct viommu_endpoint *vdev = fwspec->iommu_priv; 810 + struct viommu_endpoint *vdev = dev_iommu_priv_get(dev); 812 811 int prot = IOMMU_WRITE | IOMMU_NOEXEC | IOMMU_MMIO; 813 812 814 813 list_for_each_entry(entry, &vdev->resv_regions, list) { ··· 875 876 vdev->dev = dev; 876 877 vdev->viommu = viommu; 877 878 INIT_LIST_HEAD(&vdev->resv_regions); 878 - fwspec->iommu_priv = vdev; 879 + dev_iommu_priv_set(dev, vdev); 879 880 880 881 if (viommu->probe_size) { 881 882 /* Get additional information for this endpoint */ ··· 919 920 if (!fwspec || fwspec->ops != &viommu_ops) 920 921 return; 921 922 922 - vdev = fwspec->iommu_priv; 923 + vdev = dev_iommu_priv_get(dev); 923 924 924 925 iommu_group_remove_device(dev); 925 926 iommu_device_unlink(&vdev->viommu->iommu, dev);