| Message ID | 880562c45fc1658d8d1fb22dff616b56c2e051b5.1566451243.git.sbobroff@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | powerpc/eeh: Fixup EEH for pSeries hotplug | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | warning | Failed to apply on branch next (0e4523c0b4f64eaf7abe59e143e6bdf8f972acff) |
| snowpatch_ozlabs/apply_patch | fail | Failed to apply to any branch |
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 87edac6f2fd9..e95a7a3c9037 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1328,6 +1328,8 @@ void eeh_add_device_tree_late(struct pci_bus *bus) { struct pci_dev *dev; + if (eeh_has_flag(EEH_FORCE_DISABLED)) + return; list_for_each_entry(dev, &bus->devices, bus_list) { eeh_add_device_late(dev); if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) { diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 11c807468ab5..427fc22f72b6 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c @@ -81,8 +81,7 @@ static int of_pci_phb_probe(struct platform_device *dev) pcibios_claim_one_bus(phb->bus); /* Finish EEH setup */ - if (!eeh_has_flag(EEH_FORCE_DISABLED)) - eeh_add_device_tree_late(phb->bus); + eeh_add_device_tree_late(phb->bus); /* Add probed PCI devices to the device model */ pci_bus_add_devices(phb->bus);
Signed-off-by: Sam Bobroff <sbobroff@linux.ibm.com> --- Let's move the test into eeh_add_device_tree_late(). Thanks, Sam. arch/powerpc/kernel/eeh.c | 2 ++ arch/powerpc/kernel/of_platform.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)