diff options
| author | Greg Still <stillgs@us.ibm.com> | 2017-09-11 13:04:32 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-10-02 23:49:48 -0400 |
| commit | 64c2388d078163fc3bbe671f5f6084beca69c7be (patch) | |
| tree | 4202d351bbe24c65906fb5c6a11cac6ed808a8a9 | |
| parent | 1fe17ef6ff369ac8c1ae6b5a8b3cc294f8233a03 (diff) | |
| download | talos-hostboot-64c2388d078163fc3bbe671f5f6084beca69c7be.tar.gz talos-hostboot-64c2388d078163fc3bbe671f5f6084beca69c7be.zip | |
PM: clear OCB Heartbeat enable during pm_reset
Change-Id: Iff6f5b61c4dfeb32b20a20088c2cd95e1e9a8c60
RTC: 172638
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46027
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: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46031
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: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C | 11 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C index 52d4b4ad0..c296053ce 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.C @@ -666,7 +666,7 @@ fapi2::ReturnCode pm_ocb_reset( // hardware procedures. FAPI_TRY(fapi2::getScom(i_target, PU_PBAMODE_SCOM, l_buf64), "**** ERROR : Failed to fetch PBA mode control status"); - l_buf64.clearBit<8>(); + l_buf64.clearBit<PU_PBAMODE_EN_MARKER_ACK>(); FAPI_TRY(fapi2::putScom(i_target, PU_PBAMODE_SCOM, l_buf64), "**** ERROR : Failed to write PBA mode control"); @@ -674,6 +674,15 @@ fapi2::ReturnCode pm_ocb_reset( FAPI_TRY(fapi2::putScom(i_target, PU_OCB_PIB_OSTOESR, 0), "**** ERROR : Failed to write OSTESR"); + // Explicitly disable the OCC Heartbeat (RTC: 172638) + // Only clearing the OCB_OCI_OCCHBR_OCC_HEARTBEAT_EN and leaving the + // Heartbeat count intact as this may prove useful for debug later. + FAPI_TRY(fapi2::getScom(i_target, PU_OCB_OCI_OCCHBR_SCOM, l_buf64), + "**** ERROR : Failed to read OCBHBR"); + l_buf64.clearBit<PU_OCB_OCI_OCCHBR_OCC_HEARTBEAT_EN>(); + FAPI_TRY(fapi2::putScom(i_target, PU_OCB_OCI_OCCHBR_SCOM, l_buf64), + "**** ERROR : Failed to write OCBHBR"); + fapi_try_exit: return fapi2::current_err; } diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H index 174a531ef..8ec4aab93 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_init.H @@ -43,6 +43,7 @@ #include <p9_pm.H> #include <fapi2.H> #include <p9_misc_scom_addresses.H> +#include <p9_misc_scom_addresses_fld.H> //------------------------------------------------------------------------------ // Constants definitions |
