Commit 522af649 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

iommu/s390: Convert to probe/release_device() call-backs 



Convert the S390 IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200429133712.31431-20-joro@8bytes.org


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 52dd3ca4

drivers/iommu/s390-iommu.c

+6 −16
Original line number Diff line number Diff line
@@ -166,21 +166,14 @@ static void s390_iommu_detach_device(struct iommu_domain *domain, 
	}

}



static int s390_iommu_add_device(struct device *dev)

static struct iommu_device *s390_iommu_probe_device(struct device *dev)

{

	struct iommu_group *group = iommu_group_get_for_dev(dev);

	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;



	if (IS_ERR(group))

		return PTR_ERR(group);



	iommu_group_put(group);

	iommu_device_link(&zdev->iommu_dev, dev);



	return 0;

	return &zdev->iommu_dev;

}



static void s390_iommu_remove_device(struct device *dev)

static void s390_iommu_release_device(struct device *dev)

{

	struct zpci_dev *zdev = to_pci_dev(dev)->sysdata;

	struct iommu_domain *domain;
@@ -191,7 +184,7 @@ static void s390_iommu_remove_device(struct device *dev) 
	 * to vfio-pci and completing the VFIO_SET_IOMMU ioctl (which triggers

	 * the attach_dev), removing the device via

	 * "echo 1 > /sys/bus/pci/devices/.../remove" won't trigger detach_dev,

	 * only remove_device will be called via the BUS_NOTIFY_REMOVED_DEVICE

	 * only release_device will be called via the BUS_NOTIFY_REMOVED_DEVICE

	 * notifier.

	 *

	 * So let's call detach_dev from here if it hasn't been called before.
@@ -201,9 +194,6 @@ static void s390_iommu_remove_device(struct device *dev) 
		if (domain)

			s390_iommu_detach_device(domain, dev);

	}



	iommu_device_unlink(&zdev->iommu_dev, dev);

	iommu_group_remove_device(dev);

}



static int s390_iommu_update_trans(struct s390_domain *s390_domain,
@@ -373,8 +363,8 @@ static const struct iommu_ops s390_iommu_ops = { 
	.map = s390_iommu_map,

	.unmap = s390_iommu_unmap,

	.iova_to_phys = s390_iommu_iova_to_phys,

	.add_device = s390_iommu_add_device,

	.remove_device = s390_iommu_remove_device,

	.probe_device = s390_iommu_probe_device,

	.release_device = s390_iommu_release_device,

	.device_group = generic_device_group,

	.pgsize_bitmap = S390_IOMMU_PGSIZES,

};