mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
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:
parent
7ad820e433
commit
ffa080ebb5
1 changed files with 0 additions and 3 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue