diff options
| author | Mark Wenning <wenning@us.ibm.com> | 2012-10-16 23:49:07 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-11-03 14:49:59 -0500 |
| commit | a577e41f193dafd6d866e67c754b3c1a30e34f59 (patch) | |
| tree | e0f520f9ac5d13a83c860115766d7b30d325ee17 /src/usr/initservice/istepdispatcher | |
| parent | d1ea835e9a3b4b77649f1fd349d6dce434ee506a (diff) | |
| download | talos-hostboot-a577e41f193dafd6d866e67c754b3c1a30e34f59.tar.gz talos-hostboot-a577e41f193dafd6d866e67c754b3c1a30e34f59.zip | |
Move to using ISTEP_MODE when FSP is present
Also add code to clear status reg before starting splessmode.
Change-Id: I96c8ff7fef7fd62ae8958104e47319303d9aa080
RTC: 51001
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2104
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/initservice/istepdispatcher')
| -rw-r--r-- | src/usr/initservice/istepdispatcher/splesscommon.C | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/usr/initservice/istepdispatcher/splesscommon.C b/src/usr/initservice/istepdispatcher/splesscommon.C index 809915014..0f30d741b 100644 --- a/src/usr/initservice/istepdispatcher/splesscommon.C +++ b/src/usr/initservice/istepdispatcher/splesscommon.C @@ -115,20 +115,24 @@ void initIStepMode( ) } else { + TRACDCOMP( INITSERVICE::g_trac_initsvc, + "initIStepMode entry: ISTEP_MODE attribute = %x", + l_pTopLevel->getAttr<ATTR_ISTEP_MODE>( ) ); // got a pointer to Targeting, complete setting the flag - // $$ save l_readData = mmio_scratch_read( MMIO_SCRATCH_IPLSTEP_CONFIG ); l_readData = g_SPLess_IStepMode_Reg; // Get the Thread 5 scratch reg uint64_t t5ScratchVal = mmio_scratch_read( MMIO_SCRATCH_ISTEP_MODE ); - TRACFCOMP( INITSERVICE::g_trac_initsvc, + TRACDCOMP( INITSERVICE::g_trac_initsvc, INFO_MRK"Thread 5 scratch reg val: 0x%08x", t5ScratchVal ); // Only need 1 bit. t5ScratchVal = t5ScratchVal & 0x1; #ifdef SPLESS_DEBUG - printk( "IStepMode Reg = 0x%p, 0x%lx\n", &g_SPLess_IStepMode_Reg, l_readData ); + printk( "IStepMode Reg = 0x%p, 0x%lx\n", + &g_SPLess_IStepMode_Reg, + l_readData ); printk( "Status Reg = 0x%p\n", &g_SPLess_Status_Reg ); printk( "Command Reg = 0x%p\n", &g_SPLess_Command_Reg ); #endif @@ -138,23 +142,13 @@ void initIStepMode( ) // check for IStep Mode signature(s) if ( ( l_readData == ISTEP_MODE_SPLESS_SIGNATURE ) - || ( l_readData == ISTEP_MODE_FSP_SIGNATURE ) || - ( 0x1 == t5ScratchVal ) ) + || ( 0x1 == t5ScratchVal ) ) { l_pTopLevel->setAttr<ATTR_ISTEP_MODE> (true ); TRACDCOMP( INITSERVICE::g_trac_initsvc, - "ISTEP_MODE attribute set to TRUE." ); - } - else - { - // If not either of the above, set to run-all - l_readData = RUN_ALL_MODE_SIGNATURE; - // $$ save mmio_scratch_write( MMIO_SCRATCH_IPLSTEP_CONFIG, l_readData ); - l_pTopLevel->setAttr<ATTR_ISTEP_MODE> ( false ); - - TRACDCOMP( INITSERVICE::g_trac_initsvc, - "ISTEP_MODE attribute set to FALSE." ); + "Signature or scratch reg set, ISTEP_MODE attr set = TRUE.", + l_readData ); } } |
