diff options
42 files changed, 912 insertions, 1295 deletions
diff --git a/src/build/tools/genIStep.pl b/src/build/tools/genIStep.pl index 6f327fc8a..982bb9b34 100755 --- a/src/build/tools/genIStep.pl +++ b/src/build/tools/genIStep.pl @@ -158,7 +158,7 @@ # ## cutNpaste the patch comand from Gerrit and pipe to a file: # git fetch ssh://wenning@gfw160.austin.ibm.com:29418/hwp_review_centaur refs/changes/63/663/3 && git format-patch -1 --stdout FETCH_HEAD > mss_eff_config.patch # ## then run the git command to put the code in the right directory: -# git apply --directory=src/usr/hwpf/hwp/mc_init/mss_eff_config mss_eff_config.patch +# git apply --directory=src/usr/hwpf/hwp/mc_config/mss_eff_config mss_eff_config.patch # # Add makefile support for the new HWP: # - src/usr/hwpf/makefile ( add any xml files to HWP_ERROR_XML_FILES ) diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H index efe8104d9..b029a328f 100644 --- a/src/include/usr/isteps/istep08list.H +++ b/src/include/usr/isteps/istep08list.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/isteps/istep08list.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/include/usr/isteps/istep08list.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __ISTEPS_ISTEP08LIST_H #define __ISTEPS_ISTEP08LIST_H @@ -28,19 +28,23 @@ * @file istep08list.H * * IStep 08 EDI, EI Initialization - * IPL FLow Doc v1.01 (03/26/12) + * IPL FLow Doc v1.08 (08/13/12) * * 08.1 fabric_erepair * : Restore Fabric/EDI Bus eRepair data * 08.2 fabric_io_dccal * : Calibrate Fabric/EDI interfaces - * 08.3 fabric_io_run_training + * 08.3 fabric_pre_trainadv + * : Advanced pre EI/EDI training + * 08.4 fabric_io_run_training * : Run training on internal buses - * 08.4 host_startPRD_pbus + * 08.5 fabric_post_trainadv + * : Advanced post EI/EDI training + * 08.6 host_startPRD_pbus * : Load PRD for powerbus domain - * 08.5 host_attnlisten_proc + * 08.7 host_attnlisten_proc * : Start listening for attentions - * 08.6 proc_fab_iovalid + * 08.8 proc_fab_iovalid * : Lower functional fences on local SMP * * ***************************************************************** @@ -93,7 +97,17 @@ namespace INITSERVICE { - ISTEPNAME(08,03,"fabric_io_run_training"), + ISTEPNAME(08,03,"fabric_pre_trainadv"), + EDI_EI_INITIALIZATION::call_fabric_pre_trainadv, + { + START_FN, + EXT_IMAGE, + } + }, + + + { + ISTEPNAME(08,04,"fabric_io_run_training"), EDI_EI_INITIALIZATION::call_fabric_io_run_training, { START_FN, @@ -103,7 +117,17 @@ namespace INITSERVICE { - ISTEPNAME(08,04,"host_startPRD_pbus"), + ISTEPNAME(08,05,"fabric_post_trainadv"), + EDI_EI_INITIALIZATION::call_fabric_post_trainadv, + { + START_FN, + EXT_IMAGE, + } + }, + + + { + ISTEPNAME(08,06,"host_startPRD_pbus"), EDI_EI_INITIALIZATION::call_host_startPRD_pbus, { START_FN, @@ -113,7 +137,7 @@ namespace INITSERVICE { - ISTEPNAME(08,05,"host_attnlisten_proc"), + ISTEPNAME(08,07,"host_attnlisten_proc"), EDI_EI_INITIALIZATION::call_host_attnlisten_proc, { START_FN, @@ -123,7 +147,7 @@ namespace INITSERVICE { - ISTEPNAME(08,06,"proc_fab_iovalid"), + ISTEPNAME(08,08,"proc_fab_iovalid"), EDI_EI_INITIALIZATION::call_proc_fab_iovalid, { START_FN, diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index 3436c90d0..31b174de2 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -26,7 +26,7 @@ /** * list of functions called for DMI Training - ISTEP 11 according to Dean's - * HostBoot IPL Flow v1.05 + * HostBoot IPL Flow v1.08 * * 11.1. dmi_scominit * : Scom setup on centaur @@ -34,15 +34,19 @@ * : Restore EDI Bus eRepair data * 11.3. dmi_io_dccal * : Calibrate DMI interfaces - * 11.4. dmi_io_run_training + * 11.4. dmi_pre_trainadv + * : Advanced pre DMI training + * 11.5. dmi_io_run_training * : Run training on MC buses - * 11.5. proc_cen_framelock + * 11.6. dmi_post_trainadv + * : Advanced post DMI training + * 11.7. proc_cen_framelock * : Initialize EDI Frame - * 11.6. host_startPRD_dmi + * 11.8. host_startPRD_dmi * : Load PRD for DMI domain - * 11.7. host_attnlisten_cen + * 11.9. host_attnlisten_cen * : Start listening for attentions - * 11.8. cen_set_inband_addr + * 11.10. cen_set_inband_addr * : Set the Inband base addresses */ @@ -100,7 +104,15 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,04,"dmi_io_run_training"), // substep name + ISTEPNAME(11,04,"dmi_pre_trainadv"), // substep name + DMI_TRAINING::call_dmi_pre_trainadv, // pointer to fn + { + START_FN, // task type + EXT_IMAGE, // Extended Module + } + }, + { + ISTEPNAME(11,05,"dmi_io_run_training"), // substep name DMI_TRAINING::call_dmi_io_run_training, // pointer to fn { START_FN, // task type @@ -108,7 +120,15 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,05,"proc_cen_framelock"), // substep name + ISTEPNAME(11,06,"dmi_post_trainadv"), // substep name + DMI_TRAINING::call_dmi_post_trainadv, // pointer to fn + { + START_FN, // task type + EXT_IMAGE, // Extended Module + } + }, + { + ISTEPNAME(11,07,"proc_cen_framelock"), // substep name DMI_TRAINING::call_proc_cen_framelock, // pointer to fn { START_FN, // task type @@ -116,7 +136,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,06,"host_startPRD_dmi"), // substep name + ISTEPNAME(11,08,"host_startPRD_dmi"), // substep name DMI_TRAINING::call_host_startPRD_dmi, // pointer to fn { START_FN, // task type @@ -124,7 +144,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,07,"host_attnlisten_cen"), // substep name + ISTEPNAME(11,09,"host_attnlisten_cen"), // substep name DMI_TRAINING::call_host_attnlisten_cen, // pointer to fn { START_FN, // task type @@ -132,8 +152,8 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,08,"cen_set_inband_addr"), // substep name - DMI_TRAINING::call_cen_set_inband_addr, // pointer to fn + ISTEPNAME(11,10,"cen_set_inband_addr"), // substep name + DMI_TRAINING::call_cen_set_inband_addr, // pointer to fn { START_FN, // task type EXT_IMAGE, // Extended Module diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index 3e95ae824..0fce06b7a 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -27,8 +27,8 @@ /** * @file istep12list.H * - * IStep 12 Step 12 MC Init - * IPL FLow Doc v0.99 (02/10/12) + * IStep 12 Step 12 MC Config + * IPL FLow Doc v1.08 (08/13/12) * * 12.1 host_collect_dimm_spd * : Collect Master dimm SPD @@ -52,7 +52,7 @@ #include <initservice/initsvcreasoncodes.H> // include prototypes file -#include "../../../usr/hwpf/hwp/mc_init/mc_init.H" +#include "../../../usr/hwpf/hwp/mc_config/mc_config.H" namespace INITSERVICE { @@ -69,7 +69,7 @@ const TaskInfo g_istep12[] = { { ISTEPNAME(12,01,"host_collect_dimm_spd"), - MC_INIT::call_host_collect_dimm_spd, + MC_CONFIG::call_host_collect_dimm_spd, { START_FN, EXT_IMAGE, @@ -77,7 +77,7 @@ const TaskInfo g_istep12[] = { }, { ISTEPNAME(12,02,"mss_volt"), - MC_INIT::call_mss_volt, + MC_CONFIG::call_mss_volt, { START_FN, EXT_IMAGE, @@ -85,7 +85,7 @@ const TaskInfo g_istep12[] = { }, { ISTEPNAME(12,03,"mss_freq"), - MC_INIT::call_mss_freq, + MC_CONFIG::call_mss_freq, { START_FN, EXT_IMAGE, @@ -93,7 +93,7 @@ const TaskInfo g_istep12[] = { }, { ISTEPNAME(12,04,"mss_eff_config"), - MC_INIT::call_mss_eff_config, + MC_CONFIG::call_mss_eff_config, { START_FN, EXT_IMAGE, diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H index 870427d8d..fe982d0e9 100644 --- a/src/include/usr/isteps/istep13list.H +++ b/src/include/usr/isteps/istep13list.H @@ -28,28 +28,28 @@ * @file istep13list.H * * IStep 13 Step 13 DRAM Training - * IPL FLow Doc v0.99 (02/10/12) + * IPL FLow Doc v1.08 (08/13/12) * - * 13.1 host_disable_vddr - * : Disable VDDR on CanContinue loops - * 13.2 mc_pll_setup - * : Setup PLL for MBAs - * 13.3 mem_startclocks - * : Start clocks on MBAs - * 13.4 host_enable_vddr - * : Enable the VDDR3 Voltage Rail - * 13.5 mss_scominit - * : Perform scom inits to MC and PHY - * 13.6 mss_ddr_phy_reset - * : Soft reset of DDR PHY macros - * 13.7 mss_draminit - * : Dram initialize - * 13.8 mss_draminit_training - * : Dram training - * 13.9 mss_draminit_trainadv - * : Advanced dram training - * 13.10 mss_draminit_mc - * : Hand off control to MC + * 13.1 host_disable_vddr + * : Disable VDDR on CanContinue loops + * 13.2 mem_pll_setup + * : Setup PLL for MBAs + * 13.3 mem_startclocks + * : Start clocks on MBAs + * 13.4 host_enable_vddr + * : Enable the VDDR3 Voltage Rail + * 13.5 mss_scominit + * : Perform scom inits to MC and PHY + * 13.6 mss_ddr_phy_reset + * : Soft reset of DDR PHY macros + * 13.7 mss_draminit + * : Dram initialize + * 13.8 mss_draminit_training + * : Dram training + * 13.9 mss_draminit_trainadv + * : Advanced dram training + * 13.10 mss_draminit_mc + * : Hand off control to MC * * ***************************************************************** * THIS FILE WAS GENERATED ON 2012-02-27:2142 @@ -88,8 +88,8 @@ const TaskInfo g_istep13[] = { } }, { - ISTEPNAME(13,02,"mc_pll_setup"), - DRAM_TRAINING::call_mc_pll_setup, + ISTEPNAME(13,02,"mem_pll_setup"), + DRAM_TRAINING::call_mem_pll_setup, { START_FN, EXT_IMAGE, diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H index 715b13ee8..efd697a3f 100644 --- a/src/include/usr/isteps/istep14list.H +++ b/src/include/usr/isteps/istep14list.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/isteps/istep14list.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/include/usr/isteps/istep14list.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __ISTEPS_ISTEP14LIST_H #define __ISTEPS_ISTEP14LIST_H @@ -28,7 +28,7 @@ * @file istep14list.H * * IStep 14 Dram Initialization - * IPL FLow Doc v1.01 (03/26/12) + * IPL FLow Doc v1.08 (08/13/12) * * 14.1 host_startPRD_dram * : Load PRD for DRAM domain @@ -42,8 +42,8 @@ * : Initialize the thermal sensor * 14.6 proc_setup_bars * : Setup Memory BARs - * 14.7 proc_pbus_epsilon - * : Set runtime epsilons + * 14.7 proc_pcie_config + * : Configure the PHBs * 14.8 proc_exit_cache_contained * : Allow execution from memory * @@ -137,8 +137,8 @@ namespace INITSERVICE { - ISTEPNAME(14,07,"proc_pbus_epsilon"), - DRAM_INITIALIZATION::call_proc_pbus_epsilon, + ISTEPNAME(14,07,"proc_pcie_config"), + DRAM_INITIALIZATION::call_proc_pcie_config, { START_FN, EXT_IMAGE, diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H index 21ddc2d61..d50e48cec 100644 --- a/src/include/usr/isteps/istep15list.H +++ b/src/include/usr/isteps/istep15list.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/isteps/istep15list.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/include/usr/isteps/istep15list.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __ISTEPS_ISTEP15LIST_H #define __ISTEPS_ISTEP15LIST_H @@ -28,12 +28,12 @@ * @file istep15list.H * * IStep 15 Build Winkle Images - * IPL FLow Doc v1.01 (03/26/12) + * IPL FLow Doc v1.08 (08/13/12) * * 15.1 host_build_winkle * : Build runtime winkle images * 15.2 proc_set_pore_bar - * : Place winkle images in memory + * : Tell SLW Eng where winkle image is * * ***************************************************************** * THIS FILE WAS GENERATED ON 2012-04-12:1228 diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H index 1ef4428bd..69a282c8b 100644 --- a/src/include/usr/isteps/istep18list.H +++ b/src/include/usr/isteps/istep18list.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/isteps/istep18list.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/include/usr/isteps/istep18list.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __ISTEPS_ISTEP18LIST_H #define __ISTEPS_ISTEP18LIST_H @@ -28,14 +28,10 @@ * @file istep18list.H * * IStep 18 Establish System SMP - * IPL FLow Doc v1.01 (03/26/12) + * IPL FLow Doc v1.08 (08/13/12) * * 18.8 host_coalesce_host * : Create single host image - * 18.9 proc_tod_setup - * : Setup TOD - * 18.10 proc_tod_init - * : Init TOD * * ***************************************************************** * THIS FILE WAS PARTIALLY GENERATED ON 2012-04-11:1611 @@ -140,26 +136,6 @@ namespace INITSERVICE }, - { - ISTEPNAME(18,09,"proc_tod_setup"), - ESTABLISH_SYSTEM_SMP::call_proc_tod_setup, - { - START_FN, - EXT_IMAGE, - } - }, - - - { - ISTEPNAME(18,10,"proc_tod_init"), - ESTABLISH_SYSTEM_SMP::call_proc_tod_init, - { - START_FN, - EXT_IMAGE, - } - }, - - // END OF LIST! }; diff --git a/src/include/usr/isteps/istep20list.H b/src/include/usr/isteps/istep20list.H deleted file mode 100644 index d7a86d57b..000000000 --- a/src/include/usr/isteps/istep20list.H +++ /dev/null @@ -1,87 +0,0 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/isteps/istep20list.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - -#ifndef __ISTEPS_ISTEP20LIST_H -#define __ISTEPS_ISTEP20LIST_H - -/** - * @file istep20list.H - * - * IStep 20 Load Payload - * IPL FLow Doc v1.01 (03/26/12) - * - * 20.1 host_load_payload - * : Load payload - * - * ***************************************************************** - * THIS FILE WAS GENERATED ON 2012-04-11:1612 - * ***************************************************************** - * - * Please see the note in initsvcstructs.H for description of - * the ISTEPNAME macro. - * - */ - -#include <initservice/initsvcstructs.H> -#include <initservice/initsvcreasoncodes.H> - -// include prototypes file -#include "../../../usr/hwpf/hwp/load_payload/load_payload.H" - -namespace INITSERVICE -{ - const TaskInfo g_istep20[] = { - - { - - "", // dummy, index 0 - NULL, - { - NONE, - EXT_IMAGE, - } - }, - - { - ISTEPNAME(20,01,"host_load_payload"), - LOAD_PAYLOAD::call_host_load_payload, - { - START_FN, - EXT_IMAGE, - } - }, - - - // END OF LIST! -}; - -// make a struct from the above with the number of items included -const ExtTaskInfo g_istep20TaskList = { - &(g_istep20[0]), - ( sizeof(g_istep20)/sizeof(TaskInfo) ), - NULL // later, depModules struct -}; - -}; // end namespace - -#endif diff --git a/src/include/usr/isteps/istepmasterlist.H b/src/include/usr/isteps/istepmasterlist.H index 4d01074cb..902ba4277 100644 --- a/src/include/usr/isteps/istepmasterlist.H +++ b/src/include/usr/isteps/istepmasterlist.H @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/include/usr/isteps/istepmasterlist.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/include/usr/isteps/istepmasterlist.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2011-2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __ISTEPS_ISTEPMASTERLIST_H #define __ISTEPS_ISTEPMASTERLIST_H @@ -73,7 +74,7 @@ // istep 17, FSP only #include "istep18list.H" // istep 19, FSP only -#include "istep20list.H" +// istep 20, FSP only #include "istep21list.H" namespace INITSERVICE @@ -101,7 +102,7 @@ const ExtTaskInfo g_isteps[] = { { NULL, 0, NULL}, // FSP IStep 17 INITSERVICE::g_istep18TaskList, // IStep 18 { NULL, 0, NULL }, // FSP IStep 19 - INITSERVICE::g_istep20TaskList, // IStep 20 + { NULL, 0, NULL }, // FSP IStep 20 INITSERVICE::g_istep21TaskList // IStep 21 // // add further istep lists at the end. diff --git a/src/makefile b/src/makefile index 4dcc6006a..c87be69ca 100644 --- a/src/makefile +++ b/src/makefile @@ -56,11 +56,11 @@ BASE_MODULES = trace errl devicefw scom xscom initservice \ EXTENDED_MODULES = targeting ecmddatabuffer fapi hwp plat \ extinitsvc istepdisp hwas fsi fsiscom i2c intr \ spd dmi_training fapiporeve poreve util \ - sbe_centaur_init mc_init dram_training \ + sbe_centaur_init mc_config dram_training \ mdia mbox mvpd prdf bus_training \ activate_powerbus build_winkle_images \ core_activate dram_initialization edi_ei_initialization \ - establish_system_smp load_payload \ + establish_system_smp \ nest_chiplets start_payload thread_activate slave_sbe \ attn 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 7fda04299..6ece831d2 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 @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __BUILD_WINKLE_IMAGES_BUILD_WINKLE_IMAGES_H #define __BUILD_WINKLE_IMAGES_BUILD_WINKLE_IMAGES_H @@ -39,7 +39,7 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.08 (08/13/12) * @istepname build_winkle_images * @istepnum 15 * @istepdesc Build Winkle Images @@ -53,7 +53,7 @@ * @{ * @substepnum 2 * @substepname proc_set_pore_bar - * @substepdesc : Place winkle images in memory + * @substepdesc : Tell SLW Eng where winkle image is * @target_sched serial * @} * @@ -86,7 +86,7 @@ void call_host_build_winkle( void *io_pArgs ); /** * @brief proc_set_pore_bar * - * 15.2 : : Place winkle images in memory + * 15.2 : : Tell SLW Eng where winkle image is * * 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 49225dfef..05511cfc8 100644 --- a/src/usr/hwpf/hwp/dmi_training/dmi_training.C +++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.C @@ -160,7 +160,7 @@ void call_dmi_erepair( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_erepair entry" ); - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "dmi_erepair exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_erepair exit" ); task_end2( l_err ); } @@ -175,20 +175,36 @@ void call_dmi_io_dccal( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_dccal entry" ); - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "dmi_io_dccal exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_dccal exit" ); task_end2( l_err ); } // -// Wrapper function to call 11.4 : dmi_io_run_training +// Wrapper function to call 11.4 : dmi_pre_trainadv +// +void call_dmi_pre_trainadv( void *io_pArgs ) +{ + errlHndl_t l_err = NULL; + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_pre_trainadv entry" ); + + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_pre_trainadv exit" ); + + task_end2( l_err ); +} + + +// +// Wrapper function to call 11.5 : dmi_io_run_training // void call_dmi_io_run_training( void *io_pArgs ) { errlHndl_t l_err = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "dmi_io_run_training entry" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_run_training entry" ); TARGETING::TargetHandleList l_cpuTargetList; getAllChips(l_cpuTargetList, TYPE_PROC); @@ -287,13 +303,29 @@ void call_dmi_io_run_training( void *io_pArgs ) } // end for l_cpu_target - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_io_run_training exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_io_run_training exit" ); task_end2( l_err ); } // -// Wrapper function to call 11.5 : proc_cen_framelock +// Wrapper function to call 11.6 : dmi_post_trainadv +// +void call_dmi_post_trainadv( void *io_pArgs ) +{ + errlHndl_t l_err = NULL; + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_post_trainadv entry" ); + + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_dmi_post_trainadv exit" ); + + task_end2( l_err ); +} + + +// +// Wrapper function to call 11.7 : proc_cen_framelock // void call_proc_cen_framelock( void *io_pArgs ) { @@ -379,7 +411,7 @@ void call_proc_cen_framelock( void *io_pArgs ) } // -// Wrapper function to call 11.6 : host_startPRD_dmi +// Wrapper function to call 11.8 : host_startPRD_dmi // void call_host_startPRD_dmi( void *io_pArgs ) { @@ -387,13 +419,13 @@ void call_host_startPRD_dmi( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_dmi entry" ); - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "host_startPRD_dmi exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_dmi exit" ); task_end2( l_err ); } // -// Wrapper function to call 11.7 : host_attnlisten_cen +// Wrapper function to call 11.9 : host_attnlisten_cen // void call_host_attnlisten_cen( void *io_pArgs ) { @@ -403,13 +435,13 @@ void call_host_attnlisten_cen( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_attnlisten_cen entry" ); - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "<host_attnlisten_cen exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_attnlisten_cen exit" ); task_end2( l_err ); } // -// Wrapper function to call 11.8 : cen_set_inband_addr +// Wrapper function to call 11.10 : cen_set_inband_addr // void call_cen_set_inband_addr( void *io_pArgs ) { @@ -418,7 +450,7 @@ void call_cen_set_inband_addr( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_cen_set_inband_addr entry" ); - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "cen_set_inband_addr exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_cen_set_inband_addr exit" ); task_end2( l_err ); } diff --git a/src/usr/hwpf/hwp/dmi_training/dmi_training.H b/src/usr/hwpf/hwp/dmi_training/dmi_training.H index 0caa96680..571fb5ae8 100644 --- a/src/usr/hwpf/hwp/dmi_training/dmi_training.H +++ b/src/usr/hwpf/hwp/dmi_training/dmi_training.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/HWPs/dmi_training/dmi_training.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/dmi_training/dmi_training.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __DMI_TRAINING_DMI_TRAINING_H #define __DMI_TRAINING_DMI_TRAINING_H /** @@ -32,7 +32,7 @@ */ /* @tag isteplist - * @docversion v0.982 (01/11/12) + * @docversion v1.08 (08/13/12) * @istepname dmi_training * @istepnum 11 * @istepdesc DMI Training @@ -58,20 +58,20 @@ * @} * @{ * @substepnum 4 - * @substepname dmi_io_run_training - * @substepdesc : Run training on MC buses + * @substepname dmi_pre_trainadv + * @substepdesc : Advanced pre DMI training * @target_sched serial * @} * @{ * @substepnum 5 - * @substepname host_startPRD_dmi - * @substepdesc : Load PRD for DMI domain + * @substepname dmi_io_run_training + * @substepdesc : Run training on MC buses * @target_sched serial * @} * @{ * @substepnum 6 - * @substepname host_attnlisten_cen - * @substepdesc : Start listening for attentions + * @substepname dmi_post_trainadv + * @substepdesc : Advanced post DMI training * @target_sched serial * @} * @{ @@ -82,6 +82,18 @@ * @} * @{ * @substepnum 8 + * @substepname host_startPRD_dmi + * @substepdesc : Load PRD for DMI domain + * @target_sched serial + * @} + * @{ + * @substepnum 9 + * @substepname host_attnlisten_cen + * @substepdesc : Start listening for attentions + * @target_sched serial + * @} + * @{ + * @substepnum 10 * @substepname cen_set_inband_addr * @substepdesc : Set the Inband base addresses * @target_sched serial @@ -115,7 +127,7 @@ void call_dmi_scominit( void * io_pArgs ); /** * @brief dmi_erepair * - * 11.2 : Restore EDI Bus eRepair data<@substepdesc> + * 11.2 : Restore EDI Bus eRepair data * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. @@ -139,42 +151,42 @@ void call_dmi_io_dccal( void * io_pArgs ); /** - * @brief dmi_io_run_training + * @brief dmi_pre_trainadv * - * 11.4 : Run training on MC buses + * 11.4 : Advanced pre DMI training * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. * return none * */ -void call_dmi_io_run_training( void * io_pArgs ); +void call_dmi_pre_trainadv( void * io_pArgs ); /** - * @brief host_startPRD_dmi + * @brief dmi_io_run_training * - * 11.5 : Start listening for attentions + * 11.5 : Run training on MC buses * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. * return none * */ -void call_host_startPRD_dmi( void * io_pArgs ); +void call_dmi_io_run_training( void * io_pArgs ); /** - * @brief attnlisten_cen + * @brief dmi_post_trainadv * - * 11.6 : Set the Inband base addresses + * 11.6 : Advanced post DMI training * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. * return none * */ -void call_host_attnlisten_cen( void * io_pArgs ); +void call_dmi_post_trainadv( void * io_pArgs ); /** @@ -191,9 +203,35 @@ void call_proc_cen_framelock( void *io_pArgs ); /** + * @brief host_startPRD_dmi + * + * 11.8 : Load PRD for DMI domain + * + * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, + * or NULL. + * return none + * + */ +void call_host_startPRD_dmi( void * io_pArgs ); + + +/** + * @brief host_attnlisten_cen + * + * 11.9 : Start listening for attentions + * + * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, + * or NULL. + * return none + * + */ +void call_host_attnlisten_cen( void * io_pArgs ); + + +/** * @brief cen_set_inband_addr * - * 11.6 : Set the Inband base addresses + * 11.10 : 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 311b1b8af..355b95fe2 100644 --- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C +++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C @@ -64,7 +64,7 @@ // #include "mss_thermal_init/mss_thermal_init.H" #include "proc_setup_bars/mss_setup_bars.H" #include "proc_setup_bars/proc_setup_bars.H" -// #include "proc_pbus_epsilon/proc_pbus_epsilon.H" +// #include "proc_pcie_config/proc_pcie_config.H" #include "proc_exit_cache_contained/proc_exit_cache_contained.H" //remove these once memory setup workaround is removed @@ -506,14 +506,14 @@ void call_proc_setup_bars( void *io_pArgs ) // // Wrapper function to call 14.7 : -// proc_pbus_epsilon +// proc_pcie_config // -void call_proc_pbus_epsilon( void *io_pArgs ) +void call_proc_pcie_config( void *io_pArgs ) { errlHndl_t l_errl = NULL; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_proc_pbus_epsilon entry" ); + "call_proc_pcie_config entry" ); #if 0 // @@@@@ CUSTOM BLOCK: @@@@@ @@ -533,7 +533,7 @@ void call_proc_pbus_epsilon( void *io_pArgs ) (const_cast<TARGETING::Target*>(l_@targetN_target)) ); // call the HWP with each fapi::Target - FAPI_INVOKE_HWP( l_errl, proc_pbus_epsilon, _args_...); + FAPI_INVOKE_HWP( l_errl, proc_pcie_config, _args_...); if ( l_errl ) { TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, @@ -549,7 +549,7 @@ void call_proc_pbus_epsilon( void *io_pArgs ) #endif TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_proc_pbus_epsilon exit" ); + "call_proc_pcie_config exit" ); // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H index 8ef7d77b6..bacbfa53e 100644 --- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H +++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.H @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/dram_initialization/dram_initialization.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/dram_initialization/dram_initialization.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __DRAM_INITIALIZATION_DRAM_INITIALIZATION_H #define __DRAM_INITIALIZATION_DRAM_INITIALIZATION_H @@ -39,7 +39,7 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.08 (08/13/12) * @istepname dram_initialization * @istepnum 14 * @istepdesc Dram Initialization @@ -82,8 +82,8 @@ * @} * @{ * @substepnum 7 - * @substepname proc_pbus_epsilon - * @substepdesc : Set runtime epsilons + * @substepname proc_pcie_config + * @substepdesc : Configure the PHBs * @target_sched serial * @} * @{ @@ -185,16 +185,16 @@ void call_proc_setup_bars( void *io_pArgs ); /** - * @brief proc_pbus_epsilon + * @brief proc_pcie_config * - * 14.7 : : Set runtime epsilons + * 14.7 : : Configure the PHBs * * param[in,out] - pointer to any arguments, usually NULL * * return none * */ -void call_proc_pbus_epsilon( void *io_pArgs ); +void call_proc_pcie_config( void *io_pArgs ); diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C index ec560300f..2db7a4e1e 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.C +++ b/src/usr/hwpf/hwp/dram_training/dram_training.C @@ -68,7 +68,7 @@ const uint8_t VPO_NUM_OF_MEMBUF_TO_RUN = UNLIMITED_RUN; // Un-comment these files as they become available: // #include "host_disable_vddr/host_disable_vddr.H" -// #include "mc_pll_setup/mc_pll_setup.H" +// #include "mem_pll_setup/mem_pll_setup.H" #include "mem_startclocks/cen_mem_startclocks.H" // #include "host_enable_vddr/host_enable_vddr.H" #include "mss_scominit/mss_scominit.H" @@ -146,13 +146,13 @@ void call_host_disable_vddr( void *io_pArgs ) // -// Wrapper function to call 13.2 : mc_pll_setup +// Wrapper function to call 13.2 : mem_pll_setup // -void call_mc_pll_setup( void *io_pArgs ) +void call_mem_pll_setup( void *io_pArgs ) { errlHndl_t l_err = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mc_pll_setup entry" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup entry" ); #if 0 // @@@@@ CUSTOM BLOCK: @@@@@ @@ -162,7 +162,7 @@ void call_mc_pll_setup( void *io_pArgs ) // print call to hwp and dump physical path of the target(s) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "===== mc_pll_setup HWP(? ? ? )", + "===== mem_pll_setup HWP(? ? ? )", ? ? ? ); @@ -179,13 +179,13 @@ void call_mc_pll_setup( void *io_pArgs ) (const_cast<TARGETING::Target*>(l_@targetN_target)) ); // call the HWP with each fapi::Target - l_fapirc = mc_pll_setup( ? , ?, ? ); + l_fapirc = mem_pll_setup( ? , ?, ? ); // process return code. if ( l_fapirc== fapi::FAPI_RC_SUCCESS ) { TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : mc_pll_setup HWP(? ? ? )" ); + "SUCCESS : mem_pll_setup HWP(? ? ? )" ); } else { @@ -193,13 +193,13 @@ void call_mc_pll_setup( void *io_pArgs ) * @todo fapi error - just print out for now... */ TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR 0x%.8X: mc_pll_setup HWP(? ? ?) ", + "ERROR 0x%.8X: mem_pll_setup HWP(? ? ?) ", static_cast<uint32_t>(l_fapirc) ); } // @@@@@ END CUSTOM BLOCK: @@@@@ #endif - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mc_pll_setup exit" ); + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup exit" ); task_end2( l_err ); } diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.H b/src/usr/hwpf/hwp/dram_training/dram_training.H index f89605d52..1a28e2e21 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.H +++ b/src/usr/hwpf/hwp/dram_training/dram_training.H @@ -39,7 +39,7 @@ */ /* @tag isteplist - * @docversion v0.99 (02/10/12) + * @docversion v1.08 (08/13/12) * @istepname dram_training * @istepnum 13 * @istepdesc Step 13 DRAM Training @@ -52,7 +52,7 @@ * @} * @{ * @substepnum 2 - * @substepname mc_pll_setup + * @substepname mem_pll_setup * @substepdesc : Setup PLL for MBAs * @target_sched serial * @} @@ -130,7 +130,7 @@ void call_host_disable_vddr( void * io_pArgs ); /** - * @brief mc_pll_setup + * @brief mem_pll_setup * * 13.2 : : Setup PLL for MBAs * @@ -139,7 +139,7 @@ void call_host_disable_vddr( void * io_pArgs ); * return none * */ -void call_mc_pll_setup( void * io_pArgs ); +void call_mem_pll_setup( void * io_pArgs ); 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 3acbef00a..d9fc91941 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 @@ -62,7 +62,9 @@ // Uncomment these files as they become available: // #include "fabric_erepair/fabric_erepair.H" // #include "fabric_io_dccal/fabric_io_dccal.H" +// #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_attnlisten_proc/host_attnlisten_proc.H" #include "proc_fab_iovalid/proc_fab_iovalid.H" @@ -83,7 +85,7 @@ void call_fabric_erepair( void *io_pArgs ) { errlHndl_t l_errl = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_fabric_erepair entry" ); #if 0 @@ -107,22 +109,22 @@ void call_fabric_erepair( void *io_pArgs ) FAPI_INVOKE_HWP( l_errl, fabric_erepair, _args_...); if ( l_errl ) { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR : .........." ); errlCommit( l_errl, HWPF_COMP_ID ); } else { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : .........." ); } // @@@@@ END CUSTOM BLOCK: @@@@@ #endif - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_fabric_erepair exit" ); - // end task, returning any errorlogs to IStepDisp + // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); } @@ -136,7 +138,7 @@ void call_fabric_io_dccal( void *io_pArgs ) { errlHndl_t l_errl = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_fabric_io_dccal entry" ); #if 0 @@ -160,22 +162,22 @@ void call_fabric_io_dccal( void *io_pArgs ) FAPI_INVOKE_HWP( l_errl, fabric_io_dccal, _args_...); if ( l_errl ) { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR : .........." ); errlCommit( l_errl, HWPF_COMP_ID ); } else { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : .........." ); } // @@@@@ END CUSTOM BLOCK: @@@@@ #endif - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_fabric_io_dccal exit" ); - // end task, returning any errorlogs to IStepDisp + // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); } @@ -183,13 +185,66 @@ void call_fabric_io_dccal( void *io_pArgs ) // // Wrapper function to call 08.3 : +// fabric_pre_trainadv +// +void call_fabric_pre_trainadv( void *io_pArgs ) +{ + errlHndl_t l_errl = NULL; + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_fabric_pre_trainadv entry" ); + +#if 0 + // @@@@@ CUSTOM BLOCK: @@@@@ + // figure out what targets we need + // customize any other inputs + // set up loops to go through all targets (if parallel, spin off a task) + + // dump physical path to targets + EntityPath l_path; + l_path = l_@targetN_target->getAttr<ATTR_PHYS_PATH>(); + l_path.dump(); + + // cast OUR type of target to a FAPI type of target. + const fapi::Target l_fapi_@targetN_target( + TARGET_TYPE_MEMBUF_CHIP, + reinterpret_cast<void *> + (const_cast<TARGETING::Target*>(l_@targetN_target)) ); + + // call the HWP with each fapi::Target + FAPI_INVOKE_HWP( l_errl, fabric_pre_trainadv, _args_...); + if ( l_errl ) + { + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + "ERROR : .........." ); + errlCommit( l_errl, HWPF_COMP_ID ); + } + else + { + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "SUCCESS : .........." ); + } + // @@@@@ END CUSTOM BLOCK: @@@@@ +#endif + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_fabric_pre_trainadv exit" ); + + // end task, returning any errorlogs to IStepDisp + task_end2( l_errl ); +} + + + +// +// Wrapper function to call 08.4 : // fabric_io_run_training // void call_fabric_io_run_training( void *io_pArgs ) { errlHndl_t l_errl = NULL; - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_fabric_io_run_training entry" ); TargetPairs_t l_PbusConnections; @@ -224,31 +279,84 @@ void call_fabric_io_run_training( void *io_pArgs ) FAPI_INVOKE_HWP( l_errl, fabric_io_run_training, l_fapi_endp1_target, l_fapi_endp2_target ); - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "%s : %cbus connection io_run_training", (l_errl ? "ERROR" : "SUCCESS"), (i ? 'X' : 'A') ); } } - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_fabric_io_run_training exit" ); - // end task, returning any errorlogs to IStepDisp + // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); } // -// Wrapper function to call 08.4 : +// Wrapper function to call 08.5 : +// fabric_post_trainadv +// +void call_fabric_post_trainadv( void *io_pArgs ) +{ + errlHndl_t l_errl = NULL; + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_fabric_post_trainadv entry" ); + +#if 0 + // @@@@@ CUSTOM BLOCK: @@@@@ + // figure out what targets we need + // customize any other inputs + // set up loops to go through all targets (if parallel, spin off a task) + + // dump physical path to targets + EntityPath l_path; + l_path = l_@targetN_target->getAttr<ATTR_PHYS_PATH>(); + l_path.dump(); + + // cast OUR type of target to a FAPI type of target. + const fapi::Target l_fapi_@targetN_target( + TARGET_TYPE_MEMBUF_CHIP, + reinterpret_cast<void *> + (const_cast<TARGETING::Target*>(l_@targetN_target)) ); + + // call the HWP with each fapi::Target + FAPI_INVOKE_HWP( l_errl, fabric_post_trainadv, _args_...); + if ( l_errl ) + { + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + "ERROR : .........." ); + errlCommit( l_errl, HWPF_COMP_ID ); + } + else + { + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "SUCCESS : .........." ); + } + // @@@@@ END CUSTOM BLOCK: @@@@@ +#endif + + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + "call_fabric_post_trainadv exit" ); + + // end task, returning any errorlogs to IStepDisp + task_end2( l_errl ); +} + + + +// +// Wrapper function to call 08.6 : // host_startPRD_pbus // void call_host_startPRD_pbus( void *io_pArgs ) { errlHndl_t l_errl = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_pbus entry" ); #if 0 @@ -272,36 +380,36 @@ void call_host_startPRD_pbus( void *io_pArgs ) FAPI_INVOKE_HWP( l_errl, host_startPRD_pbus, _args_...); if ( l_errl ) { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR : .........." ); errlCommit( l_errl, HWPF_COMP_ID ); } else { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : .........." ); } // @@@@@ END CUSTOM BLOCK: @@@@@ #endif - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_startPRD_pbus exit" ); - // end task, returning any errorlogs to IStepDisp + // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); } // -// Wrapper function to call 08.5 : +// Wrapper function to call 08.7 : // host_attnlisten_proc // void call_host_attnlisten_proc( void *io_pArgs ) { errlHndl_t l_errl = NULL; - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_attnlisten_proc entry" ); #if 0 @@ -325,29 +433,29 @@ void call_host_attnlisten_proc( void *io_pArgs ) FAPI_INVOKE_HWP( l_errl, host_attnlisten_proc, _args_...); if ( l_errl ) { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "ERROR : .........." ); errlCommit( l_errl, HWPF_COMP_ID ); } else { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "SUCCESS : .........." ); } // @@@@@ END CUSTOM BLOCK: @@@@@ #endif - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, + TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_attnlisten_proc exit" ); - // end task, returning any errorlogs to IStepDisp + // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); } // -// Wrapper function to call 08.6 : +// Wrapper function to call 08.8 : // proc_fab_iovalid // void call_proc_fab_iovalid( void *io_pArgs ) @@ -447,7 +555,7 @@ void call_proc_fab_iovalid( void *io_pArgs ) { FAPI_INVOKE_HWP( l_errl, proc_fab_iovalid, l_smp, true ); - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, + TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "%s : proc_fab_iovalid HWP.", (l_errl ? "ERROR" : "SUCCESS")); } @@ -455,7 +563,7 @@ void call_proc_fab_iovalid( void *io_pArgs ) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_proc_fab_iovalid exit" ); - // end task, returning any errorlogs to IStepDisp + // end task, returning any errorlogs to IStepDisp task_end2( l_errl ); } 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 5282b78eb..c8f5efa26 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 @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __EDI_EI_INITIALIZATION_EDI_EI_INITIALIZATION_H #define __EDI_EI_INITIALIZATION_EDI_EI_INITIALIZATION_H @@ -39,7 +39,7 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.08 (08/13/12) * @istepname edi_ei_initialization * @istepnum 08 * @istepdesc EDI, EI Initialization @@ -58,24 +58,36 @@ * @} * @{ * @substepnum 3 + * @substepname fabric_pre_trainadv + * @substepdesc : Advanced pre EI/EDI training + * @target_sched serial + * @} + * @{ + * @substepnum 4 * @substepname fabric_io_run_training * @substepdesc : Run training on internal buses * @target_sched serial * @} * @{ - * @substepnum 4 + * @substepnum 5 + * @substepname fabric_post_trainadv + * @substepdesc : Advanced post EI/EDI training + * @target_sched serial + * @} + * @{ + * @substepnum 6 * @substepname host_startPRD_pbus * @substepdesc : Load PRD for powerbus domain * @target_sched serial * @} * @{ - * @substepnum 5 + * @substepnum 7 * @substepname host_attnlisten_proc * @substepdesc : Start listening for attentions * @target_sched serial * @} * @{ - * @substepnum 6 + * @substepnum 8 * @substepname proc_fab_iovalid * @substepdesc : Lower functional fences on local SMP * @target_sched serial @@ -122,9 +134,23 @@ void call_fabric_io_dccal( void *io_pArgs ); /** + * @brief fabric_pre_trainadv + * + * 08.3 : : Advanced pre EI/EDI training + * + * param[in,out] - pointer to any arguments, usually NULL + * + * return none + * + */ +void call_fabric_pre_trainadv( void *io_pArgs ); + + + +/** * @brief fabric_io_run_training * - * 08.3 : : Run training on internal buses + * 08.4 : : Run training on internal buses * * param[in,out] - pointer to any arguments, usually NULL * @@ -136,9 +162,23 @@ void call_fabric_io_run_training( void *io_pArgs ); /** + * @brief fabric_post_trainadv + * + * 08.5 : : Advanced post EI/EDI training + * + * param[in,out] - pointer to any arguments, usually NULL + * + * return none + * + */ +void call_fabric_post_trainadv( void *io_pArgs ); + + + +/** * @brief host_startPRD_pbus * - * 08.4 : : Load PRD for powerbus domain + * 08.6 : : Load PRD for powerbus domain * * param[in,out] - pointer to any arguments, usually NULL * @@ -152,7 +192,7 @@ void call_host_startPRD_pbus( void *io_pArgs ); /** * @brief host_attnlisten_proc * - * 08.5 : : Start listening for attentions + * 08.7 : : Start listening for attentions * * param[in,out] - pointer to any arguments, usually NULL * @@ -166,7 +206,7 @@ void call_host_attnlisten_proc( void *io_pArgs ); /** * @brief proc_fab_iovalid * - * 08.6 : : Lower functional fences on local SMP + * 08.8 : : 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 0f9015739..1508ecbf0 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 @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ /** * @file establish_system_smp.C * @@ -55,8 +55,6 @@ // Uncomment these files as they become available: // #include "host_coalesce_host/host_coalesce_host.H" -// #include "proc_tod_setup/proc_tod_setup.H" -// #include "proc_tod_init/proc_tod_init.H" namespace ESTABLISH_SYSTEM_SMP { @@ -119,109 +117,4 @@ void call_host_coalesce_host( void *io_pArgs ) -// -// Wrapper function to call 18.9 : -// proc_tod_setup -// -void call_proc_tod_setup( void *io_pArgs ) -{ - errlHndl_t l_errl = NULL; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_proc_tod_setup entry" ); - -#if 0 - // @@@@@ CUSTOM BLOCK: @@@@@ - // figure out what targets we need - // customize any other inputs - // set up loops to go through all targets (if parallel, spin off a task) - - // dump physical path to targets - EntityPath l_path; - l_path = l_@targetN_target->getAttr<ATTR_PHYS_PATH>(); - l_path.dump(); - - // cast OUR type of target to a FAPI type of target. - const fapi::Target l_fapi_@targetN_target( - TARGET_TYPE_MEMBUF_CHIP, - reinterpret_cast<void *> - (const_cast<TARGETING::Target*>(l_@targetN_target)) ); - - // call the HWP with each fapi::Target - FAPI_INVOKE_HWP( l_errl, proc_tod_setup, _args_...); - if ( l_errl ) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR : .........." ); - errlCommit( l_errl, HWPF_COMP_ID ); - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : .........." ); - } - // @@@@@ END CUSTOM BLOCK: @@@@@ -#endif - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_proc_tod_setup exit" ); - - // end task, returning any errorlogs to IStepDisp - task_end2( l_errl ); -} - - - -// -// Wrapper function to call 18.10 : -// proc_tod_init -// -void call_proc_tod_init( void *io_pArgs ) -{ - errlHndl_t l_errl = NULL; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_proc_tod_init entry" ); - -#if 0 - // @@@@@ CUSTOM BLOCK: @@@@@ - // figure out what targets we need - // customize any other inputs - // set up loops to go through all targets (if parallel, spin off a task) - - // dump physical path to targets - EntityPath l_path; - l_path = l_@targetN_target->getAttr<ATTR_PHYS_PATH>(); - l_path.dump(); - - // cast OUR type of target to a FAPI type of target. - const fapi::Target l_fapi_@targetN_target( - TARGET_TYPE_MEMBUF_CHIP, - reinterpret_cast<void *> - (const_cast<TARGETING::Target*>(l_@targetN_target)) ); - - // call the HWP with each fapi::Target - FAPI_INVOKE_HWP( l_errl, proc_tod_init, _args_...); - if ( l_errl ) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR : .........." ); - errlCommit( l_errl, HWPF_COMP_ID ); - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : .........." ); - } - // @@@@@ END CUSTOM BLOCK: @@@@@ -#endif - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_proc_tod_init exit" ); - - // end task, returning any errorlogs to IStepDisp - task_end2( l_errl ); -} - - }; // end namespace 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 a5208fe97..ddebded86 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 @@ -1,26 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/establish_system_smp/establish_system_smp.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ #ifndef __ESTABLISH_SYSTEM_SMP_ESTABLISH_SYSTEM_SMP_H #define __ESTABLISH_SYSTEM_SMP_ESTABLISH_SYSTEM_SMP_H @@ -39,7 +39,7 @@ */ /* @tag isteplist - * @docversion v1.01 (03/26/12) + * @docversion v1.08 (08/13/12) * @istepname establish_system_smp * @istepnum 18 * @istepdesc Establish System SMP @@ -50,18 +50,6 @@ * @substepdesc : Create single host image * @target_sched serial * @} - * @{ - * @substepnum 9 - * @substepname proc_tod_setup - * @substepdesc : Setup TOD - * @target_sched serial - * @} - * @{ - * @substepnum 10 - * @substepname proc_tod_init - * @substepdesc : Init TOD - * @target_sched serial - * @} * */ @@ -89,33 +77,6 @@ void call_host_coalesce_host( void *io_pArgs ); -/** - * @brief proc_tod_setup - * - * 18.9 : : Setup TOD - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return none - * - */ -void call_proc_tod_setup( void *io_pArgs ); - - - -/** - * @brief proc_tod_init - * - * 18.10 : : Init TOD - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return none - * - */ -void call_proc_tod_init( void *io_pArgs ); - - }; // end namespace #endif diff --git a/src/usr/hwpf/hwp/load_payload/load_payload.C b/src/usr/hwpf/hwp/load_payload/load_payload.C deleted file mode 100644 index 403f962eb..000000000 --- a/src/usr/hwpf/hwp/load_payload/load_payload.C +++ /dev/null @@ -1,119 +0,0 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/load_payload/load_payload.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - -/** - * @file load_payload.C - * - * Support file for IStep: load_payload - * Load Payload - * - * ***************************************************************** - * THIS FILE WAS GENERATED ON 2012-04-11:1612 - * ***************************************************************** - * - */ - -/******************************************************************************/ -// Includes -/******************************************************************************/ -#include <stdint.h> - -#include <trace/interface.H> -#include <initservice/taskargs.H> -#include <errl/errlentry.H> - -#include <initservice/isteps_trace.H> - -// targeting support -#include <targeting/common/commontargeting.H> - -// fapi support -#include <fapi.H> -#include <fapiPlatHwpInvoker.H> - -#include "load_payload.H" - -// Uncomment these files as they become available: -// #include "host_load_payload/host_load_payload.H" - -namespace LOAD_PAYLOAD -{ - -using namespace TARGETING; -using namespace fapi; - - - -// -// Wrapper function to call 20.1 : -// host_load_payload -// -void call_host_load_payload( void *io_pArgs ) -{ - errlHndl_t l_errl = NULL; - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_load_payload entry" ); - -#if 0 - // @@@@@ CUSTOM BLOCK: @@@@@ - // figure out what targets we need - // customize any other inputs - // set up loops to go through all targets (if parallel, spin off a task) - - // dump physical path to targets - EntityPath l_path; - l_path = l_@targetN_target->getAttr<ATTR_PHYS_PATH>(); - l_path.dump(); - - // cast OUR type of target to a FAPI type of target. - const fapi::Target l_fapi_@targetN_target( - TARGET_TYPE_MEMBUF_CHIP, - reinterpret_cast<void *> - (const_cast<TARGETING::Target*>(l_@targetN_target)) ); - - // call the HWP with each fapi::Target - FAPI_INVOKE_HWP( l_errl, host_load_payload, _args_...); - if ( l_errl ) - { - TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, - "ERROR : .........." ); - errlCommit( l_errl, HWPF_COMP_ID ); - } - else - { - TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "SUCCESS : .........." ); - } - // @@@@@ END CUSTOM BLOCK: @@@@@ -#endif - - TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, - "call_host_load_payload exit" ); - - // end task, returning any errorlogs to IStepDisp - task_end2( l_errl ); -} - - -}; // end namespace diff --git a/src/usr/hwpf/hwp/load_payload/load_payload.H b/src/usr/hwpf/hwp/load_payload/load_payload.H deleted file mode 100644 index c5c9bc27e..000000000 --- a/src/usr/hwpf/hwp/load_payload/load_payload.H +++ /dev/null @@ -1,82 +0,0 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/load_payload/load_payload.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - -#ifndef __LOAD_PAYLOAD_LOAD_PAYLOAD_H -#define __LOAD_PAYLOAD_LOAD_PAYLOAD_H - -/** - * @file load_payload.H - * - * Load Payload - * - * All of the following routines are "named isteps" - they are invoked as - * tasks by the @ref IStepDispatcher. - * - * ***************************************************************** - * THIS FILE WAS GENERATED ON 2012-04-11:1612 - * ***************************************************************** - * - */ - - /* @tag isteplist - * @docversion v1.01 (03/26/12) - * @istepname load_payload - * @istepnum 20 - * @istepdesc Load Payload - * - * @{ - * @substepnum 1 - * @substepname host_load_payload - * @substepdesc : Load payload - * @target_sched serial - * @} - * - */ - -/******************************************************************************/ -// Includes -/******************************************************************************/ -#include <stdint.h> - -namespace LOAD_PAYLOAD -{ - - - -/** - * @brief host_load_payload - * - * 20.1 : : Load payload - * - * param[in,out] - pointer to any arguments, usually NULL - * - * return none - * - */ -void call_host_load_payload( void *io_pArgs ); - - -}; // end namespace - -#endif - diff --git a/src/usr/hwpf/hwp/load_payload/makefile b/src/usr/hwpf/hwp/load_payload/makefile deleted file mode 100644 index 9c847fd7b..000000000 --- a/src/usr/hwpf/hwp/load_payload/makefile +++ /dev/null @@ -1,56 +0,0 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/usr/hwpf/hwp/load_payload/makefile $ -# -# IBM CONFIDENTIAL -# -# COPYRIGHT International Business Machines Corp. 2012 -# -# p1 -# -# Object Code Only (OCO) source materials -# Licensed Internal Code Source Materials -# IBM HostBoot Licensed Internal Code -# -# The source code for this program is not published or other- -# wise divested of its trade secrets, irrespective of what has -# been deposited with the U.S. Copyright Office. -# -# Origin: 30 -# -# IBM_PROLOG_END - -ROOTPATH = ../../../../.. - -MODULE = load_payload - -## support for Targeting and fapi -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat -EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp - -## pointer to common HWP files -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include - -## NOTE: add the base istep dir here. -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/load_payload - -## Include sub dirs -## NOTE: add a new EXTRAINCDIR when you add a new HWP -## EXAMPLE: -## EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/load_payload/<HWP_dir> - - -## NOTE: add new object files when you add a new HWP -OBJS = load_payload.o - - -## NOTE: add a new directory onto the vpaths when you add a new HWP -## EXAMPLE: -# VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/load_payload/<HWP_dir> - - -include ${ROOTPATH}/config.mk - diff --git a/src/usr/hwpf/hwp/makefile b/src/usr/hwpf/hwp/makefile index 10c52e219..f78c6f7f6 100644 --- a/src/usr/hwpf/hwp/makefile +++ b/src/usr/hwpf/hwp/makefile @@ -40,10 +40,10 @@ OBJS = fapiTestHwp.o \ dimmBadDqBitmapAccessHwp.o \ RepairRingFunc.o -SUBDIRS = dmi_training.d sbe_centaur_init.d mc_init.d \ +SUBDIRS = dmi_training.d sbe_centaur_init.d mc_config.d \ dram_training.d activate_powerbus.d build_winkle_images.d \ core_activate.d dram_initialization.d edi_ei_initialization.d \ - establish_system_smp.d load_payload.d bus_training.d \ + establish_system_smp.d bus_training.d \ nest_chiplets.d start_payload.d thread_activate.d slave_sbe.d include ${ROOTPATH}/config.mk diff --git a/src/usr/hwpf/hwp/mc_init/makefile b/src/usr/hwpf/hwp/mc_config/makefile index 0dbd28630..4256480d7 100644 --- a/src/usr/hwpf/hwp/mc_init/makefile +++ b/src/usr/hwpf/hwp/mc_config/makefile @@ -1,7 +1,7 @@ -# IBM_PROLOG_BEGIN_TAG +# IBM_PROLOG_BEGIN_TAG # This is an automatically generated prolog. # -# $Source: src/usr/hwpf/hwp/mc_init/makefile $ +# $Source: src/usr/hwpf/hwp/mc_config/makefile $ # # IBM CONFIDENTIAL # @@ -19,11 +19,10 @@ # # Origin: 30 # -# IBM_PROLOG_END - +# IBM_PROLOG_END_TAG ROOTPATH = ../../../../.. -MODULE = mc_init +MODULE = mc_config ## support for Targeting and fapi EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer @@ -37,11 +36,11 @@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include ## Include sub dirs ## NOTE: add a new EXTRAINCDIR when you add a new HWP ##@ EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/??? -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_init/mss_eff_config -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_init/mss_volt -EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_init/mss_freq +EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_eff_config +EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_volt +EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_freq -OBJS = mc_init.o \ +OBJS = mc_config.o \ mss_volt.o \ mss_freq.o \ mss_eff_config.o \ @@ -51,9 +50,9 @@ OBJS = mc_init.o \ ## NOTE: add a new directory onto the vpaths when you add a new HWP ##@ VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/??? -VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/mc_init/mss_eff_config -VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/mc_init/mss_volt -VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/mc_init/mss_freq +VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_eff_config +VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_volt +VPATH += ${ROOTPATH}/src/usr/hwpf/hwp/mc_config/mss_freq include ${ROOTPATH}/config.mk diff --git a/src/usr/hwpf/hwp/mc_init/mc_init.C b/src/usr/hwpf/hwp/mc_config/mc_config.C index 9a636b29e..04387718e 100644 --- a/src/usr/hwpf/hwp/mc_init/mc_init.C +++ b/src/usr/hwpf/hwp/mc_config/mc_config.C @@ -1,31 +1,31 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mc_init.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mc_config.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ /** - * @file mc_init.C + * @file mc_config.C * - * Support file for IStep: mc_init - * Step 12 MC Init + * Support file for IStep: mc_config + * Step 12 MC Config * * ***************************************************************** * THIS FILE WAS GENERATED ON 2012-03-01:1032 @@ -55,10 +55,10 @@ // -- prototype includes -- // Add any customized routines that you don't want overwritten into -// "mc_init_custom.C" and include the prototypes here. -// #include "mc_init_custom.H" +// "mc_config_custom.C" and include the prototypes here. +// #include "mc_config_custom.H" -#include "mc_init.H" +#include "mc_config.H" // Uncomment these files as they become available: // #include "host_collect_dimm_spd/host_collect_dimm_spd.H" @@ -66,7 +66,7 @@ #include "mss_freq/mss_freq.H" #include "mss_eff_config/mss_eff_config.H" -namespace MC_INIT +namespace MC_CONFIG { using namespace TARGETING; diff --git a/src/usr/hwpf/hwp/mc_init/mc_init.H b/src/usr/hwpf/hwp/mc_config/mc_config.H index e62593432..0f58a844f 100644 --- a/src/usr/hwpf/hwp/mc_init/mc_init.H +++ b/src/usr/hwpf/hwp/mc_config/mc_config.H @@ -1,33 +1,33 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mc_init.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END - -#ifndef __MC_INIT_MC_INIT_H -#define __MC_INIT_MC_INIT_H +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mc_config.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ +#ifndef __MC_CONFIG_MC_CONFIG_H +#define __MC_CONFIG_MC_CONFIG_H /** - * @file mc_init.H + * @file mc_config.H * - * Step 12 MC Init + * Step 12 MC Config * * All of the following routines are "named isteps" - they are invoked as * tasks by the @ref IStepDispatcher. @@ -39,10 +39,10 @@ */ /* @tag isteplist - * @docversion v0.99 (02/10/12) - * @istepname mc_init + * @docversion v1.08 (08/13/12) + * @istepname mc_config * @istepnum 12 - * @istepdesc Step 12 MC Init + * @istepdesc Step 12 MC Config * * @{ * @substepnum 1 @@ -74,7 +74,7 @@ /******************************************************************************/ #include <stdint.h> -namespace MC_INIT +namespace MC_CONFIG { diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C index 53f5723ce..53f5723ce 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config.C +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.C diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config.H b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.H index 724085e02..3283fc09a 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config.H +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.H @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config.H,v 1.2 2012/02/15 01:34:45 asaetow Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config.H,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_rank_group.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_rank_group.C index ec3c6f353..399a91e09 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_rank_group.C +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_rank_group.C @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_rank_group.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_rank_group.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config_rank_group.C,v 1.6 2012/04/30 15:11:46 asaetow Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config_rank_group.C,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_rank_group.H b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_rank_group.H index f5197c008..54c478d6b 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_rank_group.H +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_rank_group.H @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_rank_group.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_rank_group.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config_rank_group.H,v 1.3 2012/02/15 01:39:30 asaetow Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config_rank_group.H,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_termination.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_termination.C index 1204b0205..fa5746c00 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_termination.C +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_termination.C @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_termination.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_termination.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config_termination.C,v 1.1 2012/04/30 16:42:50 asaetow Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config_termination.C,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_termination.H b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_termination.H index bf23c5bfd..79c3ad052 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_termination.H +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_termination.H @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_termination.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_termination.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config_termination.H,v 1.1 2012/04/26 00:08:52 asaetow Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config_termination.H,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_thermal.C b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_thermal.C index 650a77ab8..64809e94a 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_thermal.C +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_thermal.C @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_thermal.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_thermal.C $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config_thermal.C,v 1.7 2012/05/04 15:53:44 pardeik Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config_thermal.C,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_thermal.H b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_thermal.H index d52e8b754..a280cbf02 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_thermal.H +++ b/src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_thermal.H @@ -1,25 +1,26 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_eff_config/mss_eff_config_thermal.H $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END +/* IBM_PROLOG_BEGIN_TAG + * This is an automatically generated prolog. + * + * $Source: src/usr/hwpf/hwp/mc_config/mss_eff_config/mss_eff_config_thermal.H $ + * + * IBM CONFIDENTIAL + * + * COPYRIGHT International Business Machines Corp. 2012 + * + * p1 + * + * Object Code Only (OCO) source materials + * Licensed Internal Code Source Materials + * IBM HostBoot Licensed Internal Code + * + * The source code for this program is not published or other- + * wise divested of its trade secrets, irrespective of what has + * been deposited with the U.S. Copyright Office. + * + * Origin: 30 + * + * IBM_PROLOG_END_TAG + */ // $Id: mss_eff_config_thermal.H,v 1.3 2012/04/03 22:13:03 pardeik Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/centaur/working/procedures/ipl/fapi/mss_eff_config_thermal.H,v $ //------------------------------------------------------------------------------ diff --git a/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq.C b/src/usr/hwpf/hwp/mc_config/mss_freq/mss_freq.C index 63162d0d7..63162d0d7 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq.C +++ b/src/usr/hwpf/hwp/mc_config/mss_freq/mss_freq.C diff --git a/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq.H b/src/usr/hwpf/hwp/mc_config/mss_freq/mss_freq.H index 74f8de4ab..fbc52308f 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq.H +++ b/src/usr/hwpf/hwp/mc_config/mss_freq/mss_freq.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG * This is an automatically generated prolog. * - * $Source: src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq.H $ + * $Source: src/usr/hwpf/hwp/mc_config/mss_freq/mss_freq.H $ * * IBM CONFIDENTIAL * diff --git a/src/usr/hwpf/hwp/mc_init/mss_volt/mss_volt.C b/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C index 8aa152e37..8aa152e37 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_volt/mss_volt.C +++ b/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.C diff --git a/src/usr/hwpf/hwp/mc_init/mss_volt/mss_volt.H b/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.H index a37a3a225..31c0ab4b1 100644 --- a/src/usr/hwpf/hwp/mc_init/mss_volt/mss_volt.H +++ b/src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.H @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG * This is an automatically generated prolog. * - * $Source: src/usr/hwpf/hwp/mc_init/mss_volt/mss_volt.H $ + * $Source: src/usr/hwpf/hwp/mc_config/mss_volt/mss_volt.H $ * * IBM CONFIDENTIAL * diff --git a/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq_wrap.C b/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq_wrap.C deleted file mode 100644 index a689b68ef..000000000 --- a/src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq_wrap.C +++ /dev/null @@ -1,138 +0,0 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/hwp/mc_init/mss_freq/mss_freq_wrap.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2012 -// -// p1 -// -// Object Code Only (OCO) source materials -// Licensed Internal Code Source Materials -// IBM HostBoot Licensed Internal Code -// -// The source code for this program is not published or other- -// wise divested of its trade secrets, irrespective of what has -// been deposited with the U.S. Copyright Office. -// -// Origin: 30 -// -// IBM_PROLOG_END -//---------------------------------------------------------------------- -// Includes -//---------------------------------------------------------------------- - -//---------------------------------------------------------------------- -// eCMD Includes -//---------------------------------------------------------------------- -#include <ecmdClientCapi.H> -#include <ecmdDataBuffer.H> -#include <ecmdUtils.H> -#include <ecmdSharedUtils.H> -#include <fapiClientCapi.H> -#include <croClientCapi.H> -#include <fapi.H> - -const uint32_t BAD_ERROR_CODE = 0xFFFF0000; -//---------------------------------------------------------------------- - - -int main( int argc, char *argv[] ) -{ - uint32_t rc = ECMD_SUCCESS; - ecmdLooperData looperdata; // Store internal Looper data - ecmdLooperData looperdata2; - ecmdChipTarget target; // This is the chip target to operate on - bool validPosFound = false; - ecmdDataBuffer data; - char printStr[200]; - - //------------------------------------ - // Load and initialize the eCMD Dll - // If left NULL, which DLL to load is determined by the ECMD_DLL_FILE environment variable - // If set to a specific value, the specified dll will be loaded - //------------------------------------ - rc = ecmdLoadDll(""); - if (rc) return rc; - - /* This is needed if you're running a FAPI procedure via ecmdRunSo() */ - rc = fapiInitExtension(); if (rc) { printf("Error init fapi extension\n");return rc;} - rc = croInitExtension(); if (rc) { printf("Error init cro extension\n");return rc;} - - //------------------------------------ - // Parse out common eCMD args like -p0, -c0, -coe, etc.. - // Any found args will be removed from arg list upon return - //------------------------------------ - rc = ecmdCommandArgs(&argc, &argv); - if (rc) return rc; - - /* Let's always print the dll info to the screen, unless in quiet mode */ - if (!ecmdGetGlobalVar(ECMD_GLOBALVAR_QUIETMODE)) { - rc = ecmdDisplayDllInfo(); - if (rc) return rc; - } - - - /*******************************/ - /* Loop over all all Centaur chips */ - /*******************************/ - ecmdOutput("---------------------------------------------\n"); - ecmdOutput("Loop over all Centaur chips:\n"); - ecmdOutput("---------------------------------------------\n"); - target.chipType = "cen"; - target.chipTypeState = ECMD_TARGET_FIELD_VALID; - target.cageState = ECMD_TARGET_FIELD_WILDCARD; - target.nodeState = ECMD_TARGET_FIELD_WILDCARD; - target.slotState = ECMD_TARGET_FIELD_WILDCARD; - target.posState = ECMD_TARGET_FIELD_WILDCARD; - target.chipUnitTypeState = ECMD_TARGET_FIELD_UNUSED; - target.chipUnitNumState = ECMD_TARGET_FIELD_UNUSED; - target.threadState = ECMD_TARGET_FIELD_UNUSED; - - rc = ecmdConfigLooperInit( target, ECMD_SELECTED_TARGETS_LOOP_DEFALL, looperdata); if (rc) return rc; - - std::list<uint64_t> myArgs; - uint64_t arg1 = 0xBB; - myArgs.push_back(arg1); - arg1 = 0xDD; - myArgs.push_back(arg1); - - while( ecmdConfigLooperNext( target, looperdata ) ){ - validPosFound = true; - snprintf(printStr, 200, "Working on ecmdChipTarget = %s\n", ecmdWriteTarget(target).c_str()); - ecmdOutput(printStr); - std::string myFileWithPath; - std::string myFile = "mss_ddr_phy_reset_x86.so"; - rc = fapiQueryFileLocation(FAPI_FILE_HWP, myFile, myFileWithPath); if (rc) return rc; - rc = fapiHwpInvoker(target, myFileWithPath, "mss_ddr_phy_reset", myArgs); if (rc) return rc; - - if (rc) { - ecmdOutputError("-----------------------------------------------------------\n"); - ecmdOutputError(" mss_ddr_phy_reset exited early with ...\n"); - snprintf(printStr, 200," Return code = %s 0x%08x \n", ecmdParseReturnCode(rc).c_str(),rc); - ecmdOutputError(printStr); - ecmdOutputError("-----------------------------------------------------------\n"); - return rc; - } - } // end of loop through all configured Centaur chips - - if( rc == ECMD_SUCCESS && !validPosFound ){ - ecmdOutputError("**** ERROR : There were no Centaur chips configured so none were initialized."); - rc= BAD_ERROR_CODE; - } - - ecmdOutput("-------------------------------\n"); - ecmdOutput(" mss_ddr_phy_reset is Done\n"); - ecmdOutput("-------------------------------\n"); - //------------------------------------ - // Unload the eCMD Dll, this should always be the last thing you do - //------------------------------------ - ecmdUnloadDll(); - - return rc; -} - - - |
