aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/pci-gart.c
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2007-07-21 11:11:28 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 21:37:13 -0400
commitbc2cea6a34fdb30f118ec75db39a46a191870607 (patch)
tree823a027872cad6165530323b9b2196f9ef82ce29 /arch/x86_64/kernel/pci-gart.c
parent48dd9343d0bb54362a2ba65380fea7c8f07f9e74 (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 'arch/x86_64/kernel/pci-gart.c')
-rw-r--r--arch/x86_64/kernel/pci-gart.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index e587b65e754f..12acafdca791 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -571,6 +571,26 @@ static const struct dma_mapping_ops gart_dma_ops = {
571 .unmap_sg = gart_unmap_sg, 571 .unmap_sg = gart_unmap_sg,
572}; 572};
573 573
574void gart_iommu_shutdown(void)
575{
576 struct pci_dev *dev;
577 int i;
578
579 if (no_agp && (dma_ops != &gart_dma_ops))
580 return;
581
582 for (i = 0; i < num_k8_northbridges; i++) {
583 u32 ctl;
584
585 dev = k8_northbridges[i];
586 pci_read_config_dword(dev, 0x90, &ctl);
587
588 ctl &= ~1;
589
590 pci_write_config_dword(dev, 0x90, ctl);
591 }
592}
593
574void __init gart_iommu_init(void) 594void __init gart_iommu_init(void)
575{ 595{
576 struct agp_kern_info info; 596 struct agp_kern_info info;