diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-27 19:48:52 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-06 09:31:52 +1100 |
| commit | fd6852c8fa060bd45c82a2593e18f933f6c6204f (patch) | |
| tree | a0534b189bc6a791e93bce5894f892634aa4ab0c /arch/powerpc/include/asm/pci.h | |
| parent | b5ae5f911d221ad85090d6805ab9ab020f6e4703 (diff) | |
| download | linux-fd6852c8fa060bd45c82a2593e18f933f6c6204f.tar.gz linux-fd6852c8fa060bd45c82a2593e18f933f6c6204f.tar.xz | |
powerpc/pci: Fix various pseries PCI hotplug issues
The pseries PCI hotplug code has a number of issues, ranging from
incorrect resource setup to crashes, depending on what is added,
when, whether it contains a bridge, etc etc....
This fixes a whole bunch of these, while actually simplifying the code
a bit, using more generic code in the process and factoring out common
code between adding of a PHB, a slot or a device.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/include/asm/pci.h')
| -rw-r--r-- | arch/powerpc/include/asm/pci.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 32e03e6d25c5..1c721a632d8e 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h @@ -204,15 +204,14 @@ static inline struct resource *pcibios_select_root(struct pci_dev *pdev, return root; } -extern void pcibios_setup_new_device(struct pci_dev *dev); - extern void pcibios_claim_one_bus(struct pci_bus *b); -extern void pcibios_allocate_bus_resources(struct pci_bus *bus); +extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); extern void pcibios_resource_survey(void); extern struct pci_controller *init_phb_dynamic(struct device_node *dn); +extern int remove_phb_dynamic(struct pci_controller *phb); extern struct pci_dev *of_create_pci_dev(struct device_node *node, struct pci_bus *bus, int devfn); |