diff options
41 files changed, 634 insertions, 411 deletions
diff --git a/src/include/usr/hwas/hostbootIstep.H b/src/include/usr/hwas/hostbootIstep.H index ceca11f1c..94c55e71f 100644 --- a/src/include/usr/hwas/hostbootIstep.H +++ b/src/include/usr/hwas/hostbootIstep.H @@ -112,7 +112,7 @@ void* host_gard( void *io_pArgs ); void* host_cancontinue_clear( void *io_pArgs ); /** - * @brief host_PRD_hwreconfig Hook for PRD to handle reconfigure + * @brief host_prd_hwreconfig Hook for PRD to handle reconfigure * * TBD * @@ -120,7 +120,7 @@ void* host_cancontinue_clear( void *io_pArgs ); * or NULL. * return any error logs to istep */ -void* host_PRD_hwreconfig( void *io_pArgs ); +void* host_prd_hwreconfig( void *io_pArgs ); } // namespace HWAS #endif // HOSTBOOTISTEP_H_ diff --git a/src/include/usr/hwpf/istepreasoncodes.H b/src/include/usr/hwpf/istepreasoncodes.H index 9b03c9b8b..0639e713b 100644 --- a/src/include/usr/hwpf/istepreasoncodes.H +++ b/src/include/usr/hwpf/istepreasoncodes.H @@ -104,6 +104,7 @@ enum istepModuleId ISTEP_HOST_MPIPL_SERVICE = 0x37, ISTEP_PROC_CEN_SET_INBAND_ADDR = 0x38, ISTEP_MSS_THERMAL_INIT = 0x39, + ISTEP_MSS_VOLT = 0x3A, }; /** diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H index 29f354026..a15d2edc4 100644 --- a/src/include/usr/isteps/istep06list.H +++ b/src/include/usr/isteps/istep06list.H @@ -27,7 +27,7 @@ * @file istep6list.H * * list of functions called by HWAS (ISTEP 6) - "named isteps" - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. @@ -44,20 +44,35 @@ namespace INITSERVICE { /** + * @file istep06list.H + * * @note IStep definition for Hostboot - Slave SBE * - * 1. host_setup : Setup host environment - * 2. host_istep_enable : Hostboot istep ready - * 3. host_init_fsi : Setup the FSI links to slave chips - * 4. host_set_ipl_parms : Build ipl parameters - * 5. host_discover_targets : Builds targeting - * 6. host_gard : Do Gard - * 7. host_cancontinue_clear : Clear deconfigured states - * 8. proc_revert_sbe_mcs_setup : Clean up MCS extent regs - * 9. host_slave_sbe_config - * 10. host_sbe_start - * 11. proc_check_slave_sbe_seeprom_complete : Check Slave SBE Complete - * 12. proc_xmit_sbe : vSBE Init of Slave Chips + * IStep 06 Slave SBE + * IPL FLow Doc v1.28 (12/03/12) + * + * 06.1 host_setup + * : Setup host environment (non-executable istep) + * 06.2 host_istep_enable + * : Hostboot istep ready (non-executable istep) + * 06.3 host_init_fsi + * : Setup the FSI links to slave chips + * 06.4 host_set_ipl_parms + * : Build ipl parameters + * 06.5 host_discover_targets + * : Builds targeting + * 06.6 host_gard + * : Do Gard + * 06.7 host_cancontinue_clear + * : Clear deconfigured states + * 06.8 proc_revert_sbe_mcs_setup + * : Clean up MCS extent regs + * 06.9 host_slave_sbe_config + * 06.10 host_sbe_start + * 06.11 proc_check_slave_sbe_seeprom_complete + * : Check Slave SBE Complete + * 06.12 proc_xmit_sbe + * : vSBE Init of Slave Chips * */ const TaskInfo g_istep06[] = { diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H index 73b4875a6..4b7684280 100644 --- a/src/include/usr/isteps/istep07list.H +++ b/src/include/usr/isteps/istep07list.H @@ -28,7 +28,7 @@ * @file istep07list.H * * IStep 07 Nest Chiplets - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 07.1 proc_a_x_pci_dmi_pll_initf * : PLL Initfile for A, X, PCIe, DMI @@ -38,15 +38,15 @@ * : Start clocks on A, X, PCIe chiplets * 07.4 proc_chiplet_scominit * : Apply scom inits to chiplets - * 07.5 proc_pcie_scominit - * : Apply scom inits to PCIe chiplets - * 07.6 proc_scomoverride_chiplets + * 07.5 proc_xbus_scominit + * : Apply scom inits to Xbus + * 07.6 proc_abus_scominit + * : Apply scom inits to Abus + * 07.7 proc_pcie_scominit + * : Apply scom inits to PCIE chiplets + * 07.8 proc_scomoverride_chiplets * : Apply sequenced scom inits * - * ***************************************************************** - * THIS FILE WAS GENERATED ON 2012-04-11:1605 - * ***************************************************************** - * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. * @@ -113,10 +113,26 @@ namespace INITSERVICE NORMAL_IPL_OP, } }, - - { - ISTEPNAME(07,05,"proc_pcie_scominit"), + ISTEPNAME(07,05,"proc_xbus_scominit"), + NEST_CHIPLETS::call_proc_xbus_scominit, + { + START_FN, + EXT_IMAGE, + NORMAL_IPL_OP, + } + }, + { + ISTEPNAME(07,06,"proc_abus_scominit"), + NEST_CHIPLETS::call_proc_abus_scominit, + { + START_FN, + EXT_IMAGE, + NORMAL_IPL_OP, + } + }, + { + ISTEPNAME(07,07,"proc_pcie_scominit"), NEST_CHIPLETS::call_proc_pcie_scominit, { START_FN, @@ -124,10 +140,8 @@ namespace INITSERVICE NORMAL_IPL_OP, } }, - - { - ISTEPNAME(07,06,"proc_scomoverride_chiplets"), + ISTEPNAME(07,08,"proc_scomoverride_chiplets"), NEST_CHIPLETS::call_proc_scomoverride_chiplets, { START_FN, diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H index d3565a9ee..cac17c3e1 100644 --- a/src/include/usr/isteps/istep08list.H +++ b/src/include/usr/isteps/istep08list.H @@ -28,7 +28,7 @@ * @file istep08list.H * * IStep 08 EDI, EI Initialization - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 08.1 fabric_erepair * : Restore Fabric/EDI Bus eRepair data @@ -40,8 +40,8 @@ * : Run training on internal buses * 08.5 fabric_post_trainadv * : Advanced post EI/EDI training - * 08.6 host_startPRD_pbus - * : Load PRD for powerbus domain + * 08.6 host_startprd_pbus + * : Load prd for powerbus domain * 08.7 host_attnlisten_proc * : Start listening for attentions * 08.8 proc_fab_iovalid @@ -133,8 +133,8 @@ namespace INITSERVICE { - ISTEPNAME(08,06,"host_startPRD_pbus"), - EDI_EI_INITIALIZATION::call_host_startPRD_pbus, + ISTEPNAME(08,06,"host_startprd_pbus"), + EDI_EI_INITIALIZATION::call_host_startprd_pbus, { START_FN, EXT_IMAGE, diff --git a/src/include/usr/isteps/istep09list.H b/src/include/usr/isteps/istep09list.H index 8ad4354b4..22a6f49a6 100644 --- a/src/include/usr/isteps/istep09list.H +++ b/src/include/usr/isteps/istep09list.H @@ -28,11 +28,10 @@ * @file istep09list.H * * IStep 09 Activate PowerBus - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 09.1 proc_build_smp * : Integrate PgP Islands into SMP - * * 09.2 host_slave_sbe_update * : placeholder for secure boot * diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H index 6d955fa73..84493af66 100644 --- a/src/include/usr/isteps/istep10list.H +++ b/src/include/usr/isteps/istep10list.H @@ -29,16 +29,16 @@ * @file istep10list.H * * Step 10 Hostboot SBE Centaur Init - * IPL FLow Doc v1.18 (10/10/12) + * IPL FLow Doc v1.28 (12/03/12) * - * 10.1 host_PRD_hwreconfig - * : Hook for PRD to handle reconfig - * 10.2 cen_sbe_istep_pnor + * 10.1 host_prd_hwreconfig + * : Hook for prd to handle reconfig + * 10.2 cen_sbe_tp_chiplet_init1 * : TP Chiplet init - * 10.3 cen_sbe_tp_chiplet_init1 - * : TP Chiplet init - * 10.4 cen_sbe_npll_initf + * 10.3 cen_sbe_pll_initf * : Program Nest PLL + * 10.4 cen_sbe_pll_setup + * : Setup Nest PLL * 10.5 cen_sbe_tp_chiplet_init2 * : Cen TP Chiplet init 2 * 10.6 cen_sbe_tp_arrayinit @@ -86,17 +86,16 @@ const TaskInfo g_istep10[] = { } }, { - ISTEPNAME(10,01,"host_PRD_hwreconfig"), - HWAS::host_PRD_hwreconfig, + ISTEPNAME(10,01,"host_prd_hwreconfig"), + HWAS::host_prd_hwreconfig, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, } }, - { - ISTEPNAME(10,02,"cen_sbe_istep_pnor"), + ISTEPNAME(10,02,"cen_sbe_tp_chiplet_init1"), SBE_CENTAUR_INIT::call_sbe_centaur_init, { START_FN, @@ -105,7 +104,7 @@ const TaskInfo g_istep10[] = { } }, { - ISTEPNAME(10,03,"cen_sbe_tp_chiplet_init1"), + ISTEPNAME(10,03,"cen_sbe_pll_initf"), HWAS::host_stub, { START_FN, @@ -114,7 +113,7 @@ const TaskInfo g_istep10[] = { } }, { - ISTEPNAME(10,04,"cen_sbe_npll_initf"), + ISTEPNAME(10,04,"cen_sbe_pll_setup"), HWAS::host_stub, { START_FN, @@ -122,6 +121,7 @@ const TaskInfo g_istep10[] = { NORMAL_IPL_OP, } }, + { ISTEPNAME(10,05,"cen_sbe_tp_chiplet_init2"), HWAS::host_stub, diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index 7e24e61d9..693631c07 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -25,27 +25,31 @@ /** * list of functions called for DMI Training - ISTEP 11 according to Dean's - * IPL Flow Doc v1.18 (10/18/12) + * IPL Flow Doc v1.28 (12/03/12) * - * 11.1. dmi_scominit + * 11.1 mss_getecid + * : Read out ECID orff all Centaurs + * 11.2 proc_dmi_scominit + * : DMI Scom setup on P8 MCS + * 11.3 dmi_scominit * : Scom setup on centaur - * 11.2. dmi_erepair + * 11.4 dmi_erepair * : Restore EDI Bus eRepair data - * 11.3. dmi_io_dccal + * 11.5 dmi_io_dccal * : Calibrate DMI interfaces - * 11.4. dmi_pre_trainadv + * 11.6 dmi_pre_trainadv * : Advanced pre DMI training - * 11.5. dmi_io_run_training + * 11.7 dmi_io_run_training * : Run training on MC buses - * 11.6. dmi_post_trainadv + * 11.8 dmi_post_trainadv * : Advanced post DMI training - * 11.7. proc_cen_framelock + * 11.9 proc_cen_framelock * : Initialize EDI Frame - * 11.8. host_startPRD_dmi - * : Load PRD for DMI domain - * 11.9. host_attnlisten_cen + * 11.10 host_startprd_dmi + * : Load prd for DMI domain + * 11.11 host_attnlisten_cen * : Start listening for attentions - * 11.10. cen_set_inband_addr + * 11.12 cen_set_inband_addr * : Set the Inband base addresses */ @@ -80,8 +84,8 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,01,"dmi_scominit"), // substep name - DMI_TRAINING::call_dmi_scominit, // pointer to fn + ISTEPNAME(11,01,"mss_getecid"), // substep name + DMI_TRAINING::call_mss_getecid, // pointer to fn { START_FN, // task type EXT_IMAGE, // Extended Module @@ -89,16 +93,36 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,02,"dmi_erepair"), // substep name - DMI_TRAINING::call_dmi_erepair, // pointer to fn + ISTEPNAME(11,02,"proc_dmi_scominit"), // substep name + DMI_TRAINING::call_proc_dmi_scominit, // pointer to fn { START_FN, // task type EXT_IMAGE, // Extended Module NORMAL_IPL_OP, } }, + + { + ISTEPNAME(11,03,"dmi_scominit"), // substep name + DMI_TRAINING::call_dmi_scominit, // pointer to fn + { + START_FN, // task type + EXT_IMAGE, // Extended Module + NORMAL_IPL_OP, + } + }, + + { + ISTEPNAME(11,04,"dmi_erepair"), // substep name + DMI_TRAINING::call_dmi_erepair, // pointer to fn + { + START_FN, // task type + EXT_IMAGE, // Extended Module + NORMAL_IPL_OP, + } + }, { - ISTEPNAME(11,03,"dmi_io_dccal"), // substep name + ISTEPNAME(11,05,"dmi_io_dccal"), // substep name DMI_TRAINING::call_dmi_io_dccal, // pointer to fn { START_FN, // task type @@ -107,7 +131,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,04,"dmi_pre_trainadv"), // substep name + ISTEPNAME(11,06,"dmi_pre_trainadv"), // substep name DMI_TRAINING::call_dmi_pre_trainadv, // pointer to fn { START_FN, // task type @@ -116,7 +140,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,05,"dmi_io_run_training"), // substep name + ISTEPNAME(11,07,"dmi_io_run_training"), // substep name DMI_TRAINING::call_dmi_io_run_training, // pointer to fn { START_FN, // task type @@ -125,7 +149,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,06,"dmi_post_trainadv"), // substep name + ISTEPNAME(11,08,"dmi_post_trainadv"), // substep name DMI_TRAINING::call_dmi_post_trainadv, // pointer to fn { START_FN, // task type @@ -134,7 +158,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,07,"proc_cen_framelock"), // substep name + ISTEPNAME(11,09,"proc_cen_framelock"), // substep name DMI_TRAINING::call_proc_cen_framelock, // pointer to fn { START_FN, // task type @@ -143,8 +167,8 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,08,"host_startPRD_dmi"), // substep name - DMI_TRAINING::call_host_startPRD_dmi, // pointer to fn + ISTEPNAME(11,10,"host_startprd_dmi"), // substep name + DMI_TRAINING::call_host_startprd_dmi, // pointer to fn { START_FN, // task type EXT_IMAGE, // Extended Module @@ -152,7 +176,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,09,"host_attnlisten_cen"), // substep name + ISTEPNAME(11,11,"host_attnlisten_cen"), // substep name DMI_TRAINING::call_host_attnlisten_cen, // pointer to fn { START_FN, // task type @@ -161,7 +185,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,10,"cen_set_inband_addr"), // substep name + ISTEPNAME(11,12,"cen_set_inband_addr"), // substep name DMI_TRAINING::call_cen_set_inband_addr, // pointer to fn { START_FN, // task type diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index d5cdd1f78..5c0d09f1c 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -28,13 +28,15 @@ * @file istep12list.H * * IStep 12 Step 12 MC Config - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 12.1 host_collect_dimm_spd * : Collect Master dimm SPD - * 12.2 mss_freq + * 12.2 mss_volt + * : Calc dimm voltage + * 12.3 mss_freq * : Calc dimm frequency - * 12.3 mss_eff_config + * 12.4 mss_eff_config * : Determine effective config * * ***************************************************************** @@ -76,7 +78,16 @@ const TaskInfo g_istep12[] = { } }, { - ISTEPNAME(12,02,"mss_freq"), + ISTEPNAME(12,02,"mss_volt"), + MC_CONFIG::call_mss_volt, + { + START_FN, + EXT_IMAGE, + NORMAL_IPL_OP, + } + }, + { + ISTEPNAME(12,03,"mss_freq"), MC_CONFIG::call_mss_freq, { START_FN, @@ -85,7 +96,7 @@ const TaskInfo g_istep12[] = { } }, { - ISTEPNAME(12,03,"mss_eff_config"), + ISTEPNAME(12,04,"mss_eff_config"), MC_CONFIG::call_mss_eff_config, { START_FN, diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H index a72e3afcd..093cbb2a8 100644 --- a/src/include/usr/isteps/istep13list.H +++ b/src/include/usr/isteps/istep13list.H @@ -28,7 +28,7 @@ * @file istep13list.H * * IStep 13 Step 13 DRAM Training - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 13.1 host_disable_vddr * : Disable VDDR on CanContinue loops diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H index eca3251e5..225b5cf63 100644 --- a/src/include/usr/isteps/istep14list.H +++ b/src/include/usr/isteps/istep14list.H @@ -28,28 +28,27 @@ * @file istep14list.H * * IStep 14 Dram Initialization - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * - * 14.1 host_startPRD_dram - * : Load PRD for DRAM domain + * 14.1 host_startprd_dram + * : Load prd for DRAM domain * 14.2 mss_extent_setup - * MSS Extent Setup - * 14.3 mss_scrub + * : MSS Extent Setup + * 14.3 mss_memdiag + * : Mainstore Pattern Testing + * 14.4 mss_scrub * : Start background scrub - * 14.4 mss_thermal_init + * 14.5 mss_thermal_init * : Initialize the thermal sensor - * 14.5 proc_setup_bars + * 14.6 proc_setup_bars * : Setup Memory BARs - * 14.6 proc_pcie_config + * 14.7 proc_pcie_config * : Configure the PHBs - * 14.7 proc_exit_cache_contained + * 14.8 proc_exit_cache_contained * : Allow execution from memory - * 14.8 host_mpipl_service + * 14.9 host_mpipl_service * : Perform MPIPL tasks * - * ***************************************************************** - * THIS FILE WAS GENERATED ON 2012-04-11:1608 - * ***************************************************************** * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. @@ -78,16 +77,14 @@ namespace INITSERVICE }, { - ISTEPNAME(14,01,"host_startPRD_dram"), - DRAM_INITIALIZATION::call_host_startPRD_dram, + ISTEPNAME(14,01,"host_startprd_dram"), + DRAM_INITIALIZATION::call_host_startprd_dram, { START_FN, EXT_IMAGE, NORMAL_IPL_OP, } }, - - { ISTEPNAME(14,02,"mss_extent_setup"), DRAM_INITIALIZATION::call_mss_extent_setup, @@ -98,7 +95,16 @@ namespace INITSERVICE } }, { - ISTEPNAME(14,03,"mss_scrub"), + ISTEPNAME(14,03,"mss_memdiag"), + DRAM_INITIALIZATION::call_mss_memdiag, + { + START_FN, + EXT_IMAGE, + NORMAL_IPL_OP, + } + }, + { + ISTEPNAME(14,04,"mss_scrub"), DRAM_INITIALIZATION::call_mss_scrub, { START_FN, @@ -109,7 +115,7 @@ namespace INITSERVICE { - ISTEPNAME(14,04,"mss_thermal_init"), + ISTEPNAME(14,05,"mss_thermal_init"), DRAM_INITIALIZATION::call_mss_thermal_init, { START_FN, @@ -120,7 +126,7 @@ namespace INITSERVICE { - ISTEPNAME(14,05,"proc_setup_bars"), + ISTEPNAME(14,06,"proc_setup_bars"), DRAM_INITIALIZATION::call_proc_setup_bars, { START_FN, @@ -131,7 +137,7 @@ namespace INITSERVICE { - ISTEPNAME(14,06,"proc_pcie_config"), + ISTEPNAME(14,07,"proc_pcie_config"), DRAM_INITIALIZATION::call_proc_pcie_config, { START_FN, @@ -142,7 +148,7 @@ namespace INITSERVICE { - ISTEPNAME(14,07,"proc_exit_cache_contained"), + ISTEPNAME(14,08,"proc_exit_cache_contained"), DRAM_INITIALIZATION::call_proc_exit_cache_contained, { START_FN, @@ -151,7 +157,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(14,08,"host_mpipl_service"), + ISTEPNAME(14,09,"host_mpipl_service"), DRAM_INITIALIZATION::call_host_mpipl_service, { START_FN, diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H index df9ed5f3c..531c45118 100644 --- a/src/include/usr/isteps/istep15list.H +++ b/src/include/usr/isteps/istep15list.H @@ -28,7 +28,7 @@ * @file istep15list.H * * IStep 15 Build Winkle Images - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 15.1 host_build_winkle * : Build runtime winkle images @@ -37,9 +37,6 @@ * 15.3 proc_poreslw_init * : Initialize the PORE-SLW engine * - * ***************************************************************** - * THIS FILE WAS GENERATED ON 2012-04-12:1228 - * ***************************************************************** * * Please see the note in initsvcstructs.H for description of * the ISTEPNAME macro. diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H index fef1983cf..422099b02 100644 --- a/src/include/usr/isteps/istep16list.H +++ b/src/include/usr/isteps/istep16list.H @@ -28,7 +28,7 @@ * @file istep16list.H * * IStep 16 Core Activate - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 16.1 host_activate_master * : Activate master core diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H index c3771b19f..f4ef21caa 100644 --- a/src/include/usr/isteps/istep18list.H +++ b/src/include/usr/isteps/istep18list.H @@ -28,7 +28,7 @@ * @file istep18list.H * * IStep 18 Establish System SMP - * IPL FLow Doc v1.18 (10/18/12) + * IPL FLow Doc v1.28 (12/03/12) * * 18.10 host_coalesce_host * : Create single host image diff --git a/src/usr/hwas/hostbootIstep.C b/src/usr/hwas/hostbootIstep.C index 7fde0b52a..ba76ac6d4 100644 --- a/src/usr/hwas/hostbootIstep.C +++ b/src/usr/hwas/hostbootIstep.C @@ -43,7 +43,7 @@ namespace HWAS // functions called from the istep dispatcher -- hostboot only //****************************************************************************** -// host_init_fsi function (step 6.3) +// host_init_fsi function //****************************************************************************** void* host_init_fsi( void *io_pArgs ) { @@ -57,7 +57,7 @@ void* host_init_fsi( void *io_pArgs ) } //****************************************************************************** -// host_set_ipl_parms function (step 6.4) +// host_set_ipl_parms function //****************************************************************************** void* host_set_ipl_parms( void *io_pArgs ) { @@ -72,7 +72,7 @@ void* host_set_ipl_parms( void *io_pArgs ) } //****************************************************************************** -// host_discover_targets function (step 6.5) +// host_discover_targets function //****************************************************************************** void* host_discover_targets( void *io_pArgs ) { @@ -88,7 +88,7 @@ void* host_discover_targets( void *io_pArgs ) } //****************************************************************************** -// host_gard function (step 6.6) +// host_gard function //****************************************************************************** void* host_gard( void *io_pArgs ) { @@ -102,7 +102,7 @@ void* host_gard( void *io_pArgs ) } //****************************************************************************** -// host_cancontinue_clear functioni (step 6.7) +// host_cancontinue_clear function //****************************************************************************** void* host_cancontinue_clear( void *io_pArgs ) { @@ -119,19 +119,19 @@ void* host_cancontinue_clear( void *io_pArgs ) } //****************************************************************************** -// host_PRD_hwreconfig function +// host_prd_hwreconfig function //****************************************************************************** -void* host_PRD_hwreconfig( void *io_pArgs ) +void* host_prd_hwreconfig( void *io_pArgs ) { TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "host_PRD_hwreconfig entry" ); + "host_prd_hwreconfig entry" ); errlHndl_t errl = NULL; // stub -- nothing here currently TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "host_PRD_hwreconfig exit" ); + "host_prd_hwreconfig exit" ); return errl; } diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C index 18da77659..fd2d26bef 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C +++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.C @@ -71,8 +71,7 @@ using namespace EDI_EI_INITIALIZATION; using namespace fapi; //****************************************************************************** -// Wrapper function to call 09.1 : -// proc_build_smp +// wrapper function to call proc_build_smp //****************************************************************************** void* call_proc_build_smp( void *io_pArgs ) { @@ -105,7 +104,7 @@ void* call_proc_build_smp( void *io_pArgs ) // Get XBUS connections l_errl = PbusLinkSvc::getTheInstance().getPbusConnections( l_xbusConnections, TYPE_XBUS, false ); - + if (l_errl) { l_StepError.addErrorDetails(ISTEP_ACTIVATE_POWER_BUS_FAILED, @@ -244,18 +243,18 @@ void* call_proc_build_smp( void *io_pArgs ) } //****************************************************************************** -// wrapper function to call step 9.02 - host_slave_sbe_update +// wrapper function to call host_slave_sbe_update //****************************************************************************** void * call_host_slave_sbe_update( void * io_pArgs ) { errlHndl_t l_errl = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_slave_sbe_update entry" ); // call p8_customize_image.C - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_slave_sbe_update exit" ); return l_errl; diff --git a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H index bb7a19fcc..aba77f71b 100644 --- a/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H +++ b/src/usr/hwpf/hwp/activate_powerbus/activate_powerbus.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.28 (12/03/12) * @istepname activate_powerbus * @istepnum 09 * @istepdesc Activate PowerBus @@ -52,6 +52,12 @@ * @substepdesc : Integrate PgP Islands into SMP * @target_sched serial * @} + * @{ + * @substepnum 2 + * @substepname host_slave_sbe_update + * @substepdesc : execute p8_customize_image + * @target_sched serial + * @} * */ @@ -68,7 +74,7 @@ namespace ACTIVATE_POWERBUS /** * @brief proc_build_smp * - * 09.1 : : Integrate PgP Islands into SMP + * Integrate PgP Islands into SMP * * param[in,out] - pointer to any arguments, usually NULL * @@ -80,8 +86,8 @@ void* call_proc_build_smp( void *io_pArgs ); /** * @brief host_slave_sbe_update * - * 09.2 : : Placeholder for secureboot where Hostboot must update - * SEEPROM because FSP cannot. + * Placeholder for secureboot where Hostboot must update + * SEEPROM because FSP cannot. * * param[in,out] - pointer to any arguments, usually NULL * diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C index 7fc304142..f9fe90658 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C +++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C @@ -319,8 +319,7 @@ errlHndl_t applyPoreGenCpuRegs( TARGETING::Target *i_cpuTarget, } // -// Wrapper function to call 15.1 : -// host_build_winkle +// Wrapper function to call host_build_winkle // void* call_host_build_winkle( void *io_pArgs ) { @@ -489,8 +488,7 @@ void* call_host_build_winkle( void *io_pArgs ) // -// Wrapper function to call 15.2 : -// p8_set_pore_bar +// Wrapper function to call p8_set_pore_bar // void* call_proc_set_pore_bar( void *io_pArgs ) { @@ -605,8 +603,7 @@ void* call_proc_set_pore_bar( void *io_pArgs ) } // -// Wrapper function to call 15.3 : -// p8_poreslw_init +// Wrapper function to call p8_poreslw_init // void* call_p8_poreslw_init( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H index a032774c4..644cce3a5 100644 --- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H +++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.28 (12/03/12) * @istepname build_winkle_images * @istepnum 15 * @istepdesc Build Winkle Images @@ -79,7 +79,7 @@ namespace BUILD_WINKLE_IMAGES /** * @brief host_build_winkle * - * 15.1 : : Build runtime winkle images + * Build runtime winkle images * * param[in,out] - pointer to any arguments, usually NULL * @@ -93,7 +93,7 @@ void* call_host_build_winkle( void *io_pArgs ); /** * @brief proc_set_pore_bar * - * 15.2 : : Tell SLW Eng where winkle image is + * Tell SLW Eng where winkle image is * * param[in,out] - pointer to any arguments, usually NULL * @@ -107,7 +107,7 @@ void* call_proc_set_pore_bar( void *io_pArgs ); /** * @brief p8_poreslw_init * - * 15.3 : : Initialize the PORE-SLW engine + * Initialize the PORE-SLW engine * * param[in,out] - pointer to any arguments, usually NULL * diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.C b/src/usr/hwpf/hwp/core_activate/core_activate.C index 1818ee32f..56070edbc 100644 --- a/src/usr/hwpf/hwp/core_activate/core_activate.C +++ b/src/usr/hwpf/hwp/core_activate/core_activate.C @@ -82,8 +82,7 @@ using namespace ISTEP_ERROR; // -// Wrapper function to call 16.1 : -// host_activate_master +// Wrapper function to call host_activate_master // void* call_host_activate_master( void *io_pArgs ) { @@ -325,8 +324,7 @@ void* call_host_activate_master( void *io_pArgs ) // -// Wrapper function to call 16.2 : -// host_activate_slave_cores +// Wrapper function to call host_activate_slave_cores // void* call_host_activate_slave_cores( void *io_pArgs ) { @@ -487,8 +485,7 @@ void* call_host_activate_slave_cores( void *io_pArgs ) // -// Wrapper function to call 16.3 : -// host_ipl_complete +// Wrapper function to call host_ipl_complete // void* call_host_ipl_complete( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.H b/src/usr/hwpf/hwp/core_activate/core_activate.H index 147118b47..b38a43f98 100644 --- a/src/usr/hwpf/hwp/core_activate/core_activate.H +++ b/src/usr/hwpf/hwp/core_activate/core_activate.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.28 (12/03/12) * @istepname core_activate * @istepnum 16 * @istepdesc Core Activate @@ -80,7 +80,7 @@ namespace CORE_ACTIVATE /** * @brief host_activate_master * - * 16.1 : : Activate master core + * Activate master core * * param[in,out] - pointer to any arguments, usually NULL * @@ -94,7 +94,7 @@ void* call_host_activate_master( void *io_pArgs ); /** * @brief host_activate_slave_cores * - * 16.2 : : Activate slave cores + * Activate slave cores * * param[in,out] - pointer to any arguments, usually NULL * @@ -108,7 +108,7 @@ void* call_host_activate_slave_cores( void *io_pArgs ); /** * @brief host_ipl_complete * - * 16.3 : : Notify FSP drawer ipl complete + * Notify FSP drawer ipl complete * * param[in,out] - pointer to any arguments, usually NULL * diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.C b/src/usr/hwpf/hwp/dmi_training/dmi_training.C index 5645bb71a..c917b54f3 100644 --- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C +++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C @@ -77,8 +77,39 @@ using namespace ERRORLOG; using namespace TARGETING; using namespace fapi; + +// +// Wrapper function to call mss_getecid +// +void* call_mss_getecid( void *io_pArgs ) +{ + errlHndl_t l_err = NULL; + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_getecid entry" ); + + // call mss_getecid.C + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_getecid exit" ); + + return l_err; +} + +// +// Wrapper function to call proc_dmi_scominit +// +void* call_proc_dmi_scominit( void *io_pArgs ) +{ + errlHndl_t l_err = NULL; + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_dmi_scominit entry" ); + + // call proc_dmi_scominit.C + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_dmi_scominit exit" ); + + return l_err; +} + // -// Wrapper function to call 11.1 dmi_scominit +// Wrapper function to call dmi_scominit // void* call_dmi_scominit( void *io_pArgs ) { @@ -197,7 +228,7 @@ void* call_dmi_scominit( void *io_pArgs ) // -// Wrapper function to call 11.2 : dmi_erepair +// Wrapper function to call dmi_erepair // void* call_dmi_erepair( void *io_pArgs ) { @@ -211,7 +242,7 @@ void* call_dmi_erepair( void *io_pArgs ) } // -// Wrapper function to call 11.3 : dmi_io_dccal +// Wrapper function to call dmi_io_dccal // void* call_dmi_io_dccal( void *io_pArgs ) { @@ -227,7 +258,7 @@ void* call_dmi_io_dccal( void *io_pArgs ) // -// Wrapper function to call 11.4 : dmi_pre_trainadv +// Wrapper function to call dmi_pre_trainadv // void* call_dmi_pre_trainadv( void *io_pArgs ) { @@ -243,7 +274,7 @@ void* call_dmi_pre_trainadv( void *io_pArgs ) // -// Wrapper function to call 11.5 : dmi_io_run_training +// Wrapper function to call dmi_io_run_training // void* call_dmi_io_run_training( void *io_pArgs ) { @@ -386,7 +417,7 @@ void* call_dmi_io_run_training( void *io_pArgs ) } // -// Wrapper function to call 11.6 : dmi_post_trainadv +// Wrapper function to call dmi_post_trainadv // void* call_dmi_post_trainadv( void *io_pArgs ) { @@ -402,7 +433,7 @@ void* call_dmi_post_trainadv( void *io_pArgs ) // -// Wrapper function to call 11.7 : proc_cen_framelock +// Wrapper function to call proc_cen_framelock // void* call_proc_cen_framelock( void *io_pArgs ) { @@ -515,9 +546,9 @@ void* call_proc_cen_framelock( void *io_pArgs ) } // -// Wrapper function to call 11.8 : host_startPRD_dmi +// Wrapper function to call host_startprd_dmi // -void* call_host_startPRD_dmi( void *io_pArgs ) +void* call_host_startprd_dmi( void *io_pArgs ) { errlHndl_t l_err = NULL; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_dmi entry" ); @@ -529,7 +560,7 @@ void* call_host_startPRD_dmi( void *io_pArgs ) } // -// Wrapper function to call 11.9 : host_attnlisten_cen +// Wrapper function to call host_attnlisten_cen // void* call_host_attnlisten_cen( void *io_pArgs ) { @@ -545,7 +576,7 @@ void* call_host_attnlisten_cen( void *io_pArgs ) } // -// Wrapper function to call 11.10 : cen_set_inband_addr +// Wrapper function to call cen_set_inband_addr // void* call_cen_set_inband_addr( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.H b/src/usr/hwpf/hwp/dmi_training/dmi_training.H index 5b25b817c..ee0e0a7f0 100644 --- a/src/usr/hwpf/hwp/dmi_training/dmi_training.H +++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.H @@ -34,68 +34,79 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.18 (12/03/12) * @istepname dmi_training * @istepnum 11 * @istepdesc DMI Training * - * * @{ * @substepnum 1 + * @substepname mss_getecid + * @substepdesc : Read out ECID from all centaur chips + * @target_sched serial + * @} + * @{ + * @substepnum 2 + * @substepname proc_dmi_scominit + * @substepdesc : DMI Scom setup on P8 MCS + * @target_sched serial + * @} + * @{ + * @substepnum 3 * @substepname dmi_scominit * @substepdesc : Scom setup on centaur * @target_sched serial * @} * @{ - * @substepnum 2 + * @substepnum 4 * @substepname dmi_erepair * @substepdesc : Restore EDI Bus eRepair data * @target_sched serial * @} * @{ - * @substepnum 3 + * @substepnum 5 * @substepname dmi_io_dccal * @substepdesc : Calibrate DMI interfaces * @target_sched serial * @} * @{ - * @substepnum 4 + * @substepnum 6 * @substepname dmi_pre_trainadv * @substepdesc : Advanced pre DMI training * @target_sched serial * @} * @{ - * @substepnum 5 + * @substepnum 7 * @substepname dmi_io_run_training * @substepdesc : Run training on MC buses * @target_sched serial * @} * @{ - * @substepnum 6 + * @substepnum 8 * @substepname dmi_post_trainadv * @substepdesc : Advanced post DMI training * @target_sched serial * @} * @{ - * @substepnum 7 + * @substepnum 9 * @substepname proc_cen_framelock * @substepdesc : Initialize EDI Frame * @target_sched serial * @} * @{ - * @substepnum 8 - * @substepname host_startPRD_dmi + * @substepnum 10 + * @substepname host_startprd_dmi * @substepdesc : Load PRD for DMI domain * @target_sched serial * @} * @{ - * @substepnum 9 + * @substepnum 11 * @substepname host_attnlisten_cen * @substepdesc : Start listening for attentions * @target_sched serial * @} * @{ - * @substepnum 10 + * @substepnum 12 * @substepname cen_set_inband_addr * @substepdesc : Set the Inband base addresses * @target_sched serial @@ -114,9 +125,35 @@ namespace DMI_TRAINING { /** + * @brief mss_getecid + * + * Read out ECID of all centaur chips + * + * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, + * or NULL. + * return any error logs to istep + * + */ +void* call_mss_getecid( void * io_pArgs ); + + +/** + * @brief proc_dmi_scominit + * + * DMI Scom setup on P8 MCS + * + * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, + * or NULL. + * return any error logs to istep + * + */ +void* call_proc_dmi_scominit( void * io_pArgs ); + + +/** * @brief dmi_scominit * - * 11.1 : Scom setup on centaur + * Scom setup on centaur * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -129,7 +166,7 @@ void* call_dmi_scominit( void * io_pArgs ); /** * @brief dmi_erepair * - * 11.2 : Restore EDI Bus eRepair data + * Restore EDI Bus eRepair data * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -142,7 +179,7 @@ void* call_dmi_erepair( void * io_pArgs ); /** * @brief dmi_io_dccal * - * 11.3 : Calibrate DMI interfaces + * Calibrate DMI interfaces * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -155,7 +192,7 @@ void* call_dmi_io_dccal( void * io_pArgs ); /** * @brief dmi_pre_trainadv * - * 11.4 : Advanced pre DMI training + * Advanced pre DMI training * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -168,7 +205,7 @@ void* call_dmi_pre_trainadv( void * io_pArgs ); /** * @brief dmi_io_run_training * - * 11.5 : Run training on MC buses + * Run training on MC buses * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -181,7 +218,7 @@ void* call_dmi_io_run_training( void * io_pArgs ); /** * @brief dmi_post_trainadv * - * 11.6 : Advanced post DMI training + * Advanced post DMI training * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -194,7 +231,7 @@ void* call_dmi_post_trainadv( void * io_pArgs ); /** * @brief proc_cen_framelock * - * 11.7 : Initialize EDI Frame + * Initialize EDI Frame * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -205,22 +242,22 @@ void* call_proc_cen_framelock( void *io_pArgs ); /** - * @brief host_startPRD_dmi + * @brief host_startprd_dmi * - * 11.8 : Load PRD for DMI domain + * Load PRD for DMI domain * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. * return any error logs to istep * */ -void* call_host_startPRD_dmi( void * io_pArgs ); +void* call_host_startprd_dmi( void * io_pArgs ); /** * @brief host_attnlisten_cen * - * 11.9 : Start listening for attentions + * Start listening for attentions * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -233,7 +270,7 @@ void* call_host_attnlisten_cen( void * io_pArgs ); /** * @brief cen_set_inband_addr * - * 11.10 : Set the Inband base addresses + * Set the Inband base addresses * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C index a5b6b61ac..91af87b07 100644 --- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C +++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C @@ -94,10 +94,9 @@ using namespace fapi; using namespace ERRORLOG; // -// Wrapper function to call 14.1 : -// host_startPRD_dram +// Wrapper function to call host_startprd_dram // -void* call_host_startPRD_dram( void *io_pArgs ) +void* call_host_startprd_dram( void *io_pArgs ) { errlHndl_t l_errl = NULL; @@ -146,8 +145,7 @@ void* call_host_startPRD_dram( void *io_pArgs ) } // -// Wrapper function to call 14.2 : -// mss_extent_setup +// Wrapper function to call mss_extent_setup // void* call_mss_extent_setup( void *io_pArgs ) { @@ -188,32 +186,9 @@ void* call_mss_extent_setup( void *io_pArgs ) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : mss_extent_setup completed ok" ); - - // call mss_memdiag - l_errl = call_mss_memdiag(io_pArgs); - - if( l_errl ) - { - /*@ - * @errortype - * @reasoncode ISTEP_DRAM_INITIALIZATION_FAILED - * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE - * @moduleid ISTEP_MSS_MEMDIAG - * @userdata1 bytes 0-1: plid identifying first error - * bytes 2-3: reason code of first error - * @userdata2 bytes 0-1: total number of elogs included - * bytes 2-3: N/A - * @devdesc call to mss_memdiag has failed, see error log - * identified by the plid in user data - */ - l_stepError.addErrorDetails(ISTEP_DRAM_INITIALIZATION_FAILED, - ISTEP_MSS_MEMDIAG, - l_errl ); - - errlCommit( l_errl, HWPF_COMP_ID ); - } } + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_extent_setup exit" ); @@ -221,15 +196,18 @@ void* call_mss_extent_setup( void *io_pArgs ) return l_stepError.getErrorHandle(); } + // // Wrapper function to call mss_memdiag // -errlHndl_t call_mss_memdiag( void *io_pArgs ) +void* call_mss_memdiag( void *io_pArgs ) { using namespace MDIA; errlHndl_t l_errl = NULL; + IStepError l_stepError; + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_memdiag entry" ); @@ -262,18 +240,38 @@ errlHndl_t call_mss_memdiag( void *io_pArgs ) } while (0); + if( l_errl ) + { + /*@ + * @errortype + * @reasoncode ISTEP_DRAM_INITIALIZATION_FAILED + * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE + * @moduleid ISTEP_MSS_MEMDIAG + * @userdata1 bytes 0-1: plid identifying first error + * bytes 2-3: reason code of first error + * @userdata2 bytes 0-1: total number of elogs included + * bytes 2-3: N/A + * @devdesc call to mss_memdiag has failed, see error log + * identified by the plid in user data + */ + l_stepError.addErrorDetails(ISTEP_DRAM_INITIALIZATION_FAILED, + ISTEP_MSS_MEMDIAG, + l_errl ); + + errlCommit( l_errl, HWPF_COMP_ID ); + } + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_memdiag exit" ); // end task, returning any errorlogs to IStepDisp - return l_errl; + return l_stepError.getErrorHandle(); } // -// Wrapper function to call 14.3 : -// mss_scrub +// Wrapper function to call mss_scrub // void* call_mss_scrub( void *io_pArgs ) { @@ -325,8 +323,7 @@ void* call_mss_scrub( void *io_pArgs ) // -// Wrapper function to call 14.4 : -// mss_thermal_init +// Wrapper function to call mss_thermal_init // void* call_mss_thermal_init( void *io_pArgs ) { @@ -417,8 +414,7 @@ void* call_mss_thermal_init( void *io_pArgs ) // -// Wrapper function to call 14.5 : -// proc_setup_bars +// Wrapper function to call proc_setup_bars // void* call_proc_setup_bars( void *io_pArgs ) { @@ -643,8 +639,7 @@ void* call_proc_setup_bars( void *io_pArgs ) // -// Wrapper function to call 14.6 : -// proc_pcie_config +// Wrapper function to call proc_pcie_config // void* call_proc_pcie_config( void *io_pArgs ) { @@ -720,8 +715,7 @@ void* call_proc_pcie_config( void *io_pArgs ) // -// Wrapper function to call 14.7 : -// proc_exit_cache_contained +// Wrapper function to call proc_exit_cache_contained // void* call_proc_exit_cache_contained( void *io_pArgs ) { @@ -764,8 +758,8 @@ void* call_proc_exit_cache_contained( void *io_pArgs ) * @errortype * @moduleid fapi::MOD_EXIT_CACHE_CONTAINED * @reasoncode fapi::RC_MM_EXTEND_FAILED - * @userdata1 rc from mm_extend - * @userdata2 <UNUSED> + * @userdata1 rc from mm_extend + * @userdata2 <UNUSED> * * @devdesc Failure extending memory to 32MEG after * exiting cache contained mode. @@ -815,8 +809,7 @@ void* call_proc_exit_cache_contained( void *io_pArgs ) // -// Wrapper function to call 14.8 : -// call_host_mpipl_service +// Wrapper function to call call_host_mpipl_service // void* call_host_mpipl_service( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H index c45a08563..935b3824d 100644 --- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H +++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H @@ -43,14 +43,14 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.28 (12/03/12) * @istepname dram_initialization * @istepnum 14 * @istepdesc Dram Initialization * * @{ * @substepnum 1 - * @substepname host_startPRD_dram + * @substepname host_startprd_dram * @substepdesc : Load PRD for DRAM domain * @target_sched serial * @} @@ -96,7 +96,13 @@ * @substepdesc : Allow execution from memory * @target_sched serial * @} - * + * @{ + * @substepnum 9 + * @substepname host_mpipl_service + * @substepdesc : host_mpipl_service + * @target_sched serial + * @} + */ namespace DRAM_INITIALIZATION @@ -104,22 +110,22 @@ namespace DRAM_INITIALIZATION /** - * @brief host_startPRD_dram + * @brief host_startprd_dram * - * 14.1 : : Load PRD for DRAM domain + * Load PRD for DRAM domain * * param[in,out] - pointer to any arguments, usually NULL * * return pointer to any errlogs * */ -void* call_host_startPRD_dram( void *io_pArgs ); +void* call_host_startprd_dram( void *io_pArgs ); /** * @brief mss_extent_setup * - * 14.2 : MSS Extent Setup + * MSS Extent Setup * * param[in,out] - pointer to any arguments, usually NULL * @@ -138,12 +144,12 @@ void* call_mss_extent_setup( void *io_pArgs ); * return pointer to any errlogs * */ -errlHndl_t call_mss_memdiag( void *io_pArgs ); +void* call_mss_memdiag( void *io_pArgs ); /** * @brief mss_scrub * - * 14.3 : : Start background scrub + * Start background scrub * * param[in,out] - pointer to any arguments, usually NULL * @@ -157,7 +163,7 @@ void* call_mss_scrub( void *io_pArgs ); /** * @brief mss_thermal_init * - * 14.4 : : Initialize the thermal sensor + * Initialize the thermal sensor * * param[in,out] - pointer to any arguments, usually NULL * @@ -171,7 +177,7 @@ void* call_mss_thermal_init( void *io_pArgs ); /** * @brief proc_setup_bars * - * 14.5 : : Setup Memory BARs + * Setup Memory BARs * * param[in,out] - pointer to any arguments, usually NULL * @@ -185,7 +191,7 @@ void* call_proc_setup_bars( void *io_pArgs ); /** * @brief proc_pcie_config * - * 14.6 : : Configure the PHBs + * Configure the PHBs * * param[in,out] - pointer to any arguments, usually NULL * @@ -199,7 +205,7 @@ void* call_proc_pcie_config( void *io_pArgs ); /** * @brief proc_exit_cache_contained * - * 14.7 : : Allow execution from memory + * Allow execution from memory * * param[in,out] - pointer to any arguments, usually NULL * @@ -212,7 +218,7 @@ void* call_proc_exit_cache_contained( void *io_pArgs ); /** * @brief host_mpipl_service * - * 14.8 : : Perform MPIPL tasks + * Perform MPIPL tasks * * param[in,out] - pointer to any arguments, usually NULL * diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C index b160a04c2..083786e64 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.C +++ b/src/usr/hwpf/hwp/dram_training/dram_training.C @@ -94,7 +94,7 @@ using namespace TARGETING; using namespace fapi; // -// Wrapper function to call 13.1 : host_disable_vddr +// Wrapper function to call host_disable_vddr // void* call_host_disable_vddr( void *io_pArgs ) { @@ -153,7 +153,7 @@ void* call_host_disable_vddr( void *io_pArgs ) } // -// Wrapper function to call 13.2 : mem_pll_initf +// Wrapper function to call mem_pll_initf // void* call_mem_pll_initf( void *io_pArgs ) { @@ -169,7 +169,7 @@ void* call_mem_pll_initf( void *io_pArgs ) // -// Wrapper function to call 13.3 : mem_pll_setup +// Wrapper function to call mem_pll_setup // void* call_mem_pll_setup( void *io_pArgs ) { @@ -282,7 +282,7 @@ void* call_mem_pll_setup( void *io_pArgs ) } // -// Wrapper function to call 13.4 : mem_startclocks +// Wrapper function to call mem_startclocks // void* call_mem_startclocks( void *io_pArgs ) { @@ -363,7 +363,7 @@ void* call_mem_startclocks( void *io_pArgs ) // -// Wrapper function to call 13.5 : host_enable_vddr +// Wrapper function to call host_enable_vddr // void* call_host_enable_vddr( void *io_pArgs ) { @@ -424,7 +424,7 @@ void* call_host_enable_vddr( void *io_pArgs ) // -// Wrapper function to call 13.6 : mss_scominit +// Wrapper function to call mss_scominit // void* call_mss_scominit( void *io_pArgs ) { @@ -499,7 +499,7 @@ void* call_mss_scominit( void *io_pArgs ) } // -// Wrapper function to call 13.7 : mss_ddr_phy_reset +// Wrapper function to call mss_ddr_phy_reset // void* call_mss_ddr_phy_reset( void *io_pArgs ) { @@ -584,7 +584,7 @@ void* call_mss_ddr_phy_reset( void *io_pArgs ) // -// Wrapper function to call 13.8 : mss_draminit +// Wrapper function to call mss_draminit // void* call_mss_draminit( void *io_pArgs ) { @@ -671,7 +671,7 @@ void* call_mss_draminit( void *io_pArgs ) // -// Wrapper function to call 13.9 : mss_draminit_training +// Wrapper function to call mss_draminit_training // void* call_mss_draminit_training( void *io_pArgs ) { @@ -758,7 +758,7 @@ void* call_mss_draminit_training( void *io_pArgs ) } // -// Wrapper function to call 13.10 : mss_draminit_trainadv +// Wrapper function to call mss_draminit_trainadv // void* call_mss_draminit_trainadv( void *io_pArgs ) { @@ -817,7 +817,7 @@ void* call_mss_draminit_trainadv( void *io_pArgs ) } // -// Wrapper function to call 13.11 : mss_draminit_mc +// Wrapper function to call mss_draminit_mc // void* call_mss_draminit_mc( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.H b/src/usr/hwpf/hwp/dram_training/dram_training.H index 9e256036e..6092fb99d 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.H +++ b/src/usr/hwpf/hwp/dram_training/dram_training.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.28 (12/03/12) * @istepname dram_training * @istepnum 13 * @istepdesc Step 13 DRAM Training @@ -54,54 +54,61 @@ * @} * @{ * @substepnum 2 + * @substepname mem_pll_initf + * @substepdesc : PLL initfile for MBAs + * @target_sched serial + * @} + + * @{ + * @substepnum 3 * @substepname mem_pll_setup * @substepdesc : Setup PLL for MBAs * @target_sched serial * @} * @{ - * @substepnum 3 + * @substepnum 4 * @substepname mem_startclocks * @substepdesc : Start clocks on MBAs * @target_sched serial * @} * @{ - * @substepnum 4 + * @substepnum 5 * @substepname host_enable_vddr * @substepdesc : Enable the VDDR3 Voltage Rail * @target_sched serial * @} * @{ - * @substepnum 5 + * @substepnum 6 * @substepname mss_scominit * @substepdesc : Perform scom inits to MC and PHY * @target_sched serial * @} * @{ - * @substepnum 6 + * @substepnum 7 * @substepname mss_ddr_phy_reset * @substepdesc : Soft reset of DDR PHY macros * @target_sched serial * @} * @{ - * @substepnum 7 + * @substepnum 8 * @substepname mss_draminit * @substepdesc : Dram initialize * @target_sched serial * @} * @{ - * @substepnum 8 + * @substepnum 9 * @substepname mss_draminit_training * @substepdesc : Dram training * @target_sched serial * @} * @{ - * @substepnum 9 + * @substepnum 10 * @substepname mss_draminit_trainadv * @substepdesc : Advanced dram training * @target_sched serial * @} * @{ - * @substepnum 10 + * @substepnum 11 * @substepname mss_draminit_mc * @substepdesc : Hand off control to MC * @target_sched serial @@ -118,7 +125,7 @@ namespace DRAM_TRAINING /** * @brief host_disable_vddr * - * 13.1 : : Disable VDDR on CanContinue loops + * Disable VDDR on CanContinue loops * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -128,9 +135,9 @@ namespace DRAM_TRAINING void* call_host_disable_vddr( void * io_pArgs ); /** - * @brief mem_pll_pll_initf + * @brief mem_pll_initf * - * 13.2 : : PLL init file for MBAs + * PLL init file for MBAs * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -142,7 +149,7 @@ void* call_mem_pll_initf( void * io_pArgs ); /** * @brief mem_pll_setup * - * 13.3 : : Setup PLL for MBAs + * Setup PLL for MBAs * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -156,7 +163,7 @@ void* call_mem_pll_setup( void * io_pArgs ); /** * @brief mem_startclocks * - * 13.4 : : Start clocks on MBAs + * Start clocks on MBAs * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -170,7 +177,7 @@ void* call_mem_startclocks( void * io_pArgs ); /** * @brief host_enable_vddr * - * 13.5 : : Enable the VDDR3 Voltage Rail + * Enable the VDDR3 Voltage Rail * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -185,7 +192,7 @@ void* call_host_enable_vddr( void * io_pArgs ); /** * @brief mss_scominit * - * 13.6 : : Perform scom inits to MC and PHY + * Perform scom inits to MC and PHY * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -199,7 +206,7 @@ void* call_mss_scominit( void * io_pArgs ); /** * @brief mss_ddr_phy_reset * - * 13.7 : : Soft reset of DDR PHY macros + * Soft reset of DDR PHY macros * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -213,7 +220,7 @@ void* call_mss_ddr_phy_reset( void * io_pArgs ); /** * @brief mss_draminit * - * 13.8 : : Dram initialize + * Dram initialize * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -226,7 +233,7 @@ void* call_mss_draminit( void * io_pArgs ); /** * @brief mss_draminit_training * - * 13.9 : : Dram training + * Dram training * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -240,7 +247,7 @@ void* call_mss_draminit_training( void * io_pArgs ); /** * @brief mss_draminit_trainadv * - * 13.10 : : Advanced dram training + * Advanced dram training * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -254,7 +261,7 @@ void* call_mss_draminit_trainadv( void * io_pArgs ); /** * @brief mss_draminit_mc * - * 13.11 : : Hand off control to MC + * Hand off control to MC * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C index f23233a57..a7c38f477 100644 --- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C +++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C @@ -69,7 +69,7 @@ // #include "fabric_pre_trainadv/fabric_pre_trainadv.H" #include "fabric_io_run_training/fabric_io_run_training.H" // #include "fabric_post_trainadv/fabric_post_trainadv.H" -// #include "host_startPRD_pbus/host_startPRD_pbus.H" +// #include "host_startprd_pbus/host_startprd_pbus.H" // #include "host_attnlisten_proc/host_attnlisten_proc.H" #include "proc_fab_iovalid/proc_fab_iovalid.H" #include <diag/prdf/common/prdfMain.H> @@ -85,8 +85,7 @@ using namespace fapi; // -// Wrapper function to call 08.1 : -// fabric_erepair +// Wrapper function to call fabric_erepair // void* call_fabric_erepair( void *io_pArgs ) { @@ -138,8 +137,7 @@ void* call_fabric_erepair( void *io_pArgs ) // -// Wrapper function to call 08.2 : -// fabric_io_dccal +// Wrapper function to call fabric_io_dccal // void* call_fabric_io_dccal( void *io_pArgs ) { @@ -191,8 +189,7 @@ void* call_fabric_io_dccal( void *io_pArgs ) // -// Wrapper function to call 08.3 : -// fabric_pre_trainadv +// Wrapper function to call fabric_pre_trainadv // void* call_fabric_pre_trainadv( void *io_pArgs ) { @@ -244,8 +241,7 @@ void* call_fabric_pre_trainadv( void *io_pArgs ) // -// Wrapper function to call 08.4 : -// fabric_io_run_training +// Wrapper function to call fabric_io_run_training // void* call_fabric_io_run_training( void *io_pArgs ) { @@ -329,8 +325,7 @@ void* call_fabric_io_run_training( void *io_pArgs ) // -// Wrapper function to call 08.5 : -// fabric_post_trainadv +// Wrapper function to call fabric_post_trainadv // void* call_fabric_post_trainadv( void *io_pArgs ) { @@ -382,15 +377,14 @@ void* call_fabric_post_trainadv( void *io_pArgs ) // -// Wrapper function to call 08.6 : -// host_startPRD_pbus +// Wrapper function to call host_startprd_pbus // -void* call_host_startPRD_pbus( void *io_pArgs ) +void* call_host_startprd_pbus( void *io_pArgs ) { errlHndl_t l_errl = NULL; TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_startPRD_pbus entry" ); + "call_host_startprd_pbus entry" ); l_errl = PRDF::initialize(); @@ -401,7 +395,7 @@ void* call_host_startPRD_pbus( void *io_pArgs ) } TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_startPRD_pbus exit" ); + "call_host_startprd_pbus exit" ); // end task, returning any errorlogs to IStepDisp return l_errl; @@ -410,8 +404,7 @@ void* call_host_startPRD_pbus( void *io_pArgs ) // -// Wrapper function to call 08.7 : -// host_attnlisten_proc +// Wrapper function to call host_attnlisten_proc // void* call_host_attnlisten_proc( void *io_pArgs ) { @@ -463,8 +456,7 @@ void* call_host_attnlisten_proc( void *io_pArgs ) // -// Wrapper function to call 08.8 : -// proc_fab_iovalid +// Wrapper function to call proc_fab_iovalid // void* call_proc_fab_iovalid( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H index ab6d0bf2c..890dfe4c2 100644 --- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H +++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.28 (12/03/12) * @istepname edi_ei_initialization * @istepnum 08 * @istepdesc EDI, EI Initialization @@ -78,7 +78,7 @@ * @} * @{ * @substepnum 6 - * @substepname host_startPRD_pbus + * @substepname host_startprd_pbus * @substepdesc : Load PRD for powerbus domain * @target_sched serial * @} @@ -110,7 +110,7 @@ namespace EDI_EI_INITIALIZATION /** * @brief fabric_erepair * - * 08.1 : : Restore Fabric/EDI Bus eRepair data + * Restore Fabric/EDI Bus eRepair data * * param[in,out] - pointer to any arguments, usually NULL * @@ -124,7 +124,7 @@ void* call_fabric_erepair( void *io_pArgs ); /** * @brief fabric_io_dccal * - * 08.2 : : Calibrate Fabric/EDI interfaces + * Calibrate Fabric/EDI interfaces * * param[in,out] - pointer to any arguments, usually NULL * @@ -152,7 +152,7 @@ void* call_fabric_pre_trainadv( void *io_pArgs ); /** * @brief fabric_io_run_training * - * 08.4 : : Run training on internal buses + * Run training on internal buses * * param[in,out] - pointer to any arguments, usually NULL * @@ -166,7 +166,7 @@ void* call_fabric_io_run_training( void *io_pArgs ); /** * @brief fabric_post_trainadv * - * 08.5 : : Advanced post EI/EDI training + * Advanced post EI/EDI training * * param[in,out] - pointer to any arguments, usually NULL * @@ -178,23 +178,23 @@ void* call_fabric_post_trainadv( void *io_pArgs ); /** - * @brief host_startPRD_pbus + * @brief host_startprd_pbus * - * 08.6 : : Load PRD for powerbus domain + * Load PRD for powerbus domain * * param[in,out] - pointer to any arguments, usually NULL * * return any errlogs to istep * */ -void* call_host_startPRD_pbus( void *io_pArgs ); +void* call_host_startprd_pbus( void *io_pArgs ); /** * @brief host_attnlisten_proc * - * 08.7 : : Start listening for attentions + * Start listening for attentions * * param[in,out] - pointer to any arguments, usually NULL * @@ -208,7 +208,7 @@ void* call_host_attnlisten_proc( void *io_pArgs ); /** * @brief proc_fab_iovalid * - * 08.8 : : Lower functional fences on local SMP + * Lower functional fences on local SMP * * param[in,out] - pointer to any arguments, usually NULL * diff --git a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C index 6c6816f4f..c46703cd1 100644 --- a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C +++ b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C @@ -71,8 +71,7 @@ using namespace fapi; // -// Wrapper function to call 18.8 : -// host_coalesce_host +// Wrapper function to call host_coalesce_host // void* call_host_coalesce_host( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H index db290f4c1..43efa5283 100644 --- a/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H +++ b/src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H @@ -41,13 +41,13 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.28 (12/03/12) * @istepname establish_system_smp * @istepnum 18 * @istepdesc Establish System SMP * * @{ - * @substepnum 8 + * @substepnum 10 * @substepname host_coalesce_host * @substepdesc : Create single host image * @target_sched serial @@ -68,7 +68,7 @@ namespace ESTABLISH_SYSTEM_SMP /** * @brief host_coalesce_host * - * 18.8 : : Create single host image + * Create single host image * * param[in,out] - pointer to any arguments, usually NULL * diff --git a/src/usr/hwpf/hwp/mc_config/mc_config.C b/src/usr/hwpf/hwp/mc_config/mc_config.C index 486987fe2..4cef54b1d 100644 --- a/src/usr/hwpf/hwp/mc_config/mc_config.C +++ b/src/usr/hwpf/hwp/mc_config/mc_config.C @@ -85,52 +85,27 @@ using namespace fapi; // -// Wrapper function to call 12.1 : host_collect_dimm_spd +// 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" ); - - l_err = call_mss_volt( io_pArgs ); - - if( l_err ) - { - /*@ - * @errortype - * @reasoncode ISTEP_MC_CONFIG_FAILED - * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE - * @moduleid ISTEP_HOST_COLLECT_DIMM_SPD - * @userdata1 bytes 0-1: plid identifying first error - * bytes 2-3: reason code of first error - * @userdata2 bytes 0-1: total number of elogs included - * bytes 2-3: N/A - * @devdesc call to mss_volt has failed - * - */ - l_StepError.addErrorDetails(ISTEP_MC_CONFIG_FAILED, - ISTEP_HOST_COLLECT_DIMM_SPD, - l_err ); - - errlCommit( l_err, HWPF_COMP_ID ); - - } TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_collect_dimm_spd exit" ); return l_err; } - // -// Wrapper function to call mss_volt +// Wrapper function to call mss_volt // -errlHndl_t call_mss_volt( void *io_pArgs ) +void* call_mss_volt( void *io_pArgs ) { errlHndl_t l_err = NULL; + IStepError l_StepError; + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_volt entry" ); TARGETING::TargetHandleList l_membufTargetList; @@ -163,7 +138,7 @@ errlHndl_t call_mss_volt( void *io_pArgs ) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "===== mss_volt HWP( vector )" ); - // call the HWP with each target ( if parallel, spin off a task ) + // call the HWP with a vector of targets FAPI_INVOKE_HWP(l_err, mss_volt, l_membufFapiTargets); // process return code. @@ -172,6 +147,24 @@ errlHndl_t call_mss_volt( void *io_pArgs ) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "ERROR 0x%.8X: mss_volt HWP( ) ", l_err->reasonCode()); + /*@ + * @errortype + * @reasoncode ISTEP_MC_CONFIG_FAILED + * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE + * @moduleid ISTEP_MSS_VOLT + * @userdata1 bytes 0-1: plid identifying first error + * bytes 2-3: reason code of first error + * @userdata2 bytes 0-1: total number of elogs included + * bytes 2-3: N/A + * @devdesc call to mss_volt has failed + * + */ + l_StepError.addErrorDetails(ISTEP_MC_CONFIG_FAILED, + ISTEP_MSS_VOLT, + l_err ); + + errlCommit( l_err, HWPF_COMP_ID ); + } else { @@ -181,11 +174,11 @@ errlHndl_t call_mss_volt( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_volt exit" ); - return l_err; + return l_StepError.getErrorHandle(); } // -// Wrapper function to call 12.2 : mss_freq +// Wrapper function to call mss_freq // void* call_mss_freq( void *io_pArgs ) { @@ -376,7 +369,7 @@ errlHndl_t call_opt_memmap() } // -// Wrapper function to call 12.3 : mss_eff_config +// Wrapper function to call mss_eff_config // void* call_mss_eff_config( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/mc_config/mc_config.H b/src/usr/hwpf/hwp/mc_config/mc_config.H index 4326619bc..93c5267f8 100644 --- a/src/usr/hwpf/hwp/mc_config/mc_config.H +++ b/src/usr/hwpf/hwp/mc_config/mc_config.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.08 (08/13/12) + * @docversion v1.28 (12/03/12) * @istepname mc_config * @istepnum 12 * @istepdesc Step 12 MC Config @@ -84,7 +84,7 @@ namespace MC_CONFIG /** * @brief host_collect_dimm_spd * - * 12.1 : : Collect Master dimm SPD + * Collect Master dimm SPD * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -105,14 +105,14 @@ void* call_host_collect_dimm_spd( void * io_pArgs ); * return any error logs to istep * */ -errlHndl_t call_mss_volt( void * io_pArgs ); +void* call_mss_volt( void * io_pArgs ); /** * @brief mss_freq * - * 12.2 : : Calc dimm frequency + * Calc dimm frequency * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -126,7 +126,7 @@ void* call_mss_freq( void * io_pArgs ); /** * @brief mss_eff_config * - * 12.3 : : Determine effective config + * Determine effective config * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. diff --git a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C index f6671c10c..594981119 100644 --- a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C +++ b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.C @@ -84,7 +84,7 @@ using namespace TARGETING; using namespace fapi; //***************************************************************************** -// wrapper function to call step 7.01 - proc_a_x_pci_dmi_pll_initf +// wrapper function to call proc_a_x_pci_dmi_pll_initf //***************************************************************************** void* call_proc_a_x_pci_dmi_pll_initf( void *io_pArgs ) { @@ -176,7 +176,7 @@ void* call_proc_a_x_pci_dmi_pll_initf( void *io_pArgs ) } //***************************************************************************** -// wrapper function to call step 7.02 - proc_a_x_pci_dmi_pll_setup +// wrapper function to call proc_a_x_pci_dmi_pll_setup //***************************************************************************** void* call_proc_a_x_pci_dmi_pll_setup( void *io_pArgs ) { @@ -271,7 +271,7 @@ void* call_proc_a_x_pci_dmi_pll_setup( void *io_pArgs ) } //***************************************************************************** -// wrapper function to call step 7.03 - proc_startclock_chiplets +// wrapper function to call proc_startclock_chiplets //***************************************************************************** void* call_proc_startclock_chiplets( void *io_pArgs ) { @@ -354,7 +354,7 @@ void* call_proc_startclock_chiplets( void *io_pArgs ) } //****************************************************************************** -// wrapper function ito call step 7.04 - proc_chiplet_scominit +// wrapper function to call proc_chiplet_scominit //****************************************************************************** void* call_proc_chiplet_scominit( void *io_pArgs ) { @@ -655,9 +655,41 @@ void* call_proc_chiplet_scominit( void *io_pArgs ) return l_StepError.getErrorHandle(); } +//***************************************************************************** +// wrapper function to call proc_xbus_scominit +//****************************************************************************** +void* call_proc_xbus_scominit( void *io_pArgs ) +{ + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_proc_xbus_scominit entry" ); + + // call proc_xbus_scominit.C + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_proc_xbus_scominit exit" ); + + return NULL; +} + +//***************************************************************************** +// wrapper function to call proc_abus_scominit +//****************************************************************************** +void* call_proc_abus_scominit( void *io_pArgs ) +{ + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_proc_abus_scominit entry" ); + + // call proc_abus_scominit.C + // + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_proc_abus_scominit exit" ); + + return NULL; +} + //***************************************************************************** -// wrapper function to call step 7.05 - proc_pcie_scominit +// wrapper function to call proc_pcie_scominit //****************************************************************************** void* call_proc_pcie_scominit( void *io_pArgs ) { @@ -734,7 +766,7 @@ void* call_proc_pcie_scominit( void *io_pArgs ) } //***************************************************************************** -// wrapper function to call step 7.06 - proc_scomoverride_chiplets +// wrapper function to call proc_scomoverride_chiplets //***************************************************************************** void* call_proc_scomoverride_chiplets( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H index c600273a3..5792c1541 100644 --- a/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H +++ b/src/usr/hwpf/hwp/nest_chiplets/nest_chiplets.H @@ -41,37 +41,56 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.28 (12/03/12) * @istepname nest_chiplets * @istepnum 07 * @istepdesc Nest Chiplets * * @{ * @substepnum 1 + * @substepname proc_a_x_pci_dmi_pll_initf + * @substepdesc : PLL Initfile for A, X, PCIe, DMI + * @target_sched serial + * @} + * @{ + * @substepnum 2 * @substepname proc_a_x_pci_dmi_pll_setup * @substepdesc : Setup PLL for A, X, PCIe, DMI * @target_sched serial * @} * @{ - * @substepnum 2 + * @substepnum 3 * @substepname proc_startclock_chiplets * @substepdesc : Start clocks on A, X, PCIe chiplets * @target_sched serial * @} * @{ - * @substepnum 3 + * @substepnum 4 * @substepname proc_chiplet_scominit * @substepdesc : Apply scom inits to chiplets * @target_sched serial * @} * @{ - * @substepnum 4 + * @substepnum 5 + * @substepname proc_xbus_scominit + * @substepdesc : Apply scom inits to Xbus + * @target_sched serial + * @} + * @{ + * @substepnum 6 + * @substepname proc_abus_scominit + * @substepdesc : Apply scom inits to Abus + * @target_sched serial + * @} + + * @{ + * @substepnum 7 * @substepname proc_pcie_scominit * @substepdesc : Apply scom inits to PCIe chiplets * @target_sched serial * @} * @{ - * @substepnum 5 + * @substepnum 8 * @substepname proc_scomoverride_chiplets * @substepdesc : Apply sequenced scom inits * @target_sched serial @@ -87,65 +106,83 @@ namespace NEST_CHIPLETS { - /** - * @brief proc_a_x_pci_dmi_pll_initf + * @brief proc_a_x_pci_dmi_pll_initf * - * 07.1 : : PLL init file for A, X, PCIe, DMI + * PLL init file for A, X, PCIe, DMI * * param[in,out] - pointer to any arguments, usually NULL - * + * * return any error logs to istep * */ void* call_proc_a_x_pci_dmi_pll_initf( void *io_pArgs ); /** - * @brief proc_a_x_pci_dmi_pll_setup + * @brief proc_a_x_pci_dmi_pll_setup * - * 07.2 : : Setup PLL for A, X, PCIe, DMI + * Setup PLL for A, X, PCIe, DMI * * param[in,out] - pointer to any arguments, usually NULL - * + * * return any error logs to istep * */ void* call_proc_a_x_pci_dmi_pll_setup( void *io_pArgs ); - /** - * @brief proc_startclock_chiplets + * @brief proc_startclock_chiplets * - * 07.3 : : Start clocks on A, X, PCIe chiplets + * Start clocks on A, X, PCIe chiplets * * param[in,out] - pointer to any arguments, usually NULL - * + * * return any error logs to istep * */ void* call_proc_startclock_chiplets( void *io_pArgs ); - - /** - * @brief proc_chiplet_scominit + * @brief proc_chiplet_scominit * - * 07.3 : : Apply scom inits to chiplets + * Apply scom inits to chiplets * * param[in,out] - pointer to any arguments, usually NULL - * + * * return any error logs to istep * */ void* call_proc_chiplet_scominit( void *io_pArgs ); +/** + * @brief proc_xbus_scominit + * + * Apply scom inits to Xbus + * + * param[in,out] - pointer to any arguments, usually NULL + * + * return any error logs to istep + * + */ +void* call_proc_xbus_scominit( void *io_pArgs ); +/** + * @brief proc_abus_scominit + * + * Apply scom inits to Abus + * + * param[in,out] - pointer to any arguments, usually NULL + * + * return any error logs to istep + * + */ +void* call_proc_abus_scominit( void *io_pArgs ); /** * @brief proc_pcie_scominit * - * 07.5 : : Apply scom inits to PCIe chiplets + * Apply scom inits to PCIe chiplets * * param[in,out] - pointer to any arguments, usually NULL * @@ -154,15 +191,13 @@ void* call_proc_chiplet_scominit( void *io_pArgs ); */ void* call_proc_pcie_scominit( void *io_pArgs ); - - /** * @brief proc_scomoverride_chiplets * - * 07.6 : : Apply sequenced scom inits + * Apply sequenced scom inits * * param[in,out] - pointer to any arguments, usually NULL - * + * * return any error logs to istep * */ diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C index 9888d549f..12382cd0a 100644 --- a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C +++ b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.C @@ -72,7 +72,7 @@ using namespace vsbe; // -// Wrapper function to call step 10 : sbe_centaur_init +// Wrapper function to call step 10 // void* call_sbe_centaur_init( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H index e5e1de483..b9b15b63a 100644 --- a/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H +++ b/src/usr/hwpf/hwp/sbe_centaur_init/sbe_centaur_init.H @@ -34,18 +34,26 @@ */ /* @tag isteplist - * @docversion v0.99 (02/10/12) + * @docversion v1.28 (12/03/12) * @istepname sbe_centaur_init * @istepnum 10 * @istepdesc Step 10 Hostboot SBE Centaur Init * * @{ * @substepnum 1 - * @substepname sbe_centaur_init - * @substepdesc : SBE Centaur Init - * @param target (CLASS_CHIP, TYPE_MEMBUF) + * @substepname host_prd_hwreconfig + * @substepdesc : Hook for PRD to handle reconfig + * @param target * @target_sched serial * @} + * @{ + * @substepnum 2 + * @substepname cen_sbe_tp_chiplet_init1 + * @substepdesc : Execute all steps in ISTEP 10 + * @param target + * @target_sched serial + * @} + * */ @@ -61,6 +69,8 @@ namespace SBE_CENTAUR_INIT /** * @brief sbe_centaur_init * + * Execute alll steps in step 10 + * * param[in,out] io_pArgs - (normally) a pointer to args, * or NULL. * return any errlors to istep diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C index f395f7894..a810f748a 100644 --- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C +++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.C @@ -66,7 +66,7 @@ namespace SLAVE_SBE { //****************************************************************************** -// call_proc_revert_sbe_mcs_setup function (step 6.08) +// call_proc_revert_sbe_mcs_setup function //****************************************************************************** void* call_proc_revert_sbe_mcs_setup(void *io_pArgs) { @@ -131,7 +131,7 @@ void* call_proc_revert_sbe_mcs_setup(void *io_pArgs) //****************************************************************************** -// call_host_slave_sbe function (step 6.09) +// call_host_slave_sbe function //****************************************************************************** void* call_host_slave_sbe_config(void *io_pArgs) { @@ -141,6 +141,9 @@ void* call_host_slave_sbe_config(void *io_pArgs) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_slave_sbe_config entry" ); + // execute proc_read_nest_freq.C + // execute proc_setup_sbe_config.C + l_errl = NULL; // assignment to make the compiler happy TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, @@ -152,7 +155,7 @@ void* call_host_slave_sbe_config(void *io_pArgs) } //****************************************************************************** -// call_host_sbe_start function (step 6.10) +// call_host_sbe_start function //****************************************************************************** void* call_host_sbe_start( void *io_pArgs ) { @@ -172,7 +175,7 @@ void* call_host_sbe_start( void *io_pArgs ) //****************************************************************************** -// call_proc_check_slave_sbe_seeprom_complete function (step 6.11) +// call_proc_check_slave_sbe_seeprom_complete function //****************************************************************************** void* call_proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) { @@ -350,7 +353,7 @@ void* call_proc_check_slave_sbe_seeprom_complete( void *io_pArgs ) } //****************************************************************************** -// call_proc_xmit_sbe (step 6.12) +// call_proc_xmit_sbe //****************************************************************************** void* call_proc_xmit_sbe(void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H index 6067dce78..b0fed944f 100644 --- a/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H +++ b/src/usr/hwpf/hwp/slave_sbe/slave_sbe.H @@ -41,7 +41,7 @@ */ /* @tag isteplist - * @docversion v1.05 (06/28/12) + * @docversion v1.28 (12/03/12) * @istepname slave_sbe * @istepnum 6 * @istepdesc Slave SBE @@ -52,6 +52,24 @@ * @substepdesc : Clean up MCS Extent regs * @target_sched serial * @} + * @{ + * @substepnum 9 + * @substepname host_slave_sbe_config + * @substepdesc : + * @target_sched serial + * @} + * @{ + * @substepnum 10 + * @substepname host_sbe_start + * @substepdesc : execute proc_start_sbe.C procedure + * @target_sched serial + * @} + * @{ + * @substepnum 11 + * @substepname proc_check_slave_slave_sbe_seeprom_complete + * @substepdesc : Check slave SBE complete + * @target_sched serial + * */ @@ -61,7 +79,7 @@ namespace SLAVE_SBE /** * @brief proc_revert_sbe_mcs_setup * - * 6.8 : : Clean up MCS Extent regs + * Clean up MCS Extent regs * * param[in,out] - pointer to any arguments, usually NULL * @@ -72,8 +90,6 @@ void* call_proc_revert_sbe_mcs_setup(void *io_pArgs); /** * @brief host_slave_sbe_config * - * 6.9 : : - * * param[in,out] - pointer to any arguments, usually NULL * * return any error logs to istep @@ -83,8 +99,6 @@ void* call_host_slave_sbe_config(void *io_pArgs); /** * @brief host_sbe_start * - * 6.10 : : - * * param[in,out] - pointer to any arguments, usually NULL * * return any error logs to istep @@ -94,8 +108,6 @@ void* call_host_sbe_start(void *io_pArgs); /** * @brief proc_check_slave_sbe_seeprom_complete * - * 6.11 : : - * * param[in,out] - pointer to any arguments, usually NULL * * return any error logs to istep @@ -105,8 +117,6 @@ void* call_proc_check_slave_sbe_seeprom_complete(void *io_pArgs); /** * @brief proc_xmit_sbe * - * 6.12 : : - * * param[in,out] - pointer to any arguments, usually NULL * * return any error logs to istep diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C index aa9c89e96..c757df18c 100644 --- a/src/usr/hwpf/hwp/start_payload/start_payload.C +++ b/src/usr/hwpf/hwp/start_payload/start_payload.C @@ -101,8 +101,7 @@ errlHndl_t notifyFsp ( bool i_istepModeFlag, TARGETING::SpFunctions i_spFuncs ); // -// Wrapper function to call 21.1 : -// host_runtime_setup +// Wrapper function to call host_runtime_setup // void* call_host_runtime_setup( void *io_pArgs ) { @@ -160,8 +159,7 @@ void* call_host_runtime_setup( void *io_pArgs ) } // -// Wrapper function to call 21.2 : -// host_start_payload +// Wrapper function to call host_start_payload // void* call_host_verify_hdat( void *io_pArgs ) { @@ -183,8 +181,7 @@ void* call_host_verify_hdat( void *io_pArgs ) return l_err; } // -// Wrapper function to call 21.3 : -// host_start_payload +// Wrapper function to call host_start_payload // void* call_host_start_payload( void *io_pArgs ) { diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.H b/src/usr/hwpf/hwp/start_payload/start_payload.H index 036efe967..62727f242 100644 --- a/src/usr/hwpf/hwp/start_payload/start_payload.H +++ b/src/usr/hwpf/hwp/start_payload/start_payload.H @@ -37,13 +37,25 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.28 (12/03/12) * @istepname start_payload * @istepnum 21 * @istepdesc Start Payload * * @{ * @substepnum 1 + * @substepname host_runtime_setup + * @substepdesc : + * @target_sched serial + * @} + * @{ + * @substepnum 2 + * @substepname host_verify_hdat + * @substepdesc : Start Payload + * @target_sched serial + * @} + * @{ + * @substepnum 3 * @substepname host_start_payload * @substepdesc : Start Payload * @target_sched serial @@ -62,7 +74,7 @@ namespace START_PAYLOAD /** * @brief host_runtime_setup * - * 21.1 : : Host Runtime Setup + * Host Runtime Setup * * param[in,out] - pointer to any arguments, usually NULL * @@ -74,7 +86,7 @@ void* call_host_runtime_setup( void *io_pArgs ); /** * @brief host_verify_hdat * - * 21.2 : : Secureboot verification of PHYP/AVP image load + * Secureboot verification of PHYP/AVP image load * * param[in,out] - pointer to any arguments, usually NULL * @@ -86,7 +98,7 @@ void* call_host_verify_hdat( void *io_pArgs ); /** * @brief host_start_payload * - * 21.3 : : Start Payload + * Start Payload * * param[in,out] - pointer to any arguments, usually NULL * |
