From 4b1f946d7558f8ca95c87d89e637513f18e87818 Mon Sep 17 00:00:00 2001 From: "Richard J. Knight" Date: Fri, 19 Apr 2013 07:17:37 -0500 Subject: Add new istep for multinode support in Hostboot and FSP Change-Id: I1e9b0662ded03828f5df9e16aa35960ccb8d90cc RTC:63129 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4247 Reviewed-by: Van H. Lee Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/include/usr/hwas/hostbootIstep.H | 45 ++++++++++++++-------------- src/include/usr/isteps/istep07list.H | 50 +++++++++++++++++++------------ src/include/usr/isteps/istep11list.H | 57 ++++++++++++++++++++++-------------- src/include/usr/isteps/istep12list.H | 31 ++++++++++++++------ src/include/usr/isteps/istep18list.H | 39 +++++++++++++++++------- 5 files changed, 139 insertions(+), 83 deletions(-) (limited to 'src/include') diff --git a/src/include/usr/hwas/hostbootIstep.H b/src/include/usr/hwas/hostbootIstep.H index 94c55e71f..46a99ab72 100644 --- a/src/include/usr/hwas/hostbootIstep.H +++ b/src/include/usr/hwas/hostbootIstep.H @@ -1,26 +1,25 @@ -/* IBM_PROLOG_BEGIN_TAG - * This is an automatically generated prolog. - * - * $Source: src/include/usr/hwas/hostbootIstep.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 - */ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/include/usr/hwas/hostbootIstep.H $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* */ +/* 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 otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ /** * @file hostbootIstep.H * diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H index 41b95117b..c407a963a 100644 --- a/src/include/usr/isteps/istep07list.H +++ b/src/include/usr/isteps/istep07list.H @@ -27,23 +27,25 @@ * @file istep07list.H * * IStep 07 Nest Chiplets - * IPL FLow Doc v1.28 (12/03/12) + * IPL FLow Doc v1.35 (04/11/13) * - * 07.1 proc_a_x_pci_dmi_pll_initf + * 07.1 proc_attr_update + * : Proc attr update + * 07.2 proc_a_x_pci_dmi_pll_initf * : PLL Initfile for A, X, PCIe, DMI - * 07.2 proc_a_x_pci_dmi_pll_setup + * 07.3 proc_a_x_pci_dmi_pll_setup * : Setup PLL for A, X, PCIe, DMI - * 07.3 proc_startclock_chiplets + * 07.4 proc_startclock_chiplets * : Start clocks on A, X, PCIe chiplets - * 07.4 proc_chiplet_scominit + * 07.5 proc_chiplet_scominit * : Apply scom inits to chiplets - * 07.5 proc_xbus_scominit - * : Apply scom inits to Xbus - * 07.6 proc_abus_scominit - * : Apply scom inits to Abus - * 07.7 proc_pcie_scominit + * 07.6 proc_xbus_scominit + * : Apply scom inits to Xbus + * 07.7 proc_abus_scominit + * : Apply scom inits to Abus + * 07.8 proc_pcie_scominit * : Apply scom inits to PCIE chiplets - * 07.8 proc_scomoverride_chiplets + * 07.9 proc_scomoverride_chiplets * : Apply sequenced scom inits * * Please see the note in initsvcstructs.H for description of @@ -73,7 +75,17 @@ namespace INITSERVICE } }, { - ISTEPNAME(07,01,"proc_a_x_pci_dmi_pll_initf"), + ISTEPNAME(07,01,"proc_attr_update"), + NEST_CHIPLETS::call_proc_attr_update, + { + START_FN, + EXT_IMAGE, + NORMAL_IPL_OP, + false, + } + }, + { + ISTEPNAME(07,02,"proc_a_x_pci_dmi_pll_initf"), NEST_CHIPLETS::call_proc_a_x_pci_dmi_pll_initf, { START_FN, @@ -84,7 +96,7 @@ namespace INITSERVICE }, { - ISTEPNAME(07,02,"proc_a_x_pci_dmi_pll_setup"), + ISTEPNAME(07,03,"proc_a_x_pci_dmi_pll_setup"), NEST_CHIPLETS::call_proc_a_x_pci_dmi_pll_setup, { START_FN, @@ -96,7 +108,7 @@ namespace INITSERVICE { - ISTEPNAME(07,03,"proc_startclock_chiplets"), + ISTEPNAME(07,04,"proc_startclock_chiplets"), NEST_CHIPLETS::call_proc_startclock_chiplets, { START_FN, @@ -108,7 +120,7 @@ namespace INITSERVICE { - ISTEPNAME(07,04,"proc_chiplet_scominit"), + ISTEPNAME(07,05,"proc_chiplet_scominit"), NEST_CHIPLETS::call_proc_chiplet_scominit, { START_FN, @@ -118,7 +130,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(07,05,"proc_xbus_scominit"), + ISTEPNAME(07,06,"proc_xbus_scominit"), NEST_CHIPLETS::call_proc_xbus_scominit, { START_FN, @@ -128,7 +140,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(07,06,"proc_abus_scominit"), + ISTEPNAME(07,07,"proc_abus_scominit"), NEST_CHIPLETS::call_proc_abus_scominit, { START_FN, @@ -138,7 +150,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(07,07,"proc_pcie_scominit"), + ISTEPNAME(07,08,"proc_pcie_scominit"), NEST_CHIPLETS::call_proc_pcie_scominit, { START_FN, @@ -148,7 +160,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(07,08,"proc_scomoverride_chiplets"), + ISTEPNAME(07,09,"proc_scomoverride_chiplets"), NEST_CHIPLETS::call_proc_scomoverride_chiplets, { START_FN, diff --git a/src/include/usr/isteps/istep11list.H b/src/include/usr/isteps/istep11list.H index 408a94a89..7a6567f76 100644 --- a/src/include/usr/isteps/istep11list.H +++ b/src/include/usr/isteps/istep11list.H @@ -25,31 +25,33 @@ /** * list of functions called for DMI Training - ISTEP 11 according to Dean's - * IPL Flow Doc v1.28 (12/03/12) + * IPL Flow Doc v1.35 (04/11/13) * * 11.1 mss_getecid * : Read out ECID orff all Centaurs - * 11.2 proc_dmi_scominit + * 11.2 dmi_attr_update + * :DMI ATTR update + * 11.3 proc_dmi_scominit * : DMI Scom setup on P8 MCS - * 11.3 dmi_scominit + * 11.4 dmi_scominit * : Scom setup on centaur - * 11.4 dmi_erepair + * 11.5 dmi_erepair * : Restore EDI Bus eRepair data - * 11.5 dmi_io_dccal + * 11.6 dmi_io_dccal * : Calibrate DMI interfaces - * 11.6 dmi_pre_trainadv + * 11.7 dmi_pre_trainadv * : Advanced pre DMI training - * 11.7 dmi_io_run_training + * 11.8 dmi_io_run_training * : Run training on MC buses - * 11.8 dmi_post_trainadv + * 11.9 dmi_post_trainadv * : Advanced post DMI training - * 11.9 proc_cen_framelock + * 11.10 proc_cen_framelock * : Initialize EDI Frame - * 11.10 host_startprd_dmi + * 11.11 host_startprd_dmi * : Load prd for DMI domain - * 11.11 host_attnlisten_cen + * 11.12 host_attnlisten_cen * : Start listening for attentions - * 11.12 cen_set_inband_addr + * 11.13 cen_set_inband_addr * : Set the Inband base addresses */ @@ -95,7 +97,18 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,02,"proc_dmi_scominit"), // substep name + ISTEPNAME(11,02,"dmi_attr_update"), // substep name + DMI_TRAINING::call_dmi_attr_update, // pointer to fn + { + START_FN, // task type + EXT_IMAGE, // Extended Module + NORMAL_IPL_OP, + true, + } + }, + + { + ISTEPNAME(11,03,"proc_dmi_scominit"), // substep name DMI_TRAINING::call_proc_dmi_scominit, // pointer to fn { START_FN, // task type @@ -106,7 +119,7 @@ const TaskInfo g_istep11[] = { }, { - ISTEPNAME(11,03,"dmi_scominit"), // substep name + ISTEPNAME(11,04,"dmi_scominit"), // substep name DMI_TRAINING::call_dmi_scominit, // pointer to fn { START_FN, // task type @@ -117,7 +130,7 @@ const TaskInfo g_istep11[] = { }, { - ISTEPNAME(11,04,"dmi_erepair"), // substep name + ISTEPNAME(11,05,"dmi_erepair"), // substep name DMI_TRAINING::call_dmi_erepair, // pointer to fn { START_FN, // task type @@ -127,7 +140,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,05,"dmi_io_dccal"), // substep name + ISTEPNAME(11,06,"dmi_io_dccal"), // substep name DMI_TRAINING::call_dmi_io_dccal, // pointer to fn { START_FN, // task type @@ -137,7 +150,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,06,"dmi_pre_trainadv"), // substep name + ISTEPNAME(11,07,"dmi_pre_trainadv"), // substep name DMI_TRAINING::call_dmi_pre_trainadv, // pointer to fn { START_FN, // task type @@ -147,7 +160,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,07,"dmi_io_run_training"), // substep name + ISTEPNAME(11,08,"dmi_io_run_training"), // substep name DMI_TRAINING::call_dmi_io_run_training, // pointer to fn { START_FN, // task type @@ -167,7 +180,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,09,"proc_cen_framelock"), // substep name + ISTEPNAME(11,10,"proc_cen_framelock"), // substep name DMI_TRAINING::call_proc_cen_framelock, // pointer to fn { START_FN, // task type @@ -177,7 +190,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,10,"host_startprd_dmi"), // substep name + ISTEPNAME(11,11,"host_startprd_dmi"), // substep name DMI_TRAINING::call_host_startprd_dmi, // pointer to fn { START_FN, // task type @@ -187,7 +200,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,11,"host_attnlisten_cen"), // substep name + ISTEPNAME(11,12,"host_attnlisten_cen"), // substep name DMI_TRAINING::call_host_attnlisten_cen, // pointer to fn { START_FN, // task type @@ -197,7 +210,7 @@ const TaskInfo g_istep11[] = { } }, { - ISTEPNAME(11,12,"cen_set_inband_addr"), // substep name + ISTEPNAME(11,13,"cen_set_inband_addr"), // substep name DMI_TRAINING::call_cen_set_inband_addr, // pointer to fn { START_FN, // task type diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H index f980e7a44..93c7fbe65 100644 --- a/src/include/usr/isteps/istep12list.H +++ b/src/include/usr/isteps/istep12list.H @@ -27,18 +27,20 @@ * @file istep12list.H * * IStep 12 Step 12 MC Config - * IPL FLow Doc v1.28 (12/03/12) + * IPL FLow Doc v1.35 (04/11/13) * - * 12.1 host_collect_dimm_spd + * 12.1 host_collect_dimm_spd * : Collect Master dimm SPD - * 12.2 mss_volt + * 12.2 mss_volt * : Calc dimm voltage - * 12.3 mss_freq + * 12.3 mss_freq * : Calc dimm frequency - * 12.4 mss_eff_config + * 12.4 mss_eff_config * : Determine effective config - * - * ***************************************************************** + * 12.5 mss_attr_update + * : MSS ATTR update +* +* ***************************************************************** * THIS FILE WAS GENERATED ON 2012-03-01:1032 * ***************************************************************** * @@ -58,13 +60,13 @@ namespace INITSERVICE const TaskInfo g_istep12[] = { { - "", // dummy, index 0 + "", // dummy, index 0 NULL, { NONE, EXT_IMAGE, IPL_NOOP, - false, // true = check for attentions + false, // true = check for attentions } }, @@ -108,6 +110,17 @@ const TaskInfo g_istep12[] = { true, } }, + { + ISTEPNAME(12,05,"mss_attr_update"), + MC_CONFIG::call_mss_attr_update, + { + START_FN, + EXT_IMAGE, + NORMAL_IPL_OP, + true, + } + }, + // END OF LIST! }; diff --git a/src/include/usr/isteps/istep18list.H b/src/include/usr/isteps/istep18list.H index 98bb9ca85..48bd78c78 100644 --- a/src/include/usr/isteps/istep18list.H +++ b/src/include/usr/isteps/istep18list.H @@ -27,13 +27,13 @@ * @file istep18list.H * * IStep 18 Establish System SMP - * IPL FLow Doc v1.28 (12/03/12) + * IPL FLow Doc v1.35 (04/11/13) * - * 18.10 host_coalesce_host + * 18.12 host_coalesce_host * : Create single host image - * 18.11 proc_tod_setup + * 18.13 proc_tod_setup * : Create TOD topology - * 18.12 proc_tod_init + * 18.14 proc_tod_init * : Start TOD to running state * * ***************************************************************** @@ -64,7 +64,7 @@ namespace INITSERVICE NONE, EXT_IMAGE, IPL_NOOP, - false, // true = check for attentions + false, // true = check for attentions } }, @@ -146,7 +146,6 @@ namespace INITSERVICE } }, { - ISTEPNAME(18,08,""), NULL, { @@ -157,7 +156,6 @@ namespace INITSERVICE } }, { - ISTEPNAME(18,09,""), NULL, { @@ -168,7 +166,28 @@ namespace INITSERVICE } }, { - ISTEPNAME(18,10,"host_coalesce_host"), + + ISTEPNAME(18,10,""), + NULL, + { + NONE, + EXT_IMAGE, + IPL_NOOP, + false, + } + }, + { + ISTEPNAME(18,11,""), + NULL, + { + NONE, + EXT_IMAGE, + IPL_NOOP, + false, + } + }, + { + ISTEPNAME(18,12,"host_coalesce_host"), ESTABLISH_SYSTEM_SMP::call_host_coalesce_host, { START_FN, @@ -178,7 +197,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(18,11,"proc_tod_setup"), + ISTEPNAME(18,13,"proc_tod_setup"), TOD::call_tod_setup, { START_FN, @@ -188,7 +207,7 @@ namespace INITSERVICE } }, { - ISTEPNAME(18,12,"proc_tod_init"), + ISTEPNAME(18,14,"proc_tod_init"), TOD::call_tod_init, { START_FN, -- cgit v1.2.1