Add count_dimm

  Flag if there are no DIMM seen in draminit

Change-Id: I985617421f0a1b5b3c2784ea61573dbee46c1ca3
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22861
Tested-by: Jenkins Server
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22862
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 12 insertions, 3 deletions

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H b/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H
index b5024172c..9aeab43ba 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/utils/index.H
@@ -40,7 +40,7 @@ namespace mss
 /// @brief Return an attribute array index from a fapi2 target
 /// @tparam T the fapi2::TargetType
 /// @param[in] i_target a DIMM target representing the DIMM in question
-/// @return size_t, the attribute array index.
+/// @return size_t the attribute array index.
 ///
 template< fapi2::TargetType T >
 inline size_t index(const fapi2::Target<T>& i_target);
@@ -60,7 +60,7 @@ inline size_t index(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& i_target)
 ///
 /// @brief Return an attribute array index from a rank number
 /// @param[in] i_rank uint64_t a rank number DIMM0 {0, 1, 2, 3} DIMM1 {0, 1, 2, 3}
-/// @return size_t, the attribute array index.
+/// @return size_t the attribute array index.
 ///
 inline size_t index(const uint64_t i_rank)
 {
diff --git a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C
index dc8ff6a2f..cf96bbf10 100644
--- a/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C
+++ b/src/import/chips/p9/procedures/hwp/memory/p9_mss_draminit.C
@@ -31,9 +31,11 @@
 #include <mss.H>
 
 #include <p9_mss_draminit.H>
+#include <lib/utils/count_dimm.H>
 
 using fapi2::TARGET_TYPE_MCBIST;
 using fapi2::TARGET_TYPE_MCA;
+using fapi2::TARGET_TYPE_DIMM;
 using fapi2::FAPI2_RC_SUCCESS;
 
 extern "C"
@@ -62,7 +64,14 @@ extern "C"
         // If we don't have any ports, lets go.
         if (l_mca.size() == 0)
         {
-            FAPI_INF("No ports? %s", mss::c_str(i_target));
+            FAPI_INF("++++ No ports? %s ++++", mss::c_str(i_target));
+            return fapi2::FAPI2_RC_SUCCESS;
+        }
+
+        // If we don't have any DIMM, lets go.
+        if (mss::count_dimm(i_target) == 0)
+        {
+            FAPI_INF("++++ NO DIMM on %s ++++", mss::c_str(i_target));
             return fapi2::FAPI2_RC_SUCCESS;
         }