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>
This commit is contained in:
Joerg Roedel 2017-06-16 16:10:00 +02:00
parent 7ad820e433
commit ffa080ebb5
1 changed files with 0 additions and 3 deletions

View File

@ -2578,9 +2578,6 @@ int __init amd_iommu_detect(void)
if (no_iommu || (iommu_detected && !gart_iommu_aperture)) if (no_iommu || (iommu_detected && !gart_iommu_aperture))
return -ENODEV; return -ENODEV;
if (amd_iommu_disabled)
return -ENODEV;
ret = iommu_go_to_state(IOMMU_IVRS_DETECTED); ret = iommu_go_to_state(IOMMU_IVRS_DETECTED);
if (ret) if (ret)
return ret; return ret;