diff options
author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2007-07-21 11:11:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 21:37:13 -0400 |
commit | bc2cea6a34fdb30f118ec75db39a46a191870607 (patch) | |
tree | 823a027872cad6165530323b9b2196f9ef82ce29 /include | |
parent | 48dd9343d0bb54362a2ba65380fea7c8f07f9e74 (diff) |
x86_64: disable the GART in shutdown
For K8 system: 4G RAM with memory hole remapping enabled, or more than 4G
RAM installed. when using kexec to load second kernel. In the second
kernel, when mem is allocated for GART, it will do the memset for clear, it
will cause restart, because some device still used that for dma. solution
will be:
in second kernel: disable that at first before we try to allocate mem for
it. or in the first kernel: do disable that before shutdown.
Andi/Eric/Alan prefer to second one for clean shutdown in first kernel.
Andi also point out need to consider to AGP enable but mem less 4G case
too.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86_64/proto.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86_64/proto.h index 85255db1e82d..b70aa0ccbe2d 100644 --- a/include/asm-x86_64/proto.h +++ b/include/asm-x86_64/proto.h | |||
@@ -85,11 +85,13 @@ extern int exception_trace; | |||
85 | extern unsigned cpu_khz; | 85 | extern unsigned cpu_khz; |
86 | extern unsigned tsc_khz; | 86 | extern unsigned tsc_khz; |
87 | 87 | ||
88 | extern void pci_iommu_shutdown(void); | ||
88 | extern void no_iommu_init(void); | 89 | extern void no_iommu_init(void); |
89 | extern int force_iommu, no_iommu; | 90 | extern int force_iommu, no_iommu; |
90 | extern int iommu_detected; | 91 | extern int iommu_detected; |
91 | #ifdef CONFIG_IOMMU | 92 | #ifdef CONFIG_IOMMU |
92 | extern void gart_iommu_init(void); | 93 | extern void gart_iommu_init(void); |
94 | extern void gart_iommu_shutdown(void); | ||
93 | extern void __init gart_parse_options(char *); | 95 | extern void __init gart_parse_options(char *); |
94 | extern void iommu_hole_init(void); | 96 | extern void iommu_hole_init(void); |
95 | extern int fallback_aper_order; | 97 | extern int fallback_aper_order; |
@@ -101,6 +103,11 @@ extern int fix_aperture; | |||
101 | #else | 103 | #else |
102 | #define iommu_aperture 0 | 104 | #define iommu_aperture 0 |
103 | #define iommu_aperture_allowed 0 | 105 | #define iommu_aperture_allowed 0 |
106 | |||
107 | static inline void gart_iommu_shutdown(void) | ||
108 | { | ||
109 | } | ||
110 | |||
104 | #endif | 111 | #endif |
105 | 112 | ||
106 | extern int reboot_force; | 113 | extern int reboot_force; |