Commit 75f66533 authored by Chris Wright's avatar Chris Wright Committed by Joerg Roedel

x86/amd-iommu: enable iommu before attaching devices

Hit another kdump problem as reported by Neil Horman.  When initializaing
the IOMMU, we attach devices to their domains before the IOMMU is
fully (re)initialized.  Attaching a device will issue some important
invalidations.  In the context of the newly kexec'd kdump kernel, the
IOMMU may have stale cached data from the original kernel.  Because we
do the attach too early, the invalidation commands are placed in the new
command buffer before the IOMMU is updated w/ that buffer.  This leaves
the stale entries in the kdump context and can renders device unusable.
Simply enable the IOMMU before we do the attach.

Cc: stable@kernel.org
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 8b408fe4
...@@ -1304,6 +1304,8 @@ static int __init amd_iommu_init(void) ...@@ -1304,6 +1304,8 @@ static int __init amd_iommu_init(void)
if (ret) if (ret)
goto free; goto free;
enable_iommus();
if (iommu_pass_through) if (iommu_pass_through)
ret = amd_iommu_init_passthrough(); ret = amd_iommu_init_passthrough();
else else
...@@ -1316,8 +1318,6 @@ static int __init amd_iommu_init(void) ...@@ -1316,8 +1318,6 @@ static int __init amd_iommu_init(void)
amd_iommu_init_notifier(); amd_iommu_init_notifier();
enable_iommus();
if (iommu_pass_through) if (iommu_pass_through)
goto out; goto out;
...@@ -1331,6 +1331,7 @@ out: ...@@ -1331,6 +1331,7 @@ out:
return ret; return ret;
free: free:
disable_iommus();
amd_iommu_uninit_devices(); amd_iommu_uninit_devices();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment