diff options
| author | Greg Still <stillgs@us.ibm.com> | 2017-02-24 11:04:01 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-04-13 10:28:37 -0400 |
| commit | f882d0def567c7d8fc5dea0faf1e3310cc9a674d (patch) | |
| tree | c79cc890a270946126f0c2b82b06074af141d78d /src/import | |
| parent | 9767648a2334b49567eddce8f21ec20be48ab3e3 (diff) | |
| download | talos-hostboot-f882d0def567c7d8fc5dea0faf1e3310cc9a674d.tar.gz talos-hostboot-f882d0def567c7d8fc5dea0faf1e3310cc9a674d.zip | |
Enable PGPE reset & init in the PM reset-init flow
Change-Id: I39b95edbeb6f53a2f2a336ff82c5875665ed2f25
RTC: 157096
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37006
Tested-by: Jenkins Server <pfd-jenkins+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: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37532
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import')
6 files changed, 11 insertions, 9 deletions
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.C index 4263a58f6..0568b7470 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.C @@ -196,12 +196,11 @@ fapi2::ReturnCode pm_init( // ************************************************************************ // Initialize the PSTATE GPE Engine // ************************************************************************ - /* TODO: RTC 157096: Enable pstate GPE initialization in PM_INIT phase FAPI_DBG("Executing p9_pm_pstate_gpe_init to initialize PGPE"); FAPI_EXEC_HWP(l_rc, p9_pm_pstate_gpe_init, i_target, p9pm::PM_INIT); FAPI_TRY(l_rc, "ERROR: Failed to initialize PGPE"); FAPI_TRY(p9_pm_glob_fir_trace(i_target, "After PGPE initialization")); - */ + // ************************************************************************ // Switch off OCC initiated special wakeup on EX to allowSTOP functionality // ************************************************************************ diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.H index 4757fbe64..5551c6dd0 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.H +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -48,6 +48,7 @@ #include <p9_pm_pba_init.H> #include <p9_pm_firinit.H> #include <p9_pm_stop_gpe_init.H> +#include <p9_pm_pstate_gpe_init.H> #include <p9_pm_occ_control.H> #include <p9_pm_reset.H> diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.mk b/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.mk index 2add8c512..bef78a492 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.mk +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_init.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016 +# Contributors Listed Below - COPYRIGHT 2016,2017 # [+] International Business Machines Corp. # # @@ -23,7 +23,9 @@ # # IBM_PROLOG_END_TAG PROCEDURE=p9_pm_init -libp9_pm_init_DEPLIBS += p9_pm_utils p9_pm_corequad_init p9_pm_ocb_init p9_pm_pss_init p9_pm_pba_init p9_pm_firinit p9_pm_stop_gpe_init p9_pm_occ_control p9_pm_reset +libp9_pm_init_DEPLIBS += p9_pm_utils p9_pm_corequad_init p9_pm_ocb_init p9_pm_pss_init +libp9_pm_init_DEPLIBS += p9_pm_pba_init p9_pm_firinit p9_pm_stop_gpe_init p9_pm_pstate_gpe_init +libp9_pm_init_DEPLIBS += p9_pm_occ_control p9_pm_reset $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/lib) $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/common/pmlib/include/registers) $(call BUILD_PROCEDURE) diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.C index cd53f0fa7..77e8308dd 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.C @@ -159,11 +159,9 @@ fapi2::ReturnCode p9_pm_reset( // Reset the PSTATE GPE (Bring it to HALT) // ************************************************************************ FAPI_DBG("Executing p9_pm_pstate_gpe_init to reset PGPE"); - /* TODO: RTC 157096 - Enable once the procedure is available FAPI_EXEC_HWP(l_rc, p9_pm_pstate_gpe_init, i_target, p9pm::PM_RESET); - FAPI_TRY(l_rc, "ERROR: Failed to reset PGPE"); + FAPI_TRY(l_rc, "ERROR: Failed to reset the PGPE"); FAPI_TRY(p9_pm_glob_fir_trace(i_target, "After reset of PGPE")); - */ // ************************************************************************ // Reset the STOP GPE (Bring it to HALT) diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.H index bf3890e48..7056dcac1 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.H +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.H @@ -57,6 +57,7 @@ #include <p9_pm_occ_sram_init.H> #include <p9_pm_ocb_init.H> #include <p9_pm_pss_init.H> +#include <p9_pm_pstate_gpe_init.H> typedef fapi2::ReturnCode (*p9_pm_reset_FP_t) ( const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&); diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.mk b/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.mk index 0e2b3307a..847172354 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.mk +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.mk @@ -25,7 +25,8 @@ PROCEDURE=p9_pm_reset libp9_pm_reset_DEPLIBS += p9_pm_utils p9_pm_occ_firinit p9_pm_firinit p9_pm_occ_control -libp9_pm_reset_DEPLIBS += p9_pm_stop_gpe_init p9_pm_occ_gpe_init p9_pm_corequad_init p9_pm_occ_sram_init p9_pm_ocb_init p9_pm_pss_init +libp9_pm_reset_DEPLIBS += p9_pm_pstate_gpe_init p9_pm_stop_gpe_init p9_pm_occ_gpe_init +libp9_pm_reset_DEPLIBS += p9_pm_corequad_init p9_pm_occ_sram_init p9_pm_ocb_init p9_pm_pss_init $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/lib) $(call ADD_MODULE_SRCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/common/pmlib/include/registers) $(call BUILD_PROCEDURE) |
