diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2017-02-02 10:16:14 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-02-02 16:17:54 -0500 |
| commit | d7058975ebf6059bc79893dd5fbd624a8ce42eb6 (patch) | |
| tree | 232cdc61799bf4a849b62174becbf3a9c19fe155 /src/usr/sbe | |
| parent | a42bbccdd949bc4b78e856087019c73a126420d4 (diff) | |
| download | blackbird-hostboot-d7058975ebf6059bc79893dd5fbd624a8ce42eb6.tar.gz blackbird-hostboot-d7058975ebf6059bc79893dd5fbd624a8ce42eb6.zip | |
IPL: BC8A2211 - SBE_P9_XIP_CUSTOMIZE_UNSUCCESSFUL
Modify core count to be the minimum of what is desired and what is available.
Change-Id: I0859db40944571e084ec2c8aa338ccf1a4c909e6
CQ: SW378586
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35811
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/sbe')
| -rw-r--r-- | src/usr/sbe/sbe_update.C | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 752984105..52818337e 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1187,9 +1187,9 @@ namespace SBE // setup loop parameters coreCount = __builtin_popcount(coreMask); - uint32_t min_cores = + uint32_t desired_min_cores = ((is_fused_mode()) ? 2 : 1) * sys->getAttr<ATTR_SBE_IMAGE_MINIMUM_VALID_ECS>(); - min_cores *= (is_fused_mode()) ? 2 : 1; // double minimum for fused + uint32_t min_cores = std::min(desired_min_cores, coreCount); while( coreCount >= min_cores ) { @@ -1347,10 +1347,11 @@ namespace SBE TRACFCOMP( g_trac_sbe, ERR_MRK"procCustomizeSbeImg() - " "Failure to successfully complete p9_xip_customize()" ". HUID=0x%X, rc=0x%X, coreCount=%d, coreMask=0x%.8X" - " procIOMask=0x%.8X, maxCores=0x%X, min_cores=0x%X", + " procIOMask=0x%.8X, maxCores=0x%X, min_cores=0x%X, " + "desired_min_cores=0x%X", TARGETING::get_huid(i_target), ERRL_GETRC_SAFE(err), coreCount, coreMask, procIOMask, maxCores, - min_cores); + min_cores, desired_min_cores); /*@ * @errortype * @moduleid SBE_CUSTOMIZE_IMG |
