Call new p9a_throttle_sync procedure

Should be called just like the old p9_throttle_sync but
specific to Axone.

Change-Id: I08c39ecae6453e527482f7e498e44131b4222894
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80237
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
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: Christian R Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>

src/usr/isteps/istep14/call_mss_thermal_init.C

@@ -37,13 +37,15 @@
 #include    <config.h>
 #include    <fapi2.H>
 #include    <fapi2/plat_hwp_invoker.H>
-#include    <p9c_mss_thermal_init.H>
-#include    <p9_mss_thermal_init.H>
-#include    <p9_throttle_sync.H>
 
 #ifdef CONFIG_AXONE
     //@TODO RTC:195557 #include    <exp_thermal_init.H>
     #include    <chipids.H> // for EXPLORER ID
+    #include    <p9a_throttle_sync.H>
+#else
+    #include    <p9c_mss_thermal_init.H>
+    #include    <p9_mss_thermal_init.H>
+    #include    <p9_throttle_sync.H>
 #endif
 
 using   namespace   ISTEP;
@@ -81,6 +83,7 @@ void* call_mss_thermal_init (void *io_pArgs)
             break;
     }
 
+    // This should run whether or not mss_thermal_init worked
     run_proc_throttle_sync(l_StepError);
 
     TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_thermal_init exit");
@@ -276,6 +279,7 @@ void axone_call_mss_thermal_init(IStepError & io_istepError)
 }
 #endif
 
+
 void run_proc_throttle_sync(IStepError & io_istepError)
 {
     errlHndl_t  l_errl  =   nullptr;
@@ -293,12 +297,18 @@ void run_proc_throttle_sync(IStepError & io_istepError)
         fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
                                            l_fapi2CpuTarget((l_procChip));
 
+        // Call p9_throttle_sync
+#ifndef CONFIG_AXONE
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                    "Running p9_throttle_sync HWP on target HUID %.8X",
                    TARGETING::get_huid(l_procChip) );
-
-        // Call p9_throttle_sync
         FAPI_INVOKE_HWP( l_errl, p9_throttle_sync, l_fapi2CpuTarget );
+#else
+        TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                   "Running p9a_throttle_sync HWP on target HUID %.8X",
+                   TARGETING::get_huid(l_procChip) );
+        FAPI_INVOKE_HWP( l_errl, p9a_throttle_sync, l_fapi2CpuTarget );
+#endif
 
         if (l_errl)
         {
@@ -321,7 +331,7 @@ void run_proc_throttle_sync(IStepError & io_istepError)
         else
         {
             TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
-                       "SUCCESS :  p9_throttle_sync HWP( ) on 0x%.8X processor",
+                       "SUCCESS : p9_throttle_sync HWP on 0x%.8X processor",
                        TARGETING::get_huid(l_procChip) );
         }
     }

src/usr/isteps/istep14/makefile

@@ -26,6 +26,7 @@ ROOTPATH = ../../../..
 MODULE = istep14
 
 PROCEDURE_PATH = ${ROOTPATH}/src/import/chips/p9/procedures
+AXONE_PROCEDURE_PATH = ${ROOTPATH}/src/import/chips/p9a/procedures
 CEN_PROC_PATH = ${ROOTPATH}/src/import/chips/centaur/procedures
 EXP_COMMON_PATH = ${ROOTPATH}/src/import/chips/ocmb/explorer/common
 
@@ -51,6 +52,7 @@ EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/ddr4/
 EXTRAINCDIR += ${EXP_COMMON_PATH}/include/
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory
 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils
+EXTRAINCDIR += ${AXONE_PROCEDURE_PATH}/hwp/memory/
 
 OBJS += call_mss_memdiag.o
 OBJS += call_mss_thermal_init.o
@@ -93,14 +95,19 @@ OBJS += p9_revert_sbe_mcs_setup.o
 # include ${PROCEDURE_PATH}/hwp/memory/p9_mss_thermal_init.mk
 # include ${CEN_PROC_PATH}/hwp/memory/p9c_mss_thermal_init.mk
 # include ${CEN_PROC_PATH}/hwp/memory/p9c_mss_unmask_errors.mk
-include ${PROCEDURE_PATH}/hwp/nest/p9_throttle_sync.mk
+
 include ${PROCEDURE_PATH}/hwp/memory/p9_mss_power_cleanup.mk
-include ${ROOTPATH}/config.mk
 
-VPATH    += ${PROCEDURE_PATH}/hwp/nest/ ${PROCEDURE_PATH}/hwp/memory/
+VPATH    += ${PROCEDURE_PATH}/hwp/nest/
+VPATH    += ${PROCEDURE_PATH}/hwp/memory/
 VPATH    += ${PROCEDURE_PATH}/hwp/memory/lib/eff_config/
 VPATH    += ${PROCEDURE_PATH}/hwp/memory/lib/utils/
 VPATH    += ${PROCEDURE_PATH}/hwp/memory/lib/mcbist/
 VPATH    += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/
 VPATH    += ${CEN_PROC_PATH}/hwp/memory/
 VPATH    += ${PROCEDURE_PATH}/hwp/memory/lib/dimm/ddr4/
+
+# Axone vs non-Axone specific HWP
+OBJS += $(if $(CONFIG_AXONE),p9a_throttle_sync.o,p9_throttle_sync.o)
+
+include ${ROOTPATH}/config.mk