diff options
author | Joe McGill <jmcgill@us.ibm.com> | 2016-06-03 09:18:06 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-06-09 11:32:41 -0400 |
commit | 99b208e603f508422bd68986d64b7544495fe821 (patch) | |
tree | 079dfde01844e1ff5b356b7b0190c006a8cc66d5 /src | |
parent | c9ffa599614f2ae9251abc48f5b747e69b7b1bbe (diff) | |
download | talos-hostboot-99b208e603f508422bd68986d64b7544495fe821.tar.gz talos-hostboot-99b208e603f508422bd68986d64b7544495fe821.zip |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C | 38 | ||||
-rw-r--r-- | src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml | 14 |
2 files changed, 8 insertions, 44 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; diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml index 41e458682..2b45b7a0c 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml @@ -7,7 +7,7 @@ <!-- --> <!-- EKB Project --> <!-- --> -<!-- COPYRIGHT 2015 --> +<!-- COPYRIGHT 2015,2016 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -23,18 +23,6 @@ <hwpErrors> <!-- ******************************************************************** --> <hwpError> - <rc>RC_OSC_BIT_ERR</rc> - <description>OSC is not in valid state</description> - <ffdc>READ_SNS1LTH</ffdc> - </hwpError> - <!-- ******************************************************************** --> - <hwpError> - <rc>RC_VDD_NEST_OBSERVE</rc> - <description>VDD is in OFF state</description> - <ffdc>READ_FSI2PIB_STATUS</ffdc> - </hwpError> - <!-- ******************************************************************** --> - <hwpError> <rc>RC_CBS_CS_INTERNAL_STATE</rc> <description>CBS is not in IDLE state</description> </hwpError> |