Moved out sbecmdmpipl.C functions into Seeprom

Change-Id: I688f29478f5b67c82b76eaf5658ac807f169448f
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45087
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 33 insertions, 20 deletions

diff --git a/src/sbefw/sbecmdmpipl.C b/src/sbefw/sbecmdmpipl.C
index f28c47e4..b00d6640 100644
--- a/src/sbefw/sbecmdmpipl.C
+++ b/src/sbefw/sbecmdmpipl.C
@@ -46,6 +46,22 @@
 
 using namespace fapi2;
 
+// Defines for stop clock
+#define SBE_IS_EX0(chipletId) \
+    (!(((chipletId - CORE_CHIPLET_OFFSET) & 0x0002) >> 1))
+
+/* @brief Bitmapped enumeration to identify the stop clock HWP call
+ */
+enum stopClockHWPType
+{
+    SC_NONE     = 0x00,
+    SC_PROC     = 0x01, // Call p9_stopclocks
+    SC_CACHE    = 0x02, // Call p9_hcd_cache_stopclocks
+    SC_CORE     = 0x04, // Call p9_hcd_core_stopclocks
+};
+
+#ifdef __SBEFW_SEEPROM__
+
 #ifdef SEEPROM_IMAGE
     // Using function pointer to force long call.
 p9_hcd_cache_stopclocks_FP_t p9_hcd_cache_stopclocks_hwp = &p9_hcd_cache_stopclocks;
@@ -53,6 +69,7 @@ p9_hcd_core_stopclocks_FP_t p9_hcd_core_stopclocks_hwp = &p9_hcd_core_stopclocks
 p9_stopclocks_FP_t p9_stopclocks_hwp = &p9_stopclocks;
 #endif
 
+
 ///////////////////////////////////////////////////////////////////////
 // @brief sbeEnterMpipl Sbe enter MPIPL function
 //
@@ -182,21 +199,6 @@ uint32_t sbeContinueMpipl(uint8_t *i_pArg)
 }
 
 ///////////////////////////////////////////////////////////////////////
-// @brief sbeStopClocks Sbe Stop Clocks function
-//
-// @return  RC from the underlying FIFO utility
-///////////////////////////////////////////////////////////////////////
-#define SBE_IS_EX0(chipletId) \
-    (!(((chipletId - CORE_CHIPLET_OFFSET) & 0x0002) >> 1))
-/* @brief Bitmapped enumeration to identify the stop clock HWP call
- */
-enum stopClockHWPType
-{
-    SC_NONE     = 0x00,
-    SC_PROC     = 0x01, // Call p9_stopclocks
-    SC_CACHE    = 0x02, // Call p9_hcd_cache_stopclocks
-    SC_CORE     = 0x04, // Call p9_hcd_core_stopclocks
-};
 /* @brief Deduce the type of stop clock procedure to call based on
  *        target and chiplet id combination
  *
@@ -204,9 +206,10 @@ enum stopClockHWPType
  * @param[in] i_chipletId   Chiplet id
  *
  * @return Bitmapped stopClockHWPType enum values
- * */
+ */
+///////////////////////////////////////////////////////////////////////
 static inline uint32_t getStopClockHWPType(uint32_t i_targetType,
-                                  uint32_t i_chipletId)
+                                           uint32_t i_chipletId)
 {
     uint32_t l_rc = SC_NONE;
     TargetType l_fapiTarget = sbeGetFapiTargetType(
@@ -232,14 +235,16 @@ static inline uint32_t getStopClockHWPType(uint32_t i_targetType,
     }
     return l_rc;
 }
+
+///////////////////////////////////////////////////////////////////////
 /* @brief Prepare Stop clock flags base on Target Type
  *
  * @param[in] i_targetType  SBE chip-op target Type
  *
  * @return p9_stopclocks_flags
  */
-static inline p9_stopclocks_flags getStopClocksFlags(
-                                     uint32_t i_targetType)
+///////////////////////////////////////////////////////////////////////
+static inline p9_stopclocks_flags getStopClocksFlags(uint32_t i_targetType)
 {
     p9_stopclocks_flags l_flags;
 
@@ -273,6 +278,12 @@ static inline p9_stopclocks_flags getStopClocksFlags(
 
     return l_flags;
 }
+
+///////////////////////////////////////////////////////////////////////
+// @brief sbeStopClocks Sbe Stop Clocks function
+//
+// @return  RC from the underlying FIFO utility
+///////////////////////////////////////////////////////////////////////
 uint32_t sbeStopClocks(uint8_t *i_pArg)
 {
     #define SBE_FUNC " sbeStopClocks"
@@ -408,4 +419,4 @@ uint32_t sbeStopClocks(uint8_t *i_pArg)
     #undef SBE_FUNC
 }
 
-
+#endif //__SBEFW_SEEPROM__
diff --git a/src/sbefw/sbefwseepromfiles.mk b/src/sbefw/sbefwseepromfiles.mk
index 116c7573..24a1a1d6 100644
--- a/src/sbefw/sbefwseepromfiles.mk
+++ b/src/sbefw/sbefwseepromfiles.mk
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2015,2017
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +23,7 @@
 #
 # IBM_PROLOG_END_TAG
 SBEFWSEEPROM-CPP-SOURCES = sbecmdgeneric.C
+SBEFWSEEPROM-CPP-SOURCES += sbecmdmpipl.C
 
 SBEFWSEEPROM-C-SOURCES =
 SBEFWSEEPROM-S-SOURCES =