[PATCH 06/12] x86/amd-iommu: enable iommu before attaching devices
in [Kernel]
|
Prev: [PATCH 03/12] x86/amd-iommu: Pt mode fix for domain_destroy
Next: [GIT PULL][PATCH 0/12] IOMMU fixes for 2.6.34-rc3
From: Joerg Roedel on 7 Apr 2010 08:50 From: Chris Wright <chrisw(a)sous-sol.org> 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(a)kernel.org 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> --- arch/x86/kernel/amd_iommu_init.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index feaf471..8975965 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c @@ -1304,6 +1304,8 @@ static int __init amd_iommu_init(void) if (ret) goto free; + enable_iommus(); + if (iommu_pass_through) ret = amd_iommu_init_passthrough(); else @@ -1316,8 +1318,6 @@ static int __init amd_iommu_init(void) amd_iommu_init_notifier(); - enable_iommus(); - if (iommu_pass_through) goto out; @@ -1331,6 +1331,7 @@ out: return ret; free: + disable_iommus(); amd_iommu_uninit_devices(); -- 1.7.0.4 -- 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/ |