diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2014-10-10 15:58:08 +1100 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2014-10-10 15:58:08 +1100 |
commit | 216547fde5bd0cf5a806c0a3053da8fb81b45ad8 (patch) | |
tree | 47cd3a783b205fe0cf3bbee7ff96508568adcf3d /hw/occ.c | |
parent | 72f080a3b1bdc6f3a0843f0c98579848fdd2a682 (diff) | |
parent | d5a261b3aa266ff8a780b66569175aef96d0a95a (diff) | |
download | skiboot-216547fde5bd0cf5a806c0a3053da8fb81b45ad8.zip skiboot-216547fde5bd0cf5a806c0a3053da8fb81b45ad8.tar.gz skiboot-216547fde5bd0cf5a806c0a3053da8fb81b45ad8.tar.bz2 |
Merge branch 'release-2.1.1'
Diffstat (limited to 'hw/occ.c')
-rw-r--r-- | hw/occ.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -64,6 +64,10 @@ DEFINE_LOG_ENTRY(OPAL_RC_OCC_PSTATE_INIT, OPAL_PLATFORM_ERR_EVT, OPAL_OCC, OPAL_CEC_HARDWARE, OPAL_INFO, OPAL_NA, NULL); +DEFINE_LOG_ENTRY(OPAL_RC_OCC_TIMEOUT, OPAL_PLATFORM_ERR_EVT, OPAL_OCC, + OPAL_CEC_HARDWARE, OPAL_UNRECOVERABLE_ERR_GENERAL, + OPAL_NA, NULL); + /* Check each chip's HOMER/Sapphire area for PState valid bit */ static bool wait_for_all_occ_init(void) { @@ -275,8 +279,9 @@ void occ_pstates_init(void) /* Wait for all OCC to boot up */ if(!wait_for_all_occ_init()) { - log_simple_error(&e_info(OPAL_RC_OCC_PSTATE_INIT), - "OCC: All OCC did not init. Timed Out\n"); + log_simple_error(&e_info(OPAL_RC_OCC_TIMEOUT), + "OCC: Initialization on all chips did not complete" + "(timed out)\n"); return; } |