From e4b279cb88d769dd7167b35d0d6f51d9c5500bd3 Mon Sep 17 00:00:00 2001
From: Christian Geddes <crgeddes@us.ibm.com>
Date: Tue, 30 Apr 2019 13:32:18 -0500
Subject: Compile and call exp_draminit in istep 13.10

This commit adds the call to exp_draminit which sends the command
EXP_FW_DDR_PHY_INIT to the explorer chip. Currently simics is just
returning valid response and the data associated with the response
is all 0s. This is acceptable for the time being.

RTC: 207856
Change-Id: Ie160d1e6405d1c2922500c40f04c9f5470d7db23
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76755
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/usr/isteps/istep13/call_mss_draminit.C | 18 +++++++++---------
 src/usr/isteps/istep13/makefile            |  1 +
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/usr')

diff --git a/src/usr/isteps/istep13/call_mss_draminit.C b/src/usr/isteps/istep13/call_mss_draminit.C
index 6eed78587..7067e45ff 100644
--- a/src/usr/isteps/istep13/call_mss_draminit.C
+++ b/src/usr/isteps/istep13/call_mss_draminit.C
@@ -23,7 +23,7 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-//Error handling and tracing
+// Error Handling and Tracing Support
 #include <errl/errlentry.H>
 #include <errl/errlmanager.H>
 #include <errl/errludtarget.H>
@@ -32,12 +32,15 @@
 #include <initservice/initserviceif.H>
 #include <plat_trace.H>
 
-//Istep 13 framework
+// Generated files
+#include  <config.h>
+
+// Istep 13 framework
 #include <istepHelperFuncs.H>
 #include "istep13consts.H"
 #include "platform_vddr.H"
 
-// targeting support
+// Targeting support
 #include <targeting/common/commontargeting.H>
 #include <targeting/common/util.H>
 #include <targeting/common/utilFilter.H>
@@ -47,18 +50,17 @@
 
 //From Import Directory (EKB Repository)
 #include  <fapi2.H>
-#include  <config.h>
 #ifndef CONFIG_AXONE
     #include  <p9_mss_draminit.H>
     #include  <p9c_mss_draminit.H>
 #else
 #include <chipids.H>
-// @todo RTC 207856   #include  <exp_draminit.H>
+    #include  <exp_draminit.H>
     #include  <gem_draminit.H>
 #endif
 
-#ifdef CONFIG_NVDIMM
 // NVDIMM support
+#ifdef CONFIG_NVDIMM
 #include    <isteps/nvdimm/nvdimm.H>
 #endif
 
@@ -254,7 +256,6 @@ void nimbus_mss_draminit(IStepError & io_istepError)
     }   // endfor   mcbist's
 }
 
-
 void cumulus_mss_draminit(IStepError & io_istepError)
 {
     errlHndl_t l_err = NULL;
@@ -346,7 +347,7 @@ void axone_mss_draminit(IStepError & io_istepError)
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                 "Running exp_draminit HWP on target HUID 0x%.8X",
                 TARGETING::get_huid(l_ocmb) );
-            //@todo RTC 207856: FAPI_INVOKE_HWP(l_err, exp_draminit, l_fapi_ocmb_target);
+            FAPI_INVOKE_HWP(l_err, exp_draminit, l_fapi_ocmb_target);
         }
         else
         {
@@ -392,7 +393,6 @@ void axone_mss_draminit(IStepError & io_istepError)
               "Error: Trying to call 'exp_draminit' or 'gem_draminit' but Axone code is not compiled in");
     assert(0, "Calling wrong Model's HWPs");
 }
-
 #endif
 
 };
diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile
index 57a83e567..1636c7f17 100644
--- a/src/usr/isteps/istep13/makefile
+++ b/src/usr/isteps/istep13/makefile
@@ -137,6 +137,7 @@ include ${CEN_PROCEDURES_PATH}/hwp/memory/p9c_mss_row_repair.mk
 OBJS += $(if $(CONFIG_AXONE),exp_scominit.o,)
 OBJS += $(if $(CONFIG_AXONE),explorer_scom.o,)
 OBJS += $(if $(CONFIG_AXONE),exp_draminit_mc.o,)
+OBJS += $(if $(CONFIG_AXONE),exp_draminit.o,)
 OBJS += $(if $(CONFIG_AXONE),gem_draminit.o,)
 
 include ${ROOTPATH}/config.mk
-- 
cgit v1.2.3