Commit 3aebae06 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "mdev IOMMU groups are not yet compatible with the powerpc SPAPR IOMMU
  backend, detect and fail group attach (Greg Kurz)"

* tag 'vfio-v4.10-rc6' of git://github.com/awilliam/linux-vfio:
  vfio/spapr: fail tce_iommu_attach_group() when iommu_data is null
parents 9d1d166f bd00fdf1
...@@ -1270,6 +1270,10 @@ static int tce_iommu_attach_group(void *iommu_data, ...@@ -1270,6 +1270,10 @@ static int tce_iommu_attach_group(void *iommu_data,
/* pr_debug("tce_vfio: Attaching group #%u to iommu %p\n", /* pr_debug("tce_vfio: Attaching group #%u to iommu %p\n",
iommu_group_id(iommu_group), iommu_group); */ iommu_group_id(iommu_group), iommu_group); */
table_group = iommu_group_get_iommudata(iommu_group); table_group = iommu_group_get_iommudata(iommu_group);
if (!table_group) {
ret = -ENODEV;
goto unlock_exit;
}
if (tce_groups_attached(container) && (!table_group->ops || if (tce_groups_attached(container) && (!table_group->ops ||
!table_group->ops->take_ownership || !table_group->ops->take_ownership ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment