diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-03-21 10:57:57 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-03-21 10:57:57 +1100 |
| commit | 90407c9976939e061f32b0e07602e5ce4887d9e8 (patch) | |
| tree | 9e962cdc2f11687751c8d37d74dad1abcd88e5e9 | |
| parent | a952baa034ae7c2e4a66932005cbc7ebbccfe28d (diff) | |
| download | linux-3.10-90407c9976939e061f32b0e07602e5ce4887d9e8.tar.gz linux-3.10-90407c9976939e061f32b0e07602e5ce4887d9e8.tar.bz2 linux-3.10-90407c9976939e061f32b0e07602e5ce4887d9e8.zip | |
powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodes
Commit b5d937de0367d26f65b9af1aef5f2c34c1939be0 has a bug which causes
basically a NULL dereference in the PCI code during boot on ppc64
machines.
fetch_dev_dn() is called when dev->dev.of_node is NULL, so using that
as the starting point for the search makes no sense. It should instead
start from the device node of the PHB.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/kernel/pci_dn.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 29852688cea..d225d99fe39 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -176,11 +176,14 @@ static void *is_devfn_node(struct device_node *dn, void *data) */ struct device_node *fetch_dev_dn(struct pci_dev *dev) { - struct device_node *orig_dn = dev->dev.of_node; + struct pci_controller *phb = dev->sysdata; struct device_node *dn; unsigned long searchval = (dev->bus->number << 8) | dev->devfn; - dn = traverse_pci_devices(orig_dn, is_devfn_node, (void *)searchval); + if (WARN_ON(!phb)) + return NULL; + + dn = traverse_pci_devices(phb->dn, is_devfn_node, (void *)searchval); if (dn) dev->dev.of_node = dn; return dn; |