diff options
| author | Nathan Fontenot <nfont@austin.ibm.com> | 2008-10-27 19:48:17 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-10-31 16:12:03 +1100 |
| commit | e90a13184600ec756875238ad130e2f205cd9a1b (patch) | |
| tree | 2a82267eebaef48a8ce2001d2a1e6ec6d87ce1a3 /arch/powerpc/platforms/pseries/pci_dlpar.c | |
| parent | 6098e2ee14849e0819ffa887ebf470dcfad4a2be (diff) | |
| download | blackbird-op-linux-e90a13184600ec756875238ad130e2f205cd9a1b.tar.gz blackbird-op-linux-e90a13184600ec756875238ad130e2f205cd9a1b.zip | |
powerpc/pci: Properly allocate bus resources for hotplug PHBs
Resources for PHB's that are dynamically added to a system are not
properly allocated in the resource tree.
Not having these resources allocated causes an oops when removing
the PHB when we try to release them.
The diff appears a bit messy, this is mainly due to moving everything
one tab to the left in the pcibios_allocate_bus_resources routine.
The functionality change in this routine is only that the
list_for_each_entry() loop is pulled out and moved to the necessary
calling routine.
Signed-off-by: Nathan Fontenot <nfont@austin.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/pci_dlpar.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/pci_dlpar.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index 21a6d55418f1..31481dc485de 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c @@ -189,6 +189,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn) { struct pci_controller *phb; int primary; + struct pci_bus *b; primary = list_empty(&hose_list); phb = pcibios_alloc_controller(dn); @@ -203,6 +204,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn) eeh_add_device_tree_early(dn); scan_phb(phb); + pcibios_allocate_bus_resources(phb->bus); pcibios_fixup_new_pci_devices(phb->bus); pci_bus_add_devices(phb->bus); eeh_add_device_tree_late(phb->bus); |
