diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-20 14:54:53 +1100 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-12-20 16:18:09 +1100 |
| commit | 3fd94c6b1a1158d3e0e505b0a00c3a707b5fcd40 (patch) | |
| tree | ad542ce91f44a5aeacf095d2100a831ab6ebf23e /arch/powerpc/platforms/powermac/pci.c | |
| parent | [POWERPC] Merge PCI resource fixups (diff) | |
| download | linux-dev-3fd94c6b1a1158d3e0e505b0a00c3a707b5fcd40.tar.xz linux-dev-3fd94c6b1a1158d3e0e505b0a00c3a707b5fcd40.zip | |
[POWERPC] Merge PCI resource allocation & assignment
The 32 bits PCI code now uses the generic code for assigning unassigned
resources and an algorithm similar to x86 for claiming existing ones.
This works far better than the 64 bits code which basically can only
claim existing ones (pci_probe_only=1) or would fall apart completely.
This merges them so that the new 32 bits implementation is used for both.
64 bits now gets the new PCI flags for controlling the behaviour, though
the old pci_probe_only global is still there for now to be cleared if you
want to.
I kept a pcibios_claim_one_bus() function mostly based on the old 64
bits code for use by the DLPAR hotplug. This will have to be cleaned
up, thought I hope it will work in the meantime.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index a2e9b36f61ef..6bbf3c881711 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c @@ -994,9 +994,8 @@ void __init pmac_pci_init(void) struct device_node *np, *root; struct device_node *ht = NULL; -#ifdef CONFIG_PPC32 ppc_pci_flags = PPC_PCI_CAN_SKIP_ISA_ALIGN; -#endif + root = of_find_node_by_path("/"); if (root == NULL) { printk(KERN_CRIT "pmac_pci_init: can't find root " |