diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/hwpf/hwp/activate_powerbus/makefile | 3 | ||||
| -rw-r--r-- | src/usr/isteps/istep10/call_host_slave_sbe_update.C | 116 | ||||
| -rw-r--r-- | src/usr/isteps/istep10/call_host_update_redundant_tpm.C | 36 | ||||
| -rw-r--r-- | src/usr/isteps/istep10/call_proc_build_smp.C (renamed from src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C) | 133 | ||||
| -rw-r--r-- | src/usr/isteps/istep10/makefile | 32 | ||||
| -rw-r--r-- | src/usr/isteps/makefile | 1 |
6 files changed, 198 insertions, 123 deletions
diff --git a/src/usr/hwpf/hwp/activate_powerbus/makefile b/src/usr/hwpf/hwp/activate_powerbus/makefile index 0db637a6f..6e7bce2ad 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/makefile +++ b/src/usr/hwpf/hwp/activate_powerbus/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2012,2014 +# Contributors Listed Below - COPYRIGHT 2012,2015 # [+] International Business Machines Corp. # # @@ -50,7 +50,6 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/activate_powerbus EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/activate_powerbus/proc_build_smp ## NOTE: add new object files when you add a new HWP -OBJS += activate_powerbus.o OBJS += proc_build_smp.o OBJS += proc_build_smp_adu.o OBJS += proc_build_smp_epsilon.o diff --git a/src/usr/isteps/istep10/call_host_slave_sbe_update.C b/src/usr/isteps/istep10/call_host_slave_sbe_update.C new file mode 100644 index 000000000..4a82043cc --- /dev/null +++ b/src/usr/isteps/istep10/call_host_slave_sbe_update.C @@ -0,0 +1,116 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/isteps/istep10/call_host_slave_sbe_update.C $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2015 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* Licensed under the Apache License, Version 2.0 (the "License"); */ +/* you may not use this file except in compliance with the License. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +#include <errl/errlentry.H> +#include <errl/errludtarget.H> +#include <errl/errlmanager.H> +#include <isteps/hwpisteperror.H> +#include <initservice/isteps_trace.H> + +// targeting support +#include <targeting/common/commontargeting.H> +#include <targeting/common/utilFilter.H> +#include <targeting/common/target.H> + +#include <sbe/sbeif.H> +#include <pnor/pnorif.H> +#include <i2c/i2cif.H> + + +using namespace ISTEP_ERROR; +using namespace ISTEP; +using namespace TARGETING; +using namespace ERRORLOG; + +namespace ISTEP_10 +{ +void* call_host_slave_sbe_update (void *io_pArgs) +{ + errlHndl_t l_errl = NULL; + IStepError l_StepError; + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_host_slave_sbe_update entry" ); + do + { + + // Slave processors should now use Host I2C Access Method + I2C::i2cSetAccessMode( I2C::I2C_SET_ACCESS_MODE_PROC_HOST ); + + // Reset I2C devices before trying to access the SBE SEEPROMs + // Any error returned should not fail istep + l_errl = I2C::i2cResetActiveMasters( I2C::I2C_PROC_ALL ); + if (l_errl) + { + // Commit error and keep going + errlCommit( l_errl, HWPF_COMP_ID ); + } + + // Call to check state of Processor SBE SEEPROMs and + // make any necessary updates + l_errl = SBE::updateProcessorSbeSeeproms(); + + if (l_errl) + { + // Create IStep error log and cross reference error that occurred + l_StepError.addErrorDetails( l_errl); + // Commit error + errlCommit( l_errl, HWPF_COMP_ID ); + break; + } + + // Call to Validate any Alternative Master's connection to PNOR + // Only call this in MNFG mode + // Any error returned should not fail istep + + // 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 ) + { + 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, + "call_host_slave_sbe_update exit" ); + + // end task, returning any errorlogs to IStepDisp + return l_StepError.getErrorHandle(); + +} + +}; diff --git a/src/usr/isteps/istep10/call_host_update_redundant_tpm.C b/src/usr/isteps/istep10/call_host_update_redundant_tpm.C new file mode 100644 index 000000000..fc10dcac4 --- /dev/null +++ b/src/usr/isteps/istep10/call_host_update_redundant_tpm.C @@ -0,0 +1,36 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/isteps/istep10/call_host_update_redundant_tpm.C $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2015 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* Licensed under the Apache License, Version 2.0 (the "License"); */ +/* you may not use this file except in compliance with the License. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +#include <errl/errlentry.H> + +namespace ISTEP_10 +{ +void* call_host_update_redundant_tpm (void *io_pArgs) +{ + errlHndl_t l_err = NULL; + //@TODO RTC:133830 call p9_update_security_ctrl.C HWP + return l_err; +} + +}; diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C b/src/usr/isteps/istep10/call_proc_build_smp.C index c8724222a..24323255d 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C +++ b/src/usr/isteps/istep10/call_proc_build_smp.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C $ */ +/* $Source: src/usr/isteps/istep10/call_proc_build_smp.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,69 +22,31 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ - -/** - * @file activate_powerbus.C - * - * Support file for IStep: activate_powerbus - * Activate PowerBus - * - * HWP_IGNORE_VERSION_CHECK - * - */ - -/******************************************************************************/ -// Includes -/******************************************************************************/ -#include <stdint.h> -#include <config.h> - -#include <trace/interface.H> -#include <initservice/taskargs.H> #include <errl/errlentry.H> #include <errl/errludtarget.H> - -#include <initservice/isteps_trace.H> +#include <errl/errlmanager.H> #include <isteps/hwpisteperror.H> - -#include <sbe/sbeif.H> -#include <pnor/pnorif.H> -#include <i2c/i2cif.H> +#include <initservice/isteps_trace.H> // targeting support #include <targeting/common/commontargeting.H> #include <targeting/common/utilFilter.H> #include <targeting/common/target.H> -// fapi support -#include <fapi.H> -#include <fapiPlatHwpInvoker.H> - -#include "activate_powerbus.H" -#include <pbusLinkSvc.H> - -#include "proc_build_smp/proc_build_smp.H" -#include <intr/interrupt.H> -#include <fsi/fsiif.H> - -namespace ACTIVATE_POWERBUS -{ - using namespace ISTEP_ERROR; using namespace ISTEP; using namespace TARGETING; -using namespace EDI_EI_INITIALIZATION; -using namespace fapi; using namespace ERRORLOG; -//****************************************************************************** -// wrapper function to call proc_build_smp -//****************************************************************************** -void* call_proc_build_smp( void *io_pArgs ) + +namespace ISTEP_10 +{ +void* call_proc_build_smp (void *io_pArgs) { - errlHndl_t l_errl = NULL; IStepError l_StepError; + //@TODO RTC:133830 +/* errlHndl_t l_errl = NULL; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_build_smp entry" ); @@ -329,80 +291,9 @@ void* call_proc_build_smp( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_build_smp exit" ); - - // end task, returning any errorlogs to IStepDisp - return l_StepError.getErrorHandle(); -} - -//****************************************************************************** -// wrapper function to call host_slave_sbe_update -//****************************************************************************** -void * call_host_slave_sbe_update( void * io_pArgs ) -{ - errlHndl_t l_errl = NULL; - IStepError l_StepError; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_slave_sbe_update entry" ); - do - { - - // Slave processors should now use Host I2C Access Method - I2C::i2cSetAccessMode( I2C::I2C_SET_ACCESS_MODE_PROC_HOST ); - - // Reset I2C devices before trying to access the SBE SEEPROMs - // Any error returned should not fail istep - l_errl = I2C::i2cResetActiveMasters( I2C::I2C_PROC_ALL ); - if (l_errl) - { - // Commit error and keep going - errlCommit( l_errl, HWPF_COMP_ID ); - } - - // Call to check state of Processor SBE SEEPROMs and - // make any necessary updates - l_errl = SBE::updateProcessorSbeSeeproms(); - - if (l_errl) - { - // Create IStep error log and cross reference error that occurred - l_StepError.addErrorDetails( l_errl); - // Commit error - errlCommit( l_errl, HWPF_COMP_ID ); - break; - } - - // Call to Validate any Alternative Master's connection to PNOR - // Only call this in MNFG mode - // Any error returned should not fail istep - - // 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 ) - { - 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, - "call_host_slave_sbe_update exit" ); - +*/ // end task, returning any errorlogs to IStepDisp return l_StepError.getErrorHandle(); - } -}; // end namespace +}; diff --git a/src/usr/isteps/istep10/makefile b/src/usr/isteps/istep10/makefile new file mode 100644 index 000000000..2cc0c171c --- /dev/null +++ b/src/usr/isteps/istep10/makefile @@ -0,0 +1,32 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/isteps/istep10/makefile $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 2015 +# [+] International Business Machines Corp. +# +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. See the License for the specific language governing +# permissions and limitations under the License. +# +# IBM_PROLOG_END_TAG +ROOTPATH = ../../../.. +MODULE = istep10 + +OBJS += call_proc_build_smp.o +OBJS += call_host_slave_sbe_update.o +OBJS += call_host_update_redundant_tpm.o + +include ${ROOTPATH}/config.mk diff --git a/src/usr/isteps/makefile b/src/usr/isteps/makefile index 6344af107..7c1e4406a 100644 --- a/src/usr/isteps/makefile +++ b/src/usr/isteps/makefile @@ -29,6 +29,7 @@ SUBDIRS+=istep06.d SUBDIRS+=istep07.d SUBDIRS+=istep08.d SUBDIRS+=istep09.d +SUBDIRS+=istep10.d OBJS += hwpisteperror.o OBJS += hwpistepud.o |
