From 4cbe15e36f11f6d0e9c274390429b4abede4e135 Mon Sep 17 00:00:00 2001
From: Louis Stermole <stermole@us.ibm.com>
Date: Mon, 30 Sep 2019 11:54:53 -0400
Subject: Rename p9a_mss_memdiag to exp_mss_memdiag

The memdiag process operates entirely on Explorer, so the
procedure name and location should reflect that for porting purposes.

Change-Id: I3f43eae5c0476ef4bc5140f43d8625f05fff558d
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84508
Reviewed-by: ANDRE A MARIN <aamarin@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Dev-Ready: Steven B Janssen <janssens@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Devon A Baughen <devon.baughen1@ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/84546
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: Daniel M Crowell <dcrowell@us.ibm.com>
---
 .../procedures/hwp/memory/exp_mss_memdiag.C        | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/import/chips/ocmb/explorer/procedures/hwp/memory')

diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C
index 080b3b4f0..14b9af119 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_mss_memdiag.C
@@ -36,31 +36,26 @@
 #include <fapi2.H>
 #include <exp_mss_memdiag.H>
 #include <lib/shared/exp_defaults.H>
-#include <lib/dimm/exp_rank.H>
-#include <generic/memory/lib/utils/poll.H>
-#include <generic/memory/lib/utils/find.H>
-#include <generic/memory/lib/utils/count_dimm.H>
-#include <generic/memory/lib/utils/mcbist/gen_mss_mcbist_patterns.H>
 
-using fapi2::TARGET_TYPE_OCMB_CHIP;
-using fapi2::TARGET_TYPE_SYSTEM;
-using fapi2::TARGET_TYPE_MEM_PORT;
-using fapi2::FAPI2_RC_SUCCESS;
+#include <lib/dimm/exp_rank.H>
+#include <lib/mc/exp_port.H>
+#include <lib/mcbist/exp_memdiags.H>
+#include <lib/mcbist/exp_mcbist_traits.H>
 
 extern "C"
 {
     ///
-    /// @brief Begin background scrub and run pattern tests
+    /// @brief Initializes memory and sets firs
     /// @param[in] i_target OCMB Chip
     /// @return FAPI2_RC_SUCCESS iff ok
     ///
-    fapi2::ReturnCode exp_mss_memdiag( const fapi2::Target<TARGET_TYPE_OCMB_CHIP>& i_target )
+    fapi2::ReturnCode exp_mss_memdiag( const fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>& i_target )
     {
-        FAPI_INF("Start mss memdiags on: %s", mss::c_str( i_target ));
-
-        // TODO: Actually implement this.
+        FAPI_INF("Start exp_mss_memdiag on: %s", mss::c_str( i_target ));
+        FAPI_TRY(mss::memdiags::mss_initialize_memory(i_target));
 
-        FAPI_INF("End memdiag");
+    fapi_try_exit:
+        FAPI_INF("End exp_mss_memdiag on %s", mss::c_str( i_target ));
         return fapi2::current_err;
     }
 }
-- 
cgit v1.2.1