diff options
| author | Mike Baiocchi <baiocchi@us.ibm.com> | 2014-09-30 13:27:57 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-10-02 15:31:52 -0500 |
| commit | 5c07a9aed24ec11be423b80771d0870d218bd07c (patch) | |
| tree | 0bdb7830ac2acfa821bb3b582184bb965de53edc | |
| parent | be9cd0c114ca51fa30c1b92646a79c0f265fde54 (diff) | |
| download | talos-hostboot-5c07a9aed24ec11be423b80771d0870d218bd07c.tar.gz talos-hostboot-5c07a9aed24ec11be423b80771d0870d218bd07c.zip | |
Add Mnfg mode check around Alt-Master PNOR validation call
Only if MNFG_THRESHOLDS flag is active will the Alt-Master PNOR validation
function be called in istep 9.2.
Change-Id: I181fd181978b74b08c91ad7bdf078619d1eca6bb
CQ: SW279792
Backport: release-fips820
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13676
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C index 1bcd6c6cd..44513ef98 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C +++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C @@ -54,6 +54,7 @@ // targeting support #include <targeting/common/commontargeting.H> #include <targeting/common/utilFilter.H> +#include <targeting/common/target.H> // fapi support #include <fapi.H> @@ -370,14 +371,28 @@ void * call_host_slave_sbe_update( void * io_pArgs ) } // Call to Validate any Alternative Master's connection to PNOR + // Only call this in MNFG mode // Any error returned should not fail istep - l_errl = PNOR::validateAltMaster(); - if (l_errl) + + // Get target service and the system target + TargetService& tS = targetService(); + TARGETING::Target* sys = NULL; + (void) tS.getTopLevelTarget( sys ); + assert(sys, "call_host_slave_sbe_update() system target is NULL"); + + TARGETING::ATTR_MNFG_FLAGS_type mnfg_flags; + mnfg_flags = sys->getAttr<TARGETING::ATTR_MNFG_FLAGS>(); + if ( mnfg_flags & MNFG_FLAG_THRESHOLDS ) { - // Commit error - errlCommit( l_errl, HWPF_COMP_ID ); - break; + l_errl = PNOR::validateAltMaster(); + if (l_errl) + { + // Commit error + errlCommit( l_errl, HWPF_COMP_ID ); + break; + } } + } while (0); TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, |
