Save and restore OBUS related firmasks

During Hostboot IPL time it is impossible to see OBUS peers because
they exists on different nodes and Hostboot is unaware of other nodes.
Because of this we must mask off additional OBUS related firs during
Hostboot IPL time. After we have reached runtime and have re-adjusted
PEER targets we can restore the FIR values to what they were prior
to the additional masking Hostboot does during IPL time.

Change-Id: Ib9c158191c7f68f4bd7126799ba0a0aba40cee18
CQ: SW425530
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/58916
Tested-by: Jenkins Server <pfd-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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

5 files changed, 16 insertions, 0 deletions

diff --git a/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C b/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C
index 8a0a651e7..c34047bd2 100644
--- a/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C
+++ b/src/usr/isteps/istep08/call_proc_xbus_enable_ridi.C
@@ -82,12 +82,15 @@ void* call_proc_xbus_enable_ridi( void *io_pArgs )
         if (INITSERVICE::isSMPWrapConfig())
         {
             // Make the FAPI call to p9_chiplet_scominit
+            // Make the FAPI call to p9_io_obus_firmask_save_restore, if previous call succeeded
             // Make the FAPI call to p9_psi_scominit, if previous call succeeded
             // Make the FAPI call to p9_io_obus_scominit, if previous call succeeded
             // Make the FAPI call to p9_npu_scominit, if previous call succeeded
             // Make the FAPI call to p9_chiplet_enable_ridi, if previous call succeeded
             fapiHWPCallWrapperHandler(P9_CHIPLET_SCOMINIT, l_stepError,
                                       HWPF_COMP_ID, TYPE_PROC)             &&
+            fapiHWPCallWrapperHandler(P9_OBUS_FIRMASK_SAVE_RESTORE, l_stepError,
+                                      HWPF_COMP_ID, TYPE_PROC)             &&
             fapiHWPCallWrapperHandler(P9_PSI_SCOMINIT, l_stepError,
                                       HWPF_COMP_ID, TYPE_PROC)             &&
             fapiHWPCallWrapperHandler(P9_IO_OBUS_SCOMINIT, l_stepError,
diff --git a/src/usr/isteps/istep10/call_proc_chiplet_scominit.C b/src/usr/isteps/istep10/call_proc_chiplet_scominit.C
index 6493aa7d1..8e2950163 100644
--- a/src/usr/isteps/istep10/call_proc_chiplet_scominit.C
+++ b/src/usr/isteps/istep10/call_proc_chiplet_scominit.C
@@ -77,9 +77,12 @@ void* call_proc_chiplet_scominit( void *io_pArgs )
     if (!INITSERVICE::isSMPWrapConfig())
     {
         // Make the FAPI call to p9_chiplet_scominit
+        // Make the FAPI call to p9_io_obus_firmask_save_restore, if previous call succeeded
         // Make the FAPI call to p9_psi_scominit, if previous call succeeded
         fapiHWPCallWrapperHandler(P9_CHIPLET_SCOMINIT, l_stepError,
                                   HWPF_COMP_ID, TYPE_PROC)                &&
+        fapiHWPCallWrapperHandler(P9_OBUS_FIRMASK_SAVE_RESTORE, l_stepError,
+                                  HWPF_COMP_ID, TYPE_PROC)                &&
         fapiHWPCallWrapperHandler(P9_PSI_SCOMINIT, l_stepError,
                                   HWPF_COMP_ID, TYPE_PROC);
     }
diff --git a/src/usr/isteps/nest/makefile b/src/usr/isteps/nest/makefile
index 6a0a35625..a858b2cb2 100644
--- a/src/usr/isteps/nest/makefile
+++ b/src/usr/isteps/nest/makefile
@@ -39,6 +39,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/
 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/initfiles
 
 OBJS += nestHwpHelperFuncs.o
+OBJS += p9_io_obus_firmask_save_restore.o
 
 VPATH += ${PROCEDURES_PATH}/hwp/initfiles
 VPATH += ${PROCEDURES_PATH}/hwp/io
diff --git a/src/usr/isteps/nest/nestHwpHelperFuncs.C b/src/usr/isteps/nest/nestHwpHelperFuncs.C
index 451caf79f..6ff374f5d 100644
--- a/src/usr/isteps/nest/nestHwpHelperFuncs.C
+++ b/src/usr/isteps/nest/nestHwpHelperFuncs.C
@@ -54,6 +54,7 @@
 #include <p9_fbc_eff_config_links.H>
 #include <p9_sys_chiplet_scominit.H>
 #include <p9_chiplet_fabric_scominit.H>
+#include <p9_io_obus_firmask_save_restore.H>
 
 namespace ISTEP
 {
@@ -81,6 +82,7 @@ const char * hwpCallToString( HWP_CALL_TYPE i_hwpCall )
         { P9_PSI_SCOMINIT, "p9_psi_scominit" },
         { P9_SYS_CHIPLET_SCOMINIT, "p9_sys_chiplet_scominit" },
         { P9_XBUS_ENABLE_RIDI, "p9_xbus_enable_ridi" },
+        { P9_OBUS_FIRMASK_SAVE_RESTORE, "p9_io_obus_firmask_save_restore" },
     };
 
     if (hwpCallToStringMap.count(i_hwpCall) > 0)
@@ -208,6 +210,12 @@ void fapiHWPCallWrapper(HWP_CALL_TYPE    i_hwpCall,
                                 p9_chiplet_fabric_scominit,
                                 l_fapi2Target);
             }
+            else if (P9_OBUS_FIRMASK_SAVE_RESTORE == i_hwpCall)
+            {
+                FAPI_INVOKE_HWP(l_err,
+                                p9_io_obus_firmask_save_restore,
+                                l_fapi2Target, p9iofirmasksaverestore::SAVE);
+            }
             else
             {
                 TRACFCOMP(g_trac_isteps_trace, "ERROR: Invalid/Uknown HWP call");
diff --git a/src/usr/isteps/nest/nestHwpHelperFuncs.H b/src/usr/isteps/nest/nestHwpHelperFuncs.H
index fb35700b7..9fe2b23bf 100644
--- a/src/usr/isteps/nest/nestHwpHelperFuncs.H
+++ b/src/usr/isteps/nest/nestHwpHelperFuncs.H
@@ -74,6 +74,7 @@ enum HWP_CALL_TYPE
     P9_PSI_SCOMINIT,
     P9_SYS_CHIPLET_SCOMINIT,  // Although it says chiplet, this uses proc chip
     P9_XBUS_ENABLE_RIDI,
+    P9_OBUS_FIRMASK_SAVE_RESTORE, // loops on proc chip
 };
 
 /**