powerpc: dynamic probe - use ppc_md.pci_probe_mode()
PATCH 1/1 powerpc: dynamic probe - use ppc_md.pci_probe_mode()
Change the dynamic PCI probe function for pSeries to use ppc_md.pci_probe_mode() when appropriate.
---
As suggested by BenH. Tested on POWER5.
Thanks-
John
arch/powerpc/platforms/pseries/pci_dlpar.c renamed from arch/powerpc/platforms/pseries/pci_dlpar.c~use_probe_mode +9 -3
@@ -152,20 +152,26 @@ pcibios_pci_config_bridge(struct pci_devvoid pcibios_add_pci_devices (struct pci_bus * bus) { -int slotno, num; +int slotno, num, mode;struct pci_dev *dev;struct device_node *dn =pci_bus_to_OF_node (bus);eeh_add_device_tree_early (dn); -if (_machine ==PLATFORM_PSERIES_LPAR ) { + mode =PCI_PROBE_NORMAL ; +if (ppc_md.pci_probe_mode) + mode = ppc_md.pci_probe_mode (bus); + +if (mode ==PCI_PROBE_DEVTREE ) { +printk ("%s: jhr: new probe\n" , __FUNCTION__);/* use ofdt-based probe */ of_scan_bus (dn, bus);if (!list_empty (&bus->devices)) {pcibios_fixup_new_pci_devices (bus,0 );pci_bus_add_devices (bus); } - }else { + }else if (mode ==PCI_PROBE_NORMAL ) { +printk ("%s: jhr: old probe\n" , __FUNCTION__);/* use legacy probe */ slotno =PCI_SLOT (PCI_DN (dn->child)->devfn); num =pci_scan_slot (bus,PCI_DEVFN (slotno,0 ));
_
PATCH 1/1 powerpc: dynamic probe - use ppc_md.pci_probe_mode()
Change the dynamic PCI probe function for pSeries to use ppc_md.pci_probe_mode() when appropriate.
---
Actually - how about a version without debug prints!? Original change suggested by BenH. Tested on POWER5.
Thanks-
John
arch/powerpc/platforms/pseries/pci_dlpar.c renamed from arch/powerpc/platforms/pseries/pci_dlpar.c~use_probe_mode +7 -3
@@ -152,20 +152,24 @@ pcibios_pci_config_bridge(struct pci_devvoid pcibios_add_pci_devices (struct pci_bus * bus) { -int slotno, num; +int slotno, num, mode;struct pci_dev *dev;struct device_node *dn =pci_bus_to_OF_node (bus);eeh_add_device_tree_early (dn); -if (_machine ==PLATFORM_PSERIES_LPAR ) { + mode =PCI_PROBE_NORMAL ; +if (ppc_md.pci_probe_mode) + mode = ppc_md.pci_probe_mode (bus); + +if (mode ==PCI_PROBE_DEVTREE ) {/* use ofdt-based probe */ of_scan_bus (dn, bus);if (!list_empty (&bus->devices)) {pcibios_fixup_new_pci_devices (bus,0 );pci_bus_add_devices (bus); } - }else { + }else if (mode ==PCI_PROBE_NORMAL ) {/* use legacy probe */ slotno =PCI_SLOT (PCI_DN (dn->child)->devfn); num =pci_scan_slot (bus,PCI_DEVFN (slotno,0 ));
_
arch/powerpc/platforms/pseries/pci_dlpar.c pcibios_pci_config_bridge(struct pci_dev · line 166
Quoted 2 lines · John Rose
arch/powerpc/platforms/pseries/pci_dlpar.c renamed from arch/powerpc/platforms/pseries/pci_dlpar.c~use_probe_mode +2
-0+if (mode ==PCI_PROBE_DEVTREE ) { +printk ("%s: jhr: new probe\n" , __FUNCTION__);
Did you intend to leave in this print statement? Its looks suspiciously like a debug print.
--linas
Quoted 6 lines · Linas Vepstas
arch/powerpc/platforms/pseries/pci_dlpar.c pcibios_pci_config_bridge(struct pci_dev · line 166
Quoted 2 lines · John Rose
arch/powerpc/platforms/pseries/pci_dlpar.c renamed from arch/powerpc/platforms/pseries/pci_dlpar.c~use_probe_mode +2
-0+if (mode ==PCI_PROBE_DEVTREE ) { +printk ("%s: jhr: new probe\n" , __FUNCTION__);Did you intend to leave in this print statement? Its looks suspiciously like a debug print.
Never mind, I should have looked at the next eamil.
--linas