From 38845b6460903998891709c6a4bfcaec2a9ed837 Mon Sep 17 00:00:00 2001
From: Ben Gass <bgass@us.ibm.com>
Date: Thu, 22 Aug 2019 12:58:22 -0400
Subject: Call p9_fbc_ioo_dl_npu_scom from p9_npu_scominit

Stacked on https://rchgit01.rchland.ibm.com/gerrit1/#/c/78203/
which defines the new initfile.

Change-Id: Id9c97dd5a6343db8afee42068ef4294202be3473
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82683
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J McGill <jmcgill@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/83035
Reviewed-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Christian R Geddes <crgeddes@us.ibm.com>
---
 .../chips/p9/procedures/hwp/nest/p9_npu_scominit.C | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'src/import/chips/p9/procedures/hwp')

diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_npu_scominit.C b/src/import/chips/p9/procedures/hwp/nest/p9_npu_scominit.C
index cf3edc4f4..cb2e6f175 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_npu_scominit.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_npu_scominit.C
@@ -42,6 +42,7 @@
 #include <p9_misc_scom_addresses_fld.H>
 #include <p9a_misc_scom_addresses.H>
 #include <p9a_misc_scom_addresses_fld.H>
+#include <p9_fbc_ioo_dl_npu_scom.H>
 
 //------------------------------------------------------------------------------
 // Constant definitions
@@ -99,6 +100,30 @@ fapi2::ReturnCode p9_npu_scominit(
             goto fapi_try_exit;
         }
 
+        // Enable obus for NPU for Axone
+        if (l_axone)
+        {
+            auto l_obus_targets = i_target.getChildren<fapi2::TARGET_TYPE_OBUS>();
+
+            for (auto l_obus_target : l_obus_targets)
+            {
+                FAPI_DBG("Invoking p9.fbc.ioo_dl.npu.scom.initfile...");
+                FAPI_EXEC_HWP(l_rc,
+                              p9_fbc_ioo_dl_npu_scom,
+                              l_obus_target,
+                              i_target,
+                              fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>());
+
+                if (l_rc)
+                {
+                    FAPI_ERR("Error from p9.fbc.ioo_dl.npu.scom.initfile");
+                    fapi2::current_err = l_rc;
+                    goto fapi_try_exit;
+                }
+
+            }
+        }
+
         // apply additional SCOM inits
         l_atrmiss.setBit<PU_NPU_SM2_XTS_ATRMISS_FLAG_MAP>()
         .setBit<PU_NPU_SM2_XTS_ATRMISS_ENA>();
-- 
cgit v1.2.1