Skip to content

Commit

Permalink
Fix to SW473350: p9_xip_customize Vpd core fill bug
Browse files Browse the repository at this point in the history
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 <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: William G Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84630
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
  • Loading branch information
cmolsen authored and wghoffa committed Oct 4, 2019
1 parent 34f119b commit aea300c
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C
Expand Up @@ -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;
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit aea300c

Please sign in to comment.