diff options
25 files changed, 167 insertions, 1250 deletions
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H index 296c9c053..79cfc92a0 100644 --- a/src/include/usr/isteps/istep06list.H +++ b/src/include/usr/isteps/istep06list.H @@ -31,7 +31,7 @@ * @note IStep definition for Hostboot - Slave SBE * * IStep 06 Slave SBE - * IPL FLow Doc v0.67 (11/02/15) + * IPL FLow Doc v0.93 (04/04/16) * * 06.1 host_bootloader * : Host Bootloader (non-executable istep) @@ -39,20 +39,24 @@ * : Setup host environment (non-executable istep) * 06.3 host_istep_enable * : Hostboot istep ready (non-executable istep) - * 06.4 host_init_fsi + * 06.4 host_init_bmc_pcie + * : Setup the PCIE to the BMC chip + * 06.5 host_init_fsi * : Setup the FSI links to slave chips - * 06.5 host_set_ipl_parms + * 06.6 host_set_ipl_parms * : Build ipl parameters - * 06.6 host_discover_targets + * 06.7 host_discover_targets * : Builds targeting - * 06.7 host_update_master_tpm + * 06.8 host_update_master_tpm * : Update master TPM - * 06.8 host_gard + * 06.9 host_gard * : Do Gard - * 06.9 proc_revert_sbe_mcs_setup + * 06.10 proc_revert_sbe_mcs_setup * : Clean up MCS extent regs - * 06.10 host_start_occ_xstop_handler - * : + * 06.11 host_start_occ_xstop_handler + * : Start OpenPOWER xstop + * 06.12 host_setup_voltages + * : Set correct chip voltage * */ @@ -61,8 +65,9 @@ namespace ISTEP_06 { + /** - * @brief host_init_fsi Setup the FSI links to slave chips (istep 6.4) + * @brief host_init_fsi Setup the FSI links to slave chips (istep 6.5) * * Call into the hwas platform-specific initHardware() function * to init the FSI hardware. @@ -74,7 +79,7 @@ namespace ISTEP_06 void* host_init_fsi( void *io_pArgs ); /** - * @brief host_set_ipl_parms Build ipl parameters (istep 6.5) + * @brief host_set_ipl_parms Build ipl parameters (istep 6.6) * * TBD * @@ -85,7 +90,7 @@ void* host_init_fsi( void *io_pArgs ); void* host_set_ipl_parms( void *io_pArgs ); /** - * @brief host_discover_targets Builds targeting (istep 6.6) + * @brief host_discover_targets Builds targeting (istep 6.7) * * This routine will walk through all the targets and initialize HWAS STATE * to a known default value. @@ -102,7 +107,7 @@ void* host_set_ipl_parms( void *io_pArgs ); void* host_discover_targets( void *io_pArgs ); /** - * @brief call_host_update_master_tpm (istep 6.7) + * @brief call_host_update_master_tpm (istep 6.8) * * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, @@ -112,7 +117,7 @@ void* host_discover_targets( void *io_pArgs ); void* call_host_update_master_tpm( void *io_pArgs ); /** - * @brief host_gard Do Gard (istep 6.8) + * @brief host_gard Do Gard (istep 6.9) * * Collect GARD information and apply it to the target states. * @@ -123,7 +128,7 @@ void* call_host_update_master_tpm( void *io_pArgs ); void* host_gard( void *io_pArgs ); /** - * @brief proc_revert_sbe_mcs_setup (istep 6.9) + * @brief proc_revert_sbe_mcs_setup (istep 6.10) * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -132,7 +137,7 @@ void* host_gard( void *io_pArgs ); void* call_proc_revert_sbe_mcs_setup (void * io_pArgs); /** - * @brief host_start_occ_xstop_handler (istep 6.10) + * @brief host_start_occ_xstop_handler (istep 6.11) * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -140,6 +145,14 @@ void* call_proc_revert_sbe_mcs_setup (void * io_pArgs); */ void* host_start_occ_xstop_handler (void * io_pArgs); +/** + * @brief host_setup_voltages (istep 6.12) + * + * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, + * or NULL. + * return any error logs to istep + */ +void* call_host_setup_voltages (void * io_pArgs); }; @@ -170,41 +183,51 @@ const TaskInfo g_istep06[] = { { NONE, EXT_IMAGE, IPL_NOOP, false } }, { - ISTEPNAME(06,04,"host_init_fsi"), + ISTEPNAME(06,04,""), // No support for now. init bmc pcie + NULL, + { NONE, EXT_IMAGE, IPL_NOOP, false } + }, + { + ISTEPNAME(06,05,"host_init_fsi"), ISTEP_06::host_init_fsi, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false, BASE_INITIALIZATION } }, { - ISTEPNAME(06,05,"host_set_ipl_parms"), + ISTEPNAME(06,06,"host_set_ipl_parms"), ISTEP_06::host_set_ipl_parms, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false } }, { - ISTEPNAME(06,06,"host_discover_targets"), + ISTEPNAME(06,07,"host_discover_targets"), ISTEP_06::host_discover_targets, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false } }, { - ISTEPNAME(06,07,"host_update_master_tpm"), + ISTEPNAME(06,08,"host_update_master_tpm"), ISTEP_06::call_host_update_master_tpm, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false } }, { - ISTEPNAME(06,08, "host_gard"), + ISTEPNAME(06,09, "host_gard"), ISTEP_06::host_gard, { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false } }, { - ISTEPNAME(06,09,"proc_revert_sbe_mcs_setup"), + ISTEPNAME(06,10,"proc_revert_sbe_mcs_setup"), ISTEP_06::call_proc_revert_sbe_mcs_setup, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false } }, { - ISTEPNAME(06,10,"host_start_occ_xstop_handler"), + ISTEPNAME(06,11,"host_start_occ_xstop_handler"), ISTEP_06::host_start_occ_xstop_handler, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false } }, + { + ISTEPNAME(06,12,"host_setup_voltages"), + ISTEP_06::call_host_setup_voltages, + { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false } + }, }; diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H index 17333e0b5..e18f6a890 100644 --- a/src/include/usr/isteps/istep07list.H +++ b/src/include/usr/isteps/istep07list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -29,10 +29,10 @@ * @file istep07list.H * * IStep 07 Nest Chiplets - * IPL FLow Doc v0.67 (11/02/15) + * IPL FLow Doc v0.93 (04/04/16) * - * 07.1 host_collect_dimm_spd - * : Collect Master dimm SPD + * 07.1 host_mss_attr_cleanup + * : Clean up attributes * 07.2 mss_volt * : Calc dimm voltage * 07.3 mss_freq @@ -54,16 +54,18 @@ namespace ISTEP_07 { /** - * @brief host_collect_dimm_spd + * @brief host_mss_attr_cleanup * - * Collect Master dimm SPD + * Clean up attributes on reconfig loops * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. * return any error logs to istep * */ -void* call_host_collect_dimm_spd( void * io_pArgs ); +void* call_host_mss_attr_cleanup( void * io_pArgs ); + + /** * @brief mss_volt @@ -131,9 +133,9 @@ namespace INITSERVICE { NONE, EXT_IMAGE, IPL_NOOP, false } }, { - ISTEPNAME(07,01,"host_collect_dimm_spd"), - ISTEP_07::call_host_collect_dimm_spd, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } + ISTEPNAME(07,01,""), + NULL, + { NONE, EXT_IMAGE, IPL_NOOP, false } }, { ISTEPNAME(07,02,"mss_volt"), diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index d5fc9afb6..4a44800ee 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -27,7 +27,7 @@ /** * list of functions called for ISTEP 11 according to Dean's - * IPL Flow Doc v0.67 (11/11/15) + * IPL FLow Doc v0.93 (04/04/16) * */ @@ -60,71 +60,6 @@ namespace ISTEP_11 void* call_host_prd_hwreconfig( void *io_pArgs ); - -/** - * @brief cen sbe tp chiplet init1 - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_cen_sbe_tp_chiplet_init1( void *io_pArgs ); - - - -/** - * @brief cen sbe pll initf - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_cen_sbe_pll_initf( void *io_pArgs ); - -/** - * @brief cen sbe pll setup - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_cen_sbe_pll_setup( void *io_pArgs ); - - -/** - * @brief cen sbe tp chiplet init2 - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_cen_sbe_tp_chiplet_init2( void *io_pArgs ); - -/** - * @brief cen sbe tp arrayinit - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_cen_sbe_tp_arrayinit( void *io_pArgs ); - -/** - * @brief cen sbe tp chiplet init3 - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_cen_sbe_tp_chiplet_init3( void *io_pArgs ); - - }; @@ -142,36 +77,7 @@ const TaskInfo g_istep11[] = { ISTEP_11::call_host_prd_hwreconfig, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, - { - ISTEPNAME(11,02,"cen_sbe_tp_chiplet_init1"), - ISTEP_11::call_cen_sbe_tp_chiplet_init1, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(11,03,"cen_sbe_pll_initf"), - ISTEP_11::call_cen_sbe_pll_initf, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(11,04,"cen_sbe_pll_setup"), - ISTEP_11::call_cen_sbe_pll_setup, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(11,05,"cen_sbe_tp_chiplet_init2"), - ISTEP_11::call_cen_sbe_tp_chiplet_init2, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(11,06,"cen_sbe_tp_arrayinit"), - ISTEP_11::call_cen_sbe_tp_arrayinit, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(11,07,"cen_sbe_tp_chiplet_init3"), - ISTEP_11::call_cen_sbe_tp_chiplet_init3, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, + }; const DepModInfo g_istep11Dependancies = { diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index 281ef6c0d..d44cf3ba8 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -30,7 +30,7 @@ * @file istep12list.H * * IStep 12 Step 12 DMI Training - * IPL FLow Doc v0.67 (11/11/15) + * IPL FLow Doc v0.93 (04/04/16) * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. @@ -58,61 +58,6 @@ namespace ISTEP_12 void* call_mss_getecid( void *io_pArgs ); - -/** - * @brief dmi attr update - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_dmi_attr_update( void *io_pArgs ); - - - -/** - * @brief proc dmi scominit - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_proc_dmi_scominit( void *io_pArgs ); - -/** - * @brief dmi scominit - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_dmi_scominit( void *io_pArgs ); - - -/** - * @brief dmi erepair - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_dmi_erepair( void *io_pArgs ); - -/** - * @brief dmi io dccal - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return any errlogs to istep - * - */ -void* call_dmi_io_dccal( void *io_pArgs ); - - }; @@ -130,31 +75,6 @@ const TaskInfo g_istep12[] = { ISTEP_12::call_mss_getecid, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, - { - ISTEPNAME(12,02,"dmi_attr_update"), - ISTEP_12::call_dmi_attr_update, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(12,03,"proc_dmi_scominit"), - ISTEP_12::call_proc_dmi_scominit, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(12,04,"dmi_scominit"), - ISTEP_12::call_dmi_scominit, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(12,05,"dmi_erepair"), - ISTEP_12::call_dmi_erepair, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, - { - ISTEPNAME(12,06,"dmi_io_dccal"), - ISTEP_12::call_dmi_io_dccal, - { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } - }, }; diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H index 7ab413769..3c737f1ae 100644 --- a/src/include/usr/isteps/istep13list.H +++ b/src/include/usr/isteps/istep13list.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -31,7 +31,7 @@ * @file istep13list.H * * IStep 13 Step 13 - * IPL FLow Doc v0.67 (11/11/15) + * IPL FLow Doc v0.93 (04/04/16) * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. @@ -48,14 +48,26 @@ namespace ISTEP_13 { /** - * @brief host_disable_vddr + * @brief host_disable_memvolt * * param[in,out] - pointer to any arguments, usually NULL * * return any errlogs to istep * */ -void* call_host_disable_vddr( void *io_pArgs ); +void* call_host_disable_memvolt( void *io_pArgs ); + + + +/** + * @brief mem_pll_reset + * + * param[in,out] - pointer to any arguments, usually NULL + * + * return any errlogs to istep + * + */ +void* call_mem_pll_reset( void *io_pArgs ); @@ -103,14 +115,14 @@ void* call_proc_mcs_skewadjust( void *io_pArgs ); void* call_mem_startclocks( void *io_pArgs ); /** - * @brief host_enable_vddr + * @brief host_enable_memvolt * * param[in,out] - pointer to any arguments, usually NULL * * return any errlogs to istep * */ -void* call_host_enable_vddr( void *io_pArgs ); +void* call_host_enable_memvolt( void *io_pArgs ); /** * @brief mss_scominit @@ -188,62 +200,67 @@ const TaskInfo g_istep13[] = { { NONE, EXT_IMAGE, IPL_NOOP, false } }, { - ISTEPNAME(13,01,"host_disable_vddr"), - ISTEP_13::call_host_disable_vddr, + ISTEPNAME(13,01,"host_disable_memvolt"), + ISTEP_13::call_host_disable_memvolt, + { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } + }, + { + ISTEPNAME(13,02,"mem_pll_reset"), + ISTEP_13::call_mem_pll_reset, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,02,"mem_pll_initf"), + ISTEPNAME(13,03,"mem_pll_initf"), ISTEP_13::call_mem_pll_initf, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,03,"mem_pll_setup"), + ISTEPNAME(13,04,"mem_pll_setup"), ISTEP_13::call_mem_pll_setup, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,04,"proc_mcs_skewadjust"), + ISTEPNAME(13,05,"proc_mcs_skewadjust"), ISTEP_13::call_proc_mcs_skewadjust, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,05,"mem_startclocks"), + ISTEPNAME(13,06,"mem_startclocks"), ISTEP_13::call_mem_startclocks, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,06,"host_enable_vddr"), - ISTEP_13::call_host_enable_vddr, + ISTEPNAME(13,07,"host_enable_memvolt"), + ISTEP_13::call_host_enable_memvolt, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,07,"mss_scominit"), + ISTEPNAME(13,08,"mss_scominit"), ISTEP_13::call_mss_scominit, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,08,"mss_ddr_phy_reset"), + ISTEPNAME(13,09,"mss_ddr_phy_reset"), ISTEP_13::call_mss_ddr_phy_reset, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,09,"mss_draminit"), + ISTEPNAME(13,10,"mss_draminit"), ISTEP_13::call_mss_draminit, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,10,"mss_draminit_training"), + ISTEPNAME(13,11,"mss_draminit_training"), ISTEP_13::call_mss_draminit_training, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,11,"mss_draminit_trainadv"), + ISTEPNAME(13,12,"mss_draminit_trainadv"), ISTEP_13::call_mss_draminit_trainadv, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, { - ISTEPNAME(13,12,"mss_draminit_mc"), + ISTEPNAME(13,13,"mss_draminit_mc"), ISTEP_13::call_mss_draminit_mc, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true } }, diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H index b1754ae86..ef565180a 100644 --- a/src/include/usr/isteps/istep18list.H +++ b/src/include/usr/isteps/istep18list.H @@ -29,7 +29,7 @@ * @file istep18list.H * * IStep 18 Establish System SMP - * IPL FLow Doc v0.60 (06/02/15) + * IPL FLow Doc v0.93 (04/04/16) * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. @@ -105,6 +105,21 @@ namespace INITSERVICE NULL, { NONE, EXT_IMAGE, IPL_NOOP, false } }, + { + ISTEPNAME(18,13,""), + NULL, + { NONE, EXT_IMAGE, IPL_NOOP, false } + }, + { + ISTEPNAME(18,14,""), + NULL, + { NONE, EXT_IMAGE, IPL_NOOP, false } + }, + { + ISTEPNAME(18,15,""), + NULL, + { NONE, EXT_IMAGE, IPL_NOOP, false } + }, }; const DepModInfo g_istep18Dependancies = { diff --git a/src/usr/isteps/istep11/call_cen_sbe_pll_initf.C b/src/usr/isteps/istep06/call_host_setup_voltages.C index a42b0d89d..e6da0fff4 100644 --- a/src/usr/isteps/istep11/call_cen_sbe_pll_initf.C +++ b/src/usr/isteps/istep06/call_host_setup_voltages.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/isteps/istep11/call_cen_sbe_pll_initf.C $ */ +/* $Source: src/usr/isteps/istep06/call_host_setup_voltages.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,17 +22,28 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ +#include <stdint.h> +#include <trace/interface.H> #include <errl/errlentry.H> +#include <errl/errlmanager.H> +#include <isteps/hwpisteperror.H> -using namespace ERRORLOG; - -namespace ISTEP_11 +namespace ISTEP_06 { -void* call_cen_sbe_pll_initf (void *io_pArgs) + +void* call_host_setup_voltages( void *io_pArgs ) { - errlHndl_t l_err = NULL; - //@TODO call cen_sbe_pll_initf.C HWP - return l_err; + ISTEP_ERROR::IStepError l_stepError; + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_host_setup_voltages entry" ); + + // TODO-RTC: 144620 + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_host_setup_voltages exit" ); + + return l_stepError.getErrorHandle(); } }; diff --git a/src/usr/isteps/istep06/makefile b/src/usr/isteps/istep06/makefile index 7ebb207a4..6a464c44a 100644 --- a/src/usr/isteps/istep06/makefile +++ b/src/usr/isteps/istep06/makefile @@ -33,6 +33,7 @@ OBJS += call_host_update_master_tpm.o OBJS += host_gard.o OBJS += call_proc_revert_sbe_mcs_setup.o OBJS += host_start_occ_xstop_handler.o +OBJS += call_host_setup_voltages.o SUBDIRS += thread_activate.d diff --git a/src/usr/isteps/istep07/host_collect_dimm_spd.C b/src/usr/isteps/istep07/host_collect_dimm_spd.C deleted file mode 100644 index ae15e8a54..000000000 --- a/src/usr/isteps/istep07/host_collect_dimm_spd.C +++ /dev/null @@ -1,155 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep07/host_collect_dimm_spd.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 */ -/** - * @file host_collect_dimm_spd.C - * Contains the wrapper for istep 7.1 - */ - -/******************************************************************************/ -// Includes -/******************************************************************************/ -#include <stdint.h> - -#include <isteps/hwpisteperror.H> -#include <trace/interface.H> -#include <initservice/taskargs.H> -#include <initservice/isteps_trace.H> - -#include <errl/errlentry.H> -#include <errl/errludtarget.H> - -// targeting support -#include <targeting/common/commontargeting.H> -#include <targeting/common/utilFilter.H> -#include <config.h> - -namespace ISTEP_07 -{ - -using namespace ISTEP; -using namespace ISTEP_ERROR; -using namespace ERRORLOG; -using namespace TARGETING; - -// -// Wrapper function to call host_collect_dimm_spd -// -void* call_host_collect_dimm_spd( void *io_pArgs ) -{ - errlHndl_t l_err = NULL; - IStepError l_stepError; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_collect_dimm_spd entry" ); - - // Get a list of all present Centaurs - TargetHandleList l_presCentaurs; - getChipResources(l_presCentaurs, TYPE_MEMBUF, UTIL_FILTER_PRESENT); - // Associated MBA targets - TARGETING::TargetHandleList l_mbaList; - - // Define predicate for associated MBAs - PredicateCTM predMba(CLASS_UNIT, TYPE_MBA); - PredicatePostfixExpr presMba; - PredicateHwas predPres; - predPres.present(true); - presMba.push(&predMba).push(&predPres).And(); - - for (TargetHandleList::const_iterator - l_cenIter = l_presCentaurs.begin(); - l_cenIter != l_presCentaurs.end(); - ++l_cenIter) - { - // make a local copy of the target for ease of use - TARGETING::Target * l_pCentaur = *l_cenIter; - // Retrieve HUID of current Centaur - TARGETING::ATTR_HUID_type l_currCentaurHuid = - TARGETING::get_huid(l_pCentaur); - - // Dump current run on target - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "Running mss_attr_cleanup HWP on " - "target HUID %.8X", l_currCentaurHuid); - - // find all present MBAs associated with this Centaur - TARGETING::TargetHandleList l_presMbas; - targetService().getAssociated(l_presMbas, - l_pCentaur, - TargetService::CHILD, - TargetService::IMMEDIATE, - &presMba); - - // If not at least two MBAs found - if (l_presMbas.size() < 2) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "Not enough MBAs found for Centaur target HUID %.8X, " - "skipping this Centaur.", - l_currCentaurHuid); - continue; - } - - // Create FAPI Targets. - /* @TODO: RTC:133830 use fapi2 targets - const fapi::Target l_fapiCentaurTarget(TARGET_TYPE_MEMBUF_CHIP, - (const_cast<TARGETING::Target*>(l_pCentaur))); - const fapi::Target l_fapiMba0Target(TARGET_TYPE_MBA_CHIPLET, - (const_cast<TARGETING::Target*>(l_presMbas[0]))); - const fapi::Target l_fapiMba1Target(TARGET_TYPE_MBA_CHIPLET, - (const_cast<TARGETING::Target*>(l_presMbas[1]))); - */ - //@TODO RTC:133830 call the HWP with each fapi::Target - //FAPI_INVOKE_HWP(l_err, p9_mss_attr_cleanup, l_fapiCentaurTarget, - // l_fapiMba0Target, l_fapiMba1Target); - if (l_err) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: mss_attr_cleanup HWP returns error", - l_err->reasonCode()); - // capture the target data in the elog - ErrlUserDetailsTarget(l_pCentaur).addToLog(l_err); - // Create IStep error log and cross reference error that occurred - l_stepError.addErrorDetails(l_err); - // Commit Error - errlCommit(l_err, HWPF_COMP_ID); - } - else - { - // Success - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "Successfully ran mss_attr_cleanup HWP on " - "CENTAUR target HUID %.8X " - "and associated MBAs", - l_currCentaurHuid); - } - } - - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_collect_dimm_spd exit" ); - - // end task, returning any errorlogs to IStepDisp - return l_stepError.getErrorHandle(); -} -}; diff --git a/src/usr/isteps/istep07/makefile b/src/usr/isteps/istep07/makefile index 857381d3f..6ee76e3b0 100644 --- a/src/usr/isteps/istep07/makefile +++ b/src/usr/isteps/istep07/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015 +# Contributors Listed Below - COPYRIGHT 2015,2016 # [+] International Business Machines Corp. # # @@ -25,7 +25,6 @@ ROOTPATH = ../../../.. MODULE = istep07 -OBJS += host_collect_dimm_spd.o OBJS += call_mss_volt.o OBJS += call_mss_freq.o OBJS += call_mss_eff_config.o diff --git a/src/usr/isteps/istep11/call_cen_sbe_pll_setup.C b/src/usr/isteps/istep11/call_cen_sbe_pll_setup.C deleted file mode 100644 index bb873e0ed..000000000 --- a/src/usr/isteps/istep11/call_cen_sbe_pll_setup.C +++ /dev/null @@ -1,38 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep11/call_cen_sbe_pll_setup.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> - -using namespace ERRORLOG; - -namespace ISTEP_11 -{ -void* call_cen_sbe_pll_setup (void *io_pArgs) -{ - errlHndl_t l_err = NULL; - //@TODO call cen_sbe_pll_setup.C HWP - return l_err; -} - -}; diff --git a/src/usr/isteps/istep11/call_cen_sbe_tp_arrayinit.C b/src/usr/isteps/istep11/call_cen_sbe_tp_arrayinit.C deleted file mode 100644 index 2cec8931a..000000000 --- a/src/usr/isteps/istep11/call_cen_sbe_tp_arrayinit.C +++ /dev/null @@ -1,38 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep11/call_cen_sbe_tp_arrayinit.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> - -using namespace ERRORLOG; - -namespace ISTEP_11 -{ -void* call_cen_sbe_tp_arrayinit (void *io_pArgs) -{ - errlHndl_t l_err = NULL; - //@TODO call cen_sbe_tp_arrayinit.C HWP - return l_err; -} - -}; diff --git a/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init1.C b/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init1.C deleted file mode 100644 index be2038cc9..000000000 --- a/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init1.C +++ /dev/null @@ -1,38 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init1.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> - -using namespace ERRORLOG; - -namespace ISTEP_11 -{ -void* call_cen_sbe_tp_chiplet_init1 (void *io_pArgs) -{ - errlHndl_t l_err = NULL; - //@TODO call cen_sbe_tp_chiplet_init1.C HWP - return l_err; -} - -}; diff --git a/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init2.C b/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init2.C deleted file mode 100644 index 585d75167..000000000 --- a/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init2.C +++ /dev/null @@ -1,38 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init2.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> - -using namespace ERRORLOG; - -namespace ISTEP_11 -{ -void* call_cen_sbe_tp_chiplet_init2 (void *io_pArgs) -{ - errlHndl_t l_err = NULL; - //@TODO call cen_sbe_tp_chiplet_init2.C HWP - return l_err; -} - -}; diff --git a/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init3.C b/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init3.C deleted file mode 100644 index 312c20999..000000000 --- a/src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init3.C +++ /dev/null @@ -1,38 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep11/call_cen_sbe_tp_chiplet_init3.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> - -using namespace ERRORLOG; - -namespace ISTEP_11 -{ -void* call_cen_sbe_tp_chiplet_init3 (void *io_pArgs) -{ - errlHndl_t l_err = NULL; - //@TODO call cen_sbe_tp_chiplet_init3.C HWP - return l_err; -} - -}; diff --git a/src/usr/isteps/istep11/makefile b/src/usr/isteps/istep11/makefile index 7ad9affff..4550f483a 100644 --- a/src/usr/isteps/istep11/makefile +++ b/src/usr/isteps/istep11/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015 +# Contributors Listed Below - COPYRIGHT 2015,2016 # [+] International Business Machines Corp. # # @@ -26,11 +26,6 @@ ROOTPATH = ../../../.. MODULE = istep11 OBJS += call_host_prd_hwreconfig.o -OBJS += call_cen_sbe_tp_chiplet_init1.o -OBJS += call_cen_sbe_pll_initf.o -OBJS += call_cen_sbe_pll_setup.o -OBJS += call_cen_sbe_tp_chiplet_init2.o -OBJS += call_cen_sbe_tp_arrayinit.o -OBJS += call_cen_sbe_tp_chiplet_init3.o + include ${ROOTPATH}/config.mk diff --git a/src/usr/isteps/istep12/call_dmi_erepair.C b/src/usr/isteps/istep12/call_dmi_erepair.C deleted file mode 100644 index 88c834d8c..000000000 --- a/src/usr/isteps/istep12/call_dmi_erepair.C +++ /dev/null @@ -1,250 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep12/call_dmi_erepair.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/errlmanager.H> -#include <initservice/isteps_trace.H> - -#include <isteps/hwpisteperror.H> -#include <errl/errludtarget.H> - -// targeting support. -#include <targeting/common/commontargeting.H> -#include <targeting/common/utilFilter.H> - -using namespace ISTEP; -using namespace ISTEP_ERROR; -using namespace ERRORLOG; -using namespace TARGETING; - -namespace ISTEP_12 -{ -void* call_dmi_erepair (void *io_pArgs) -{ - ISTEP_ERROR::IStepError l_StepError; - //@TODO RTC:133831 - /* - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_erepair entry" ); - -#ifdef CONFIG_NO_DMI_EREPAIR - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "DMI erepair is disabled" ); -#else - - errlHndl_t l_errPtr = NULL; - fapi::ReturnCode l_rc; - std::vector<uint8_t> l_endp1_txFaillanes; - std::vector<uint8_t> l_endp1_rxFaillanes; - std::vector<uint8_t> l_endp2_txFaillanes; - std::vector<uint8_t> l_endp2_rxFaillanes; - uint32_t l_count = 0; - - TargetHandleList l_mcsTargetList; - TargetHandleList l_memTargetList; - TargetHandleList::iterator l_mem_iter; - - // find all MCS chiplets of all procs - getAllChiplets(l_mcsTargetList, TYPE_MCS); - - for (TargetHandleList::const_iterator - l_mcs_iter = l_mcsTargetList.begin(); - l_mcs_iter != l_mcsTargetList.end(); - ++l_mcs_iter) - { - // make a local copy of the MCS target - TARGETING::Target *l_mcs_target = *l_mcs_iter; - ATTR_CHIP_UNIT_type l_mcsNum = l_mcs_target->getAttr<ATTR_CHIP_UNIT>(); - - // find all the Centaurs that are associated with this MCS - getChildAffinityTargets(l_memTargetList, l_mcs_target, - CLASS_CHIP, TYPE_MEMBUF); - - if(l_memTargetList.size() != EREPAIR_MAX_CENTAUR_PER_MCS) - { - continue; - } - - // There will always be 1 Centaur associated with a MCS - l_mem_iter = l_memTargetList.begin(); - - // make a local copy of the MEMBUF target - TARGETING::Target *l_mem_target = *l_mem_iter; - ATTR_POSITION_type l_memNum = l_mem_target->getAttr<ATTR_POSITION>(); - - // struct containing custom parameters that is fed to HWP - // call the HWP with each target(if parallel, spin off a task) - const fapi::Target l_fapi_endp1_target(TARGET_TYPE_MCS_CHIPLET, - l_mcs_target); - - const fapi::Target l_fapi_endp2_target(TARGET_TYPE_MEMBUF_CHIP, - l_mem_target); - - // Get the repair lanes from the VPD - l_endp1_txFaillanes.clear(); - l_endp1_rxFaillanes.clear(); - l_endp2_txFaillanes.clear(); - l_endp2_rxFaillanes.clear(); - l_rc = erepairGetRestoreLanes(l_fapi_endp1_target, - l_endp1_txFaillanes, - l_endp1_rxFaillanes, - l_fapi_endp2_target, - l_endp2_txFaillanes, - l_endp2_rxFaillanes); - if(l_rc) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "Unable to" - " retrieve DMI eRepair data from the VPD"); - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "target HUID %.8X", TARGETING::get_huid(l_mem_target)); - - // Convert fapi returnCode to Error handle - l_errPtr = fapiRcToErrl(l_rc); - - // capture the target data in the elog - ErrlUserDetailsTarget(l_mcs_target).addToLog(l_errPtr); - ErrlUserDetailsTarget(l_mem_target).addToLog(l_errPtr); - - // Create IStep error log and cross reference error that occurred - l_StepError.addErrorDetails( l_errPtr); - - // Commit Error - errlCommit(l_errPtr, HWPF_COMP_ID); - break; - } - - if(l_endp1_txFaillanes.size() || l_endp1_rxFaillanes.size()) - { - // call the io_restore_erepair HWP to restore eRepair - // lanes of endp1 - - TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "io_restore_erepair HWP on %s" - " ( mcs 0x%x, mem 0x%x ) : ", - l_fapi_endp1_target.toEcmdString(), - l_mcsNum, - l_memNum ); - - FAPI_INVOKE_HWP(l_errPtr, - io_restore_erepair, - l_fapi_endp1_target, - l_endp1_txFaillanes, - l_endp1_rxFaillanes); - if(l_errPtr) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X : io_restore_erepair HWP" - "( mcs 0x%x, mem 0x%x ) ", - l_errPtr->reasonCode(), - l_mcsNum, - l_memNum); - - // capture the target data in the elog - ErrlUserDetailsTarget(l_mcs_target).addToLog(l_errPtr); - - // Create IStep error log and cross ref error that occurred - l_StepError.addErrorDetails( l_errPtr); - - // Commit Error - errlCommit(l_errPtr, HWPF_COMP_ID); - break; - } - - for(l_count = 0; l_count < l_endp1_txFaillanes.size(); l_count++) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,"Successfully" - " restored Tx lane %d, of DMI-Bus, of endpoint %s", - l_endp1_txFaillanes[l_count], - l_fapi_endp1_target.toEcmdString()); - } - - for(l_count = 0; l_count < l_endp1_rxFaillanes.size(); l_count++) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,"Successfully" - " restored Rx lane %d, of DMI-Bus, of endpoint %s", - l_endp1_rxFaillanes[l_count], - l_fapi_endp1_target.toEcmdString()); - } - } // end of if(l_endp1_txFaillanes.size() || l_endp1_rxFaillanes.size()) - - if(l_endp2_txFaillanes.size() || l_endp2_rxFaillanes.size()) - { - // call the io_restore_erepair HWP to restore eRepair - // lanes of endp2 - - TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "io_restore_erepair HWP on %s" - " ( mcs 0x%x, mem 0x%x ) : ", - l_fapi_endp2_target.toEcmdString(), - l_mcsNum, - l_memNum ); - FAPI_INVOKE_HWP(l_errPtr, - io_restore_erepair, - l_fapi_endp2_target, - l_endp2_txFaillanes, - l_endp2_rxFaillanes); - if (l_errPtr) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X : io_restore_erepair HWP" - "( mcs 0x%x, mem 0x%x ) ", - l_errPtr->reasonCode(), - l_mcsNum, - l_memNum); - - // capture the target data in the elog - ErrlUserDetailsTarget(l_mem_target).addToLog(l_errPtr); - - // Create IStep error log and cross ref error that occurred - l_StepError.addErrorDetails( l_errPtr); - - // Commit Error - errlCommit(l_errPtr, HWPF_COMP_ID); - break; - } - - for(l_count = 0; l_count < l_endp2_txFaillanes.size(); l_count++) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,"Successfully" - " restored Tx lane %d, of DMI-Bus, of endpoint %s", - l_endp2_txFaillanes[l_count], - l_fapi_endp2_target.toEcmdString()); - } - - for(l_count = 0; l_count < l_endp2_rxFaillanes.size(); l_count++) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,"Successfully" - " restored Rx lane %d, of DMI-Bus, of endpoint %s", - l_endp2_rxFaillanes[l_count], - l_fapi_endp2_target.toEcmdString()); - } - } // end of if(l_endp2_txFaillanes.size() || l_endp2_rxFaillanes.size()) - } // end for l_mcs_target - -#endif - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_erepair exit" ); - - */ - return l_StepError.getErrorHandle(); -} - -}; diff --git a/src/usr/isteps/istep12/call_dmi_io_dccal.C b/src/usr/isteps/istep12/call_dmi_io_dccal.C deleted file mode 100644 index 199804797..000000000 --- a/src/usr/isteps/istep12/call_dmi_io_dccal.C +++ /dev/null @@ -1,159 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep12/call_dmi_io_dccal.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/errlmanager.H> -#include <initservice/isteps_trace.H> - -#include <isteps/hwpisteperror.H> -#include <errl/errludtarget.H> - -// targeting support. -#include <targeting/common/commontargeting.H> -#include <targeting/common/utilFilter.H> - -using namespace ISTEP; -using namespace ISTEP_ERROR; -using namespace ERRORLOG; -using namespace TARGETING; - - -namespace ISTEP_12 -{ -void* call_dmi_io_dccal (void *io_pArgs) -{ - ISTEP_ERROR::IStepError l_StepError; - //@TODO RTC:133831 -#if 0 - errlHndl_t l_errl = NULL; - - // We are not running this analog procedure in VPO - if (TARGETING::is_vpo()) - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "Skip dmi_io_dccal in VPO!"); - return l_StepError.getErrorHandle(); - } - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_dmi_io_dccal entry" ); - - TargetPairs_t l_dmi_io_dccal_targets; - get_dmi_io_targets(l_dmi_io_dccal_targets); - - - // Note: - // Due to lab tester board environment, HW procedure writer (Varkey) has - // requested to send in one target of a time (we used to send in - // the MCS and MEMBUF pair in one call). Even though they don't have to be - // in order, we should keep the pair concept here in case we need to send - // in a pair in the future again. - for (TargetPairs_t::const_iterator - l_itr = l_dmi_io_dccal_targets.begin(); - l_itr != l_dmi_io_dccal_targets.end(); - ++l_itr) - { - /* - //@TODO RTC:133831 - const fapi::Target l_fapi_mcs_target( TARGET_TYPE_MCS_CHIPLET, - (const_cast<TARGETING::Target*>(l_itr->first))); - - const fapi::Target l_fapi_membuf_target( TARGET_TYPE_MEMBUF_CHIP, - (const_cast<TARGETING::Target*>(l_itr->second))); - - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "===== Call dmi_io_dccal HWP( mcs 0x%.8X, mem 0x%.8X) : ", - TARGETING::get_huid(l_itr->first), - TARGETING::get_huid(l_itr->second)); - - // Call on the MCS - FAPI_INVOKE_HWP(l_errl, dmi_io_dccal, l_fapi_mcs_target); - */ - if (l_errl) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X : dmi_io_dccal HWP Target MCS 0x%.8X", - l_errl->reasonCode(), TARGETING::get_huid(l_itr->first)); - - // Create IStep error log and cross reference error that occurred - l_StepError.addErrorDetails( l_errl ); - - // Commit Error - errlCommit( l_errl, HWPF_COMP_ID ); - // We want to continue the training despite the error, so - // no break - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : call_dmi_io_dccal HWP - Target 0x%.8X", - TARGETING::get_huid(l_itr->first)); - } - - // io_dccal.C is going to look for a PLL ring with a "stub" - // mem freq -- so set to a default, then clear it (so as not - // to mess up MSS HWP later - //@TODO RTC:133831 - /* - TARGETING::Target* l_membuf_target = - (const_cast<TARGETING::Target*>(l_itr->second)); - l_membuf_target->setAttr<TARGETING::ATTR_MSS_FREQ>(1600); - - // Call on the MEMBUF - FAPI_INVOKE_HWP(l_errl, dmi_io_dccal, l_fapi_membuf_target); - - // Clear MSS_FREQ. This attribute will be set in istep 12 (mss_freq) for good - l_membuf_target->setAttr<TARGETING::ATTR_MSS_FREQ>(0); - */ - if (l_errl) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X : dmi_io_dccal HWP Target Membuf 0x%.8X", - l_errl->reasonCode(), TARGETING::get_huid(l_itr->second)); - - // Create IStep error log and cross reference error that occurred - l_StepError.addErrorDetails( l_errl ); - - // Commit Error - errlCommit( l_errl, HWPF_COMP_ID ); - // We want to continue the training despite the error, so - // no break - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : call_dmi_io_dccal HWP - Target 0x%.8X", - TARGETING::get_huid(l_itr->second)); - } - - } - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_dmi_io_dccal exit" ); -#endif - // end task, returning any errorlogs to IStepDisp - return l_StepError.getErrorHandle(); -} - -}; diff --git a/src/usr/isteps/istep12/call_dmi_scominit.C b/src/usr/isteps/istep12/call_dmi_scominit.C deleted file mode 100644 index 31d21171c..000000000 --- a/src/usr/isteps/istep12/call_dmi_scominit.C +++ /dev/null @@ -1,107 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep12/call_dmi_scominit.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/errlmanager.H> -#include <initservice/isteps_trace.H> - -#include <isteps/hwpisteperror.H> -#include <errl/errludtarget.H> - -// targeting support. -#include <targeting/common/commontargeting.H> -#include <targeting/common/utilFilter.H> - -using namespace ISTEP; -using namespace ISTEP_ERROR; -using namespace ERRORLOG; -using namespace TARGETING; - - -namespace ISTEP_12 -{ -void* call_dmi_scominit (void *io_pArgs) -{ - errlHndl_t l_errl = NULL; - IStepError l_StepError; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_scominit entry" ); - - // Get all functional membuf chips - TARGETING::TargetHandleList l_membufTargetList; - getAllChips(l_membufTargetList, TYPE_MEMBUF); - - // Invoke dmi_scominit on each one - for (TargetHandleList::iterator l_membuf_iter = l_membufTargetList.begin(); - l_membuf_iter != l_membufTargetList.end(); - ++l_membuf_iter) - { - const TARGETING::Target* l_pTarget = *l_membuf_iter; - - //@TODO RTC:133831 - /* - const fapi::Target l_fapi_target( - TARGET_TYPE_MEMBUF_CHIP, - reinterpret_cast<void *> - (const_cast<TARGETING::Target*>(l_pTarget))); - - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "Running cen_dmi_scominit HWP on..."); - EntityPath l_path; - l_path = l_pTarget->getAttr<ATTR_PHYS_PATH>(); - l_path.dump(); - - FAPI_INVOKE_HWP(l_errl, cen_dmi_scominit, l_fapi_target); - */ - if (l_errl) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR 0x%.8X : cen_dmi_scominit HWP returns error", - l_errl->reasonCode()); - - // capture the target data in the elog - ErrlUserDetailsTarget(l_pTarget).addToLog( l_errl ); - - break; - } - else - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : dmi_scominit HWP"); - } - } - - 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 ); - } - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_scominit exit" ); - - // end task, returning any errorlogs to IStepDisp - return l_StepError.getErrorHandle(); -} - -}; diff --git a/src/usr/isteps/istep12/call_proc_dmi_scominit.C b/src/usr/isteps/istep12/call_proc_dmi_scominit.C deleted file mode 100644 index 4d822cd92..000000000 --- a/src/usr/isteps/istep12/call_proc_dmi_scominit.C +++ /dev/null @@ -1,106 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/isteps/istep12/call_proc_dmi_scominit.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/errlmanager.H> -#include <initservice/isteps_trace.H> - -#include <isteps/hwpisteperror.H> -#include <errl/errludtarget.H> - -// targeting support. -#include <targeting/common/commontargeting.H> -#include <targeting/common/utilFilter.H> - -using namespace ISTEP; -using namespace ISTEP_ERROR; -using namespace ERRORLOG; -using namespace TARGETING; - -namespace ISTEP_12 -{ -void* call_proc_dmi_scominit (void *io_pArgs) -{ - errlHndl_t l_errl = NULL; - IStepError l_StepError; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_dmi_scominit entry" ); - - // Get all functional MCS chiplets - TARGETING::TargetHandleList l_mcsTargetList; - getAllChiplets(l_mcsTargetList, TYPE_MCS); - - // Invoke dmi_scominit on each one - for (TargetHandleList::const_iterator - l_mcs_iter = l_mcsTargetList.begin(); - l_mcs_iter != l_mcsTargetList.end(); - ++l_mcs_iter) - { - const TARGETING::Target* l_pTarget = *l_mcs_iter; - - //@TODO RTC:133831 - /* - const fapi::Target l_fapi_target( TARGET_TYPE_MCS_CHIPLET, - (const_cast<TARGETING::Target*>(l_pTarget))); - - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "Running proc_dmi_scominit HWP on " - "target HUID %.8X", TARGETING::get_huid(l_pTarget)); - - FAPI_INVOKE_HWP(l_errl, proc_dmi_scominit, l_fapi_target); - */ - if (l_errl) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X : proc_dmi_scominit HWP returns error", - l_errl->reasonCode()); - - // capture the target data in the elog - ErrlUserDetailsTarget(l_pTarget).addToLog( l_errl ); - - break; - } - else - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : proc_dmi_scominit HWP"); - } - } - - 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 ); - } - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_dmi_scominit exit" ); - - // end task, returning any errorlogs to IStepDisp - return l_StepError.getErrorHandle(); -} - -}; diff --git a/src/usr/isteps/istep12/makefile b/src/usr/isteps/istep12/makefile index 7d4527f0d..fc625bf0c 100644 --- a/src/usr/isteps/istep12/makefile +++ b/src/usr/isteps/istep12/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015 +# Contributors Listed Below - COPYRIGHT 2015,2016 # [+] International Business Machines Corp. # # @@ -26,10 +26,5 @@ ROOTPATH = ../../../.. MODULE = istep12 OBJS += call_mss_getecid.o -OBJS += call_dmi_attr_update.o -OBJS += call_proc_dmi_scominit.o -OBJS += call_dmi_scominit.o -OBJS += call_dmi_erepair.o -OBJS += call_dmi_io_dccal.o include ${ROOTPATH}/config.mk diff --git a/src/usr/isteps/istep13/call_host_disable_vddr.C b/src/usr/isteps/istep13/call_host_disable_memvolt.C index 565aab658..9824ccc80 100644 --- a/src/usr/isteps/istep13/call_host_disable_vddr.C +++ b/src/usr/isteps/istep13/call_host_disable_memvolt.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/isteps/istep13/call_host_disable_vddr.C $ */ +/* $Source: src/usr/isteps/istep13/call_host_disable_memvolt.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -35,13 +35,13 @@ using namespace ISTEP_ERROR; namespace ISTEP_13 { -void* call_host_disable_vddr (void *io_pArgs) +void* call_host_disable_memvolt (void *io_pArgs) { errlHndl_t l_err = NULL; IStepError l_StepError; TRACDCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - ENTER_MRK"call_host_disable_vddr"); + ENTER_MRK"call_host_disable_memvolt"); // This function has Compile-time binding for desired platform l_err = platform_disable_vddr(); @@ -49,7 +49,7 @@ void* call_host_disable_vddr (void *io_pArgs) if(l_err) { TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: call_host_disable_vddr returns error", + "ERROR 0x%.8X: call_host_disable_memvolt returns error", l_err->reasonCode()); // Create IStep error log and cross reference to error that occurred l_StepError.addErrorDetails( l_err ); @@ -59,7 +59,7 @@ void* call_host_disable_vddr (void *io_pArgs) } TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - EXIT_MRK"call_host_disable_vddr"); + EXIT_MRK"call_host_disable_memvolt"); return l_StepError.getErrorHandle(); } diff --git a/src/usr/isteps/istep13/call_host_enable_vddr.C b/src/usr/isteps/istep13/call_host_enable_memvolt.C index 91f05d0df..31d99c6b5 100644 --- a/src/usr/isteps/istep13/call_host_enable_vddr.C +++ b/src/usr/isteps/istep13/call_host_enable_memvolt.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/isteps/istep13/call_host_enable_vddr.C $ */ +/* $Source: src/usr/isteps/istep13/call_host_enable_memvolt.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,10 +41,10 @@ using namespace TARGETING; namespace ISTEP_13 { -void* call_host_enable_vddr (void *io_pArgs) +void* call_host_enable_memvolt (void *io_pArgs) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - ENTER_MRK"call_host_enable_vddr" ); + ENTER_MRK"call_host_enable_memvolt" ); errlHndl_t l_err = NULL; IStepError l_StepError; @@ -55,7 +55,7 @@ void* call_host_enable_vddr (void *io_pArgs) if( l_err ) { TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: call_host_enable_vddr returns error", + "ERROR 0x%.8X: call_host_enable_memvolt returns error", l_err->reasonCode()); l_StepError.addErrorDetails( l_err ); @@ -68,7 +68,7 @@ void* call_host_enable_vddr (void *io_pArgs) } TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - EXIT_MRK"call_host_enable_vddr" ); + EXIT_MRK"call_host_enable_memvolt" ); return l_StepError.getErrorHandle(); } diff --git a/src/usr/isteps/istep12/call_dmi_attr_update.C b/src/usr/isteps/istep13/call_mem_pll_reset.C index bf1e4571a..90d1f8245 100644 --- a/src/usr/isteps/istep12/call_dmi_attr_update.C +++ b/src/usr/isteps/istep13/call_mem_pll_reset.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/isteps/istep12/call_dmi_attr_update.C $ */ +/* $Source: src/usr/isteps/istep13/call_mem_pll_reset.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -23,28 +23,27 @@ /* */ /* IBM_PROLOG_END_TAG */ #include <errl/errlentry.H> +#include <errl/errlmanager.H> +#include <errl/errludtarget.H> #include <isteps/hwpisteperror.H> #include <initservice/isteps_trace.H> -using namespace ERRORLOG; -using namespace ISTEP_ERROR; +using namespace ISTEP_ERROR; -namespace ISTEP_12 +namespace ISTEP_13 { -void* call_dmi_attr_update (void *io_pArgs) +void* call_mem_pll_reset (void *io_pArgs) { IStepError l_StepError; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_dmi_attr_update entry" ); + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_reset entry" ); - //@TODO RTC:133831 call dmi_attr_update.C HWP - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_dmi_attr_update exit" ); + // TODO-RTC: 134081 - return l_StepError.getErrorHandle(); + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_reset exit" ); + return l_StepError.getErrorHandle(); } }; diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile index 3893af978..775a2d60c 100644 --- a/src/usr/isteps/istep13/makefile +++ b/src/usr/isteps/istep13/makefile @@ -39,12 +39,13 @@ EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/perv EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/nest EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ -OBJS += call_host_disable_vddr.o +OBJS += call_host_disable_memvolt.o +OBJS += call_mem_pll_reset.o OBJS += call_mem_pll_initf.o OBJS += call_mem_pll_setup.o OBJS += call_proc_mcs_skewadjust.o OBJS += call_mem_startclocks.o -OBJS += call_host_enable_vddr.o +OBJS += call_host_enable_memvolt.o OBJS += call_mss_scominit.o OBJS += call_mss_ddr_phy_reset.o OBJS += call_mss_draminit.o |
