summaryrefslogtreecommitdiffstats
path: root/drivers/vfio
diff options
context:
space:
mode:
authorAlexey Kardashevskiy <aik@ozlabs.ru>2016-04-29 18:55:15 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2016-05-11 21:54:27 +1000
commit54de285beb9ef8b85cf240f7cda161bd6ae5d04c (patch)
tree7b270ac97ed5d2608b06370ba101e51d2cd8f976 /drivers/vfio
parentc8ceacc22bce95d3a9cff198c9c27a30105a16b8 (diff)
downloadlinux-stable-54de285beb9ef8b85cf240f7cda161bd6ae5d04c.tar.gz
linux-stable-54de285beb9ef8b85cf240f7cda161bd6ae5d04c.tar.bz2
linux-stable-54de285beb9ef8b85cf240f7cda161bd6ae5d04c.zip
vfio/spapr: Relax the IOMMU compatibility check
We are going to have multiple different types of PHB on the same system with POWER8 + NVLink and PHBs will have different IOMMU ops. However we only really care about one callback - create_table - so we can relax the compatibility check here. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/vfio')
-rw-r--r--drivers/vfio/vfio_iommu_spapr_tce.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index 0582b72ef377..3054e3fa63ac 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -1188,7 +1188,8 @@ static int tce_iommu_attach_group(void *iommu_data,
goto unlock_exit;
}
table_group_tmp = iommu_group_get_iommudata(tcegrp->grp);
- if (table_group_tmp->ops != table_group->ops) {
+ if (table_group_tmp->ops->create_table !=
+ table_group->ops->create_table) {
pr_warn("tce_vfio: Group %d is incompatible with group %d\n",
iommu_group_id(iommu_group),
iommu_group_id(tcegrp->grp));