Enable Istep 13 L2 Procedures

More work to enable the building and calling of variable istep 13 HWPS

RTC: 134081
Change-Id: I662f6819dd880feed7e473f4d8bfb6bcde41aaaf
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24608
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>

5 files changed, 54 insertions, 32 deletions

diff --git a/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C b/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
index 63eb8c34a..a99544cfe 100644
--- a/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
+++ b/src/usr/isteps/istep13/call_mss_ddr_phy_reset.C
@@ -37,8 +37,7 @@
 #include "istep13consts.H"
 #include <fapi2.H>
 #include <fapi2/plat_hwp_invoker.H>
-//TODO RTC:152209 Implement std::enable_if in HB
-// #include <p9_mss_ddr_phy_reset.H>
+#include <p9_mss_ddr_phy_reset.H>
 
 using   namespace   ERRORLOG;
 using   namespace   ISTEP;
@@ -75,8 +74,8 @@ void* call_mss_ddr_phy_reset (void *io_pArgs)
 
         fapi2::Target<fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
-//TODO RTC:152209 Implement std::enable_if in HB
-//         FAPI_INVOKE_HWP(l_err, p9_mss_ddr_phy_reset, l_fapi_mcbist_target);
+
+         FAPI_INVOKE_HWP(l_err, p9_mss_ddr_phy_reset, l_fapi_mcbist_target);
 
         if (l_err)
         {
diff --git a/src/usr/isteps/istep13/call_mss_draminit.C b/src/usr/isteps/istep13/call_mss_draminit.C
index c056f9e07..3377f944f 100644
--- a/src/usr/isteps/istep13/call_mss_draminit.C
+++ b/src/usr/isteps/istep13/call_mss_draminit.C
@@ -26,6 +26,7 @@
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
 #include <isteps/hwpisteperror.H>
+#include <istepHelperFuncs.H>
 #include <initservice/isteps_trace.H>
 #include <initservice/initserviceif.H>
 #include <plat_trace.H>
@@ -39,8 +40,7 @@
 
 #include    <fapi2.H>
 #include    <fapi2/plat_hwp_invoker.H>
-//TODO RTC:152209 Implement std::enable_if in HB
-// #include    <p9_mss_draminit.H>
+#include    <p9_mss_draminit.H>
 
 using   namespace   ERRORLOG;
 using   namespace   ISTEP;
@@ -62,7 +62,7 @@ void   mss_post_draminit( IStepError & l_stepError )
     //@TODO RTC: 134081. The helper function is currently commented out because
     //some of the attributes don't exist. uncomment it once attribute support is
     //in place
-//    set_eff_config_attrs_helper(ISTEP_07::POST_DRAM_INIT, rerun_vddr);
+    set_eff_config_attrs_helper(DEFAULT, rerun_vddr);
 
     if ( rerun_vddr == false )
     {
@@ -73,12 +73,12 @@ void   mss_post_draminit( IStepError & l_stepError )
 
     // Call mss_volt_vddr_offset to recalculate VDDR voltage
     // @TODO RTC: 152294 Uncomment once attribute support is in place
-    /*
-    l_err = ISTEP_07::setMemoryVoltageDomainOffsetVoltage<
-        TARGETING::ATTR_MSS_VOLT_VDDR_OFFSET_DISABLE,
-        TARGETING::ATTR_MEM_VDDR_OFFSET_MILLIVOLTS,
-        TARGETING::ATTR_VMEM_ID>();
-        */
+
+//     l_err = ISTEP_07::setMemoryVoltageDomainOffsetVoltage<
+//         TARGETING::ATTR_MSS_VOLT_VDDR_OFFSET_DISABLE,
+//         TARGETING::ATTR_MEM_VDDR_OFFSET_MILLIVOLTS,
+//         TARGETING::ATTR_VMEM_ID>();
+
     if(l_err)
     {
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "mss_post_draminit: "
@@ -141,8 +141,7 @@ void* call_mss_draminit (void *io_pArgs)
         fapi2::Target<fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
 
-//TODO RTC:152209 Implement std::enable_if in HB
-//         FAPI_INVOKE_HWP(l_err, p9_mss_draminit, l_fapi_mcbist_target);
+         FAPI_INVOKE_HWP(l_err, p9_mss_draminit, l_fapi_mcbist_target);
 
         if (l_err)
         {
diff --git a/src/usr/isteps/istep13/call_mss_draminit_mc.C b/src/usr/isteps/istep13/call_mss_draminit_mc.C
index c0c0a301d..b47ced62f 100644
--- a/src/usr/isteps/istep13/call_mss_draminit_mc.C
+++ b/src/usr/isteps/istep13/call_mss_draminit_mc.C
@@ -37,8 +37,7 @@
 #include    <config.h>
 #include    <fapi2.H>
 #include    <fapi2/plat_hwp_invoker.H>
-//TODO RTC:152209 Implement std::enable_if in HB
-// #include    <p9_mss_draminit_mc.H>
+#include    <p9_mss_draminit_mc.H>
 
 
 using   namespace   ERRORLOG;
@@ -54,6 +53,12 @@ void* call_mss_draminit_mc (void *io_pArgs)
 
     IStepError l_stepError;
 
+    TARGETING::Target * sys = NULL;
+    TARGETING::targetService().getTopLevelTarget( sys );
+
+//  TODO: RTC 155373 Need to remove hack that is setting IS_SIMULATION to 1 for this substep
+    sys->setAttr<TARGETING::ATTR_IS_SIMULATION>(1);
+
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,"call_mss_draminit_mc entry" );
 
     // Get all MCBIST
@@ -69,8 +74,7 @@ void* call_mss_draminit_mc (void *io_pArgs)
 
         fapi2::Target<fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
-//TODO RTC:152209 Implement std::enable_if in HB
-//         FAPI_INVOKE_HWP(l_err, p9_mss_draminit_mc, l_fapi_mcbist_target);
+        FAPI_INVOKE_HWP(l_err, p9_mss_draminit_mc, l_fapi_mcbist_target);
 
         if (l_err)
         {
@@ -95,6 +99,9 @@ void* call_mss_draminit_mc (void *io_pArgs)
 
     } // End; memBuf loop
 
+    //  TODO: RTC 155373 Need to remove hack that is setting IS_SIMULATION to 1 for this substep
+    sys->setAttr<TARGETING::ATTR_IS_SIMULATION>(0);
+
     TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_mc exit" );
 
     return l_stepError.getErrorHandle();
diff --git a/src/usr/isteps/istep13/call_mss_draminit_training.C b/src/usr/isteps/istep13/call_mss_draminit_training.C
index e6a8fe134..582166dcc 100644
--- a/src/usr/isteps/istep13/call_mss_draminit_training.C
+++ b/src/usr/isteps/istep13/call_mss_draminit_training.C
@@ -37,8 +37,7 @@
 #include    <config.h>
 #include    <fapi2.H>
 #include    <fapi2/plat_hwp_invoker.H>
-//TODO RTC:152209 Implement std::enable_if in HB
-// #include    <p9_mss_draminit_training.H>
+#include    <p9_mss_draminit_training.H>
 
 
 using   namespace   ERRORLOG;
@@ -70,8 +69,7 @@ void* call_mss_draminit_training (void *io_pArgs)
 
         fapi2::Target <fapi2::TARGET_TYPE_MCBIST> l_fapi_mcbist_target
             (l_mcbist_target);
-//TODO RTC:152209 Implement std::enable_if in HB
-//         FAPI_INVOKE_HWP(l_err, p9_mss_draminit_training, l_fapi_mcbist_target);
+        FAPI_INVOKE_HWP(l_err, p9_mss_draminit_training, l_fapi_mcbist_target);
 
         if (l_err)
         {
diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile
index 60ef1a68b..10ba64908 100644
--- a/src/usr/isteps/istep13/makefile
+++ b/src/usr/isteps/istep13/makefile
@@ -32,14 +32,17 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include
 EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/
-EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/
+EXTRAINCDIR += ${ROOTPATH}/src/usr/isteps/
+EXTRAINCDIR += ${ROOTPATH}/obj/genfiles
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib
-EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/utils/
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/utils
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib/mc/
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/perv
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/nest
-EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/initfiles/
-EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/
+
+EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/initfiles
+EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include
 
 
 OBJS += call_host_disable_memvolt.o
@@ -55,6 +58,19 @@ OBJS += call_mss_draminit_training.o
 OBJS += call_mss_draminit_trainadv.o
 OBJS += call_mss_draminit_mc.o
 
+OBJS += rank.o
+OBJS += c_str.o
+OBJS += ccs.o
+OBJS += rcd_load.o
+OBJS += mrs_load.o
+OBJS += mrs_load_ddr4.o
+OBJS += rcd_load_ddr4.o
+OBJS += ddr_phy.o
+OBJS += dp16.o
+OBJS += xlate.o
+OBJS += port.o
+
+
 
 
 OBJS += $(if $(CONFIG_PALMETTO_VDDR),palmetto_vddr.o,hbVddrMsg.o)
@@ -74,12 +90,15 @@ include ${PROCEDURES_PATH}/hwp/initfiles/p9_mcbist_scom.mk
 include ${PROCEDURES_PATH}/hwp/perv/p9_mem_startclocks.mk
 include ${PROCEDURES_PATH}/hwp/perv/p9_mem_pll_setup.mk
 
-#TODO RTC:152209 Implement std::enable_if in HB
-# include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit.mk
-# include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_training.mk
-# include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_mc.mk
-# include ${PROCEDURES_PATH}/hwp/memory/p9_mss_ddr_phy_reset.mk
+
+include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit.mk
+include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_training.mk
+include ${PROCEDURES_PATH}/hwp/memory/p9_mss_draminit_mc.mk
+include ${PROCEDURES_PATH}/hwp/memory/p9_mss_ddr_phy_reset.mk
 
 include ${ROOTPATH}/config.mk
 
 VPATH    += ${PROCEDURES_PATH}/hwp/memory ${PROCEDURES_PATH}/hwp/nest ${PROCEDURES_PATH}/hwp/perv ${PROCEDURES_PATH}/hwp/initfiles/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/ccs/ ${PROCEDURES_PATH}/hwp/memory/lib/dimm/ ${PROCEDURES_PATH}/hwp/memory/lib/utils/ ${PROCEDURES_PATH}/hwp/memory/lib/phy/
+VPATH    += ${PROCEDURES_PATH}/hwp/memory/lib/mc/
+