diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2017-01-30 13:40:25 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-15 12:39:04 -0500 |
| commit | 874cef14b1471b45cc920be36c40a66fb795a004 (patch) | |
| tree | aa3e9a60aeb4a3d917ba96b139ec8f3384b15804 /src | |
| parent | 80bee20908ee71990fb5fa0f96b305c20390bac6 (diff) | |
| download | talos-hostboot-874cef14b1471b45cc920be36c40a66fb795a004.tar.gz talos-hostboot-874cef14b1471b45cc920be36c40a66fb795a004.zip | |
Remove Hack to Set SBE Side to 0 before SBE Update calls doShutdown
Can be removed with updated p9_select_boot_master.C propagated to CMVC.
Change-Id: I8fbf416c804104e3c2da3bd308f2d19b25d7d19c
RTC:167179
CMVC-Prereq: 1015962
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35600
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 5f2617559..5607d3368 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -385,79 +385,6 @@ namespace SBE errlCommit( err, SBE_COMP_ID ); } - /* --------------------------------------------------------- - Start hack to fix SBE Boot Select changing to 1 and never - being reset back to 0. @TODO RTC:167179 for removal. - --------------------------------------------------------- */ - if( (sbeState.target_is_master == true) && - (l_restartNeeded == true) ) - { - // Read PERV_SB_CS_SCOM 0x00050008 - uint64_t scomData = 0x0; - size_t op_size = sizeof(scomData); - err = deviceRead( sbeState.target, - &scomData, - op_size, - DEVICE_SCOM_ADDRESS(PERV_SB_CS_SCOM) ); - if( err ) - { - // Something failed on the read. Commit the error here - // and continue with the Re-IPL Request - TRACFCOMP(g_trac_sbe, - ERR_MRK"updateProcessorSbeSeeproms() - Error " - "reading SB CS SCOM (0x%.8X) from Target :" - "HUID=0x%.8X, RC=0x%X, PLID=0x%lX", - PERV_SB_CS_SCOM, // 0x00050008 - TARGETING::get_huid(sbeState.target), - ERRL_GETRC_SAFE(err), - ERRL_GETPLID_SAFE(err)); - errlCommit( err, SBE_COMP_ID ); - } - else - { - TRACFCOMP(g_trac_sbe, - INFO_MRK"updateProcessorSbeSeeproms() - Read " - "SB CS SCOM (0x%.8X) from Target :" - "HUID=0x%.8X as 0x%X", - PERV_SB_CS_SCOM, // 0x00050008 - TARGETING::get_huid(sbeState.target), - scomData ); - } - scomData &= ~SBE_BOOT_SELECT_MASK; // Clear SBE Boot Select - err = deviceWrite( sbeState.target, - &scomData, - op_size, - DEVICE_SCOM_ADDRESS(PERV_SB_CS_SCOM) ); - if( err ) - { - // Something failed on the write. Commit the error here - // and continue with the Re-IPL Request - TRACFCOMP(g_trac_sbe, - ERR_MRK"updateProcessorSbeSeeproms() - Error " - "writing SB CS SCOM (0x%.8X) to Target :" - "HUID=0x%.8X, RC=0x%X, PLID=0x%lX", - PERV_SB_CS_SCOM, // 0x00050008 - TARGETING::get_huid(sbeState.target), - ERRL_GETRC_SAFE(err), - ERRL_GETPLID_SAFE(err)); - errlCommit( err, SBE_COMP_ID ); - } - else - { - TRACFCOMP(g_trac_sbe, - INFO_MRK"updateProcessorSbeSeeproms() - Wrote" - " SB CS SCOM (0x%.8X) to Target :" - "HUID=0x%.8X as 0x%X", - PERV_SB_CS_SCOM, // 0x00050008 - TARGETING::get_huid(sbeState.target), - scomData ); - } - } - /* --------------------------------------------------------- - End hack to fix SBE Boot Select changing to 1 and never - being reset back to 0. @TODO RTC:167179 for removal. - --------------------------------------------------------- */ - // Push this sbeState onto the vector sbeStates_vector.push_back(sbeState); |
