Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

4 files changed, 228 insertions, 0 deletions

diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
new file mode 100644
index 000000000000..37c92e841dec
--- /dev/null
+++ b/arch/x86_64/pci/Makefile
@@ -0,0 +1,24 @@
+#
+# Makefile for X86_64 specific PCI routines
+#
+# Reuse the i386 PCI subsystem
+#
+CFLAGS += -Iarch/i386/pci
+
+obj-y           := i386.o
+obj-$(CONFIG_PCI_DIRECT)+= direct.o
+obj-y           += fixup.o
+obj-$(CONFIG_ACPI_PCI)  += acpi.o
+obj-y                   += legacy.o irq.o common.o
+# mmconfig has a 64bit special
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
+
+obj-$(CONFIG_NUMA)      += k8-bus.o
+
+direct-y += ../../i386/pci/direct.o
+acpi-y   += ../../i386/pci/acpi.o
+legacy-y += ../../i386/pci/legacy.o
+irq-y    += ../../i386/pci/irq.o
+common-y += ../../i386/pci/common.o
+fixup-y  += ../../i386/pci/fixup.o
+i386-y  += ../../i386/pci/i386.o
diff --git a/arch/x86_64/pci/Makefile-BUS b/arch/x86_64/pci/Makefile-BUS
new file mode 100644
index 000000000000..291985f0d2e4
--- /dev/null
+++ b/arch/x86_64/pci/Makefile-BUS
@@ -0,0 +1,22 @@
+#
+# Makefile for X86_64 specific PCI routines
+#
+# Reuse the i386 PCI subsystem
+#
+CFLAGS += -I arch/i386/pci
+
+obj-y           := i386.o
+obj-$(CONFIG_PCI_DIRECT)+= direct.o
+obj-y           += fixup.o
+obj-$(CONFIG_ACPI_PCI)  += acpi.o
+obj-y                   += legacy.o irq.o common.o
+# mmconfig has a 64bit special
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
+
+direct-y += ../../i386/pci/direct.o
+acpi-y   += ../../i386/pci/acpi.o
+legacy-y += ../../i386/pci/legacy.o
+irq-y    += ../../i386/pci/irq.o
+common-y += ../../i386/pci/common.o
+fixup-y  += ../../i386/pci/fixup.o
+i386-y  += ../../i386/pci/i386.o
diff --git a/arch/x86_64/pci/k8-bus.c b/arch/x86_64/pci/k8-bus.c
new file mode 100644
index 000000000000..62349c78db57
--- /dev/null
+++ b/arch/x86_64/pci/k8-bus.c
@@ -0,0 +1,78 @@
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <asm/mpspec.h>
+#include <linux/cpumask.h>
+
+/*
+ * This discovers the pcibus <-> node mapping on AMD K8.
+ *
+ * RED-PEN need to call this again on PCI hotplug
+ * RED-PEN empty cpus get reported wrong
+ */
+
+#define NODE_ID_REGISTER 0x60
+#define NODE_ID(dword) (dword & 0x07)
+#define LDT_BUS_NUMBER_REGISTER_0 0x94
+#define LDT_BUS_NUMBER_REGISTER_1 0xB4
+#define LDT_BUS_NUMBER_REGISTER_2 0xD4
+#define NR_LDT_BUS_NUMBER_REGISTERS 3
+#define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF)
+#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
+#define PCI_DEVICE_ID_K8HTCONFIG 0x1100
+
+/**
+ * fill_mp_bus_to_cpumask()
+ * fills the mp_bus_to_cpumask array based according to the LDT Bus Number
+ * Registers found in the K8 northbridge
+ */
+__init static int
+fill_mp_bus_to_cpumask(void)
+{
+        struct pci_dev *nb_dev = NULL;
+        int i, j, printed;
+        u32 ldtbus, nid;
+        static int lbnr[3] = {
+                LDT_BUS_NUMBER_REGISTER_0,
+                LDT_BUS_NUMBER_REGISTER_1,
+                LDT_BUS_NUMBER_REGISTER_2
+        };
+
+        while ((nb_dev = pci_get_device(PCI_VENDOR_ID_AMD,
+                        PCI_DEVICE_ID_K8HTCONFIG, nb_dev))) {
+                pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &nid);
+
+                for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) {
+                        pci_read_config_dword(nb_dev, lbnr[i], &ldtbus);
+                        /*
+                         * if there are no busses hanging off of the current
+                         * ldt link then both the secondary and subordinate
+                         * bus number fields are set to 0.
+                         */
+                        if (!(SECONDARY_LDT_BUS_NUMBER(ldtbus) == 0
+                                && SUBORDINATE_LDT_BUS_NUMBER(ldtbus) == 0)) {
+                                for (j = SECONDARY_LDT_BUS_NUMBER(ldtbus);
+                                     j <= SUBORDINATE_LDT_BUS_NUMBER(ldtbus);
+                                     j++)
+                                        pci_bus_to_cpumask[j] =
+                                                node_to_cpumask(NODE_ID(nid));
+                        }
+                }
+        }
+
+        /* quick sanity check */
+        printed = 0;
+        for (i = 0; i < 256; i++) {
+                if (cpus_empty(pci_bus_to_cpumask[i])) {
+                        pci_bus_to_cpumask[i] = CPU_MASK_ALL;
+                        if (printed)
+                                continue;
+                        printk(KERN_ERR
+                               "k8-bus.c: some busses have empty cpu mask\n");
+                        printed = 1;
+                }
+        }
+
+        return 0;
+}
+
+fs_initcall(fill_mp_bus_to_cpumask);
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
new file mode 100644
index 000000000000..b693c232fd07
--- /dev/null
+++ b/arch/x86_64/pci/mmconfig.c
@@ -0,0 +1,104 @@
+/*
+ * mmconfig.c - Low-level direct PCI config space access via MMCONFIG
+ * 
+ * This is an 64bit optimized version that always keeps the full mmconfig
+ * space mapped. This allows lockless config space operation.
+ */
+
+#include <linux/pci.h>
+#include <linux/init.h>
+#include "pci.h"
+
+#define MMCONFIG_APER_SIZE (256*1024*1024)
+
+/* The physical address of the MMCONFIG aperture.  Set from ACPI tables. */
+u32 pci_mmcfg_base_addr;
+
+/* Static virtual mapping of the MMCONFIG aperture */
+char *pci_mmcfg_virt;
+
+static inline char *pci_dev_base(unsigned int bus, unsigned int devfn)
+{
+        return pci_mmcfg_virt + ((bus << 20) | (devfn << 12));
+}
+
+static int pci_mmcfg_read(unsigned int seg, unsigned int bus,
+                          unsigned int devfn, int reg, int len, u32 *value)
+{
+        char *addr = pci_dev_base(bus, devfn); 
+
+        if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095)))
+                return -EINVAL;
+
+        switch (len) {
+        case 1:
+                *value = readb(addr + reg);
+                break;
+        case 2:
+                *value = readw(addr + reg);
+                break;
+        case 4:
+                *value = readl(addr + reg);
+                break;
+        }
+
+        return 0;
+}
+
+static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
+                           unsigned int devfn, int reg, int len, u32 value)
+{
+        char *addr = pci_dev_base(bus,devfn);
+
+        if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095)))
+                return -EINVAL;
+
+        switch (len) {
+        case 1:
+                writeb(value, addr + reg);
+                break;
+        case 2:
+                writew(value, addr + reg);
+                break;
+        case 4:
+                writel(value, addr + reg);
+                break;
+        }
+
+        return 0;
+}
+
+static struct pci_raw_ops pci_mmcfg = {
+        .read =         pci_mmcfg_read,
+        .write =        pci_mmcfg_write,
+};
+
+static int __init pci_mmcfg_init(void)
+{
+        if ((pci_probe & PCI_PROBE_MMCONF) == 0)
+                return 0;
+        if (!pci_mmcfg_base_addr)
+                return 0;
+
+        /* Kludge for now. Don't use mmconfig on AMD systems because
+           those have some busses where mmconfig doesn't work,
+           and we don't parse ACPI MCFG well enough to handle that. 
+           Remove when proper handling is added. */
+        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
+                return 0; 
+
+        /* RED-PEN i386 doesn't do _nocache right now */
+        pci_mmcfg_virt = ioremap_nocache(pci_mmcfg_base_addr, MMCONFIG_APER_SIZE);
+        if (!pci_mmcfg_virt) { 
+                printk("PCI: Cannot map mmconfig aperture\n");
+                return 0;
+        }       
+
+        printk(KERN_INFO "PCI: Using MMCONFIG at %x\n", pci_mmcfg_base_addr);
+        raw_pci_ops = &pci_mmcfg;
+        pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
+
+        return 0;
+}
+
+arch_initcall(pci_mmcfg_init);