summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-15 13:04:26 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-08-15 13:04:26 +1000
commit2b07e2d2ae802aa88cb02cca268486c347e8133a (patch)
tree3f4fca1cc877fa927b3f35d0f145da35e3b83de9
parent39e53e483b186122db12712aca5dfb666e819729 (diff)
parent91ab688318e7b5c368c6706a076b80d18c1f8006 (diff)
downloadtalos-skiboot-2b07e2d2ae802aa88cb02cca268486c347e8133a.tar.gz
talos-skiboot-2b07e2d2ae802aa88cb02cca268486c347e8133a.zip
Merge remote-tracking branch 'ltcgit/master'
-rw-r--r--hw/fsp/fsp-surveillance.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/fsp/fsp-surveillance.c b/hw/fsp/fsp-surveillance.c
index 9ac04a62..a8118894 100644
--- a/hw/fsp/fsp-surveillance.c
+++ b/hw/fsp/fsp-surveillance.c
@@ -134,8 +134,9 @@ static void fsp_surv_got_param(uint32_t param_id __unused, int err_len,
{
if (err_len != 4) {
log_simple_error(&e_info(OPAL_RC_SURVE_STATUS),
- "SURV: Error retreiving surveillance status: %d\n",
+ "SURV: Error (%d) retrieving surv status; initiating R/R\n",
err_len);
+ fsp_trigger_reset();
return;
}
OpenPOWER on IntegriCloud