INITPROC: Hostboot - Low Priority HW Init Procedures for week of 5/7

SW202434

Change-Id: I6bf082deb2cbe927c0ba92d670906b232482578f
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4627
Tested-by: Jenkins Server
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 22 insertions, 9 deletions

diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.H b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.H
index e437b03e1..1122ea508 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_image_help_base.H
@@ -20,12 +20,14 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_image_help_base.H,v 1.16 2013/03/27 18:31:57 cmolsen Exp $
+// $Id: p8_image_help_base.H,v 1.17 2013/05/01 15:49:00 dcrowell Exp $
 //------------------------------------------------------------------------------
 //  Title:  p8_image_help_base.H
 //  Description:  Contains the most basic structures and defines needed for 
 //                image building and interpretation.
 //------------------------------------------------------------------------------
+#ifndef _P8_IMAGE_HELP_BASE_H_
+#define _P8_IMAGE_HELP_BASE_H_
 
 #include <sbe_xip_image.h>
 
@@ -118,3 +120,4 @@ int over_write_ring_data_in_image(  void            *io_image,
 }
 #endif
 
+#endif //_P8_IMAGE_HELP_BASE_H_
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api.H b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api.H
index 8acb9aaf1..4ba6dedf6 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api.H
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_gen_api.H
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_pore_table_gen_api.H,v 1.19 2013/01/31 21:10:10 cmolsen Exp $
+// $Id: p8_pore_table_gen_api.H,v 1.20 2013/05/08 20:18:50 cmolsen Exp $
 /*------------------------------------------------------------------------------*/
 /* *! (C) Copyright International Business Machines Corp. 2012                  */
 /* *! All Rights Reserved -- Property of IBM                                    */
@@ -205,13 +205,14 @@ CONST_UINT64_T( SCRATCH0_RESET_VALUE,           (0xABBA99EBBA33DADA) );
 #define SCAN_MAX_ROTATE_38XXX_NAME           "scan_max_rotate_38xxx"
 #define SCAN_ROTATE_DEFAULT                  110 // Limit suggested by Tilman.
 #define SCAN_MAX_ROTATE                      0x00000FE0
-#define SCAN_MAX_ROTATE_LONG                 0x000FFFFF // BITS 12->31.
+//#define SCAN_MAX_ROTATE_LONG                 0x000FFFFF // BITS 12->31.
+#define SCAN_MAX_ROTATE_LONG                 0x000007C7 // Experimental max val
 
 // RAM table defines
 #define XIPSIZE_RAM_ENTRY       ( (sizeof(RamTableEntry)+7)/8*8 )
 #define SLW_MAX_CORES           16
-#define SLW_MAX_CPUREGS_CORE     9
-#define SLW_MAX_CPUREGS_THREADS  2
+#define SLW_MAX_CPUREGS_CORE    10
+#define SLW_MAX_CPUREGS_THREADS  5
 #define SLW_CORE_THREADS         8
 #define SLW_MAX_CPUREGS_OPS     ( SLW_MAX_CPUREGS_CORE + \
                                   SLW_CORE_THREADS*SLW_MAX_CPUREGS_THREADS )
@@ -228,9 +229,13 @@ enum  {
   P8_SPR_HID1   = 1009,
   P8_SPR_HID4   = 1012,
   P8_SPR_HID5   = 1014,
+	P8_CORE_XTRA8 =10008,
+	P8_CORE_XTRA9 =10009,
   P8_SPR_HSPRG0 =  304,
   P8_SPR_LPCR   =  318,
-  P8_MSR_MSR    = 2000
+  P8_MSR_MSR    = 2000,
+	P8_THRD_XTRA3 =20003,
+	P8_THRD_XTRA4 =20004
 };
 
 // SCOM table defines - Common
diff --git a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_static_data.c b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_static_data.c
index 6cce13ed7..48d3b8460 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_static_data.c
+++ b/src/usr/hwpf/hwp/build_winkle_images/p8_slw_build/p8_pore_table_static_data.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* IBM CONFIDENTIAL                                                       */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012                   */
+/* COPYRIGHT International Business Machines Corp. 2012,2013              */
 /*                                                                        */
 /* p1                                                                     */
 /*                                                                        */
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_pore_table_static_data.c,v 1.4 2012/09/13 19:42:59 cmolsen Exp $
+// $Id: p8_pore_table_static_data.c,v 1.6 2013/05/08 20:19:41 cmolsen Exp $
 /*------------------------------------------------------------------------------*/
 /* *! (C) Copyright International Business Machines Corp. 2012                  */
 /* *! All Rights Reserved -- Property of IBM                                    */
@@ -33,6 +33,7 @@
 /* *! COMMENTS :    This file is exclusively for PHYP environment.              */
 //
 /*------------------------------------------------------------------------------*/
+#include <HvPlicModule.H>
 #include <p8_pore_table_gen_api.H>
 
 const SlwSprRegs SLW_SPR_REGS[] = {  
@@ -46,10 +47,14 @@ const SlwSprRegs SLW_SPR_REGS[] = {
   { "P8_SPR_HID1",     P8_SPR_HID1,  ( P8_SPR_HID1  >>5 | ( P8_SPR_HID1  &0x1f)<<5 ) },
   { "P8_SPR_HID4",     P8_SPR_HID4,  ( P8_SPR_HID4  >>5 | ( P8_SPR_HID4  &0x1f)<<5 ) },
   { "P8_SPR_HID5",     P8_SPR_HID5,  ( P8_SPR_HID5  >>5 | ( P8_SPR_HID5  &0x1f)<<5 ) },
-  { "P8_MSR_MSR",      P8_MSR_MSR,   (            P8_MSR_MSR                       ) },
+  { "P8_CORE_XTRA8",   P8_CORE_XTRA8,(            P8_CORE_XTRA8                    ) },
+  { "P8_CORE_XTRA9",   P8_CORE_XTRA9,(            P8_CORE_XTRA9                    ) },
   // ...thread regs
   { "P8_SPR_HSPRG0",   P8_SPR_HSPRG0,( P8_SPR_HSPRG0>>5 | ( P8_SPR_HSPRG0&0x1f)<<5 ) },
   { "P8_SPR_LPCR",     P8_SPR_LPCR,  ( P8_SPR_LPCR  >>5 | ( P8_SPR_LPCR  &0x1f)<<5 ) },
+  { "P8_MSR_MSR",      P8_MSR_MSR,   (            P8_MSR_MSR                       ) },
+  { "P8_THRD_XTRA3",   P8_THRD_XTRA3,(            P8_THRD_XTRA3                    ) },
+  { "P8_THRD_XTRA4",   P8_THRD_XTRA4,(            P8_THRD_XTRA4                    ) },
 };
 
 const int SLW_SPR_REGS_SIZE = sizeof(SLW_SPR_REGS)/sizeof(SLW_SPR_REGS[0]);