Skip to content

Commit

Permalink
Enable setting the stop recovery enabled/disable policy in SGPE Init
Browse files Browse the repository at this point in the history
Reenable (re)setting STOP_RECOVERY_TRIGGER_ENABLE bit in P9N2_PU_OCB_OCI_OCCFLG2
as part of p9_pm_stop_gpe_init before initializing the Stop GPE

Key_Cronus_Test=PM_REGRESS

Change-Id: Id465e04ace93ccc3e64d47d8530e053bfad92c3a
CQ: SW417906
CMVC-Prereq: 1045730
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54340
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.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/54342
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>
  • Loading branch information
am10dolkar authored and dcrowell77 committed Feb 25, 2018
1 parent 431a3cc commit def84fb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
6 changes: 6 additions & 0 deletions src/build/citest/etc/workarounds.presimsetup
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,15 @@ echo "+++ Need to alter where we look for pnor images so they will be picked up
mkdir -p $sb/simu/data
echo "+++ Need to pick up simics fix first"
sbex -t 1043138


chmod +w $sb/simu/data/simicsInfo
egrep -v "nimbus.pnor|cumulus.pnor" $sb/simu/data/simicsInfo > $sb/simu/data/simicsInfo.new
mv $sb/simu/data/simicsInfo.new $sb/simu/data/simicsInfo
echo "IMGS:NIMBUS_PNOR_IMG | FLASH:nimbus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
echo "IMGS:BOSTON_PNOR_IMG | FLASH:nimbus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo
echo "IMGS:CUMULUS_PNOR_IMG | FLASH:cumulus.pnor | LOC:SB_CHAIN/images/ppc/lab/flash" >> $sb/simu/data/simicsInfo


echo "+++ Grab HCODE"
sbex -t 1045730
4 changes: 0 additions & 4 deletions src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,6 @@ fapi2::ReturnCode p9_pm_stop_gpe_init(
.insertFromRight<4, 4>(0xA); // FIT
FAPI_TRY(fapi2::putScom(i_target, PU_GPE3_GPETSEL_SCOM, l_data64));

// @TODO via CQ SW417195: Renable this once FW Simics support is in.
// Writing OCC FLG2 breaks HB CIs
#if 0
// Set the Malf Alert Enabled policy to OCCFLG2 reg bit 29
FAPI_IMP ("Malf Alert Policy Enabled: %d", malfAlertEnable);

Expand All @@ -335,7 +332,6 @@ fapi2::ReturnCode p9_pm_stop_gpe_init(
}

FAPI_IMP ("Malf Alert Policy Set to OCC FLAG2 .. now init SGPE");
#endif

// Boot the STOP GPE
FAPI_TRY(stop_gpe_init(i_target), "ERROR: failed to initialize Stop GPE");
Expand Down

0 comments on commit def84fb

Please sign in to comment.