summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2019-02-05 10:20:19 -0600
committerMatt Spinler <spinler@us.ibm.com>2019-02-05 10:20:19 -0600
commita27263d48e68712fbc97db0c785a13e2dad7b572 (patch)
treeb9f7f01bd311baf2a41da40d5f37b406ca8bd7f8
parent729521fef4fd2ab270fd0ebbc5035ad4ac7e5472 (diff)
downloadopenpower-proc-control-a27263d48e68712fbc97db0c785a13e2dad7b572.zip
openpower-proc-control-a27263d48e68712fbc97db0c785a13e2dad7b572.tar.gz
Don't create errors in cleanupPCIE
This code always just runs in the power off path, and at times it may be called when power is already off. In that case the FSI access would fail since the processor won't have power, so just catch the error and continue on. Change-Id: Ic02b17875763b0540edaaec47ee19846f305db72 Signed-off-by: Matt Spinler <spinler@us.ibm.com>
-rw-r--r--procedures/p9/cleanup_pcie.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/procedures/p9/cleanup_pcie.cpp b/procedures/p9/cleanup_pcie.cpp
index 179d70c..8d1145a 100644
--- a/procedures/p9/cleanup_pcie.cpp
+++ b/procedures/p9/cleanup_pcie.cpp
@@ -43,7 +43,16 @@ void cleanupPcie()
// Disable the PCIE drivers and receiver on all CPUs
for (const auto& target : targets)
{
- writeReg(target, P9_ROOT_CTRL1_CLEAR, 0x00001C00);
+ try
+ {
+ writeReg(target, P9_ROOT_CTRL1_CLEAR, 0x00001C00);
+ }
+ catch (std::exception& e)
+ {
+ // Don't need an error log coming from the power off
+ // path, just keep trying on the other processors.
+ continue;
+ }
}
}
OpenPOWER on IntegriCloud