From 13b0dd8972961a31791f15388e39add7be77e1c0 Mon Sep 17 00:00:00 2001 From: Prasad Bg Ranganath Date: Tue, 9 Jan 2018 00:03:11 -0600 Subject: FW910: PM reset procedure fix, move psafe update after CME halts Change-Id: Ib46774546db70f67a14bdd6fb83711e9dff6b782 CQ:SW395378 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51659 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Reviewed-by: Gregory S. Still Tested-by: Hostboot CI Reviewed-by: Brian T. Vanderpool Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51661 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- src/import/chips/p9/procedures/hwp/pm/p9_pm_reset.C | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/import/chips/p9/procedures/hwp/pm') 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 d8b01789e..4c633c0bc 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 @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2017 */ +/* Contributors Listed Below - COPYRIGHT 2015,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -156,11 +156,6 @@ fapi2::ReturnCode p9_pm_reset( FAPI_TRY(p9_pm_glob_fir_trace(i_target, "After reset of SGPE")); - // ************************************************************************ - // Move PSAFE values to DPLL and Ext Voltage - // ************************************************************************ - FAPI_TRY(p9_pm_reset_psafe_update(i_target), - "Error from p9_pm_reset_psafe_update"); // ************************************************************************ // Clear the OCC Flag and Scratch2 registers // which contain runtime settings and modes for PM GPEs (Pstate and Stop functions) @@ -186,6 +181,13 @@ fapi2::ReturnCode p9_pm_reset( FAPI_TRY(l_rc, "ERROR: Failed to reset cores & quads"); FAPI_TRY(p9_pm_glob_fir_trace(i_target, "After reset of core quad")); + // ************************************************************************ + // Move PSAFE values to DPLL and Ext Voltage + // ************************************************************************ + FAPI_TRY(p9_pm_reset_psafe_update(i_target), + "Error from p9_pm_reset_psafe_update"); + + // ************************************************************************ // Issue reset to OCC-SRAM // ************************************************************************ -- cgit v1.2.1