From ddae90ce735c06ef02931daf89fe38b16c8e0381 Mon Sep 17 00:00:00 2001 From: Corey Swenson Date: Wed, 23 Jan 2019 10:39:36 -0600 Subject: Make MCS acker workaround changes permanent Workaround moved the p9_revert_sbe_mcs_setup HWP from istep06 to istep14. Remove call_host_revert_sbe_mcs_setup.C from istep06 and remove workaround comments in istep14. Change-Id: I93c70364b7dde013bf003cf1920535ba78b9a58b RTC:184860 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70792 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Reviewed-by: Christian R. Geddes Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Matt Derksen Reviewed-by: Daniel M. Crowell --- src/include/usr/isteps/istep06list.H | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'src/include') diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H index 873509eda..170837c02 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"), -- cgit v1.2.3