AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

powerpc/pci: Fix PCI<->OF matching of old style multifunc devices

Browse Source 
Old OF variants used to create a 'dummy' parent node "multifunc-device"
for devices with more than one PCI function. Our code that matches OF
nodes to PCI devices dealt with that in one place but not in another,
this fixes it.

This has the practical effect of fixing interrupt routing of multifunction
PCI cards on some older PowerMac machines.

Signed-off-by: Tom Arbuckle <tom.d.arbuckle@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Tom Arbuckle 2009-02-11 10:41:48 +00:00 committed by Benjamin Herrenschmidt
parent 16c57b3620
commit f81786913a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/kernel/pci_32.c
View File

@ -218,16 +218,23 @@ scan_OF_pci_childs(struct device_node *parent, pci_OF_scan_iterator filter, void
static struct device_node *scan_OF_for_pci_dev(struct device_node *parent, static struct device_node *scan_OF_for_pci_dev(struct device_node *parent,
unsigned int devfn) unsigned int devfn)
{ {
struct device_node *np; struct device_node *np, *cnp;
const u32 *reg; const u32 *reg;
unsigned int psize; unsigned int psize;
for_each_child_of_node(parent, np) { for_each_child_of_node(parent, np) {
reg = of_get_property(np, "reg", &psize); reg = of_get_property(np, "reg", &psize);
if (reg == NULL || psize < 4) if (reg && psize >= 4 && ((reg[0] >> 8) & 0xff) == devfn)
continue;
if (((reg[0] >> 8) & 0xff) == devfn)
return np; return np;
/* Note: some OFs create a parent node "multifunc-device" as
* a fake root for all functions of a multi-function device,
* we go down them as well. */
if (!strcmp(np->name, "multifunc-device")) {
cnp = scan_OF_for_pci_dev(np, devfn);
if (cnp)
return cnp;
}
} }
return NULL; return NULL;
} }