x86: Fix dev_to_node for x86 and x86_64
PATCH 1/1 x86: Fix dev_to_node for x86 and x86_64
Hi Andrew,dev_to_node() does not work as expected on x86 and x86_64 as pointed out earlier here:
http://lkml.org/lkml/2006/11/7/10
Following patch fixes it, please apply. (Note: The fix depends on support for PCI domains for x86/x86_64)
Thanks,
Kiran
dev_to_node does not work as expected on x86_64 (and i386). This is because node value returned by pcibus_to_node is initialized after a struct device is created with current x86_64 code.
We need the node value initialized before the call to pci_scan_bus_parented, as the generic devices are allocated and initialized
off pci_scan_child_bus, which gets called from pci_scan_bus_parented The following patch does that using "pci_sysdata" introduced by the PCI domain patches in -mm.
arch/i386/pci/acpi.c +9 -2
@@ -9,6 +9,7 @@ struct pci_bus * __devinit pci_acpi_scan {struct pci_bus *bus;struct pci_sysdata *sd; +int pxm;/* Allocate per-root-bus (not per bus) arch-specific data. * TODO: leak; this memory is never freed.
@@ -30,15 +31,21 @@ struct pci_bus * __devinit pci_acpi_scan }#endif /* CONFIG_PCI_DOMAINS */ + sd->node =-1 ; + + pxm =acpi_get_pxm (device->handle); +#ifdef CONFIG_ACPI_NUMA +if (pxm >=0 ) + sd->node =pxm_to_node (pxm); +#endif + bus =pci_scan_bus_parented (NULL , busnum, &pci_root_ops, sd);if (!bus)kfree (sd);#ifdef CONFIG_ACPI_NUMA if (bus !=NULL ) { -int pxm =acpi_get_pxm (device->handle);if (pxm >=0 ) { - sd->node =pxm_to_node (pxm);printk ("bus %d -> pxm %d -> node %d\n" , busnum, pxm, sd->node); }
Quoted 7 lines · Ravikiran G Thirumalai
Hi Andrew,
dev_to_node()does not work as expected on x86 andx86_64as pointed out earlier here:
http://lkml.org/lkml/2006/11/7/10Following patch fixes it, please apply. (Note: The fix depends on support for PCI domains for x86/x86_64)
Thanks, I'll merge into my misc-2.6.git#pciseg repository, which is where Andrew gets his PCI domain support from.
Jeff