From aa122e3e9e5a89aae9fe501102ec9e3d1c93363d Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Wed, 23 Oct 2019 10:03:27 -0500 Subject: Don't consider processor's OMI freq if it is 0 when freq restrictions We have been told that processors must run at the same OMI frequency. During bringup we saw that if the first boot was done with one of the processors guarded out, and that processor was later unguarded. We would fail the check that ensures these frequencies are the same, because the proc that was guarded/unguarded would still be 0 where the other would be set. This change will allow us to ignore processors with unset frequency so we can boot far enough to set it. Later on the rule will be enforced as well on subsequent boots. Change-Id: I23950371f6f65750aacb07b28317ba11a3a4e8ab Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/85832 Reviewed-by: Matt Derksen Reviewed-by: Roland Veloz Tested-by: Jenkins Server Reviewed-by: Nicholas E Bofferding --- src/usr/fapi2/attribute_service.C | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/usr') diff --git a/src/usr/fapi2/attribute_service.C b/src/usr/fapi2/attribute_service.C index 3cc11d60b..c909467f5 100644 --- a/src/usr/fapi2/attribute_service.C +++ b/src/usr/fapi2/attribute_service.C @@ -2808,10 +2808,12 @@ errlHndl_t getOmiFreqAndVco(TARGETING::ATTR_FREQ_OMI_MHZ_type & o_omiFreq, TARGETING::ATTR_FREQ_OMI_MHZ_type l_omiFreqToCmp = l_procsList[i]->getAttr(); TARGETING::ATTR_OMI_PLL_VCO_type l_omiVcoToCmp = l_procsList[i]->getAttr(); - // If we found that this processor's OMI freq / vco values do not match the first processor's values then + // If this processors OMI freq is 0 then we have not determined this proc's OMI freq yet so we can ignore it. + // Otherwise, if we found that this processor's OMI freq / vco values do not match the first processor's values then // return an error - if (l_omiFreqToCmp != o_omiFreq || - l_omiVcoToCmp != o_omiVco ) + if ((l_omiFreqToCmp != 0) && + (l_omiFreqToCmp != o_omiFreq || + l_omiVcoToCmp != o_omiVco )) { FAPI_ERR("platGetMcPllBucket: Detected two processors with difference OMI VCO / FREQ combinations." " Proc 0x%.08X has OMI freq = %d and OMI vco = %d. " -- cgit v1.2.1