[v3,06/34] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU
diff mbox series

Message ID 20200429133712.31431-7-joro@8bytes.org
State In Next
Commit 57bd2c24ba1673bd47828f6ac5eaaa6292a03582
Headers show
  • iommu: Move iommu_group setup to IOMMU core code
Related show

Commit Message

Joerg Roedel April 29, 2020, 1:36 p.m. UTC
From: Joerg Roedel <jroedel@suse.de>

When check_device() fails on the device, it is not handled by the
IOMMU and amd_iommu_add_device() needs to return -ENODEV.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
 drivers/iommu/amd_iommu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 504f2db75eda..3e0d27f7622e 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2157,9 +2157,12 @@  static int amd_iommu_add_device(struct device *dev)
 	struct amd_iommu *iommu;
 	int ret, devid;
-	if (!check_device(dev) || get_dev_data(dev))
+	if (get_dev_data(dev))
 		return 0;
+	if (!check_device(dev))
+		return -ENODEV;
 	devid = get_device_id(dev);
 	if (devid < 0)
 		return devid;