From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 16 Jun 2017 14:10:00 +0000 (+0200)
Subject: iommu/amd: Remove amd_iommu_disabled check from amd_iommu_detect()
X-Git-Tag: v4.13-rc1~52^2^7~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ffa080ebb5405b27b0b84a3a75c9cdf4ed3d28da;p=karo-tx-linux.git

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>
---

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;