Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8f9f55e83e939724490d7cde3833c4883c6d1310

Authored by Chris Wright
Committed by Joerg Roedel
1 parent 549c90dc9a
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Revert "x86: disable IOMMUs on kernel crash" 

This effectively reverts commit 61d047be99757fd9b0af900d7abce9a13a337488.

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>

Showing 1 changed file with 0 additions and 6 deletions Side-by-side Diff

arch/x86/kernel/crash.c
Diff comments   View file @ 8f9f55e
... ... @@ -27,7 +27,6 @@
27 27 #include <asm/cpu.h>
28 28 #include <asm/reboot.h>
29 29 #include <asm/virtext.h>
30   -#include <asm/x86_init.h>
31 30  
32 31 #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
33 32  
... ... @@ -103,11 +102,6 @@
103 102 #ifdef CONFIG_HPET_TIMER
104 103 hpet_disable();
105 104 #endif
106   -
107   -#ifdef CONFIG_X86_64
108   - x86_platform.iommu_shutdown();
109   -#endif
110   -
111 105 crash_save_cpu(regs, safe_smp_processor_id());
112 106 }