Cumulus HWPs for istep 7

1. Make file changes to compile istep7HWPs

2. istep7 HWP invocation(cumulus)- Modified the following steps:

7.2 p9c_mss_volt.C (vector of centaurs)
7.3 p9c_mss_freq.C (called on each centaur)
7.4 mss_eff_config
   a) p9c_mss_eff_config.C (mba) -- loop over all functional mba
   c) p9c_mss_eff_mb_interleave.C (Cumulus only)
   d) p9c_mss_eff_config_thermal.C -- loop over all functional mba

Change-Id: I1d02f7e1b64bd53d231527ef8a29b17e09190440
RTC:177376
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44458
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>
Reviewed-by: SWATHI M. BHATTIPROLU <bhmadhur@in.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sakethan R. Kotta <sakkotta@in.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 27 insertions, 16 deletions

diff --git a/src/usr/isteps/istep07/makefile b/src/usr/isteps/istep07/makefile
index b026035fd..c48fe7efe 100644
--- a/src/usr/isteps/istep07/makefile
+++ b/src/usr/isteps/istep07/makefile
@@ -25,7 +25,9 @@
 ROOTPATH = ../../../..
 MODULE = istep07
 PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/p9/procedures
-HWP_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory
+HWP_PATH_1 += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/memory
+HWP_PATH_2 += ${ROOTPATH}/src/import/chips/centaur/procedures/hwp/memory
+HWP_PATH += ${HWP_PATH_1}/ ${HWP_PATH_2}/
 
 #Add all the object files required for istep07 module
 OBJS += call_mss_volt.o
@@ -44,17 +46,20 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/
 EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/
 EXTRAINCDIR += ${ROOTPATH}/src/usr/isteps/
 EXTRAINCDIR += ${HWP_PATH}
-EXTRAINCDIR += ${HWP_PATH}/lib/
-EXTRAINCDIR += ${HWP_PATH}/lib/dimm/
-EXTRAINCDIR += ${HWP_PATH}/lib/freq/
-EXTRAINCDIR += ${HWP_PATH}/lib/utils/
-EXTRAINCDIR += ${HWP_PATH}/lib/eff_config/
+EXTRAINCDIR += ${HWP_PATH_1}/lib/
+EXTRAINCDIR += ${HWP_PATH_1}/lib/dimm/
+EXTRAINCDIR += ${HWP_PATH_1}/lib/freq/
+EXTRAINCDIR += ${HWP_PATH_1}/lib/utils/
+EXTRAINCDIR += ${HWP_PATH_1}/lib/eff_config/
 EXTRAINCDIR += $(PROCEDURES_PATH)/hwp/nest
+EXTRAINCDIR += ${HWP_PATH_2}/lib/
+EXTRAINCDIR += ${HWP_PATH_2}/lib/shared/
+EXTRAINCDIR += ${HWP_PATH_2}/lib/utils/
 
-VPATH += ${HWP_PATH} ${HWP_PATH}/lib/spd
+VPATH += ${HWP_PATH} ${HWP_PATH_1}/lib/spd
 VPATH += $(PROCEDURES_PATH)/hwp/nest ${ROOTPATH}/src/usr/fapi2
-VPATH += ${HWP_PATH}/lib ${HWP_PATH}/lib/utils ${HWP_PATH}/lib/eff_config
-VPATH += ${HWP_PATH}/lib/freq ${HWP_PATH}/lib/dimm
+VPATH += ${HWP_PATH_1}/lib ${HWP_PATH_1}/lib/utils ${HWP_PATH_1}/lib/eff_config
+VPATH += ${HWP_PATH_1}/lib/freq ${HWP_PATH_1}/lib/dimm
 VPATH += ${ROOTPATH}/src/usr/sbe
 
 #Required include before all the procedure.mk are included
@@ -63,20 +68,26 @@ include ${ROOTPATH}/procedure.rules.mk
 #Include all the procedure makefiles
 
 #mss_volt : Calc dimm voltage
-include $(HWP_PATH)/p9_mss_volt.mk
+include $(HWP_PATH_1)/p9_mss_volt.mk
+include $(HWP_PATH_2)/p9c_mss_volt.mk
 
 #mss_freq : Calc dimm frequency
-include $(HWP_PATH)/p9_mss_freq.mk
-include $(HWP_PATH)/p9_mss_freq_system.mk
+include $(HWP_PATH_1)/p9_mss_freq.mk
+include $(HWP_PATH_1)/p9_mss_freq_system.mk
+include $(HWP_PATH_2)/p9c_mss_freq.mk
 
 #mss_eff_config : Determine effective config
 include $(PROCEDURES_PATH)/hwp/nest/p9_mss_eff_grouping.mk
-include $(HWP_PATH)/p9_mss_eff_config.mk
-include $(HWP_PATH)/p9_mss_eff_config_thermal.mk
-include $(HWP_PATH)/p9_mss_bulk_pwr_throttles.mk
+include $(HWP_PATH_1)/p9_mss_eff_config.mk
+include $(HWP_PATH_1)/p9_mss_eff_config_thermal.mk
+include $(HWP_PATH_1)/p9_mss_bulk_pwr_throttles.mk
+include $(HWP_PATH_2)/p9c_mss_eff_config.mk
+include $(HWP_PATH_2)/p9c_mss_eff_config_thermal.mk
+include $(HWP_PATH_2)/p9c_mss_bulk_pwr_throttles.mk
+include $(HWP_PATH_2)/p9c_mss_eff_mb_interleave.mk
 
 #mss_attr_update : MSS ATTR Overrides
-include $(HWP_PATH)/p9_mss_attr_update.mk
+include $(HWP_PATH_1)/p9_mss_attr_update.mk
 
 
 include ${ROOTPATH}/config.mk