P9 Isteps: Created directory structure for istep 6/7 wrappers

Change-Id: I8ac216444270b1ea5a2fd550f4e1ea8861de7c4d
RTC:137652
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/21458
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

6 files changed, 202 insertions, 187 deletions

diff --git a/src/include/usr/hwas/hostbootIstep.H b/src/include/usr/hwas/hostbootIstep.H
deleted file mode 100644
index 4d1702d5c..000000000
--- a/src/include/usr/hwas/hostbootIstep.H
+++ /dev/null
@@ -1,137 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG                                                   */
-/* This is an automatically generated prolog.                             */
-/*                                                                        */
-/* $Source: src/include/usr/hwas/hostbootIstep.H $                        */
-/*                                                                        */
-/* OpenPOWER HostBoot Project                                             */
-/*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
-/* [+] International Business Machines Corp.                              */
-/*                                                                        */
-/*                                                                        */
-/* Licensed under the Apache License, Version 2.0 (the "License");        */
-/* you may not use this file except in compliance with the License.       */
-/* You may obtain a copy of the License at                                */
-/*                                                                        */
-/*     http://www.apache.org/licenses/LICENSE-2.0                         */
-/*                                                                        */
-/* Unless required by applicable law or agreed to in writing, software    */
-/* distributed under the License is distributed on an "AS IS" BASIS,      */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
-/* implied. See the License for the specific language governing           */
-/* permissions and limitations under the License.                         */
-/*                                                                        */
-/* IBM_PROLOG_END_TAG                                                     */
-/**
- *  @file hostbootIstep.H
- *
- *  @brief Defines hostboot functions that get called by the istep dispatcher
- *         and call into the HWAS common interface
- */
-
-#ifndef HOSTBOOTISTEP_H_
-#define HOSTBOOTISTEP_H_
-
-namespace HWAS
-{
-/**
- * @brief   host_stub empty function  returning success
- *
- *  stub function to be called for un-implemented host steps
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_stub( void *io_pArgs );
-
-
-
-// hostboot only functions that are called by the istep dispatcher
-//  and then call the HWAS common functions
-
-/**
- * @brief   host_init_fsi   Setup the FSI links to slave chips
- *
- *  Call into the hwas platform-specific initHardware() function
- *  to init the FSI hardware.
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_init_fsi( void *io_pArgs );
-
-/**
- * @brief   host_set_ipl_parms  Build ipl parameters
- *
- *  TBD
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_set_ipl_parms( void *io_pArgs );
-
-/**
- * @brief   host_discover_targets   Builds targeting
- *
- *  This routine will walk through all the targets and initialize HWAS STATE
- *  to a known default value.
- *
- *  Currently everything is initialized to powered off, etc.
- *
- *  Call into the hwas platform-specific presenceDetect() function to
- *  read the hardware information, and apply it to the target states.
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_discover_targets( void *io_pArgs );
-
-/**
- * @brief   host_gard   Do Gard
- *
- * Collect GARD information and apply it to the target states.
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_gard( void *io_pArgs );
-
-/**
- *  @brief p9_revert_sbe_mcs_setup
- *
- *  Clean up MCS Extent regs
- *  param[in,out]   -   pointer to any arguments, usually NULL
- *
- *  return any error logs to istep
- */
-void* call_p9_revert_sbe_mcs_setup(void *io_pArgs);
-
-/**
- * @brief   host_cancontinue_clear  Clear deconfigured status
- *
- *  TBD
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_cancontinue_clear( void *io_pArgs );
-
-/**
- * @brief   host_prd_hwreconfig  Hook for PRD to handle reconfigure
- *
- *  TBD
- *
- *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
- *                              or NULL.
- *  return  any error logs to istep
- */
-void* host_prd_hwreconfig( void *io_pArgs );
-
-} // namespace HWAS
-#endif // HOSTBOOTISTEP_H_
diff --git a/src/include/usr/hwpf/hwp/hwpisteperror.H b/src/include/usr/isteps/hwpisteperror.H
index cb06fe878..6a906e823 100644
--- a/src/include/usr/hwpf/hwp/hwpisteperror.H
+++ b/src/include/usr/isteps/hwpisteperror.H
@@ -1,7 +1,7 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/include/usr/hwpf/hwp/hwpisteperror.H $                    */
+/* $Source: src/include/usr/isteps/hwpisteperror.H $                      */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
diff --git a/src/include/usr/hwpf/hwp/hwpistepud.H b/src/include/usr/isteps/hwpistepud.H
index ad96c7e1f..444a96abf 100644
--- a/src/include/usr/hwpf/hwp/hwpistepud.H
+++ b/src/include/usr/isteps/hwpistepud.H
@@ -1,11 +1,13 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/include/usr/hwpf/hwp/hwpistepud.H $                       */
+/* $Source: src/include/usr/isteps/hwpistepud.H $                         */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index d776c1f31..840ac56b1 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -26,31 +26,12 @@
 #define __ISTEPS_ISTEP6LIST_H
 
 /**
- * @file    istep6list.H
- *
- *  list of functions called by HWAS (ISTEP 6) - "named isteps"
- *
- *  Please see the note in initsvcstructs.H for description of
- *      the ISTEPNAME macro.
- *
- */
-
-#include    <initservice/initsvcstructs.H>
-#include    <initservice/initsvcreasoncodes.H>
-#include    <hwas/common/hwas.H>
-#include    <hwas/hostbootIstep.H>
-#include    "../../../usr/hwpf/hwp/slave_sbe/slave_sbe.H"
-
-namespace   INITSERVICE
-{
-
-/**
  * @file    istep06list.H
  *
  * @note    IStep definition for Hostboot - Slave SBE
  *
  *  IStep 06    Slave SBE
- *  IPL FLow Doc        v0.60 (06/02/15)
+ *  IPL FLow Doc        v0.67 (11/02/15)
  *
  *  06.1    host_bootloader
  *        : Host Bootloader (non-executable istep)
@@ -64,12 +45,109 @@ namespace   INITSERVICE
  *        : Build ipl parameters
  *  06.6    host_discover_targets
  *      :   Builds targeting
- *  06.7    host_gard
+ *  06.7    host_update_master_tpm
+ *      :   Update master TPM
+ *  06.8    host_gard
  *      :   Do Gard
- *  06.8    host_revert_sbe_mcs_setup
+ *  06.9    host_revert_sbe_mcs_setup
  *      :   Clean up MCS extent regs
+ *  06.10   host_start_occ_xstop_handler
+ *      :
+ *
+ */
+
+#include    <initservice/initsvcstructs.H>
+#include    <initservice/initsvcreasoncodes.H>
+
+namespace ISTEP_06
+{
+/**
+ * @brief   host_init_fsi   Setup the FSI links to slave chips (istep 6.4)
+ *
+ *  Call into the hwas platform-specific initHardware() function
+ *  to init the FSI hardware.
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ */
+void* host_init_fsi( void *io_pArgs );
+
+/**
+ * @brief   host_set_ipl_parms  Build ipl parameters (istep 6.5)
+ *
+ *  TBD
  *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
  */
+void* host_set_ipl_parms( void *io_pArgs );
+
+/**
+ * @brief   host_discover_targets   Builds targeting (istep 6.6)
+ *
+ *  This routine will walk through all the targets and initialize HWAS STATE
+ *  to a known default value.
+ *
+ *  Currently everything is initialized to powered off, etc.
+ *
+ *  Call into the hwas platform-specific presenceDetect() function to
+ *  read the hardware information, and apply it to the target states.
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ */
+void* host_discover_targets( void *io_pArgs );
+
+/**
+ * @brief   host_update_master_tpm (istep 6.7)
+ *
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ */
+void* host_update_master_tpm( void *io_pArgs );
+
+/**
+ * @brief   host_gard   Do Gard (istep 6.8)
+ *
+ * Collect GARD information and apply it to the target states.
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ */
+void* host_gard( void *io_pArgs );
+
+/**
+ * @brief   host_revert_sbe_mcs_setup (istep 6.9)
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ */
+void* host_revert_sbe_mcs_setup (void * io_pArgs);
+
+/**
+ * @brief   host_start_occ_xstop_handler (istep 6.10)
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ */
+void* host_start_occ_xstop_handler (void * io_pArgs);
+
+
+
+};
+
+
+namespace   INITSERVICE
+{
+
 const   TaskInfo    g_istep06[]  =   {
         {
                 "",         // dummy, index 0
@@ -93,41 +171,46 @@ const   TaskInfo    g_istep06[]  =   {
         },
         {
                 ISTEPNAME(06,04,"host_init_fsi"),
-                HWAS::host_init_fsi,
+                ISTEP_06::host_init_fsi,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false,
                         BASE_INITIALIZATION }
         },
         {
                 ISTEPNAME(06,05,"host_set_ipl_parms"),
-                HWAS::host_set_ipl_parms,
+                ISTEP_06::host_set_ipl_parms,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
                 ISTEPNAME(06,06,"host_discover_targets"),
-                HWAS::host_discover_targets,
+                ISTEP_06::host_discover_targets,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
+        },
+        {
+                ISTEPNAME(06,07,"host_update_master_tpm"),
+                ISTEP_06::host_update_master_tpm,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,07, "host_gard"),
-                HWAS::host_gard,
+                ISTEPNAME(06,08, "host_gard"),
+                ISTEP_06::host_gard,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,08,"host_revert_sbe_mcs_setup"),
-                HWAS::call_p9_revert_sbe_mcs_setup,
+                ISTEPNAME(06,09,"host_revert_sbe_mcs_setup"),
+                ISTEP_06::host_revert_sbe_mcs_setup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
+        {
+                ISTEPNAME(06,10,"host_start_occ_xstop_handler"),
+                ISTEP_06::host_start_occ_xstop_handler,
+                { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+        },
+
 };
 
 const DepModInfo  g_istep06Dependancies = {
     {
-      DEP_LIB(libbuild_winkle_images.so), //proc_mailbox_utils
-      DEP_LIB(libslave_sbe.so),
-      DEP_LIB(libsbe.so),
-      DEP_LIB(libporeve.so),
-      DEP_LIB(libpstates.so),
-      DEP_LIB(libcore_activate.so),
-      DEP_LIB(libsecure_boot.so),
+      DEP_LIB(libistep06.so),
 #ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
       DEP_LIB(libocc.so),
 #endif
diff --git a/src/include/usr/isteps/istep07list.H b/src/include/usr/isteps/istep07list.H
index 7520bdbed..17333e0b5 100644
--- a/src/include/usr/isteps/istep07list.H
+++ b/src/include/usr/isteps/istep07list.H
@@ -29,7 +29,7 @@
  * @file    istep07list.H
  *
  *  IStep 07    Nest Chiplets
- *  IPL FLow Doc        v0.60 (06/02/15)
+ *  IPL FLow Doc        v0.67 (11/02/15)
  *
  *    07.1    host_collect_dimm_spd
  *          : Collect Master dimm SPD
@@ -50,8 +50,77 @@
 #include    <initservice/initsvcstructs.H>
 #include    <initservice/initsvcreasoncodes.H>
 
-//  include prototypes file
-#include    "../../../usr/hwpf/hwp/mc_config/mc_config.H"
+
+namespace   ISTEP_07
+{
+/**
+ *  @brief   host_collect_dimm_spd
+ *
+ *           Collect Master dimm SPD
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ *
+ */
+void*    call_host_collect_dimm_spd( void * io_pArgs );
+
+/**
+ *  @brief   mss_volt
+ *
+ *            Calc dimm voltage
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ *
+ */
+void*   call_mss_volt( void * io_pArgs );
+
+
+
+/**
+ *  @brief   mss_freq
+ *
+ *           Calc dimm frequency
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ *
+ */
+void*    call_mss_freq( void * io_pArgs );
+
+
+
+/**
+ *  @brief   mss_eff_config
+ *
+ *           Determine effective config
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ *
+ */
+void*    call_mss_eff_config( void * io_pArgs );
+
+/**
+ *  @brief   mss_attr_update
+ *
+ *  Stub HWP to allow FW to override attributes programmatically
+ *
+ *  param[in,out] io_pArgs  -   (normally) a pointer to a TaskArgs struct,
+ *                              or NULL.
+ *  return  any error logs to istep
+ *
+ */
+void*    call_mss_attr_update( void *io_pArgs );
+
+};   // end namespace
+
+
+
 
 namespace   INITSERVICE
 {
@@ -63,27 +132,27 @@ namespace   INITSERVICE
         },
         {
                 ISTEPNAME(07,01,"host_collect_dimm_spd"),
-                MC_CONFIG::call_host_collect_dimm_spd,
+                ISTEP_07::call_host_collect_dimm_spd,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(07,02,"mss_volt"),
-                MC_CONFIG::call_mss_volt,
+                ISTEP_07::call_mss_volt,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(07,03,"mss_freq"),
-                MC_CONFIG::call_mss_freq,
+                ISTEP_07::call_mss_freq,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(07,04,"mss_eff_config"),
-                MC_CONFIG::call_mss_eff_config,
+                ISTEP_07::call_mss_eff_config,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(07,05,"mss_attr_update"),
-                MC_CONFIG::call_mss_attr_update,
+                ISTEP_07::call_mss_attr_update,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
 };
@@ -91,8 +160,7 @@ namespace   INITSERVICE
 
 const DepModInfo g_istep07Dependancies = {
     {
-        DEP_LIB(libmc_config.so),
-        DEP_LIB(libsbe.so),
+        DEP_LIB(libistep07.so),
         NULL
     }
 };
diff --git a/src/include/usr/isteps/istep12list.H b/src/include/usr/isteps/istep12list.H
index 111a16b58..20fb8d113 100644
--- a/src/include/usr/isteps/istep12list.H
+++ b/src/include/usr/isteps/istep12list.H
@@ -41,7 +41,6 @@
 #include    <initservice/initsvcreasoncodes.H>
 
 //  include prototypes file
-#include    "../../../usr/hwpf/hwp/mc_config/mc_config.H"
 
 #include <config.h>