Recent change 03a76b60 "vfio: Include No-IOMMU mode" disabled VFIO on systems which do not implement iommu_ops for the PCI bus even though there is an VFIO IOMMU driver for it such as SPAPR TCE driver for PPC64/powernv platform.
This moves iommu_present() call under #ifdef CONFIG_VFIO_NOIOMMU as it is done in the rest of the file to re-enable VFIO on powernv. Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> --- drivers/vfio/vfio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index 82f25cc..3f8060e 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c @@ -343,7 +343,6 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group, atomic_set(&group->opened, 0); group->iommu_group = iommu_group; group->noiommu = !iommu_present; - group->nb.notifier_call = vfio_iommu_group_notifier; /* @@ -767,7 +766,11 @@ int vfio_add_group_dev(struct device *dev, group = vfio_group_get_from_iommu(iommu_group); if (!group) { +#ifdef CONFIG_VFIO_NOIOMMU group = vfio_create_group(iommu_group, iommu_present(dev->bus)); +#else + group = vfio_create_group(iommu_group, true); +#endif if (IS_ERR(group)) { iommu_group_put(iommu_group); return PTR_ERR(group); -- 2.5.0.rc3 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev