diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2015-02-04 07:55:01 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-12 10:43:52 -0600 |
| commit | 02e8cfeafe60b5937a01d994d1dc25ec165eeece (patch) | |
| tree | 1c4f82a768230681ac9a3e0d47f414fd0b045e95 /src/usr/hwpf | |
| parent | 3eb0fabc51df77382919c3d24b0f38b8f4eb8051 (diff) | |
| download | blackbird-hostboot-02e8cfeafe60b5937a01d994d1dc25ec165eeece.tar.gz blackbird-hostboot-02e8cfeafe60b5937a01d994d1dc25ec165eeece.zip | |
Update i2cSetupMasters() to support different inputs
Update i2cSetupMasters similar to i2cResetActiveMasters to accept a parameter
to select procs and/or mem buffs and host and/or fsi engines.
Change-Id: I943248e01acd3254acf5635a284a05c827645123
RTC: 115834
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15552
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C | 5 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/slave_sbe/slave_sbe.C | 2 | ||||
| -rw-r--r-- | src/usr/hwpf/hwp/start_payload/start_payload.C | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C index d8fd737e2..4cb1d3a91 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C +++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C @@ -349,12 +349,11 @@ void * call_host_slave_sbe_update( void * io_pArgs ) // Reset I2C devices before trying to access the SBE SEEPROMs // Any error returned should not fail istep - l_errl = I2C::i2cResetActiveMasters( I2C::I2C_RESET_PROC_HOST ); + l_errl = I2C::i2cResetActiveMasters( I2C::I2C_PROC_HOST ); if (l_errl) { - // Commit error + // Commit error and keep going errlCommit( l_errl, HWPF_COMP_ID ); - break; } // Call to check state of Processor SBE SEEPROMs and diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C index 5c8450a49..63717dce6 100644 --- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C +++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C @@ -447,7 +447,7 @@ void* call_proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) I2C::i2cSetAccessMode( I2C::I2C_SET_ACCESS_MODE_PROC_HOST ); // Reset the Processor's I2C Masters - l_errl = I2C::i2cResetActiveMasters(I2C::I2C_RESET_PROC_ALL); + l_errl = I2C::i2cResetActiveMasters(I2C::I2C_PROC_ALL); if (l_errl) { // Commit error diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C index 4cc039759..7d28ae0b0 100644 --- a/src/usr/hwpf/hwp/start_payload/start_payload.C +++ b/src/usr/hwpf/hwp/start_payload/start_payload.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -705,12 +705,13 @@ errlHndl_t callShutdown ( uint64_t i_masterInstance, // divisor TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "Setup I2C Masters" ); - err = I2C::i2cSetupMasters(); + err = I2C::i2cSetupActiveMasters(I2C::I2C_PROC_ALL); if( err ) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "Error setting up I2C Bus Divisors" ); - break; + // just commit the error and keep going + errlCommit(err, ISTEP_COMP_ID); } // Get Target Service, and the system target. |
