From 0ad25294028f7048184f5653ad6fbf730abe6ed3 Mon Sep 17 00:00:00 2001 From: Brian Vanderpool Date: Fri, 20 Jan 2017 16:22:55 -0600 Subject: [PATCH] Fix clearing CME_FLAGS to use EX target instead of EQ target Change-Id: Ifb86d69e71994c3a1b286e910c1729bde21bb515 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35189 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: ASHISH A. MORE Reviewed-by: AMIT KUMAR Reviewed-by: Gregory S. Still Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35197 Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Reviewed-by: Daniel M. Crowell --- .../p9/procedures/hwp/pm/p9_pm_corequad_init.C | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_corequad_init.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_corequad_init.C index 1c6ff7ca995..d80ed81ea28 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_corequad_init.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_corequad_init.C @@ -210,12 +210,6 @@ fapi2::ReturnCode pm_corequad_init( FAPI_TRY(fapi2::putScom(l_quad_chplt, l_address, l_data64), "ERROR: Failed to restore the QUAD PPM Error Mask"); - // Clear CME Flags - FAPI_INF("Clear CME Flags"); - l_data64.flush<1>(); - l_address = EQ_CME_SCOM_FLAGS_CLEAR; - FAPI_TRY(fapi2::putScom(l_quad_chplt, l_address, l_data64), - "ERROR: Failed to reset CME Flags"); auto l_exChiplets = l_quad_chplt.getChildren (fapi2::TARGET_STATE_FUNCTIONAL); @@ -231,6 +225,15 @@ fapi2::ReturnCode pm_corequad_init( l_ex_chplt); FAPI_DBG("EX number = %d", l_chpltNumber); + // Clear CME Flags + FAPI_INF("Clear CME Flags"); + l_data64.flush<1>(); + // SCOM1 is the CLEAR address + l_address = EX_CME_SCOM_FLAGS_SCOM1; + FAPI_TRY(fapi2::putScom(l_ex_chplt, l_address, l_data64), + "ERROR: Failed to reset CME Flags"); + + // Setup / Clear CME SRAM Scrub // Set bit 1 : SRAM SCRUB enable // Clear bits 47 - 59: SRAM SCRUB index