Integrate L1 HWPs for steps 6

Refactor istep 6 to standard approach.

depends-on: I7405fa4480213cec2290ef4e64dc9152bfc7ae1f
Change-Id: Ie86c97cd4fdb1cfaeb83fa8cc63b1a34e00f79b3
RTC: 133830
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/20664
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Christopher J. Engel <cjengel@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 14 insertions, 14 deletions

diff --git a/src/include/usr/hwas/hwasplatreasoncodes.H b/src/include/usr/hwas/hwasplatreasoncodes.H
index af7201809..3ffcb9abb 100644
--- a/src/include/usr/hwas/hwasplatreasoncodes.H
+++ b/src/include/usr/hwas/hwasplatreasoncodes.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -35,9 +35,8 @@ namespace HWAS
         //  @note Must always start @ 0x80, since common module IDs occupy
         //      0x00 -> 0x7F range
         MOD_HOST_DISCOVER_TARGETS = 0x80,
-        MOD_HOST_GARD             = 0x81,
-        MOD_PLAT_DECONFIG_GARD    = 0x82,
-        MOD_PLAT_READIDEC         = 0x83,
+        MOD_PLAT_DECONFIG_GARD    = 0x81,
+        MOD_PLAT_READIDEC         = 0x82,
     };
 
     enum HwasPlatReasonCode
@@ -48,7 +47,6 @@ namespace HWAS
         RC_TARGET_NOT_GARDABLE              = HWAS_COMP_ID | 0x81,
         RC_GARD_REPOSITORY_FULL             = HWAS_COMP_ID | 0x82,
         RC_BAD_CHIPID                       = HWAS_COMP_ID | 0x83,
-        RC_MASTER_CORE_NULL                 = HWAS_COMP_ID | 0x84,
     };
 };
 
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 840ac56b1..296c9c053 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -49,7 +49,7 @@
  *      :   Update master TPM
  *  06.8    host_gard
  *      :   Do Gard
- *  06.9    host_revert_sbe_mcs_setup
+ *  06.9    proc_revert_sbe_mcs_setup
  *      :   Clean up MCS extent regs
  *  06.10   host_start_occ_xstop_handler
  *      :
@@ -102,14 +102,14 @@ void* host_set_ipl_parms( void *io_pArgs );
 void* host_discover_targets( void *io_pArgs );
 
 /**
- * @brief   host_update_master_tpm (istep 6.7)
+ * @brief   call_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 );
+void* call_host_update_master_tpm( void *io_pArgs );
 
 /**
  * @brief   host_gard   Do Gard (istep 6.8)
@@ -123,13 +123,13 @@ void* host_update_master_tpm( void *io_pArgs );
 void* host_gard( void *io_pArgs );
 
 /**
- * @brief   host_revert_sbe_mcs_setup (istep 6.9)
+ * @brief   proc_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);
+void* call_proc_revert_sbe_mcs_setup (void * io_pArgs);
 
 /**
  * @brief   host_start_occ_xstop_handler (istep 6.10)
@@ -187,7 +187,7 @@ const   TaskInfo    g_istep06[]  =   {
         },
         {
                 ISTEPNAME(06,07,"host_update_master_tpm"),
-                ISTEP_06::host_update_master_tpm,
+                ISTEP_06::call_host_update_master_tpm,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
@@ -196,8 +196,8 @@ const   TaskInfo    g_istep06[]  =   {
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
         },
         {
-                ISTEPNAME(06,09,"host_revert_sbe_mcs_setup"),
-                ISTEP_06::host_revert_sbe_mcs_setup,
+                ISTEPNAME(06,09,"proc_revert_sbe_mcs_setup"),
+                ISTEP_06::call_proc_revert_sbe_mcs_setup,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
         },
         {
diff --git a/src/include/usr/isteps/istep_reasoncodes.H b/src/include/usr/isteps/istep_reasoncodes.H
index 70e8ac8e2..550068c3f 100644
--- a/src/include/usr/isteps/istep_reasoncodes.H
+++ b/src/include/usr/isteps/istep_reasoncodes.H
@@ -45,6 +45,7 @@ namespace ISTEP
         MOD_DECONFIG_PHBS_BASED_ON_PCI_STATE              = 0x09,
         MOD_COMPUTE_PCIE_CONFIG_ATTRS                     = 0x0A,
         MOD_EXIT_CACHE_CONTAINED                          = 0x0B,
+        MOD_HOST_GARD                                     = 0x0C,
     };
 
     /**
@@ -68,6 +69,7 @@ namespace ISTEP
         RC_INVALID_ATTR_VALUE                    = ISTEP_COMP_ID | 0x0B,
         RC_INVALID_CONFIGURATION                 = ISTEP_COMP_ID | 0x0C,
         RC_INVALID_PCIE_IOP_LANE_CONFIG          = ISTEP_COMP_ID | 0x0D,
+        RC_MASTER_CORE_NULL                      = ISTEP_COMP_ID | 0x0E,
     };
 
 };