diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H index 873509edac1..170837c02bb 100644 --- a/src/include/usr/isteps/istep06list.H +++ b/src/include/usr/isteps/istep06list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -52,7 +52,7 @@ * 06.9 host_gard * : Do Gard * 06.10 host_revert_sbe_mcs_setup - * : Clean up MCS extent regs + * : Clean up MCS extent regs (moved to istep14) * 06.11 host_start_occ_xstop_handler * : Start OpenPOWER xstop * 06.12 host_voltage_config @@ -128,13 +128,9 @@ void* call_host_update_master_tpm( void *io_pArgs ); void* host_gard( void *io_pArgs ); /** - * @brief host_revert_sbe_mcs_setup (istep 6.10) - * - * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, - * or NULL. - * return any error logs to istep + * host_revert_sbe_mcs_setup (istep 6.10) + * Moved to istep14 call_proc_setup_bars.C */ -void* call_host_revert_sbe_mcs_setup (void * io_pArgs); /** * @brief host_start_occ_xstop_handler (istep 6.11) @@ -213,9 +209,9 @@ const TaskInfo g_istep06[] = { { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false } }, { - ISTEPNAME(06,10,"host_revert_sbe_mcs_setup"), - ISTEP_06::call_host_revert_sbe_mcs_setup, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false } + ISTEPNAME(06,10,""), // not used. moved to istep14 + NULL, + { NONE, EXT_IMAGE, IPL_NOOP, false } }, { ISTEPNAME(06,11,"host_start_occ_xstop_handler"), diff --git a/src/usr/isteps/istep06/call_host_revert_sbe_mcs_setup.C b/src/usr/isteps/istep06/call_host_revert_sbe_mcs_setup.C deleted file mode 100644 index d328e0e856e..00000000000 --- a/src/usr/isteps/istep06/call_host_revert_sbe_mcs_setup.C +++ /dev/null @@ -1,94 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep06/call_host_revert_sbe_mcs_setup.C $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ -/* [+] 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 - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -namespace ISTEP_06 -{ - -void* call_host_revert_sbe_mcs_setup( void *io_pArgs ) -{ - errlHndl_t l_err = NULL; - ISTEP_ERROR::IStepError l_stepError; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_revert_sbe_mcs_setup entry" ); - - TARGETING::Target * l_masterProc; - TARGETING::targetService().masterProcChipTargetHandle( l_masterProc ); - - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "Running p9_revert_sbe_mcs_setup on " - "target HUID %.8X", - TARGETING::get_huid(l_masterProc)); - - // cast the target to a fapi2 target - fapi2::Target l_fapi_master_proc( l_masterProc ); - - //Invoke p9_revert_sbe_mcs_setup - // Pass in boolean describing if we are using the FSP or not - // If we are using the FSP then we will ask off the SBE fir - // bits on the TP Local Fir register as the FSP with handle - // SBE errors - // TODO: RTC 184860 Remove MCS acker workaround - //FAPI_INVOKE_HWP( l_err, p9_revert_sbe_mcs_setup, - // l_fapi_master_proc, - // INITSERVICE::spBaseServicesEnabled()); - - if (l_err) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: p9_revert_sbe_mcs_setup", - l_err->reasonCode()); - // Create IStep error log and cross reference error - l_stepError.addErrorDetails(l_err); - // Commit error - errlCommit(l_err,SBE_COMP_ID); - } - - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_revert_sbe_mcs_setup exit" ); - - return l_stepError.getErrorHandle(); -} - -}; diff --git a/src/usr/isteps/istep06/makefile b/src/usr/isteps/istep06/makefile index e5e273e185b..3ad69565f33 100644 --- a/src/usr/isteps/istep06/makefile +++ b/src/usr/isteps/istep06/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2018 +# Contributors Listed Below - COPYRIGHT 2015,2019 # [+] International Business Machines Corp. # # @@ -30,7 +30,6 @@ OBJS += host_set_ipl_parms.o OBJS += host_discover_targets.o OBJS += call_host_update_master_tpm.o OBJS += host_gard.o -OBJS += call_host_revert_sbe_mcs_setup.o OBJS += host_start_occ_xstop_handler.o OBJS += call_host_voltage_config.o diff --git a/src/usr/isteps/istep14/call_proc_setup_bars.C b/src/usr/isteps/istep14/call_proc_setup_bars.C index 08d1708d31f..25ed067d263 100644 --- a/src/usr/isteps/istep14/call_proc_setup_bars.C +++ b/src/usr/isteps/istep14/call_proc_setup_bars.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -40,7 +40,6 @@ #include #include -// TODO: RTC 184860 Remove MCS acker workaround #include #include @@ -68,10 +67,11 @@ void* call_proc_setup_bars (void *io_pArgs) "call_proc_setup_bars entry" ); - // ******************************* - // Start MCS acker workaround - // TODO: RTC 184860 Remove MCS acker workaround - // ******************************* + // *************************** + // Start MCS reset + // Reset memory controller configuration written by SBE + // Close the MCS acker before enabling the real memory bars + // *************************** TARGETING::Target * l_masterProc; TARGETING::targetService().masterProcChipTargetHandle( l_masterProc ); @@ -102,9 +102,9 @@ void* call_proc_setup_bars (void *io_pArgs) // Commit error errlCommit(l_errl,SBE_COMP_ID); } - // ******************************* - // End MCS acker workaround - // ******************************* + // *************************** + // End MCS reset + // *************************** // Get all processor targets diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile index 68156f5b156..253ee9c38d6 100644 --- a/src/usr/isteps/istep14/makefile +++ b/src/usr/isteps/istep14/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2018 +# Contributors Listed Below - COPYRIGHT 2015,2019 # [+] International Business Machines Corp. # # @@ -78,7 +78,6 @@ OBJS += p9c_mss_thermal_init.o OBJS += p9c_mss_unmask_errors.o OBJS += p9c_mss_power_cleanup.o OBJS += p9c_cen_stopclocks.o -# TODO: RTC 184860 Remove MCS acker workaround OBJS += p9_revert_sbe_mcs_setup.o #include ${PROCEDURE_PATH}/hwp/nest/p9_htm_setup.mk