summaryrefslogtreecommitdiff
path: root/drivers/iommu/amd_iommu_init.c
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2017-06-16 17:10:00 +0300
committerJoerg Roedel <jroedel@suse.de>2017-06-22 13:54:21 +0300
commitffa080ebb5405b27b0b84a3a75c9cdf4ed3d28da (patch)
tree832076ab05e64f4fd7a4b98923d8d8a31d8f643f /drivers/iommu/amd_iommu_init.c
parent7ad820e43330bbf974792c5ab4e2c2355e08d597 (diff)
downloadlinux-ffa080ebb5405b27b0b84a3a75c9cdf4ed3d28da.tar.xz
iommu/amd: Remove amd_iommu_disabled check from amd_iommu_detect()
This check needs to happens later now, when all previously enabled IOMMUs have been disabled. Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/amd_iommu_init.c')
-rw-r--r--drivers/iommu/amd_iommu_init.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index 128f9665c326..5cc597b383c7 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -2578,9 +2578,6 @@ int __init amd_iommu_detect(void)
if (no_iommu || (iommu_detected && !gart_iommu_aperture))
return -ENODEV;
- if (amd_iommu_disabled)
- return -ENODEV;
-
ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);
if (ret)
return ret;