diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-20 23:50:09 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-01-16 22:57:05 -0500 |
commit | 885b86e4e7ccc360f8ce4d7fb10dfdfb6e3c8650 (patch) | |
tree | 306b7438cdce8479397ee1ae8c9f244a07f9d9f7 /arch/powerpc/kernel/pci_dn.c | |
parent | b6ed42a794e1ca51fb46ff2bdc562315c46dd9a8 (diff) |
[POWERPC] iSeries: eliminate pci_dn bussubno
xlate_iomm_address() really wants the ds_addr to pass to the HV, so store
that value (instead of the BAR number) when we allocate the device bars.
This is not a fast path, so we can look up the device_node property
there instead of using the bussubno field of the pci_dn.
The other user of iseries_ds_addr() was already scanning the device tree,
so looking up a property will not slow it down any more.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_dn.c')
-rw-r--r-- | arch/powerpc/kernel/pci_dn.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 85d4d8924b5c..1c67de52e3ce 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c | |||
@@ -56,11 +56,6 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data) | |||
56 | pdn->busno = (regs[0] >> 16) & 0xff; | 56 | pdn->busno = (regs[0] >> 16) & 0xff; |
57 | pdn->devfn = (regs[0] >> 8) & 0xff; | 57 | pdn->devfn = (regs[0] >> 8) & 0xff; |
58 | } | 58 | } |
59 | if (firmware_has_feature(FW_FEATURE_ISERIES)) { | ||
60 | const u32 *busp = of_get_property(dn, "linux,subbus", NULL); | ||
61 | if (busp) | ||
62 | pdn->bussubno = *busp; | ||
63 | } | ||
64 | 59 | ||
65 | pdn->pci_ext_config_space = (type && *type == 1); | 60 | pdn->pci_ext_config_space = (type && *type == 1); |
66 | return NULL; | 61 | return NULL; |