diff options
author | Bill Hoffa <wghoffa@us.ibm.com> | 2017-06-15 21:41:19 -0500 |
---|---|---|
committer | William A. Bryan <wilbryan@us.ibm.com> | 2017-06-16 11:18:50 -0400 |
commit | 1dc97a688e32e63420533bfde8c6d7d2996619ea (patch) | |
tree | d72f9a7ec38d9dd8fde85f02ea36b5e164c355af /src | |
parent | 2c1662e4d95a7f9fbd8bc9e01fb696f8f72889e6 (diff) | |
download | talos-occ-1dc97a688e32e63420533bfde8c6d7d2996619ea.tar.gz talos-occ-1dc97a688e32e63420533bfde8c6d7d2996619ea.zip |
Fix ast_mbox assert compile issue
Change-Id: I793a21d2b406fd3353f7fb0fd5ae6c37c86166a2
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41945
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: ILYA SMIRNOV <ismirno@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/occ_405/firdata/ast_mboxdd.h | 48 | ||||
-rw-r--r-- | src/occ_405/firdata/pnor_mboxdd.c | 13 | ||||
-rw-r--r-- | src/occ_405/firdata/pnor_util.c | 1 | ||||
-rw-r--r-- | src/occ_405/occLinkInputFile | 1 | ||||
-rw-r--r-- | src/occ_405/topfiles.mk | 1 |
5 files changed, 45 insertions, 19 deletions
diff --git a/src/occ_405/firdata/ast_mboxdd.h b/src/occ_405/firdata/ast_mboxdd.h index d48e50e..a9a8f5e 100644 --- a/src/occ_405/firdata/ast_mboxdd.h +++ b/src/occ_405/firdata/ast_mboxdd.h @@ -26,8 +26,6 @@ #ifndef __AST_MBOXDD_H #define __AST_MBOXDD_H -#include <assert.h> - /** @file ast_mboxdd.H * @brief Provides the interfaces Aspeed MBOX hardware */ @@ -120,7 +118,11 @@ errorHndl_t readRegSIO(uint8_t i_regAddr, */ inline uint8_t get8( mboxMessage_t *i_msg, uint8_t i_index) { - assert( i_index < BMC_MBOX_ARGS_REGS); + if ( i_index >= BMC_MBOX_ARGS_REGS ) + { + return 0; + } + return i_msg->iv_args[i_index]; } @@ -131,9 +133,13 @@ inline uint8_t get8( mboxMessage_t *i_msg, uint8_t i_index) * @param[in] i_index: Index into args section to be written to * @param[in] i_value: data to be written */ -inline void put8( mboxMessage_t *i_msg, uint8_t i_index, uint8_t i_value ) +inline void put8( mboxMessage_t *i_msg, uint8_t i_index, uint8_t i_value ) { - assert( i_index < BMC_MBOX_ARGS_REGS); + if ( i_index >= BMC_MBOX_ARGS_REGS ) + { + return; + } + i_msg->iv_args[i_index] = i_value; } @@ -146,7 +152,11 @@ inline void put8( mboxMessage_t *i_msg, uint8_t i_index, uint8_t i_value ) */ inline uint16_t get16( mboxMessage_t *i_msg, uint8_t i_index ) { - assert( i_index < (BMC_MBOX_ARGS_REGS - 1)); + if ( i_index >= (BMC_MBOX_ARGS_REGS-1) ) + { + return 0; + } + return i_msg->iv_args[i_index] | (i_msg->iv_args[i_index + 1] << 8); } @@ -159,7 +169,11 @@ inline uint16_t get16( mboxMessage_t *i_msg, uint8_t i_index ) */ inline void put16( mboxMessage_t *i_msg, uint8_t i_index, uint16_t i_value ) { - assert( i_index < (BMC_MBOX_ARGS_REGS - 1)); + if ( i_index >= (BMC_MBOX_ARGS_REGS-1) ) + { + return; + } + i_msg->iv_args[i_index] = i_value & 0xff; i_msg->iv_args[i_index + 1] = i_value >> 8; } @@ -174,7 +188,11 @@ inline void put16( mboxMessage_t *i_msg, uint8_t i_index, uint16_t i_value ) */ inline uint32_t get32( mboxMessage_t *i_msg, uint8_t i_index ) { - assert( i_index < (BMC_MBOX_ARGS_REGS - 3)); + if ( i_index >= (BMC_MBOX_ARGS_REGS-3) ) + { + return 0; + } + return i_msg->iv_args[i_index] | (i_msg->iv_args[i_index + 1] << 8) | (i_msg->iv_args[i_index + 2] << 16) | @@ -189,11 +207,15 @@ inline uint32_t get32( mboxMessage_t *i_msg, uint8_t i_index ) */ inline void put32( mboxMessage_t *i_msg, uint8_t i_index, uint32_t i_value ) { - assert( i_index < (BMC_MBOX_ARGS_REGS - 3)); - i_msg->iv_args[i_index] = i_value & 0xff; - i_msg->iv_args[i_index + 1] = (i_value >> 8) & 0xff; - i_msg->iv_args[i_index + 2] = (i_value >> 16) & 0xff; - i_msg->iv_args[i_index + 3 ] = i_value >> 24; + if ( i_index >= (BMC_MBOX_ARGS_REGS-3) ) + { + return; + } + + i_msg->iv_args[i_index] = i_value & 0xff; + i_msg->iv_args[i_index + 1] = (i_value >> 8) & 0xff; + i_msg->iv_args[i_index + 2] = (i_value >> 16) & 0xff; + i_msg->iv_args[i_index + 3 ] = i_value >> 24; } typedef struct { diff --git a/src/occ_405/firdata/pnor_mboxdd.c b/src/occ_405/firdata/pnor_mboxdd.c index a5624ff..5253ccf 100644 --- a/src/occ_405/firdata/pnor_mboxdd.c +++ b/src/occ_405/firdata/pnor_mboxdd.c @@ -36,7 +36,6 @@ #include <norflash.h> #include <pnor_mboxdd.h> #include <lpc.h> -#include <assert.h> extern int TRACE_PNOR_MBOX; int TRACE_PNOR_MBOX = 0; @@ -106,7 +105,11 @@ errorHndl_t readFlash(pnorMbox_t* i_pnorMbox, do { // Ensure we are operating on a 4-byte boundary - assert( i_size % 4 == 0); + if (i_size % 4 != 0) + { + TRAC_ERR("readFlash: not on 4-byte boundary"); + return FAIL; + } TRAC_INFO("readFlash(i_addr=0x%.8X)> ", i_addr); @@ -161,7 +164,11 @@ errorHndl_t writeFlash(pnorMbox_t* i_pnorMbox, do { // Ensure we are operating on a 4-byte boundary - assert( i_size % 4 == 0 ); + if (i_size % 4 != 0) + { + TRAC_ERR("writeFlash: not on 4-byte boundary"); + return FAIL; + } TRAC_INFO(ENTER_MRK"writeFlash(i_address=0x%llx)> ", i_addr); diff --git a/src/occ_405/firdata/pnor_util.c b/src/occ_405/firdata/pnor_util.c index 17a6350..c7841cb 100644 --- a/src/occ_405/firdata/pnor_util.c +++ b/src/occ_405/firdata/pnor_util.c @@ -27,7 +27,6 @@ #include <native.h> #include <pnor_mboxdd.h> -#include <ecc.h> #include <pnor_util.h> #include <norflash.h> diff --git a/src/occ_405/occLinkInputFile b/src/occ_405/occLinkInputFile index dd4e75e..34d93ce 100644 --- a/src/occ_405/occLinkInputFile +++ b/src/occ_405/occLinkInputFile @@ -98,7 +98,6 @@ INPUT ( amec_amester.o timer.o trac_interface.o wof.o - ecc.o firData.o fir_data_collect.o fsi.o diff --git a/src/occ_405/topfiles.mk b/src/occ_405/topfiles.mk index 445f7c3..ecc773d 100644 --- a/src/occ_405/topfiles.mk +++ b/src/occ_405/topfiles.mk @@ -65,7 +65,6 @@ TOP-C-SOURCES = amec/amec_analytics.c \ dimm/dimm_control.c \ errl/errl.c \ firdata/ast_mboxdd.c \ - firdata/ecc.c \ firdata/firData.c \ firdata/fir_data_collect.c \ firdata/fsi.c \ |