diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-20 14:54:46 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 16:18:07 +1100 |
| commit | fc3fb71c3e1850a6a1099dd1cb7bcd7e69ac7b73 (patch) | |
| tree | c9885bd47237c6e09b42a3c42496b5865c0caa02 /arch/powerpc/platforms/powermac/pci.c | |
| parent | b9baa20b0a50947f2e86d7775c9dba87c0d946ef (diff) | |
[POWERPC] pci32: Add flags modifying the PCI code behaviour
This adds to the 32 bits PCI code some flags, replacing the old
pci_assign_all_busses global, that allow us to control various
aspects of the PCI probing, such as whether to re-assign all
resources or not, or to not try to assign anything at all.
This also adds the flag x86 already has to avoid ISA alignment
on bridges that don't have ISA forwarding enabled (no legacy
devices on the top level bus) and sets it for PowerMacs.
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 589c613bcd3c..a2e9b36f61ef 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c @@ -725,7 +725,7 @@ static void __init setup_bandit(struct pci_controller *hose, static int __init setup_uninorth(struct pci_controller *hose, struct resource *addr) { - pci_assign_all_buses = 1; + ppc_pci_flags |= PPC_PCI_REASSIGN_ALL_BUS; has_uninorth = 1; hose->ops = ¯isc_pci_ops; hose->cfg_addr = ioremap(addr->start + 0x800000, 0x1000); @@ -994,6 +994,9 @@ 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 " @@ -1051,7 +1054,7 @@ void __init pmac_pci_init(void) * some offset between bus number and domains for now when we * assign all busses should help for now */ - if (pci_assign_all_buses) + if (ppc_pci_flags & PPC_PCI_REASSIGN_ALL_BUS) pcibios_assign_bus_offset = 0x10; #endif } |