diff options
author | Christian Geddes <crgeddes@us.ibm.com> | 2018-04-06 13:31:38 -0500 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2018-04-20 10:43:49 -0400 |
commit | b6271f37908f731fd1721e4457d187b2124e9317 (patch) | |
tree | 411d985a7c63aa868abbbd28863bb86bae92b90d | |
parent | fff083bbcee4148983e53e2a023a6ec68c503058 (diff) | |
download | talos-hostboot-b6271f37908f731fd1721e4457d187b2124e9317.tar.gz talos-hostboot-b6271f37908f731fd1721e4457d187b2124e9317.zip |
PM: Clean up PM Reset and PM Complex Suspend
- Increase timeout in PM Complex Suspend from 10ms -> 500ms
- Disable CME monitoring of PGPE heart beat loss before halting PGPE
Key_Cronus_Test=PM_REGRESS
Change-Id: I3fbb435ce694e7590e9e9570107347a621828402
CQ: SW424102
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56884
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/56904
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
-rw-r--r-- | src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C index d1c2342ea..59904d7c3 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pstate_gpe_init.C @@ -42,6 +42,7 @@ #include <p9_ppe_utils.H> #include <p9_quad_scom_addresses.H> #include <p9_quad_scom_addresses_fld.H> +#include <p9n2_misc_scom_addresses.H> #include <vector> // ----------------------------------------------------------------------------- @@ -303,6 +304,22 @@ fapi2::ReturnCode pstate_gpe_reset( FAPI_IMP(">> pstate_gpe_reset..."); + + //Disable CME monitoring of PGPE heart beat loss before halting PGPE + auto l_eqChiplets = i_target.getChildren<fapi2::TARGET_TYPE_EQ> + (fapi2::TARGET_STATE_FUNCTIONAL); + + // For each functional EQ chiplet + for (auto l_quad_chplt : l_eqChiplets) + { + l_data64.flush<0>() + .setBit<EQ_QPPM_QPMMR_ENABLE_PCB_INTR_UPON_HEARTBEAT_LOSS>(); + + FAPI_TRY(fapi2::putScom(l_quad_chplt, EQ_QPPM_QPMMR_CLEAR, l_data64), + "ERROR: Failed to setup Quad PPM register"); + + } + // Program XCR to HALT PGPE FAPI_INF(" Send HALT command via XCR..."); l_data64.flush<0>().insertFromRight(p9hcd::HALT, 1, 3); |