Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / x86_64 / kernel / aperture.c

diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86_64/kernel/aperture.c
index 70b9d21ed675b1aabe1874d785fa5f0b98e3b87d..a52af58205921b37b45e33b137f706dfa6bb3bc5 100644 (file)
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture.c
@@ -8,9 +8,7 @@
  * because only the bootmem allocator can allocate 32+MB. 
  * 
  * Copyright 2002 Andi Kleen, SuSE Labs.
- * $Id: aperture.c,v 1.7 2003/08/01 03:36:18 ak Exp $
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -19,11 +17,13 @@
 #include <linux/pci_ids.h>
 #include <linux/pci.h>
 #include <linux/bitops.h>
+#include <linux/ioport.h>
 #include <asm/e820.h>
 #include <asm/io.h>
 #include <asm/proto.h>
 #include <asm/pci-direct.h>
 #include <asm/dma.h>
+#include <asm/k8.h>
 
 int iommu_aperture;
 int iommu_aperture_disabled __initdata = 0;
@@ -34,14 +34,23 @@ int fallback_aper_force __initdata = 0;
 
 int fix_aperture __initdata = 1;
 
+static struct resource gart_resource = {
+       .name   = "GART",
+       .flags  = IORESOURCE_MEM,
+};
+
+static void __init insert_aperture_resource(u32 aper_base, u32 aper_size)
+{
+       gart_resource.start = aper_base;
+       gart_resource.end = aper_base + aper_size - 1;
+       insert_resource(&iomem_resource, &gart_resource);
+}
+
 /* This code runs before the PCI subsystem is initialized, so just
    access the northbridge directly. */
 
-#define NB_ID_3 (PCI_VENDOR_ID_AMD | (0x1103<<16))
-
 static u32 __init allocate_aperture(void) 
 {
-       pg_data_t *nd0 = NODE_DATA(0);
        u32 aper_size;
        void *p; 
 
@@ -51,37 +60,38 @@ static u32 __init allocate_aperture(void)
 
        /* 
         * Aperture has to be naturally aligned. This means an 2GB aperture won't
-        * have much chances to find a place in the lower 4GB of memory.
+        * have much chance of finding a place in the lower 4GB of memory.
         * Unfortunately we cannot move it up because that would make the
         * IOMMU useless.
         */
-       p = __alloc_bootmem_node(nd0, aper_size, aper_size, 0); 
+       p = __alloc_bootmem_nopanic(aper_size, aper_size, 0);
        if (!p || __pa(p)+aper_size > 0xffffffff) {
                printk("Cannot allocate aperture memory hole (%p,%uK)\n",
                       p, aper_size>>10);
                if (p)
-                       free_bootmem_node(nd0, __pa(p), aper_size); 
+                       free_bootmem(__pa(p), aper_size);
                return 0;
        }
        printk("Mapping aperture over %d KB of RAM @ %lx\n",
               aper_size >> 10, __pa(p)); 
+       insert_aperture_resource((u32)__pa(p), aper_size);
        return (u32)__pa(p); 
 }
 
-static int __init aperture_valid(char *name, u64 aper_base, u32 aper_size) 
+static int __init aperture_valid(u64 aper_base, u32 aper_size)
 { 
        if (!aper_base) 
                return 0;
        if (aper_size < 64*1024*1024) { 
-               printk("Aperture from %s too small (%d MB)\n", name, aper_size>>20); 
+               printk("Aperture too small (%d MB)\n", aper_size>>20);
                return 0;
        }
        if (aper_base + aper_size >= 0xffffffff) { 
-               printk("Aperture from %s beyond 4GB. Ignoring.\n",name);
+               printk("Aperture beyond 4GB. Ignoring.\n");
                return 0; 
        }
        if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
-               printk("Aperture from %s pointing to e820 RAM. Ignoring.\n",name);
+               printk("Aperture pointing to e820 RAM. Ignoring.\n");
                return 0; 
        } 
        return 1;
@@ -140,7 +150,7 @@ static __u32 __init read_agp(int num, int slot, int func, int cap, u32 *order)
        printk("Aperture from AGP @ %Lx size %u MB (APSIZE %x)\n", 
               aper, 32 << *order, apsizereg);
 
-       if (!aperture_valid("AGP bridge", aper, (32*1024*1024) << *order))
+       if (!aperture_valid(aper, (32*1024*1024) << *order))
            return 0;
        return (u32)aper; 
 } 
@@ -201,17 +211,17 @@ void __init iommu_hole_init(void)
        u64 aper_base, last_aper_base = 0;
        int valid_agp = 0;
 
-       if (iommu_aperture_disabled || !fix_aperture)
+       if (iommu_aperture_disabled || !fix_aperture || !early_pci_allowed())
                return;
 
        printk("Checking aperture...\n"); 
 
        fix = 0;
        for (num = 24; num < 32; num++) {               
-               char name[30];
-               if (read_pci_config(0, num, 3, 0x00) != NB_ID_3) 
-                       continue;       
+               if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
+                       continue;
 
+               iommu_detected = 1;
                iommu_aperture = 1; 
 
                aper_order = (read_pci_config(0, num, 3, 0x90) >> 1) & 7; 
@@ -222,9 +232,7 @@ void __init iommu_hole_init(void)
                printk("CPU %d: aperture @ %Lx size %u MB\n", num-24, 
                       aper_base, aper_size>>20);
                
-               sprintf(name, "northbridge cpu %d", num-24); 
-
-               if (!aperture_valid(name, aper_base, aper_size)) { 
+               if (!aperture_valid(aper_base, aper_size)) {
                        fix = 1; 
                        break; 
                }
@@ -238,8 +246,13 @@ void __init iommu_hole_init(void)
                last_aper_base = aper_base;
        } 
 
-       if (!fix && !fallback_aper_force) 
+       if (!fix && !fallback_aper_force) {
+               if (last_aper_base) {
+                       unsigned long n = (32 * 1024 * 1024) << last_aper_order;
+                       insert_aperture_resource((u32)last_aper_base, n);
+               }
                return; 
+       }
 
        if (!fallback_aper_force)
                aper_alloc = search_agp_bridge(&aper_order, &valid_agp); 
@@ -273,7 +286,7 @@ void __init iommu_hole_init(void)
 
        /* Fix up the north bridges */
        for (num = 24; num < 32; num++) {               
-               if (read_pci_config(0, num, 3, 0x00) != NB_ID_3) 
+               if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
                        continue;       
 
                /* Don't enable translation yet. That is done later.