From 876b79aacd9b14f4c3561e954daa0285747c9662 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Wed, 30 May 2018 08:41:29 -0500 Subject: Fix for SBE_P9_XIP_CUSTOMIZE_UNSUCCESSFUL during ipl with one EX 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 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes Reviewed-by: Corey V. Swenson Reviewed-by: Daniel M. Crowell --- src/usr/sbe/sbe_update.C | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/usr/sbe/sbe_update.C b/src/usr/sbe/sbe_update.C index 9ac74fdbb..c930706cc 100644 --- a/src/usr/sbe/sbe_update.C +++ b/src/usr/sbe/sbe_update.C @@ -1104,13 +1104,19 @@ namespace SBE uint32_t desired_min_cores = ((is_fused_mode()) ? 2 : 1) * sys->getAttr(); - // Find out what chip it is - // If NIMBUS DD1, be less restrictive - uint32_t min_cores = - ( (i_target->getAttr() == MODEL_NIMBUS) && - (i_target->getAttr() >= 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 ) { -- cgit v1.2.1