From c6bccc0240c385ed42737b915dee0543a2b54636 Mon Sep 17 00:00:00 2001 From: Thi Tran Date: Wed, 7 May 2014 08:11:52 -0500 Subject: SW259153: HMEER and LPCR should not be setup automatically by p8_xip_customize Change-Id: If63bc2ee78467b0645574b84894aa97a0fce31a3 CQ:SW259153 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10882 Reviewed-by: Daniel M. Crowell Reviewed-by: Thi N. Tran Tested-by: Thi N. Tran Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10999 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- .../p8_slw_build/p8_xip_customize.C | 45 +--------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C index a02821bf4..977b6276e 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C +++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_xip_customize.C @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: p8_xip_customize.C,v 1.69 2014/04/23 15:32:02 cmolsen Exp $ +// $Id: p8_xip_customize.C,v 1.70 2014/04/28 15:49:49 cmolsen Exp $ /*------------------------------------------------------------------------------*/ /* *! TITLE : p8_xip_customize */ /* *! DESCRIPTION : Obtains repair rings from VPD and adds them to either */ @@ -1805,49 +1805,6 @@ ReturnCode p8_xip_customize( const fapi::Target &i_target, - // ========================================================================== - // CUSTOMIZE item: Put RAMs in RAM table to support malfunction alert. - // Retrieval method: N/A. - // System phase: SLW sysPhase. (By MikeO) - // ========================================================================== - uint8_t threadId; - uint64_t lpcrData=(uint64_t)0x00005000; // Set bit(49) and bit(51). - uint64_t hmeerData=((uint64_t)0x80000000)<<32; // Set bit(0). - for (coreId=0; coreId<=15; coreId++) { - // Do the LPCR rams. - for (threadId=0; threadId<=7; threadId++) { - rcLoc = p8_pore_gen_cpureg_fixed( - o_imageOut, - i_modeBuild, - (uint32_t)P8_SPR_LPCR, - lpcrData, - coreId, - threadId); - if (rcLoc) { - FAPI_ERR("Updating RAM table w/LPCR ram unsuccessful (rcLoc=%i)\n",rcLoc); - uint32_t & RC_LOCAL = rcLoc; - FAPI_SET_HWP_ERROR(rc, RC_PROC_XIPC_GEN_RAM_ERROR); - return rc; - } - } // End of for(threadId) - // Do the HMEER rams. - rcLoc = p8_pore_gen_cpureg_fixed( - o_imageOut, - i_modeBuild, - (uint32_t)P8_SPR_HMEER, - hmeerData, - coreId, - 0); - if (rcLoc) { - FAPI_ERR("Updating RAM table w/HMEER ram unsuccessful (rcLoc=%i)\n",rcLoc); - uint32_t & RC_LOCAL = rcLoc; - FAPI_SET_HWP_ERROR(rc, RC_PROC_XIPC_GEN_RAM_ERROR); - return rc; - } - } // End of for(coreId) - - - // ========================================================================== // CUSTOMIZE item: Workaround for HW273115. (By MikeO) // Descr.: If ivrm-enabled, initialize ivrm in special way for -- cgit v1.2.1