Re: [PATCH] vfio: platform: use vfio_iommu_group_get/put

Alex Williamson
2016-05-09T15:32:39Z

On Mon, 9 May 2016 18:01:43 +0800
Peng Fan <van.freenix@gmail.com> wrote:

> Use vfio_iommu_group_get and vfio_iommu_group_put, but not
> iommu_group_get or iommu_group_put.

I assume you're trying to duplicate the vfio_pci changes from commit
03a76b60f8ba to enable no-iommu mode. That would be really relevant
information for the commit log.

>
> Signed-off-by: Peng Fan <van.freenix@gmail.com>
> Cc: Baptiste Reynal <b.reynal@virtualopensystems.com>
> Cc: Alex Williamson <alex.williamson@redhat.com>
> ---
> drivers/vfio/platform/vfio_platform_common.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c
> index e65b142..582885e 100644
> --- a/drivers/vfio/platform/vfio_platform_common.c
> +++ b/drivers/vfio/platform/vfio_platform_common.c
> @@ -561,7 +561,7 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,
>
> vdev->device = dev;
>
> - group = iommu_group_get(dev);
> + group = vfio_iommu_group_get(dev);
> if (!group) {
> pr_err("VFIO: No IOMMU group for device %s\n", vdev->name);
> return -EINVAL;
> @@ -569,7 +569,7 @@ int vfio_platform_probe_common(struct vfio_platform_device *vdev,
>
> ret = vfio_add_group_dev(dev, &vfio_platform_ops, vdev);
> if (ret) {
> - iommu_group_put(group);
> + vfio_iommu_group_put(group);
> return ret;
> }
>
> @@ -589,7 +589,7 @@ struct vfio_platform_device *vfio_platform_remove_common(struct device *dev)
>
> if (vdev) {
> vfio_platform_put_reset(vdev);
> - iommu_group_put(dev->iommu_group);
> + vfio_iommu_group_put(dev->iommu_group, dev);
> }
>
> return vdev;