Ver código fonte

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>
Joerg Roedel 8 anos atrás
pai
commit
ffa080ebb5
1 arquivos alterados com 0 adições e 3 exclusões
  1. 0 3
      drivers/iommu/amd_iommu_init.c

+ 0 - 3
drivers/iommu/amd_iommu_init.c

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