HOSTBOOT: Support fused cores

Change-Id: I2ad133be733ee9e41590b3b8bd60bd6abe69d1a9
RTC: 126786
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22054
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 12 insertions, 3 deletions

diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index 3effb1adf..4f5ab931c 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -111,13 +111,13 @@ namespace   INITSERVICE
                 NULL,
                 { NONE, EXT_IMAGE, IPL_NOOP, false }
         },
-// @todo RTC:137389 - removed for P9 bringup
-#if (0)
         {
                 ISTEPNAME(16,01,"host_activate_master"),
                 ISTEP_16::call_host_activate_master,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, true }
         },
+// @todo RTC:137389 - removed for P9 bringup
+#if 0
         {
                 ISTEPNAME(16,02,"host_activate_slave_cores"),
                 ISTEP_16::call_host_activate_slave_cores,
diff --git a/src/include/usr/targeting/common/util.H b/src/include/usr/targeting/common/util.H
index 29028cc80..1ec88be61 100644
--- a/src/include/usr/targeting/common/util.H
+++ b/src/include/usr/targeting/common/util.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -161,6 +163,13 @@ uint64_t get_bottom_mem_addr(void);
 bool orderByNodeAndPosition(  Target* i_firstProc,
                               Target* i_secondProc);
 
+/**
+ * @brief   Checks if we want to be in FUSED mode or not.
+ * @description  Fused mode is when 2 cores merge to produce
+ *               a core with 8 threads versus 4 threaded cores.
+ * @return  Non-zero if FUSED mode, 0 if non-FUSED mode
+ */
+uint8_t  is_fused_mode( );
 
 }