Enable SBE istep hwp in CMVC driver

Change-Id: If59c39bb26ef5a43f189c72de002189a9f8850fd
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22959
Tested-by: Jenkins Server
Reviewed-by: Basabjit Sengupta <basengup@in.ibm.com>
Reviewed-by: Amit J. Tendolkar <amit.tendolkar@in.ibm.com>

1 files changed, 12 insertions, 24 deletions

diff --git a/sbe/sbefw/sbecmdiplcontrol.C b/sbe/sbefw/sbecmdiplcontrol.C
index be5cbfc7..179ccafc 100644
--- a/sbe/sbefw/sbecmdiplcontrol.C
+++ b/sbe/sbefw/sbecmdiplcontrol.C
@@ -146,17 +146,25 @@ static istepMap_t g_istep3PtrTbl[ ISTEP3_MAX_SUBSTEPS ] =
              { &istepWithProc, { .procHwp = &p9_sbe_tp_enable_ridi }},
              { &istepWithProc, { .procHwp = &p9_sbe_setup_evid }},
              { &istepWithProc, { .procHwp = &p9_sbe_nest_initf }},
+           #ifdef SBE_ISTEP_STUBBED
+             { &istepNoOp, NULL }, // WA for simics testing
+           #else
              { &istepWithProc, { .procHwp = &p9_sbe_nest_startclocks }},
+           #endif
              { &istepWithProc, { .procHwp = &p9_sbe_nest_enable_ridi }},
              // TODO via RTC 142710
-             // L1 for p9_sbe_startclock_chiplets has qrong signature.
+             // L1 for p9_sbe_startclock_chiplets has wrong signature.
              // PERV team has fixed this in gerrit. Once it is merged
              // to master, enable this hwp. Remove No-Op after this.
              // { &istepWithProc, { .procHwp = &p9_sbe_startclock_chiplets }},
              { &istepNoOp, NULL }, // startclock_chiple wrong signature
              { &istepWithProc, { .procHwp = &p9_sbe_scominit }},
              { &istepWithProc, { .procHwp = &p9_sbe_lpc_init }},
+           #ifdef SBE_ISTEP_STUBBED
+             { &istepNoOp, NULL }, // WA for simics testing
+           #else
              { &istepWithProc, { .procHwp = &p9_sbe_fabricinit }},
+           #endif
              { &istepNoOp, NULL }, // TODO via RTC 120752
                                    // FW proc_sbe_check_master
              // TODO via RTC 142710
@@ -415,7 +423,6 @@ bool validateIstep (const uint8_t i_major, const uint8_t i_minor)
 
 ReturnCode istepAttrSetup( sbeIstepHwp_t i_hwp)
 {
-#ifndef SBE_ISTEP_STUBBED // @TODO  via RTC 142985
     SBE_DEBUG("istepAttrSetup");
     Target<TARGET_TYPE_PROC_CHIP > proc = plat_getChipTarget();
     ReturnCode rc = FAPI2_RC_SUCCESS;
@@ -431,23 +438,16 @@ ReturnCode istepAttrSetup( sbeIstepHwp_t i_hwp)
         rc = plat_ApplyGards();
      }while(0);
     return rc;
-#else
-    return FAPI2_RC_SUCCESS;
-#endif
 }
 
 //----------------------------------------------------------------------------
 
 ReturnCode istepWithProc( sbeIstepHwp_t i_hwp)
 {
-#ifndef SBE_ISTEP_STUBBED // @TODO  via RTC 142985
     SBE_DEBUG("istepWithProc");
     Target<TARGET_TYPE_PROC_CHIP > proc = plat_getChipTarget();
     assert( NULL != i_hwp.procHwp );
     return i_hwp.procHwp(proc);
-#else
-    return FAPI2_RC_SUCCESS;
-#endif
 }
 
 //----------------------------------------------------------------------------
@@ -455,7 +455,6 @@ ReturnCode istepWithProc( sbeIstepHwp_t i_hwp)
 
 ReturnCode istepWithEq( sbeIstepHwp_t i_hwp)
 {
-#ifndef SBE_ISTEP_STUBBED // @TODO via RTC 142985
     SBE_DEBUG("istepWithEq");
     // TODO via RTC 135345
     // Curently we are passing Hard code eq target. Finally it is
@@ -473,16 +472,12 @@ ReturnCode istepWithEq( sbeIstepHwp_t i_hwp)
 
     assert( NULL != i_hwp.eqHwp );
     return i_hwp.eqHwp( eqTgt );
-#else
-    return FAPI2_RC_SUCCESS;
-#endif
 }
 
 //----------------------------------------------------------------------------
 
 ReturnCode istepWithCore( sbeIstepHwp_t i_hwp)
 {
-#ifndef SBE_ISTEP_STUBBED // @TODO via RTC 142985
     SBE_DEBUG("istepWithCore");
     // TODO via RTC 135345
     // Curently we are passing Hard code core target. Finally it is
@@ -499,26 +494,19 @@ ReturnCode istepWithCore( sbeIstepHwp_t i_hwp)
     }
     assert( NULL != i_hwp.coreHwp );
     return i_hwp.coreHwp( coreTgt );
-#else
-    return FAPI2_RC_SUCCESS;
-#endif
 }
 
 //----------------------------------------------------------------------------
 
 ReturnCode istepLoadBootLoader( sbeIstepHwp_t i_hwp)
 {
-// @TODO via RTC 142985: Call instruct_start to load+start HB - BU hack
-#ifdef SBE_ISTEP_STUBBED
-    SBE_DEBUG ("istepLoadBootLoader: istep 5.1 hack to load+start HB");
-    fapi2::Target<fapi2::TARGET_TYPE_CORE > core_target((uint64_t)0);
-    ReturnCode rc = p9_sbe_instruct_start (core_target);
-#else
+    ReturnCode rc = FAPI2_RC_SUCCESS;
+#ifndef SBE_ISTEP_STUBBED
     // TODO via RTC 135345
     //  Send right Ex, address and size of HB loader
     Target<TARGET_TYPE_PROC_CHIP > proc = plat_getChipTarget();
     fapi2::Target<fapi2::TARGET_TYPE_EX > exTgt((uint64_t)7);
-    ReturnCode rc = p9_sbe_load_bootloader( proc, exTgt, 0, NULL );
+    rc = p9_sbe_load_bootloader( proc, exTgt, 0, NULL );
 #endif
     return rc;
 }