diff options
| author | Greg Still <stillgs@us.ibm.com> | 2017-09-11 13:04:32 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2017-09-20 10:45:43 -0400 |
| commit | e52f9abcc8460f0bdb2c02c09d1678ddf9dab6ed (patch) | |
| tree | a4c742061bcb26f0a661e7e30a8753682fc8bb2e /src/import/chips | |
| parent | 00050046029d53269663bf5ff9527f81b74baca5 (diff) | |
| download | talos-sbe-e52f9abcc8460f0bdb2c02c09d1678ddf9dab6ed.tar.gz talos-sbe-e52f9abcc8460f0bdb2c02c09d1678ddf9dab6ed.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/46030
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/import/chips')
| -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 66e77022..8cad338c 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 fb181014..a6959914 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 |
