leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[POWERPC] iSeries: eliminate pci_dn bussubno

Browse Source 
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>
This commit is contained in:
Stephen Rothwell 2007-12-21 15:50:09 +11:00 committed by Paul Mackerras
parent b6ed42a794
commit 885b86e4e7
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/pci_dn.c
View File

@ -56,11 +56,6 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
pdn->busno = (regs[0] >> 16) & 0xff; pdn->busno = (regs[0] >> 16) & 0xff;
pdn->devfn = (regs[0] >> 8) & 0xff; pdn->devfn = (regs[0] >> 8) & 0xff;
} }
if (firmware_has_feature(FW_FEATURE_ISERIES)) {
const u32 *busp = of_get_property(dn, "linux,subbus", NULL);
if (busp)
pdn->bussubno = *busp;
}
pdn->pci_ext_config_space = (type && *type == 1); pdn->pci_ext_config_space = (type && *type == 1);
return NULL; return NULL;

12
arch/powerpc/platforms/iseries/pci.c
View File

@ -29,6 +29,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/of.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/io.h> #include <asm/io.h>
@ -70,7 +71,7 @@ static long current_iomm_table_entry;
* Lookup Tables. * Lookup Tables.
*/ */
static struct device_node *iomm_table[IOMM_TABLE_MAX_ENTRIES]; static struct device_node *iomm_table[IOMM_TABLE_MAX_ENTRIES];
static u8 iobar_table[IOMM_TABLE_MAX_ENTRIES]; static u64 ds_addr_table[IOMM_TABLE_MAX_ENTRIES];
static DEFINE_SPINLOCK(iomm_table_lock); static DEFINE_SPINLOCK(iomm_table_lock);
@ -80,8 +81,9 @@ static DEFINE_SPINLOCK(iomm_table_lock);
static inline u64 iseries_ds_addr(struct device_node *node) static inline u64 iseries_ds_addr(struct device_node *node)
{ {
struct pci_dn *pdn = PCI_DN(node); struct pci_dn *pdn = PCI_DN(node);
const u32 *sbp = of_get_property(node, "linux,subbus", NULL);
return ((u64)pdn->busno << 48) + ((u64)pdn->bussubno << 40) return ((u64)pdn->busno << 48) + ((u64)(sbp ? *sbp : 0) << 40)
+ ((u64)0x10 << 32); + ((u64)0x10 << 32);
} }
@ -333,7 +335,8 @@ static void __init iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)
*/ */
while (bar_size > 0 ) { while (bar_size > 0 ) {
iomm_table[current_iomm_table_entry] = dev->sysdata; iomm_table[current_iomm_table_entry] = dev->sysdata;
iobar_table[current_iomm_table_entry] = bar_num; ds_addr_table[current_iomm_table_entry] =
iseries_ds_addr(dev->sysdata) | (bar_num << 24);
bar_size -= IOMM_TABLE_ENTRY_SIZE; bar_size -= IOMM_TABLE_ENTRY_SIZE;
++current_iomm_table_entry; ++current_iomm_table_entry;
} }
@ -598,8 +601,7 @@ static inline struct device_node *xlate_iomm_address(
dn = iomm_table[ind]; dn = iomm_table[ind];
if (dn != NULL) { if (dn != NULL) {
int barnum = iobar_table[ind]; *dsaptr = ds_addr_table[ind];
*dsaptr = iseries_ds_addr(dn) | (barnum << 24);
*bar_offset = base_addr % IOMM_TABLE_ENTRY_SIZE; *bar_offset = base_addr % IOMM_TABLE_ENTRY_SIZE;
} else } else
panic("PCI: Invalid PCI IO address detected!\n"); panic("PCI: Invalid PCI IO address detected!\n");

1
include/asm-powerpc/pci-bridge.h
View File

@ -165,7 +165,6 @@ struct iommu_table;
struct pci_dn { struct pci_dn {
int busno; /* pci bus number */ int busno; /* pci bus number */
int bussubno; /* pci subordinate bus number */
int devfn; /* pci device and function number */ int devfn; /* pci device and function number */
struct pci_controller *phb; /* for pci devices */ struct pci_controller *phb; /* for pci devices */