From e05083bbd3e02927b9a9205d805bd87b6bb5f56c Mon Sep 17 00:00:00 2001 From: Bill Hoffa Date: Tue, 4 Jun 2019 12:55:49 -0500 Subject: [PATCH] Skip Alternate PNOR Validation on alt-master proc if lpc init fails - It is expected that the alt pnor validation step will fail if lpc init fails so this step should be skipped. The errors from lpc init are committed so that is already handled. Change-Id: I07ab852abd986d743bad86040ea9b13479926501 CQ: SW465693 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/78345 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Ilya Smirnov Reviewed-by: Daniel M Crowell Reviewed-by: Christian R Geddes Reviewed-by: William G Hoffa --- .../istep10/call_host_slave_sbe_update.C | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/usr/isteps/istep10/call_host_slave_sbe_update.C b/src/usr/isteps/istep10/call_host_slave_sbe_update.C index 1d12e2fcbea..d008e8cbd07 100644 --- a/src/usr/isteps/istep10/call_host_slave_sbe_update.C +++ b/src/usr/isteps/istep10/call_host_slave_sbe_update.C @@ -249,6 +249,7 @@ void* call_host_slave_sbe_update (void *io_pArgs) { errlHndl_t l_errl = NULL; IStepError l_StepError; + bool l_testAltMaster = true; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_slave_sbe_update entry" ); @@ -322,6 +323,7 @@ void* call_host_slave_sbe_update (void *io_pArgs) l_errl->removeDeconfigure(); // Commit error errlCommit( l_errl, HWPF_COMP_ID ); + l_testAltMaster = false; } else { @@ -334,14 +336,17 @@ void* call_host_slave_sbe_update (void *io_pArgs) // Call to Validate any Alternative Master's connection to PNOR // Any error returned should not fail istep - l_errl = PNOR::validateAltMaster(); - if (l_errl) + if (l_testAltMaster == true) { - //Remove any deconfigure information, we only need the PNOR Part callout and do not want - // to deconfigure the entire proc because of a PNOR part problem - l_errl->removeDeconfigure(); - // Commit error - errlCommit( l_errl, HWPF_COMP_ID ); + l_errl = PNOR::validateAltMaster(); + if (l_errl) + { + //Remove any deconfigure information, we only need the PNOR Part callout and do not want + // to deconfigure the entire proc because of a PNOR part problem + l_errl->removeDeconfigure(); + // Commit error + errlCommit( l_errl, HWPF_COMP_ID ); + } } // Set SEEPROM_VERSIONS_MATCH attributes for each processor