summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSonny Rao <sonnyrao@us.ibm.com>2010-05-10 15:13:41 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-05-21 17:31:09 +1000
commit5b339bdf164d8aee394609768f7e2e4415b0252a (patch)
tree9f10e65450fc1027dbc974189505cf0b74932bdc /arch
parenta1263c71448aa70afb6097fdedf93c3dff5a7a15 (diff)
downloadop-kernel-dev-5b339bdf164d8aee394609768f7e2e4415b0252a.zip
op-kernel-dev-5b339bdf164d8aee394609768f7e2e4415b0252a.tar.gz
powerpc/pci: Check devices status property when scanning OF tree
We ran into an issue where it looks like we're not properly ignoring a pci device with a non-good status property when we walk the device tree and instanciate the Linux side PCI devices. However, the EEH init code does look for the property and disables EEH on these devices. This leaves us in an inconsistent where we are poking at a supposedly bad piece of hardware and RTAS will block our config cycles because EEH isn't enabled anyway. Signed-of-by: Sonny Rao <sonnyrao@linux.vnet.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/pci_of_scan.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index cd11d5c..6ddb795f 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -310,6 +310,8 @@ static void __devinit __of_scan_bus(struct device_node *node,
/* Scan direct children */
for_each_child_of_node(node, child) {
pr_debug(" * %s\n", child->full_name);
+ if (!of_device_is_available(child))
+ continue;
reg = of_get_property(child, "reg", &reglen);
if (reg == NULL || reglen < 20)
continue;
OpenPOWER on IntegriCloud