Integrate HWPs for step 15

This commit includes work to create the call_HWP wrappers
for istep15.

RTC:133832
Change-Id: Ib0db5ac2b9b5d5f5c2967ff97794493d867fb04b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/774
Reviewed-by: A. P. Williams III <iawillia@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins

2 files changed, 36 insertions, 18 deletions

diff --git a/src/include/sys/misc.h b/src/include/sys/misc.h
index 74f5ac46a..12fb89fa4 100644
--- a/src/include/sys/misc.h
+++ b/src/include/sys/misc.h
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -44,6 +44,14 @@ enum    p8SystemConsts
 
 };
 
+enum    p9SystemConsts
+{
+    /// max possible processors in a P9 system
+    P9_MAX_PROCS        =   8,
+    /// max EC (cores available in a processor )
+    P9_MAX_EC_PER_PROC  =   16,
+
+};
 
 /**
  * @enum ShutdownStatus
@@ -71,18 +79,22 @@ enum WinkleScope
     WINKLE_SCOPE_ALL = 0x1,
 };
 
+
+
+//TODO RTC:147693
+//Need to determine what HOMER layout offsets should be
 /**
  * HOMER layout offsets
  * see: HOMER_Image_Layout.odt
  */
 /** OCC image is at the start of the HOMER layout */
-#define HOMER_OFFSET_TO_OCC_IMG 0
+#define HOMER_OFFSET_TO_OCC_IMG (1*MEGABYTE)
 /** Offset from HOMER to OCC Host Data Area */
 #define HOMER_OFFSET_TO_OCC_HOST_DATA (MEGABYTE)
 /** SLW image is 2MB into the HOMER layout */
-#define HOMER_SLW_IMG_OFFSET (2*MEGABYTE)
-/** SLW Image Max ouput size */
-#define HOMER_MAX_SLW_IMG_SIZE_IN_MB 1
+#define HOMER_HCODE_IMG_OFFSET (2*MEGABYTE)
+/** STOP Image Max ouput size */
+#define HOMER_MAX_HCODE_IMG_SIZE_IN_MB 1
 
 
 #ifdef __cplusplus
diff --git a/src/include/usr/isteps/istep15list.H b/src/include/usr/isteps/istep15list.H
index 1dbf97c11..5a7386b45 100644
--- a/src/include/usr/isteps/istep15list.H
+++ b/src/include/usr/isteps/istep15list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -28,11 +28,17 @@
 /**
  * @file    istep15list.H
  *
- *  IStep 15    Build Winkle Images
- *  IPL FLow Doc        v0.67 (11/11/15)
+ *  IStep 15    Build Hcode Images
+ *  IPL FLow Doc        v0.84 (11/11/15)
  *
- *    15.1    host_build_winkle
- *          : Build runtime winkle images
+ *    15.1    host_build_stop_image
+ *          : Build runtime stop images
+ *    15.2    proc_set_pba_homer_bar
+ *          : Set HOMER location in OCC
+ *    15.3    host_establish_ex_chiplet
+ *          : Select Hostboot Core
+ *    15.4    host_start_stop_engine
+ *          : Initialize STOPGPE engine
  *
  *  Please see the note in initsvcstructs.H for description of
  *      the ISTEPNAME macro.
@@ -54,7 +60,7 @@ namespace   ISTEP_15
  *  return any errlogs to istep
  *
  */
-void*  call_host_build_stop_image( void    *io_pArgs );
+void*  host_build_stop_image( void    *io_pArgs );
 
 
 
@@ -66,7 +72,7 @@ void*  call_host_build_stop_image( void    *io_pArgs );
  *  return  any errlogs to istep
  *
  */
-void*    call_proc_set_pba_homer_bar( void    *io_pArgs );
+void*    proc_set_pba_homer_bar( void    *io_pArgs );
 
 
 
@@ -78,7 +84,7 @@ void*    call_proc_set_pba_homer_bar( void    *io_pArgs );
  *  return  any errlogs to istep
  *
  */
-void*    call_host_establish_ex_chiplet( void    *io_pArgs );
+void*    host_establish_ex_chiplet( void    *io_pArgs );
 
 /**
  *  @brief   host_start_stop_engine
@@ -88,7 +94,7 @@ void*    call_host_establish_ex_chiplet( void    *io_pArgs );
  *  return  any errlogs to istep
  *
  */
-void*    call_host_start_stop_engine( void    *io_pArgs );
+void*    host_start_stop_engine( void    *io_pArgs );
 };
 
 
@@ -102,22 +108,22 @@ namespace   INITSERVICE
         },
         {
                 ISTEPNAME(15,01,"host_build_stop_image"),
-                ISTEP_15::call_host_build_stop_image,
+                ISTEP_15::host_build_stop_image,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(15,02,"proc_set_pba_homer_bar"),
-                ISTEP_15::call_proc_set_pba_homer_bar,
+                ISTEP_15::proc_set_pba_homer_bar,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(15,03,"host_establish_ex_chiplet"),
-                ISTEP_15::call_host_establish_ex_chiplet,
+                ISTEP_15::host_establish_ex_chiplet,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
         {
                 ISTEPNAME(15,04,"host_start_stop_engine"),
-                ISTEP_15::call_host_start_stop_engine,
+                ISTEP_15::host_start_stop_engine,
                 { START_FN, EXT_IMAGE, NORMAL_IPL_OP, true }
         },
 };