From 54a8d9a839e8127991e5b582045d1a44ea526007 Mon Sep 17 00:00:00 2001 From: Greg Still Date: Thu, 25 Jan 2018 21:15:47 -0600 Subject: PM: Use auto-special wake-up to cover PM complex reset window - Removes SGPE Activity checking in Special Wake-up - Added LMCR scom error check - Fixed some bugs in lmcr check CQ: SW412666 CMVC-Prereq: 1045635 Change-Id: I10948635f3f3b26fe4d9d38f79e13c09a290140a Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52690 Tested-by: FSP CI Jenkins Tested-by: PPE CI Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: Hostboot CI Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA Reviewed-by: Gregory S. Still Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52696 Tested-by: Jenkins OP Build CI Reviewed-by: Christian R. Geddes Tested-by: Christian R. Geddes --- .../p9/procedures/hwp/pm/p9_cpu_special_wakeup_lib.H | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_lib.H') diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_lib.H b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_lib.H index 3283c73bf..3ee14e267 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_lib.H +++ b/src/import/chips/p9/procedures/hwp/pm/p9_cpu_special_wakeup_lib.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -45,6 +45,7 @@ static const uint32_t NUM_CHIPLET_TYPES = 2; static const uint32_t NUM_ENTITIES = 4; +#define PIB_CHIPLET_OFFLINE_ERR 0x2 /** @@ -670,20 +671,6 @@ fapi2::ReturnCode _special_wakeup(const fapi2::Target& i_chipletTarget, { case p9specialWakeup::SPCWKUP_ENABLE: - // Check if PM subsystem is ready for SPW - // Moved under wakeup enable, because always want to let - // SPW to be cleared - FAPI_TRY(fapi2::getScom(l_parentTarget, - PU_OCB_OCI_OCCFLG_SCOM, - occFlagReg), - "GetScom of OCC Flag Register Failed"); - - if( !occFlagReg.getBit() ) - { - FAPI_INF("SGPE not active. STOP Sub-System not ready for special wakeup" ); - break; - } - // Select the addresses to use based on the entity FAPI_TRY(spwkup_setup_entity(i_chipletTarget, i_entity, io_processing_values), "Error: spwkup_setup_entity failed"); -- cgit v1.2.1