From c60090e7991a7df52483a809b4026834dfabe1e0 Mon Sep 17 00:00:00 2001 From: Prem Shanker Jha Date: Tue, 23 May 2017 04:17:17 -0500 Subject: [PATCH] PM: Introduced a macro for core common ring. HW-Image-Prereq: Id684ecb68d987f6ecd3f2e0476ab9aa2adce338f Change-Id: Ia1c450445b69052ca6f83e026075e48b82d4bdb1 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40827 Tested-by: Jenkins Server Tested-by: Hostboot CI Reviewed-by: Juan R. Medina Reviewed-by: Gregory S. Still Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40829 Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- .../chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H | 1 + src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C | 4 ++-- src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H index ffaf0bb251a..73025e27622 100644 --- a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H +++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H @@ -66,6 +66,7 @@ namespace p9_hcodeImageBuild */ #define MAX_HOMER_QUAD_CMN_RINGS (uint32_t)(EQ::g_eqData.iv_num_common_rings - 4) +#define MAX_HOMER_CORE_CMN_RINGS (uint32_t)(EC::g_ecData.iv_num_common_rings - 2) /** * @brief models QPMR header in HOMER diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C index 7d0ec6431d0..c70138ee714 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.C @@ -2139,7 +2139,7 @@ uint32_t layoutCmnRingsForCme( Homerlayout_t* i_pHomer, break; } - for( uint32_t ringIndex = 0; ringIndex < EC::g_ecData.iv_num_common_rings; + for( uint32_t ringIndex = 0; ringIndex < MAX_HOMER_CORE_CMN_RINGS; ringIndex++ ) { ringSize = i_ringData.iv_sizeWorkBuf1; @@ -2395,7 +2395,7 @@ uint32_t layoutCmeScanOverride( Homerlayout_t* i_pHomer, uint8_t* pOverrideRingPayload = pOverrideStart + CORE_COMMON_RING_INDEX_SIZE; bool overrideNotFound = true; - for( uint8_t ringIndex = 0; ringIndex < EC::g_ecData.iv_num_common_rings; + for( uint8_t ringIndex = 0; ringIndex < MAX_HOMER_CORE_CMN_RINGS; ringIndex++ ) { tempBufSize = i_ringData.iv_sizeWorkBuf2; diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C index 83fc7e7727e..aba895c589a 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C +++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C @@ -386,7 +386,7 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_ { ec_repr, 23 }, }; - for( ringIndex = 0; ringIndex < EC::g_ecData.iv_num_common_rings; ringIndex++ ) + for( ringIndex = 0; ringIndex < MAX_HOMER_CORE_CMN_RINGS; ringIndex++ ) { iv_cmnRingMap[ringIndex] = l_coreCmnRings[ringIndex]; }