From e465a8ea286e7a8d72cc0953b381fd2691950f6f Mon Sep 17 00:00:00 2001 From: Sachin Gupta Date: Mon, 17 Jul 2017 00:48:13 -0500 Subject: Enabled p9_suspend_powman.C CMVC-Prereq: 1029951 Change-Id: If91f458e208dda1fb20e9e5d91af0eb4052805de Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43193 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk | 1 + src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk | 1 + src/sbefw/sbecmdiplcontrol.C | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk b/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk index 0aa65e9b..b4bc9e0f 100644 --- a/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk +++ b/src/build/import_hwp_mk/istepmpipl/istepmpiplfiles.mk @@ -50,6 +50,7 @@ ISTEPMPIPL-CPP-SOURCES +=p9_quad_power_off.C ISTEPMPIPL-CPP-SOURCES +=p9_pm_pfet_control.C ISTEPMPIPL-CPP-SOURCES +=p9_suspend_io.C ISTEPMPIPL-CPP-SOURCES +=p9_perv_sbe_cmn.C +ISTEPMPIPL-CPP-SOURCES +=p9_suspend_powman.C ISTEPMPIPL-C-SOURCES = ISTEPMPIPL-S-SOURCES = diff --git a/src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk b/src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk index 1b338f79..39edd599 100644 --- a/src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk +++ b/src/import/chips/p9/procedures/xml/error_info/hwpErrors.mk @@ -79,3 +79,4 @@ ERROR_XML_FILES += $(PERV_CURR_DIR)/p9_quad_power_off_errors.xml ERROR_XML_FILES += $(PERV_CURR_DIR)/p9_fastarray_errors.xml ERROR_XML_FILES += $(PERV_CURR_DIR)/p9_suspend_io_errors.xml ERROR_XML_FILES += $(PERV_CURR_DIR)/p9_sbe_ppe_utils.xml +ERROR_XML_FILES += $(PERV_CURR_DIR)/p9_suspend_powman_errors.xml diff --git a/src/sbefw/sbecmdiplcontrol.C b/src/sbefw/sbecmdiplcontrol.C index 9ccc9ea7..6e1b4e3e 100644 --- a/src/sbefw/sbecmdiplcontrol.C +++ b/src/sbefw/sbecmdiplcontrol.C @@ -102,6 +102,7 @@ #include "p9_quad_power_off.H" #include "p9_hcd_cache_stopclocks.H" #include "p9_stopclocks.H" +#include "p9_suspend_powman.H" #include "sbeXipUtils.H" // For getting hbbl offset #include "sbeutil.H" // For getting SBE_TO_NEST_FREQ_FACTOR @@ -247,8 +248,8 @@ static istepMap_t g_istepMpiplStartPtrTbl[MPIPL_START_MAX_SUBSTEPS] = // Place holder for StartMpipl, State Change, PHB State Update // Set MPIPL mode in Sratch Reg 3 { &istepStartMpipl, NULL }, - // Find all the child cores within proc and call set block intr - { &istepWithCoreSetBlock, { .coreBlockIntrHwp = &p9_block_wakeup_intr }}, + // Call suspend powerman + { &istepWithProc, { .procHwp = &p9_suspend_powman }}, // Find all the child cores within proc and call hwp to know the // scom state and call instruction control { &istepWithCoreState, { .coreScomStateHwp = &p9_query_core_access_state }}, -- cgit v1.2.1