p9_sim_model_boot -- Updates

-- add support for randomization of initial state
-- add support for secure mode boot

Change-Id: I79dc4d0bdb760f7e5103bbb4f24866ee133f34d1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25378
Tested-by: Hostboot CI
Reviewed-by: SRINIVAS V. POLISETTY <srinivan@in.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25429
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 7 insertions, 31 deletions

diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C b/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C
index b2785a066..6d704b874 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C
@@ -49,17 +49,15 @@ fapi2::ReturnCode p9_start_cbs(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
                                & i_target_chip,
                                const bool i_sbe_start)
 {
-    fapi2::buffer<uint32_t> l_read_reg ;
-    bool l_read_fsi2pib_status = false;
     bool l_sbe_start_value = false;
     fapi2::buffer<uint32_t> l_data32;
     fapi2::buffer<uint32_t> l_data32_cbs_cs;
     int l_timeout = 0;
-    FAPI_DBG("Entering ...");
+    FAPI_INF("Entering ...");
 
     l_sbe_start_value = !i_sbe_start;
 
-    FAPI_INF("Configuring Prevent SBE start option");
+    FAPI_DBG("Configuring Prevent SBE start option");
     FAPI_IMP("SBE start value : %d", l_sbe_start_value);
     //Setting CBS_CS register value
     FAPI_TRY(fapi2::getCfamRegister(i_target_chip, PERV_CBS_CS_FSI,
@@ -69,29 +67,7 @@ fapi2::ReturnCode p9_start_cbs(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
     FAPI_TRY(fapi2::putCfamRegister(i_target_chip, PERV_CBS_CS_FSI,
                                     l_data32_cbs_cs));
 
-    FAPI_INF("check for OSC ok");
-    //Getting SNS1LTH register value
-    FAPI_TRY(fapi2::getCfamRegister(i_target_chip, PERV_SNS1LTH_FSI,
-                                    l_read_reg)); //l_read_reg = CFAM.SNS1LTH
-
-    FAPI_ASSERT(l_read_reg.getBit<10>() || l_read_reg.getBit<11>(),
-                fapi2::OSC_BIT_ERR()
-                .set_READ_SNS1LTH(l_read_reg),
-                "FATAL ERROR:BIT 10 OR 11 NOT SET FOR MAILBOX SNS1LTH");
-
-    FAPI_INF("check for VDD");
-    //Getting FSI2PIB_STATUS register value
-    FAPI_TRY(fapi2::getCfamRegister(i_target_chip, PERV_FSI2PIB_STATUS_FSI,
-                                    l_data32));
-    l_read_fsi2pib_status =
-        l_data32.getBit<PERV_FSI2PIB_STATUS_VDD_NEST_OBSERVE>();  //l_read_fsi2pib_status = CFAM.FSI2PIB_STATUS.VDD_NEST_OBSERVE
-
-    FAPI_ASSERT(l_read_fsi2pib_status,
-                fapi2::VDD_NEST_OBSERVE()
-                .set_READ_FSI2PIB_STATUS(l_read_fsi2pib_status),
-                "ERROR:VDD OFF , FSI2BIB STATUS BIT 16 NOT SET");
-
-    FAPI_INF("Resetting CFAM Boot Sequencer (CBS) to flush value");
+    FAPI_DBG("Resetting CFAM Boot Sequencer (CBS) to flush value");
     //Setting CBS_CS register value
     FAPI_TRY(fapi2::getCfamRegister(i_target_chip, PERV_CBS_CS_FSI,
                                     l_data32_cbs_cs));
@@ -100,13 +76,13 @@ fapi2::ReturnCode p9_start_cbs(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
                                     l_data32_cbs_cs));
 
     // HW319150 - pervSoA:  cbs_start is implemented as pulse 0 -> 1
-    FAPI_INF("Triggering CFAM Boot Sequencer (CBS) to start");
+    FAPI_DBG("Triggering CFAM Boot Sequencer (CBS) to start");
     //Setting CBS_CS register value
     l_data32_cbs_cs.setBit<0>();  //CFAM.CBS_CS.CBS_CS_START_BOOT_SEQUENCER = 1
     FAPI_TRY(fapi2::putCfamRegister(i_target_chip, PERV_CBS_CS_FSI,
                                     l_data32_cbs_cs));
 
-    FAPI_INF("Check cbs_cs_internal_state_vector");
+    FAPI_DBG("Check cbs_cs_internal_state_vector");
     l_timeout = P9_CFAM_CBS_POLL_COUNT;
 
     //UNTIL CBS_CS.CBS_CS_INTERNAL_STATE_VECTOR == CBS_IDLE_VALUE
@@ -127,13 +103,13 @@ fapi2::ReturnCode p9_start_cbs(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
         --l_timeout;
     }
 
-    FAPI_INF("Loop Count :%d", l_timeout);
+    FAPI_DBG("Loop Count :%d", l_timeout);
 
     FAPI_ASSERT(l_timeout > 0,
                 fapi2::CBS_CS_INTERNAL_STATE(),
                 "ERROR:STATE NOT SET , CBS_CS BIT 30 NOT SET");
 
-    FAPI_DBG("Exiting ...");
+    FAPI_INF("Exiting ...");
 
 fapi_try_exit:
     return fapi2::current_err;