diff options
| author | Andres Lugo-Reyes <aalugore@us.ibm.com> | 2017-04-28 10:02:55 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2017-04-28 12:10:16 -0400 |
| commit | 6bc1827d25df20ea4dbb40129897110b2cc251a8 (patch) | |
| tree | 53ca0ef3abb12a72f41bb2a576f15c0bc7a8d0eb /src/occ_405 | |
| parent | b227f22726bc2c51c65966c461f96b450875edd3 (diff) | |
| download | talos-occ-6bc1827d25df20ea4dbb40129897110b2cc251a8.tar.gz talos-occ-6bc1827d25df20ea4dbb40129897110b2cc251a8.zip | |
Prevent any WOF code from creating errorlogs
fix WOF_DISABLED_RC Doxygen
Change-Id: I9f6e9b14b5fae1ed656713c8e48f5c44e0c83410
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39812
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405')
| -rwxr-xr-x | src/occ_405/main.c | 11 | ||||
| -rw-r--r-- | src/occ_405/wof/wof.c | 3 | ||||
| -rw-r--r-- | src/occ_405/wof/wof.h | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/occ_405/main.c b/src/occ_405/main.c index 32b8aa3..3169fc8 100755 --- a/src/occ_405/main.c +++ b/src/occ_405/main.c @@ -499,6 +499,17 @@ void read_wof_header(void) uint32_t userdata1 = 0; uint32_t userdata2 = 0; + // Skip reading wof header until WOF is enabled + // TODO RTC: 131186 - remove when WOF is up + g_amec->wof.wof_disabled |= WOF_RC_DRIVER_WOF_DISABLED; + + if( g_amec->wof.wof_disabled ) + { + MAIN_TRAC_INFO("WOF has not been enabled. Skipping read_wof_header"); + return; + } + + MAIN_TRAC_INFO("read_wof_header() 0x%08X", G_pgpe_header.wof_tables_addr); // Read active quads address, wof tables address, and wof tables len diff --git a/src/occ_405/wof/wof.c b/src/occ_405/wof/wof.c index ecc5809..14b4bab 100644 --- a/src/occ_405/wof/wof.c +++ b/src/occ_405/wof/wof.c @@ -49,7 +49,6 @@ extern pstateStatus G_proc_pstate_status; //****************************************************************************** // Globals //****************************************************************************** - uint8_t G_sram_vfrt_ping_buffer[MIN_BCE_REQ_SIZE] __attribute__ ((section(".vfrt_ping_buffer"))); uint8_t G_sram_vfrt_pong_buffer[MIN_BCE_REQ_SIZE] __attribute__ ((section(".vfrt_pong_buffer"))); @@ -1494,7 +1493,7 @@ void disable_wof( void ) /** @ * @errortype * @moduleid DISABLE_WOF - * @reasoncode WOF_DISABLED + * @reasoncode WOF_DISABLED_RC * @userdata1 wof_disabled reasoncode * @userdata2 0 * @userdata4 OCC_NO_EXTENDED_RC diff --git a/src/occ_405/wof/wof.h b/src/occ_405/wof/wof.h index e0715a3..b02f6c0 100644 --- a/src/occ_405/wof/wof.h +++ b/src/occ_405/wof/wof.h @@ -61,6 +61,7 @@ #define WOF_RC_VFRT_REQ_FAILURE 0x1000 #define WOF_RC_CONTROL_REQ_FAILURE 0x2000 #define WOF_RC_VFRT_ALIGNMENT_ERROR 0x4000 +#define WOF_RC_DRIVER_WOF_DISABLED 0x8000 // Reason codes which should NOT create an error log should be added here #define ERRL_RETURN_CODES ~(WOF_RC_MODE_CHANGE | \ |
