From a577e41f193dafd6d866e67c754b3c1a30e34f59 Mon Sep 17 00:00:00 2001 From: Mark Wenning Date: Tue, 16 Oct 2012 23:49:07 -0500 Subject: 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 Reviewed-by: A. Patrick Williams III --- src/usr/initservice/istepdispatcher/splesscommon.C | 26 +++++++++------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'src/usr/initservice/istepdispatcher') 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( ) ); // 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 (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 ( false ); - - TRACDCOMP( INITSERVICE::g_trac_initsvc, - "ISTEP_MODE attribute set to FALSE." ); + "Signature or scratch reg set, ISTEP_MODE attr set = TRUE.", + l_readData ); } } -- cgit v1.2.1