Skip to content

Commit

Permalink
Fix for SBE_P9_XIP_CUSTOMIZE_UNSUCCESSFUL during ipl with one EX
Browse files Browse the repository at this point in the history
Remove code that enforces having a minimum number of cores, allowing the
code to continue with the present cores.  Also add a trace to identify
that the minimum core count was not met.

Change-Id: I0d139d39824ad6eb57c14227e1366f96cdaf7ea7
CQ: SW418068
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59543
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: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
mgloff authored and dcrowell77 committed May 31, 2018
1 parent 3ee0baf commit 876b79a
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions src/usr/sbe/sbe_update.C
Original file line number Diff line number Diff line change
Expand Up @@ -1104,13 +1104,19 @@ namespace SBE
uint32_t desired_min_cores = ((is_fused_mode()) ? 2 : 1) *
sys->getAttr<ATTR_SBE_IMAGE_MINIMUM_VALID_ECS>();

// 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);
// Use desired minimum number of cores, but be less restrictive if
// fewer cores are found to be present
uint32_t min_cores = std::min(desired_min_cores, coreCount);
if(min_cores < desired_min_cores)
{
// Identify that the desired minimum core count was not met
TRACFCOMP( g_trac_sbe, INFO_MRK"procCustomizeSbeImg() - "
"Using fewer cores than desired minimum number of "
"cores. HUID=0x%X, coreCount=%d, coreMask=0x%.8X, "
"desired_min_cores=0x%X",
TARGETING::get_huid(i_target),
coreCount, coreMask, desired_min_cores);
}

while( coreCount >= min_cores )
{
Expand Down

0 comments on commit 876b79a

Please sign in to comment.