diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/occ_405/errl/errl.c | 2 | ||||
| -rwxr-xr-x | src/occ_405/errl/errl.h | 1 | ||||
| -rwxr-xr-x | src/occ_405/incl/occ_common.h | 3 | ||||
| -rwxr-xr-x | src/occ_405/main.c | 1 | ||||
| -rw-r--r-- | src/occ_405/wof/wof.c | 10 | ||||
| -rw-r--r-- | src/tools/ffdcparser/wofparser.c | 2 |
6 files changed, 14 insertions, 5 deletions
diff --git a/src/occ_405/errl/errl.c b/src/occ_405/errl/errl.c index d93f71c..cef5fa8 100755 --- a/src/occ_405/errl/errl.c +++ b/src/occ_405/errl/errl.c @@ -939,7 +939,7 @@ void setErrlActions(errlHndl_t io_err, const uint8_t i_mask) && ( io_err != INVALID_ERR_HNDL ) && (io_err->iv_userDetails.iv_committed == 0) ) { - // set the appropriate action bits$ + // set the appropriate action bits io_err->iv_actions.word |= i_mask; } } diff --git a/src/occ_405/errl/errl.h b/src/occ_405/errl/errl.h index ab1397e..cd6e3bb 100755 --- a/src/occ_405/errl/errl.h +++ b/src/occ_405/errl/errl.h @@ -112,6 +112,7 @@ typedef enum ERRL_USR_DTL_CALLHOME_DATA = 0x02, ERRL_USR_DTL_BINARY_DATA = 0x03, ERRL_USR_DTL_HISTORY_DATA = 0x04, + ERRL_USR_DTL_WOF_DATA = 0x05, } ERRL_USR_DETAIL_TYPE; // These are the possible OCC States. diff --git a/src/occ_405/incl/occ_common.h b/src/occ_405/incl/occ_common.h index b21b244..0d967af 100755 --- a/src/occ_405/incl/occ_common.h +++ b/src/occ_405/incl/occ_common.h @@ -5,7 +5,7 @@ /* */ /* OpenPOWER OnChipController Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2017 */ +/* Contributors Listed Below - COPYRIGHT 2011,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -287,6 +287,7 @@ enum CF_FSI_MB_TIMEOUT = 0x01, }; +#define WOF_TRACE_SIZE 1236 #define DEFAULT_TRACE_SIZE 1536 #define MAX_OCCS 8 #define MAX_CORES 24 diff --git a/src/occ_405/main.c b/src/occ_405/main.c index 623fc87..b20a075 100755 --- a/src/occ_405/main.c +++ b/src/occ_405/main.c @@ -617,6 +617,7 @@ bool read_ppmr_header(void) uint32_t userdata2 = 0; MAIN_TRAC_INFO("read_ppmr_header(0x%08X)", PPMR_ADDRESS_HOMER); + // create a DTLB entry for the PPMR image header create_tlb_entry(PPMR_ADDRESS_HOMER, sizeof(ppmr_header_t)); diff --git a/src/occ_405/wof/wof.c b/src/occ_405/wof/wof.c index d4de216..3d9814b 100644 --- a/src/occ_405/wof/wof.c +++ b/src/occ_405/wof/wof.c @@ -1410,7 +1410,6 @@ void set_clear_wof_disabled( uint8_t i_action, // Set the bit g_wof->wof_disabled |= i_bit_mask; - // If user is trying to force a reset even though WOF is disabled, // Skip straight to error log creation if( (g_wof->wof_disabled) && @@ -1567,10 +1566,17 @@ void set_clear_wof_disabled( uint8_t i_action, i_ext_rc, ERRL_SEV_UNRECOVERABLE, NULL, - DEFAULT_TRACE_SIZE, + WOF_TRACE_SIZE, g_wof->wof_disabled, i_bit_mask ); + // Add WOF parameters to error log + addUsrDtlsToErrl( l_errl, + (uint8_t*)g_wof, + sizeof(*g_wof), + ERRL_STRUCT_VERSION_1, + ERRL_USR_DTL_WOF_DATA); + // Reset if on Reason Code requires it. if(i_bit_mask & ~(IGNORE_WOF_RESET) ) { diff --git a/src/tools/ffdcparser/wofparser.c b/src/tools/ffdcparser/wofparser.c index 3a6c88b..7da974a 100644 --- a/src/tools/ffdcparser/wofparser.c +++ b/src/tools/ffdcparser/wofparser.c @@ -58,7 +58,7 @@ void dump_wof_data(wof_data_t * data) printf("vdn_percent[%d]: %d\n", i, data->vdn_percent[i]); printf("socket_power_w: %d\n", data->socket_power_w); printf("nest_freq_mhz: %d\n", data->nest_freq_mhz); - printf("nom_freq_mhz: %d\n", data->nom_freq_mhz); + printf("wof_tables_mhz: %d\n", data->nom_freq_mhz); printf("rdp_capacity: %d\n", data->rdp_capacity); printf("wof_tbls_src_tag: 0x%X\n", data->wof_tbls_src_tag); printf("package_name_hi: 0x%08x\n", data->package_name_hi); |
