Commit bc2cea6a authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds

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: default avatarYinghai 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 48dd9343
...@@ -321,6 +321,11 @@ static int __init pci_iommu_init(void) ...@@ -321,6 +321,11 @@ static int __init pci_iommu_init(void)
return 0; return 0;
} }
void pci_iommu_shutdown(void)
{
gart_iommu_shutdown();
}
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
/* Many VIA bridges seem to corrupt data for DAC. Disable it here */ /* Many VIA bridges seem to corrupt data for DAC. Disable it here */
......
...@@ -571,6 +571,26 @@ static const struct dma_mapping_ops gart_dma_ops = { ...@@ -571,6 +571,26 @@ static const struct dma_mapping_ops gart_dma_ops = {
.unmap_sg = gart_unmap_sg, .unmap_sg = gart_unmap_sg,
}; };
void gart_iommu_shutdown(void)
{
struct pci_dev *dev;
int i;
if (no_agp && (dma_ops != &gart_dma_ops))
return;
for (i = 0; i < num_k8_northbridges; i++) {
u32 ctl;
dev = k8_northbridges[i];
pci_read_config_dword(dev, 0x90, &ctl);
ctl &= ~1;
pci_write_config_dword(dev, 0x90, ctl);
}
}
void __init gart_iommu_init(void) void __init gart_iommu_init(void)
{ {
struct agp_kern_info info; struct agp_kern_info info;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/proto.h>
/* /*
* Power off function, if any * Power off function, if any
...@@ -81,6 +82,7 @@ static inline void kb_wait(void) ...@@ -81,6 +82,7 @@ static inline void kb_wait(void)
void machine_shutdown(void) void machine_shutdown(void)
{ {
unsigned long flags; unsigned long flags;
/* Stop the cpus and apics */ /* Stop the cpus and apics */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
int reboot_cpu_id; int reboot_cpu_id;
...@@ -111,6 +113,8 @@ void machine_shutdown(void) ...@@ -111,6 +113,8 @@ void machine_shutdown(void)
disable_IO_APIC(); disable_IO_APIC();
local_irq_restore(flags); local_irq_restore(flags);
pci_iommu_shutdown();
} }
void machine_emergency_restart(void) void machine_emergency_restart(void)
......
...@@ -85,11 +85,13 @@ extern int exception_trace; ...@@ -85,11 +85,13 @@ extern int exception_trace;
extern unsigned cpu_khz; extern unsigned cpu_khz;
extern unsigned tsc_khz; extern unsigned tsc_khz;
extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void); extern void no_iommu_init(void);
extern int force_iommu, no_iommu; extern int force_iommu, no_iommu;
extern int iommu_detected; extern int iommu_detected;
#ifdef CONFIG_IOMMU #ifdef CONFIG_IOMMU
extern void gart_iommu_init(void); extern void gart_iommu_init(void);
extern void gart_iommu_shutdown(void);
extern void __init gart_parse_options(char *); extern void __init gart_parse_options(char *);
extern void iommu_hole_init(void); extern void iommu_hole_init(void);
extern int fallback_aper_order; extern int fallback_aper_order;
...@@ -101,6 +103,11 @@ extern int fix_aperture; ...@@ -101,6 +103,11 @@ extern int fix_aperture;
#else #else
#define iommu_aperture 0 #define iommu_aperture 0
#define iommu_aperture_allowed 0 #define iommu_aperture_allowed 0
static inline void gart_iommu_shutdown(void)
{
}
#endif #endif
extern int reboot_force; extern int reboot_force;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment