diff options
| author | Amit Kumar <akumar3@us.ibm.com> | 2016-12-22 14:46:33 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-01-19 17:37:14 -0500 |
| commit | ce4132b0c816920620329fd4c147c04d218fcfac (patch) | |
| tree | 83184479d2390ec59836b3bde9d8a2e3a32cf510 /src | |
| parent | f2c1df8466f3276890478c382c64397d27efe37c (diff) | |
| download | talos-hostboot-ce4132b0c816920620329fd4c147c04d218fcfac.tar.gz talos-hostboot-ce4132b0c816920620329fd4c147c04d218fcfac.zip | |
p9_pm_stop_gpe_init: added a check
- now checking OCCFLAG register to make sure SGPE_ACTIVE was not set
- if SGPE_ACTIVE is set, then procedure will reset that bit and continue
Change-Id: I43c7b6b650967dff07fa9917d37bb06974c3716d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34183
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: ADAM S. HALE <ashale@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34185
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C | 14 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml | 13 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C index d2c1c4e13..38b5868ea 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_stop_gpe_init.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -237,6 +237,18 @@ fapi2::ReturnCode stop_gpe_init( FAPI_IMP(">> stop_gpe_init......"); + // First check if SGPE_ACTIVE is not set in OCCFLAG register + FAPI_TRY(getScom(i_target, PU_OCB_OCI_OCCFLG_SCOM, l_occ_flag)); + + if (l_occ_flag.getBit<p9hcd::SGPE_ACTIVE>() == 1) + { + FAPI_INF("WARNING: SGPE_ACTIVE flag is already set in OCCFLAG register, continuing with after clearing that active_bit"); + l_occ_flag.flush<0>(); + l_occ_flag.setBit<p9hcd::SGPE_ACTIVE>(); + FAPI_TRY(putScom(i_target, PU_OCB_OCI_OCCFLG_CLEAR, l_occ_flag), + "ERROR: Failed to clear sgpe_active bit in OCCFLG register"); + } + FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_STOPGPE_BOOT_COPIER_IVPR_OFFSET, i_target, l_ivpr_offset), diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml index a59eb093d..e4456f28f 100644 --- a/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml +++ b/src/import/chips/p9/procedures/xml/error_info/p9_pm_stop_gpe_init_errors.xml @@ -5,7 +5,7 @@ <!-- --> <!-- OpenPOWER HostBoot Project --> <!-- --> -<!-- Contributors Listed Below - COPYRIGHT 2016 --> +<!-- Contributors Listed Below - COPYRIGHT 2016,2017 --> <!-- [+] International Business Machines Corp. --> <!-- --> <!-- --> @@ -32,6 +32,17 @@ </hwpError> <!-- ******************************************************************** --> <hwpError> + <rc>RC_STOP_GPE_INIT_ACTIVE_FLAG_SET</rc> + <description> SGPE_ACTIVE Flag is already set when stop_gpe_init was called. + </description> + <collectRegisterFfdc> + <id>SGPE_FFDC_REGISTERS</id> + <target>CHIP</target> + <targetType>TARGET_TYPE_PROC_CHIP</targetType> + </collectRegisterFfdc> + </hwpError> + <!-- ******************************************************************** --> + <hwpError> <rc>RC_STOP_GPE_INIT_TIMEOUT</rc> <description> Stop GPE init timed out while waiting for SGPE Active in OCCFLG register. </description> |
