Commit 8f9f55e8 authored Apr 02, 2010 by Chris Wright Committed by Joerg Roedel Apr 07, 2010

Revert "x86: disable IOMMUs on kernel crash"

This effectively reverts commit 61d047be.

Disabling the IOMMU can potetially allow DMA transactions to
complete without being translated.  Leave it enabled, and allow
crash kernel to do the IOMMU reinitialization properly.

Cc: stable@kernel.org
Cc: Joerg Roedel <joerg.roedel@amd.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

parent 549c90dc

arch/x86/kernel/crash.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@
		#include <asm/cpu.h>
		#include <asm/reboot.h>
		#include <asm/virtext.h>
		#include <asm/x86_init.h>

		#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)

		@@ -103,10 +102,5 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
		#ifdef CONFIG_HPET_TIMER
		hpet_disable();
		#endif

		#ifdef CONFIG_X86_64
		x86_platform.iommu_shutdown();
		#endif

		crash_save_cpu(regs, safe_smp_processor_id());
		}

Admin message