diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-06-22 01:23:57 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 02:57:22 -0400 |
commit | 7d52c7b0cd46f42ae2c9df37f1a385d9aaf95842 (patch) | |
tree | 32138e13cbc3eb154db37b202044870419b56655 /arch/powerpc/sysdev/indirect_pci.c | |
parent | 0e302a704420afe40808fbd4ba149624c4350f31 (diff) |
[POWERPC] Pass the pci_controller into pci_exclude_device
There are times that we need to know which controller we are on to decide
how to exclude devices properly. We now pass the pci_controller that we
are going to use down to the pci_exclude_device function. This will
greatly simplify being able to exclude the PHBs in multiple controller
setups.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev/indirect_pci.c')
-rw-r--r-- | arch/powerpc/sysdev/indirect_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index e71488469704..3dedf8f5bfb4 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c | |||
@@ -35,14 +35,14 @@ indirect_read_config(struct pci_bus *bus, unsigned int devfn, int offset, | |||
35 | u8 cfg_type = 0; | 35 | u8 cfg_type = 0; |
36 | 36 | ||
37 | if (ppc_md.pci_exclude_device) | 37 | if (ppc_md.pci_exclude_device) |
38 | if (ppc_md.pci_exclude_device(bus->number, devfn)) | 38 | if (ppc_md.pci_exclude_device(hose, bus->number, devfn)) |
39 | return PCIBIOS_DEVICE_NOT_FOUND; | 39 | return PCIBIOS_DEVICE_NOT_FOUND; |
40 | 40 | ||
41 | if (hose->set_cfg_type) | 41 | if (hose->set_cfg_type) |
42 | if (bus->number != hose->first_busno) | 42 | if (bus->number != hose->first_busno) |
43 | cfg_type = 1; | 43 | cfg_type = 1; |
44 | 44 | ||
45 | PCI_CFG_OUT(hose->cfg_addr, | 45 | PCI_CFG_OUT(hose->cfg_addr, |
46 | (0x80000000 | ((bus->number - hose->bus_offset) << 16) | 46 | (0x80000000 | ((bus->number - hose->bus_offset) << 16) |
47 | | (devfn << 8) | ((offset & 0xfc) | cfg_type))); | 47 | | (devfn << 8) | ((offset & 0xfc) | cfg_type))); |
48 | 48 | ||
@@ -74,14 +74,14 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset, | |||
74 | u8 cfg_type = 0; | 74 | u8 cfg_type = 0; |
75 | 75 | ||
76 | if (ppc_md.pci_exclude_device) | 76 | if (ppc_md.pci_exclude_device) |
77 | if (ppc_md.pci_exclude_device(bus->number, devfn)) | 77 | if (ppc_md.pci_exclude_device(hose, bus->number, devfn)) |
78 | return PCIBIOS_DEVICE_NOT_FOUND; | 78 | return PCIBIOS_DEVICE_NOT_FOUND; |
79 | 79 | ||
80 | if (hose->set_cfg_type) | 80 | if (hose->set_cfg_type) |
81 | if (bus->number != hose->first_busno) | 81 | if (bus->number != hose->first_busno) |
82 | cfg_type = 1; | 82 | cfg_type = 1; |
83 | 83 | ||
84 | PCI_CFG_OUT(hose->cfg_addr, | 84 | PCI_CFG_OUT(hose->cfg_addr, |
85 | (0x80000000 | ((bus->number - hose->bus_offset) << 16) | 85 | (0x80000000 | ((bus->number - hose->bus_offset) << 16) |
86 | | (devfn << 8) | ((offset & 0xfc) | cfg_type))); | 86 | | (devfn << 8) | ((offset & 0xfc) | cfg_type))); |
87 | 87 | ||