diff options
| author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2019-10-01 15:37:33 -0500 |
|---|---|---|
| committer | William G Hoffa <wghoffa@us.ibm.com> | 2019-10-04 09:27:06 -0500 |
| commit | aea300c8e6a596170fc44d06571798b5116e47a0 (patch) | |
| tree | ae9c4edf0b40f9a278e9391350fd3a34e29dc102 /src/import/chips/p9/procedures | |
| parent | 34f119b59886e06b837413527db117887380280c (diff) | |
| download | talos-hostboot-aea300c8e6a596170fc44d06571798b5116e47a0.tar.gz talos-hostboot-aea300c8e6a596170fc44d06571798b5116e47a0.zip | |
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 <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>
Diffstat (limited to 'src/import/chips/p9/procedures')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C | 12 |
1 files 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 f822282b5..b6412b206 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. |
