| Message ID | 1461920124-21719-3-git-send-email-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, 29 Apr 2016 18:55:15 +1000 Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > 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> > --- > drivers/vfio/vfio_iommu_spapr_tce.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c > index 0582b72..3054e3f 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)); Acked-by: Alex Williamson <alex.williamson@redhat.com>
On Fri, 2016-29-04 at 08:55:15 UTC, Alexey Kardashevskiy wrote: > 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> Series applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/45295687a90a31135ab575803e cheers
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c index 0582b72..3054e3f 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));