From aea300c8e6a596170fc44d06571798b5116e47a0 Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Tue, 1 Oct 2019 15:37:33 -0500 Subject: [PATCH] Fix to SW473350: p9_xip_customize Vpd core fill bug This commit fixes the returning of RC_XIPC_IMAGE_WOULD_OVERFLOW even though the minimum requires cores has been filled. Change-Id: Iac1031c56b60ce58ec1b9c1463566af04be5c3be Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84619 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: Hostboot CI Tested-by: HWSV CI Reviewed-by: William G Hoffa Reviewed-by: Daniel M Crowell Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84630 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW --- .../p9/procedures/hwp/customize/p9_xip_customize.C | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C index f822282b5d6..b6412b206fe 100644 --- a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C +++ b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C @@ -2615,8 +2615,9 @@ ReturnCode p9_xip_customize ( if ((uint32_t)l_fapiRc == RC_XIPC_IMAGE_WOULD_OVERFLOW) { - FAPI_INF("p9_xip_customize(): Image is full. Ran out of space appending VPD rings" - " to the .rings section"); + FAPI_INF("p9_xip_customize(): Image is full. Ran out of space appending VPD" + " rings to the .rings section. Now checking if min required cores" + " is satisfied."); // Check the bootCoreMask to determine if enough cores have been configured. uint8_t attrMinReqdEcs = 0; @@ -2656,11 +2657,14 @@ ReturnCode p9_xip_customize ( "Image buffer would overflow before reaching the minimum required" " number of EC boot cores" ); + fapi2::current_err = FAPI2_RC_SUCCESS; + } + else + { + fapi2::current_err = l_fapiRc; } - fapi2::current_err = l_fapiRc; goto fapi_try_exit; - } // More size code sanity checks of section and image sizes.