diff options
3 files changed, 23 insertions, 4 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_core.C b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_core.C index 4f365c3d9..155568414 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_core.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_core.C @@ -69,7 +69,6 @@ fapi2::ReturnCode p9_cpu_special_wakeup_core( auto l_exTarget = i_target.getParent<fapi2::TARGET_TYPE_EX>(); auto l_eqTarget = i_target.getParent<fapi2::TARGET_TYPE_EQ>(); auto l_procChip = i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); - FAPI_TRY( getScom( l_procChip, PU_OCB_OCI_OCCFLG_SCOM, l_sgpeActive ) ); FAPI_ATTR_GET( fapi2::ATTR_CHIP_UNIT_POS, i_target, l_corePos ); FAPI_ATTR_GET( fapi2::ATTR_CORE_INSIDE_SPECIAL_WAKEUP, @@ -89,6 +88,13 @@ fapi2::ReturnCode p9_cpu_special_wakeup_core( } p9specialWakeup::blockWakeupRecurssion( l_eqTarget, p9specialWakeup::BLOCK ); + l_rc = getScom( l_procChip, PU_OCB_OCI_OCCFLG_SCOM, l_sgpeActive ); + + if( l_rc ) + { + FAPI_ERR( "Failed To Read OCC Flag Register" ); + return l_rc; + } //Special wakeup request can't be serviced if //SGPE did not boot and auto-special wakeup is not enabled. diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_eq.C b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_eq.C index 36d15ba2d..16e13f684 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_eq.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_eq.C @@ -67,7 +67,6 @@ fapi2::ReturnCode p9_cpu_special_wakeup_eq( auto l_procChip = i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); FAPI_ATTR_GET( fapi2::ATTR_CHIP_UNIT_POS, i_target, l_eqPos ); - FAPI_TRY( getScom( l_procChip, PU_OCB_OCI_OCCFLG_SCOM, l_sgpeActive ) ); FAPI_ATTR_GET( fapi2::ATTR_EQ_INSIDE_SPECIAL_WAKEUP, i_target, @@ -85,6 +84,13 @@ fapi2::ReturnCode p9_cpu_special_wakeup_eq( } p9specialWakeup::blockWakeupRecurssion( i_target, p9specialWakeup::BLOCK ); + l_rc = getScom( l_procChip, PU_OCB_OCI_OCCFLG_SCOM, l_sgpeActive ); + + if( l_rc ) + { + FAPI_ERR( "Failed To Read OCC Flag Register" ); + return l_rc; + } //Special wakeup request can't be serviced if //SGPE did not boot. diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_ex.C b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_ex.C index bf063ace0..05e870e5b 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_ex.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_ex.C @@ -66,9 +66,8 @@ fapi2::ReturnCode p9_cpu_special_wakeup_ex( uint8_t l_spWakeUpInProg = 0; auto l_eqTarget = i_target.getParent<fapi2::TARGET_TYPE_EQ>(); auto l_procChip = i_target.getParent<fapi2::TARGET_TYPE_PROC_CHIP>(); - FAPI_ATTR_GET( fapi2::ATTR_CHIP_UNIT_POS, i_target, l_exPos ); - FAPI_TRY( getScom( l_procChip, PU_OCB_OCI_OCCFLG_SCOM, l_sgpeActive ) ); + FAPI_ATTR_GET( fapi2::ATTR_CHIP_UNIT_POS, i_target, l_exPos ); FAPI_ATTR_GET( fapi2::ATTR_EX_INSIDE_SPECIAL_WAKEUP, i_target, l_spWakeUpInProg ); @@ -86,6 +85,14 @@ fapi2::ReturnCode p9_cpu_special_wakeup_ex( p9specialWakeup::blockWakeupRecurssion( l_eqTarget, p9specialWakeup::BLOCK ); + l_rc = getScom( l_procChip, PU_OCB_OCI_OCCFLG_SCOM, l_sgpeActive ); + + if( l_rc ) + { + FAPI_ERR( "Failed To Read OCC Flag Register" ); + return l_rc; + } + //Special wakeup request can't be serviced if //SGPE did not boot auto Special wakeup not enabled if( !l_sgpeActive.getBit( SGPE_ACTIVE_BIT ) ) |
