diff options
| author | Ben Gass <bgass@us.ibm.com> | 2018-04-09 15:24:07 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-05-17 18:01:04 -0400 |
| commit | d1c0355b013cad7fde24f9eb92a32a57ba8e9938 (patch) | |
| tree | a1cd878944b5253a48656d61b8fc6b731106c5a9 | |
| parent | a4dd8cf996bad61d0e4d246c9313a11c3ed23768 (diff) | |
| download | talos-hostboot-d1c0355b013cad7fde24f9eb92a32a57ba8e9938.tar.gz talos-hostboot-d1c0355b013cad7fde24f9eb92a32a57ba8e9938.zip | |
Set TRAIN_TIME to 0 for simulation.
Change-Id: I6b1fd94a1dfbf2f64e466a2a2bb39e735701ff35
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56968
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Soma Bhanutej <soma.bhanu@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58185
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
4 files changed, 14 insertions, 7 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C index f4ee85164..3b9f41dfc 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C @@ -43,7 +43,7 @@ constexpr uint64_t literal_0x6 = 0x6; constexpr uint64_t literal_0x7 = 0x7; fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT0, - const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1) + const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT2) { { fapi2::ATTR_EC_Type l_chip_ec; @@ -65,6 +65,9 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS fapi2::ATTR_CHIP_EC_FEATURE_HW419022_Type l_TGT1_ATTR_CHIP_EC_FEATURE_HW419022; FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW419022, TGT1, l_TGT1_ATTR_CHIP_EC_FEATURE_HW419022)); uint64_t l_def_DLL_DD10_TRAIN = (l_TGT1_ATTR_CHIP_EC_FEATURE_HW419022 != literal_0x00); + fapi2::ATTR_IS_SIMULATION_Type l_TGT2_ATTR_IS_SIMULATION; + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_IS_SIMULATION, TGT2, l_TGT2_ATTR_IS_SIMULATION)); + uint64_t l_def_IS_SIM = (l_TGT2_ATTR_IS_SIMULATION == literal_1); fapi2::buffer<uint64_t> l_scom_buffer; { if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) @@ -195,7 +198,11 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) ) { - if (( ! l_def_DLL_DD10_TRAIN)) + if (l_def_IS_SIM) + { + l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0x0 ); + } + else if (( ! l_def_DLL_DD10_TRAIN)) { l_scom_buffer.insert<4, 4, 60, uint64_t>(literal_0xF ); } diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.H b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.H index f08664303..abd594c54 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.H +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -32,13 +32,13 @@ typedef fapi2::ReturnCode (*p9_fbc_ioo_dl_scom_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>&, - const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&); + const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&, const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>&); extern "C" { fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT0, - const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1); + const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT2); } diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C index 497c209aa..77563c44b 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_chiplet_scominit.C @@ -382,7 +382,7 @@ fapi2::ReturnCode p9_chiplet_scominit(const fapi2::Target<fapi2::TARGET_TYPE_PRO } FAPI_DBG("Invoking p9.fbc.ioo_dl.scom.initfile on target %s...", l_chipletTargetStr); - FAPI_EXEC_HWP(l_rc, p9_fbc_ioo_dl_scom, *l_iter, i_target); + FAPI_EXEC_HWP(l_rc, p9_fbc_ioo_dl_scom, *l_iter, i_target, FAPI_SYSTEM); if (l_rc) { diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_sys_chiplet_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_sys_chiplet_scominit.C index d7002e406..55a0e68de 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_sys_chiplet_scominit.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_sys_chiplet_scominit.C @@ -74,7 +74,7 @@ fapi2::ReturnCode p9_sys_chiplet_scominit( l_iter++) { FAPI_DBG("Invoking p9.fbc.ioo_dl.scom.initfile..."); - FAPI_EXEC_HWP(l_rc, p9_fbc_ioo_dl_scom, *l_iter, i_target); + FAPI_EXEC_HWP(l_rc, p9_fbc_ioo_dl_scom, *l_iter, i_target, FAPI_SYSTEM); if (l_rc) { |
