73c59afc65
This patch finishes the i386 and x86-64 ->sysdata conversion and hopefully also fixes Riku's and Andy's observed bugs. It is based on Yinghai Lu's and Andy Whitcroft's patches (thanks!) with some changes: - introduce pci_scan_bus_with_sysdata() and use it instead of pci_scan_bus() where appropriate. pci_scan_bus_with_sysdata() will allocate the sysdata structure and then call pci_scan_bus(). - always allocate pci_sysdata dynamically. The whole point of this sysdata work is to make it easy to do root-bus specific things (e.g., support PCI domains and IOMMU's). I dislike using a default struct pci_sysdata in some places and a dynamically allocated pci_sysdata elsewhere - the potential for someone indavertantly changing the default structure is too high. - this patch only makes the minimal changes necessary, i.e., the NUMA node is always initialized to -1. Patches to do the right thing with regards to the NUMA node can build on top of this (either add a 'node' parameter to pci_scan_bus_with_sysdata() or just update the node when it becomes known). The patch was compile tested with various configurations (e.g., NUMAQ, VISWS) and run-time tested on i386 and x86-64. Unfortunately none of my machines exhibited the bugs so caveat emptor. Andy, could you please see if this fixes the NUMA issues you've seen? Riku, does this fix "pci=noacpi" on your laptop? Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Cc: Andi Kleen <ak@suse.de> Cc: Chuck Ebbert <cebbert@redhat.com> Cc: <riku.seppala@kymp.net> Cc: Andy Whitcroft <apw@shadowen.org> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
136 lines
3.1 KiB
C
136 lines
3.1 KiB
C
/*
|
|
* numa.c - Low-level PCI access for NUMA-Q machines
|
|
*/
|
|
|
|
#include <linux/pci.h>
|
|
#include <linux/init.h>
|
|
#include <linux/nodemask.h>
|
|
#include "pci.h"
|
|
|
|
#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])
|
|
|
|
#define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \
|
|
(0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3))
|
|
|
|
static int pci_conf1_mq_read(unsigned int seg, unsigned int bus,
|
|
unsigned int devfn, int reg, int len, u32 *value)
|
|
{
|
|
unsigned long flags;
|
|
|
|
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));
|
|
|
|
switch (len) {
|
|
case 1:
|
|
*value = inb_quad(0xCFC + (reg & 3), BUS2QUAD(bus));
|
|
break;
|
|
case 2:
|
|
*value = inw_quad(0xCFC + (reg & 2), BUS2QUAD(bus));
|
|
break;
|
|
case 4:
|
|
*value = inl_quad(0xCFC, BUS2QUAD(bus));
|
|
break;
|
|
}
|
|
|
|
spin_unlock_irqrestore(&pci_config_lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
|
|
unsigned int devfn, int reg, int len, u32 value)
|
|
{
|
|
unsigned long flags;
|
|
|
|
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));
|
|
|
|
switch (len) {
|
|
case 1:
|
|
outb_quad((u8)value, 0xCFC + (reg & 3), BUS2QUAD(bus));
|
|
break;
|
|
case 2:
|
|
outw_quad((u16)value, 0xCFC + (reg & 2), BUS2QUAD(bus));
|
|
break;
|
|
case 4:
|
|
outl_quad((u32)value, 0xCFC, BUS2QUAD(bus));
|
|
break;
|
|
}
|
|
|
|
spin_unlock_irqrestore(&pci_config_lock, flags);
|
|
|
|
return 0;
|
|
}
|
|
|
|
#undef PCI_CONF1_MQ_ADDRESS
|
|
|
|
static struct pci_raw_ops pci_direct_conf1_mq = {
|
|
.read = pci_conf1_mq_read,
|
|
.write = pci_conf1_mq_write
|
|
};
|
|
|
|
|
|
static void __devinit pci_fixup_i450nx(struct pci_dev *d)
|
|
{
|
|
/*
|
|
* i450NX -- Find and scan all secondary buses on all PXB's.
|
|
*/
|
|
int pxb, reg;
|
|
u8 busno, suba, subb;
|
|
int quad = BUS2QUAD(d->bus->number);
|
|
|
|
printk("PCI: Searching for i450NX host bridges on %s\n", pci_name(d));
|
|
reg = 0xd0;
|
|
for(pxb=0; pxb<2; pxb++) {
|
|
pci_read_config_byte(d, reg++, &busno);
|
|
pci_read_config_byte(d, reg++, &suba);
|
|
pci_read_config_byte(d, reg++, &subb);
|
|
DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb);
|
|
if (busno) {
|
|
/* Bus A */
|
|
pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, busno));
|
|
}
|
|
if (suba < subb) {
|
|
/* Bus B */
|
|
pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, suba+1));
|
|
}
|
|
}
|
|
pcibios_last_bus = -1;
|
|
}
|
|
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
|
|
|
|
static int __init pci_numa_init(void)
|
|
{
|
|
int quad;
|
|
|
|
raw_pci_ops = &pci_direct_conf1_mq;
|
|
|
|
if (pcibios_scanned++)
|
|
return 0;
|
|
|
|
pci_root_bus = pcibios_scan_root(0);
|
|
if (pci_root_bus)
|
|
pci_bus_add_devices(pci_root_bus);
|
|
if (num_online_nodes() > 1)
|
|
for_each_online_node(quad) {
|
|
if (quad == 0)
|
|
continue;
|
|
printk("Scanning PCI bus %d for quad %d\n",
|
|
QUADLOCAL2BUS(quad,0), quad);
|
|
pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, 0));
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
subsys_initcall(pci_numa_init);
|