lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Andi Kleen
2008-02-04 16:48:03 +01:00
committed by Ingo Molnar
parent fa0c864d99
commit c7e844f041
2 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
arch/x86/pci/numa.c
View File

@@ -5,36 +5,62 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <mach_apic.h>
#include "pci.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 BUS2QUAD(global) (mp_bus_id_to_node[global])
#define BUS2LOCAL(global) (mp_bus_id_to_local[global]) #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
#define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) #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) \ #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \
(0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3)) (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, static int pci_conf1_mq_read(unsigned int seg, unsigned int bus,
unsigned int devfn, int reg, int len, u32 *value) unsigned int devfn, int reg, int len, u32 *value)
{ {
unsigned long flags; unsigned long flags;
void *adr __iomem = XQUAD_PORT_ADDR(0xcfc, BUS2QUAD(bus));
if (!value || (bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255)) if (!value || (bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&pci_config_lock, flags); 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) { switch (len) {
case 1: 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; break;
case 2: 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; break;
case 4: case 4:
*value = inl_quad(0xCFC, BUS2QUAD(bus)); if (xquad_portio)
*value = readl(adr);
else
*value = inl(0xCFC);
break; 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 int devfn, int reg, int len, u32 value)
{ {
unsigned long flags; unsigned long flags;
void *adr __iomem = XQUAD_PORT_ADDR(0xcfc, BUS2QUAD(bus));
if ((bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255)) if ((bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255))
return -EINVAL; return -EINVAL;
spin_lock_irqsave(&pci_config_lock, flags); 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) { switch (len) {
case 1: 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; break;
case 2: 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; break;
case 4: case 4:
outl_quad((u32)value, 0xCFC, BUS2QUAD(bus)); if (xquad_portio)
writel(value, adr + reg);
else
outl((u32)value, 0xCFC);
break; break;
} }

2
include/asm-x86/mach-numaq/mach_apic.h
View File

@@ -109,6 +109,8 @@ static inline int mpc_apic_id(struct mpc_config_processor *m,
return logical_apicid; return logical_apicid;
} }
extern void *xquad_portio;
static inline void setup_portio_remap(void) static inline void setup_portio_remap(void)
{ {
int num_quads = num_online_nodes(); int num_quads = num_online_nodes();