diff options
| author | John Rose <johnrose@austin.ibm.com> | 2006-03-15 00:46:45 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 06:55:07 +0100 |
| commit | 92eb4602eb5c37db86cd9d2b1f4c8ca304fbc49f (patch) | |
| tree | d6f53b85f0071e914cd1fa5d363259d584f1d3b2 /arch/powerpc/kernel/rtas_pci.c | |
| parent | [PATCH] powerpc: remove duplicate EXPORT_SYMBOLS (diff) | |
| download | linux-92eb4602eb5c37db86cd9d2b1f4c8ca304fbc49f.tar.xz linux-92eb4602eb5c37db86cd9d2b1f4c8ca304fbc49f.zip | |
[PATCH] powerpc: properly configure DDR/P5IOC children devs
The dynamic add path for PCI Host Bridges can fail to configure children
adapters under P5IOC controllers. It fails to properly fixup bus/device
resources, and it fails to properly enable EEH. Both of these steps
need to occur before any children devices are enabled in
pci_bus_add_devices().
Signed-off-by: John Rose <johnrose@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/rtas_pci.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas_pci.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c index 5579f6559912..7442775ef2a1 100644 --- a/arch/powerpc/kernel/rtas_pci.c +++ b/arch/powerpc/kernel/rtas_pci.c @@ -280,8 +280,7 @@ static int phb_set_bus_ranges(struct device_node *dev, return 0; } -static int __devinit setup_phb(struct device_node *dev, - struct pci_controller *phb) +int __devinit setup_phb(struct device_node *dev, struct pci_controller *phb) { if (is_python(dev)) python_countermeasures(dev); @@ -359,27 +358,6 @@ unsigned long __init find_and_init_phbs(void) return 0; } -struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn) -{ - struct pci_controller *phb; - int primary; - - primary = list_empty(&hose_list); - phb = pcibios_alloc_controller(dn); - if (!phb) - return NULL; - setup_phb(dn, phb); - pci_process_bridge_OF_ranges(phb, dn, primary); - - pci_setup_phb_io_dynamic(phb, primary); - - pci_devs_phb_init_dynamic(phb); - scan_phb(phb); - - return phb; -} -EXPORT_SYMBOL(init_phb_dynamic); - /* RPA-specific bits for removing PHBs */ int pcibios_remove_root_bus(struct pci_controller *phb) { |