vfio: Ignore -ENODEV when getting MSI cookie
Subsystems (2)
PATCH 1/1 vfio: Ignore -ENODEV when getting MSI cookie
When we try to get an MSI cookie for a VFIO device, that can fail if CONFIG_IOMMU_DMA is not set. In this case iommu_get_msi_cookie() returns -ENODEV, and that should not be fatal.
Ignore that case and proceed with the initialisation.
This fixes VFIO with a platform device on the Calxeda Midway (no MSIs).
--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/vfio_iommu_type1.c +1 -1
@@ -1787,7 +1787,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,if (resv_msi) { ret =iommu_get_msi_cookie (domain->domain, resv_msi_base); -if (ret) +if (ret && ret != -ENODEV ) goto out_detach; }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Alex Williamson
AppliedQuoted 21 lines · On Wed, 1 Apr 2020 11:27:24 +0100 Andre Przywara <[email protected]>…
When we try to get an MSI cookie for a VFIO device, that can fail if
CONFIG_IOMMU_DMAis not set. In this caseiommu_get_msi_cookie()returns-ENODEV, and that should not be fatal.Ignore that case and proceed with the initialisation.
This fixes VFIO with a platform device on the Calxeda Midway (no MSIs).
Fixes f6810c15cf973f ("iommu/arm-smmu: Clean up early-probing workarounds")Signed-off-by Andre Przywara <[email protected]>Acked-by Robin Murphy <[email protected]>Reviewed-by Eric Auger <[email protected]>--- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/vfio/vfio_iommu_type1.c +0
-0
drivers/vfio/vfio_iommu_type1.c static int vfio_iommu_type1_attach_group(void *iommu_data, · line 1793
Quoted 8 lines
drivers/vfio/vfio_iommu_type1.c +1
-1@@ -1787,7 +1787,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data,if (resv_msi) { ret =iommu_get_msi_cookie (domain->domain, resv_msi_base); -if (ret) +if (ret && ret != -ENODEV ) goto out_detach; }
Applied to vfio next branch for v5.7. Thanks,
Alex