add core/cache initfiles

  Add SCAN/SCOM initfiles for core/core common/CME/L2/L3/NCU

  Update initf procedures to call generated SCAN HWPs directly
    Use for Cronus only testing of initfiles prior to scan via image support

  Add SCOM initfiles, do not invoke yet to stage PPE commits

Change-Id: I816e583363d7b547cec483de9a8db9f5d3b2e607
Original-Change-Id: I5b65ea980586a3cd0a4c0c0180473dec78234cba
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23910
Tested-by: Jenkins Server
Tested-by: PPE CI
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24519
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

1 files changed, 66 insertions, 6 deletions

diff --git a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C
index 7c7d2732..ea6b0e51 100644
--- a/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C
+++ b/import/chips/p9/procedures/hwp/cache/p9_hcd_cache_initf.C
@@ -43,6 +43,16 @@
 
 #include "p9_hcd_cache_initf.H"
 
+#ifdef P9_HCD_STOP_SKIP_SCAN
+    #ifndef __PPE__
+        #include <p9_core_common_scan.H>
+        #include <p9_cme_scan.H>
+        #include <p9_l2_scan.H>
+        #include <p9_l3_scan.H>
+        #include <p9_ncu_scan.H>
+    #endif
+#endif
+
 //------------------------------------------------------------------------------
 // Constant Definitions
 //------------------------------------------------------------------------------
@@ -78,15 +88,65 @@ p9_hcd_cache_initf(
     FAPI_DBG("Scanning Cache Analog FUNC Rings");
     FAPI_TRY(fapi2::putRing(i_target, EQ_ANA_FUNC,
                             fapi2::RING_MODE_HEADER_CHECK));
-
 fapi_try_exit:
+#else
+#ifndef __PPE__
+    fapi2::Target<fapi2::TARGET_TYPE_SYSTEM> FAPI_SYSTEM;
+    auto l_ex_targets = i_target.getChildren<fapi2::TARGET_TYPE_EX>();
+    fapi2::ReturnCode l_rc;
+
+    FAPI_EXEC_HWP(l_rc, p9_cme_scan, i_target, FAPI_SYSTEM);
+
+    if (l_rc)
+    {
+        FAPI_ERR("Error from p9_cme_scan (p9.cme.scan.initfile)");
+        fapi2::current_err = l_rc;
+        goto fapi_try_exit;
+    }
+
+    // process configured child EX chiplets
+    for (auto l_iter = l_ex_targets.begin(); l_iter != l_ex_targets.end(); l_iter++)
+    {
+        FAPI_EXEC_HWP(l_rc, p9_core_common_scan, *l_iter);
+
+        if (l_rc)
+        {
+            FAPI_ERR("Error from p9_core_common_scan (p9.core.common.scan.initfile)");
+            fapi2::current_err = l_rc;
+            goto fapi_try_exit;
+        }
+
+        FAPI_EXEC_HWP(l_rc, p9_l3_scan, *l_iter, FAPI_SYSTEM);
+
+        if (l_rc)
+        {
+            FAPI_ERR("Error from p9_l3_scan (p9.l3.scan.initfile)");
+            fapi2::current_err = l_rc;
+            goto fapi_try_exit;
+        }
+
+        FAPI_EXEC_HWP(l_rc, p9_l2_scan, *l_iter, FAPI_SYSTEM);
+
+        if (l_rc)
+        {
+            FAPI_ERR("Error from p9_l2_scan (p9.l2.scan.initfile)");
+            fapi2::current_err = l_rc;
+            goto fapi_try_exit;
+        }
+
+        FAPI_EXEC_HWP(l_rc, p9_ncu_scan, *l_iter, FAPI_SYSTEM);
+
+        if (l_rc)
+        {
+            FAPI_ERR("Error from p9_ncu_scan (p9.ncu.scan.initfile)");
+            fapi2::current_err = l_rc;
+            goto fapi_try_exit;
+        }
+    }
 
+fapi_try_exit:
+#endif
 #endif
-
     FAPI_INF("<<p9_hcd_cache_initf");
     return fapi2::current_err;
 }
-
-
-
-