Prev: [118/197] x86: clean up rwsem type system
Next: [109/197] x86, lib: Add wbinvd smp helpers
From: Greg KH on 22 Apr 2010 16:00
2.6.32-stable review patch. If anyone has any objections, please let us know.

------------------

From: Chris Wright <chrisw(a)sous-sol.org>

commit 75f66533bc883f761a7adcab3281fe3323efbc90 upstream.

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: Neil Horman <nhorman(a)tuxdriver.com>
Cc: Vivek Goyal <vgoyal(a)redhat.com>
Signed-off-by: Chris Wright <chrisw(a)sous-sol.org>
Signed-off-by: Joerg Roedel <joerg.roedel(a)amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
arch/x86/kernel/amd_iommu_init.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -1284,6 +1284,8 @@ int __init amd_iommu_init(void)
if (ret)
goto free;

+ enable_iommus();
+
if (iommu_pass_through)
ret = amd_iommu_init_passthrough();
else
@@ -1294,8 +1296,6 @@ int __init amd_iommu_init(void)

amd_iommu_init_api();

- enable_iommus();
-
if (iommu_pass_through)
goto out;

@@ -1314,6 +1314,8 @@ out:
return ret;

free:
+ disable_iommus();
+
free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
get_order(MAX_DOMAIN_ID/8));



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [118/197] x86: clean up rwsem type system
Next: [109/197] x86, lib: Add wbinvd smp helpers