Merge tag 'vfio-v6.3-rc1' of https://github.com/awilliam/linux-vfio

[platform/kernel/linux-rpi.git] / drivers / vfio / group.c

diff --git a/drivers/vfio/group.c b/drivers/vfio/group.c
index 160deff..27d5ba7 100644 (file)
--- a/drivers/vfio/group.c
+++ b/drivers/vfio/group.c
@@ -133,9 +133,12 @@ static int vfio_group_ioctl_set_container(struct vfio_group *group,
 
        iommufd = iommufd_ctx_from_file(f.file);
        if (!IS_ERR(iommufd)) {
-               u32 ioas_id;
+               if (IS_ENABLED(CONFIG_VFIO_NOIOMMU) &&
+                   group->type == VFIO_NO_IOMMU)
+                       ret = iommufd_vfio_compat_set_no_iommu(iommufd);
+               else
+                       ret = iommufd_vfio_compat_ioas_create(iommufd);
 
-               ret = iommufd_vfio_compat_ioas_id(iommufd, &ioas_id);
                if (ret) {
                        iommufd_ctx_put(iommufd);
                        goto out_unlock;