]>
Commit | Line | Data |
---|---|---|
6691e1a9 GKH |
1 | From 8f9f55e83e939724490d7cde3833c4883c6d1310 Mon Sep 17 00:00:00 2001 |
2 | From: Chris Wright <chrisw@sous-sol.org> | |
3 | Date: Fri, 2 Apr 2010 18:27:54 -0700 | |
4 | Subject: Revert "x86: disable IOMMUs on kernel crash" | |
5 | ||
6 | From: Chris Wright <chrisw@sous-sol.org> | |
7 | ||
8 | commit 8f9f55e83e939724490d7cde3833c4883c6d1310 upstream. | |
9 | ||
10 | This effectively reverts commit 61d047be99757fd9b0af900d7abce9a13a337488. | |
11 | ||
12 | Disabling the IOMMU can potetially allow DMA transactions to | |
13 | complete without being translated. Leave it enabled, and allow | |
14 | crash kernel to do the IOMMU reinitialization properly. | |
15 | ||
16 | Cc: Joerg Roedel <joerg.roedel@amd.com> | |
17 | Cc: Eric Biederman <ebiederm@xmission.com> | |
18 | Cc: Neil Horman <nhorman@tuxdriver.com> | |
19 | Cc: Vivek Goyal <vgoyal@redhat.com> | |
20 | Signed-off-by: Chris Wright <chrisw@sous-sol.org> | |
21 | Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> | |
22 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
23 | ||
24 | --- | |
25 | arch/x86/kernel/crash.c | 6 ------ | |
26 | 1 file changed, 6 deletions(-) | |
27 | ||
28 | --- a/arch/x86/kernel/crash.c | |
29 | +++ b/arch/x86/kernel/crash.c | |
30 | @@ -27,7 +27,6 @@ | |
31 | #include <asm/cpu.h> | |
32 | #include <asm/reboot.h> | |
33 | #include <asm/virtext.h> | |
34 | -#include <asm/iommu.h> | |
35 | ||
36 | ||
37 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) | |
38 | @@ -104,10 +103,5 @@ void native_machine_crash_shutdown(struc | |
39 | #ifdef CONFIG_HPET_TIMER | |
40 | hpet_disable(); | |
41 | #endif | |
42 | - | |
43 | -#ifdef CONFIG_X86_64 | |
44 | - pci_iommu_shutdown(); | |
45 | -#endif | |
46 | - | |
47 | crash_save_cpu(regs, safe_smp_processor_id()); | |
48 | } |