diff options
author | Dzuy Nguyen <dzuy@us.ibm.com> | 2017-08-16 14:01:09 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-22 23:39:31 -0400 |
commit | e69d62d593c031559e3749f186b6af31df0cf888 (patch) | |
tree | 958be87614c5499d69283599af8c9935413c037c /src/usr/sbe | |
parent | 35a9e7caf073148f670db462410c2ccd14e67baf (diff) | |
download | talos-hostboot-e69d62d593c031559e3749f186b6af31df0cf888.tar.gz talos-hostboot-e69d62d593c031559e3749f186b6af31df0cf888.zip |
Check for Minimum Number of Cores (depending on system) during SBE Update
Change-Id: I0ae673a82878cff5da703ee0955e86310142d00a
RTC: 169067
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44696
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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, 8 insertions, 1 deletions
diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 57997ab3d..8dc2eb34f 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1051,7 +1051,14 @@ namespace SBE coreCount = __builtin_popcount(coreMask); uint32_t desired_min_cores = ((is_fused_mode()) ? 2 : 1) * sys->getAttr<ATTR_SBE_IMAGE_MINIMUM_VALID_ECS>(); - uint32_t min_cores = std::min(desired_min_cores, coreCount); + + // Find out what chip it is + // If NIMBUS DD1, be less restrictive + uint32_t min_cores = + ( (i_target->getAttr<ATTR_MODEL>() == MODEL_NIMBUS) && + (i_target->getAttr<TARGETING::ATTR_EC>() >= 0x20) ) ? + desired_min_cores : + std::min(desired_min_cores, coreCount); while( coreCount >= min_cores ) { |