Re: [0/4] NUMA-Q: remove PCI bus number mangling

William Lee Irwin III
2002-11-12T21:44:36Z

On Tue, Nov 12, 2002 at 01:35:04PM -0800, William Lee Irwin III wrote:
> I'll remove the bus number mangling from it so it uses ->sysdata
> instead, make it an additional stage of the patch series and convert
> arch/i386/pci/numa.c to use it instead.
> Bus number mangling has been vetoed numerous times; the agreed-upon
> method of dealing with this is stuffing arch-private information in
> ->sysdata and dispatching on that within PCI config access routines.

[8/4] NUMA-Q: use __pcibus_to_node() in arch/i386/pci/numa.c

This uses the __pcibus_to_node() macro within arch/i386/pci/numa.c

numa.c | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)

diff -urpN pci-2.5.47-7/arch/i386/pci/numa.c pci-2.5.47-8/arch/i386/pci/numa.c
--- pci-2.5.47-7/arch/i386/pci/numa.c 2002-11-12 12:10:25.000000000 -0800
+++ pci-2.5.47-8/arch/i386/pci/numa.c 2002-11-12 13:07:27.000000000 -0800
@@ -9,11 +9,6 @@
#define PCI_CONF1_MQ_ADDRESS(bus, dev, fn, reg) \
(0x80000000 | (bus << 16) | (dev << 11) | (fn << 8) | (reg & ~3))

-static int bus2node(struct pci_bus *bus)
-{
- return (int)bus->sysdata;
-}
-
static int __pci_conf1_mq_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value)
{
unsigned long flags;
@@ -72,13 +67,13 @@ static int __pci_conf1_mq_write (int seg

static int pci_conf1_mq_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value)
{
- return __pci_conf1_mq_read(bus2node(bus), bus->number, PCI_SLOT(devfn),
+ return __pci_conf1_mq_read(__pcibus_to_node(bus), bus->number, PCI_SLOT(devfn),
PCI_FUNC(devfn), where, size, value);
}

static int pci_conf1_mq_write(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 value)
{
- return __pci_conf1_mq_write(bus2node(bus), bus->number, PCI_SLOT(devfn),
+ return __pci_conf1_mq_write(__pcibus_to_node(bus), bus->number, PCI_SLOT(devfn),
PCI_FUNC(devfn), where, size, value);
}

@@ -95,7 +90,7 @@ static void __devinit pci_fixup_i450nx(s
*/
int pxb, reg;
u8 busno, suba, subb;
- int node = bus2node(d->bus);
+ int node = __pcibus_to_node(d->bus);

printk("PCI: Searching for i450NX host bridges on %s\n", d->slot_name);
reg = 0xd0;