x86: move NUMAQ io handling into arch/x86/pci/numa.c

numa.c is the only user of the {in,out}*_quad functions. And it has only a few call
sites. Change them to open code the magic NUMAQ port access.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 44 insertions, 8 deletions

diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numa.c
index f5f165f69e0c..55270c26237c 100644
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -5,36 +5,62 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/nodemask.h>
+#include <mach_apic.h>
 #include "pci.h"
 
+#define XQUAD_PORTIO_BASE 0xfe400000
+#define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */
+
 #define BUS2QUAD(global) (mp_bus_id_to_node[global])
 #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
 #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
 
+extern void *xquad_portio;    /* Where the IO area was mapped */
+#define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
+
 #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \
         (0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3))
 
+static void write_cf8(unsigned bus, unsigned devfn, unsigned reg)
+{
+        unsigned val = PCI_CONF1_MQ_ADDRESS(bus, devfn, reg);
+        if (xquad_portio)
+                writel(val, XQUAD_PORT_ADDR(0xcf8, BUS2QUAD(bus)));
+        else
+                outl(val, 0xCF8);
+}
+
 static int pci_conf1_mq_read(unsigned int seg, unsigned int bus,
                              unsigned int devfn, int reg, int len, u32 *value)
 {
         unsigned long flags;
+        void *adr __iomem = XQUAD_PORT_ADDR(0xcfc, BUS2QUAD(bus));
 
         if (!value || (bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255))
                 return -EINVAL;
 
         spin_lock_irqsave(&pci_config_lock, flags);
 
-        outl_quad(PCI_CONF1_MQ_ADDRESS(bus, devfn, reg), 0xCF8, BUS2QUAD(bus));
+        write_cf8(bus, devfn, reg);
 
         switch (len) {
         case 1:
-                *value = inb_quad(0xCFC + (reg & 3), BUS2QUAD(bus));
+                if (xquad_portio)
+                        *value = readb(adr + (reg & 3));
+                else
+                        *value = inb(0xCFC + (reg & 3));
                 break;
         case 2:
-                *value = inw_quad(0xCFC + (reg & 2), BUS2QUAD(bus));
+                if (xquad_portio)
+                        *value = readw(adr + (reg & 2));
+                else
+                        *value = inw(0xCFC + (reg & 2));
                 break;
         case 4:
-                *value = inl_quad(0xCFC, BUS2QUAD(bus));
+                if (xquad_portio)
+                        *value = readl(adr);
+                else
+                        *value = inl(0xCFC);
                 break;
         }
 
@@ -47,23 +73,33 @@ static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
                               unsigned int devfn, int reg, int len, u32 value)
 {
         unsigned long flags;
+        void *adr __iomem = XQUAD_PORT_ADDR(0xcfc, BUS2QUAD(bus));
 
         if ((bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255)) 
                 return -EINVAL;
 
         spin_lock_irqsave(&pci_config_lock, flags);
 
-        outl_quad(PCI_CONF1_MQ_ADDRESS(bus, devfn, reg), 0xCF8, BUS2QUAD(bus));
+        write_cf8(bus, devfn, reg);
 
         switch (len) {
         case 1:
-                outb_quad((u8)value, 0xCFC + (reg & 3), BUS2QUAD(bus));
+                if (xquad_portio)
+                        writeb(value, adr + (reg & 3));
+                else
+                        outb((u8)value, 0xCFC + (reg & 3));
                 break;
         case 2:
-                outw_quad((u16)value, 0xCFC + (reg & 2), BUS2QUAD(bus));
+                if (xquad_portio)
+                        writew(value, adr + (reg & 2));
+                else
+                        outw((u16)value, 0xCFC + (reg & 2));
                 break;
         case 4:
-                outl_quad((u32)value, 0xCFC, BUS2QUAD(bus));
+                if (xquad_portio)
+                        writel(value, adr + reg);
+                else
+                        outl((u32)value, 0xCFC);
                 break;
         }