| Message ID | 20200401102724.161712-1-andre.przywara@arm.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f44efca0493ddc1e8731047c234ec8e475943077 |
| Headers | show |
| Series | vfio: Ignore -ENODEV when getting MSI cookie | expand |
On Wed, 1 Apr 2020 11:27:24 +0100 Andre Przywara <andre.przywara@arm.com> wrote: > 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). > > Fixes: f6810c15cf973f ("iommu/arm-smmu: Clean up early-probing workarounds") > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > Acked-by: Robin Murphy <robin.murphy@arm.com> > Reviewed-by: Eric Auger <eric.auger@redhat.com> > --- > drivers/vfio/vfio_iommu_type1.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c > index 9fdfae1cb17a..85b32c325282 100644 > --- a/drivers/vfio/vfio_iommu_type1.c > +++ b/drivers/vfio/vfio_iommu_type1.c > @@ -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
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 9fdfae1cb17a..85b32c325282 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -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; }
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). Fixes: f6810c15cf973f ("iommu/arm-smmu: Clean up early-probing workarounds") Signed-off-by: Andre Przywara <andre.przywara@arm.com> Acked-by: Robin Murphy <robin.murphy@arm.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> --- drivers/vfio/vfio_iommu_type1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)