AVP OCC Enable & Procedure Refresh

Refreshed OCC Procedures
Enabled OCC in AVP mode for all processors
Merged SLW and OCC to common HOMER image

RTC:50987
Change-Id: I08d9128dfcb572367c145ee0296a48292584a480
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4340
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 19 insertions, 28 deletions

diff --git a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_firinit.H b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_firinit.H
index 1a2790c63..a333cfd1b 100755
--- a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_firinit.H
+++ b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_firinit.H
@@ -20,24 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-/* begin_generated_IBM_copyright_prolog                            */
-/*                                                                 */
-/* This is an automatically generated copyright prolog.            */
-/* After initializing,  DO NOT MODIFY OR MOVE                      */ 
-/* --------------------------------------------------------------- */
-/* IBM Confidential                                                */
-/*                                                                 */
-/* Licensed Internal Code Source Materials                         */
-/*                                                                 */
-/* (C)Copyright IBM Corp.  2014, 2014                              */
-/*                                                                 */
-/* The Source code for this program is not published  or otherwise */
-/* divested of its trade secrets,  irrespective of what has been   */
-/* deposited with the U.S. Copyright Office.                       */
-/*  -------------------------------------------------------------- */
-/*                                                                 */
-/* end_generated_IBM_copyright_prolog                              */
-// $Id: p8_pm_firinit.H,v 1.5 2012/09/18 14:08:57 pchatnah Exp $
+// $Id: p8_pm_firinit.H,v 1.9 2013/04/01 04:27:47 stillgs Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pm_firinit.H,v $
 //------------------------------------------------------------------------------
 // *|
@@ -62,7 +45,12 @@
 // MACRO structure definitions
 //------------------------------------------------------------------------------
 
- #define SET_FIR_ACTION(b, x, y){		\
+#ifndef _P8_PM_FIRINIT_H_
+#define _P8_PM_FIRINIT_H_
+
+#include "p8_pm.H"
+
+#define SET_FIR_ACTION(b, x, y){		\
       if (x) { \
         e_rc |= action_0.setBit(b); 	\
       } \
@@ -79,10 +67,7 @@
       }\
      }
 
-
-
-
- #define SET_FIR_MASK(b,y){			\
+#define SET_FIR_MASK(b,y){			\
      if (y) { \
        e_rc |= mask.setBit(b); \
      } \
@@ -92,16 +77,14 @@
      } \
      }
 
-
-
 #define SET_CHECK_STOP(b){SET_FIR_ACTION(b, 0, 0);}
 #define SET_RECOV_ATTN(b){SET_FIR_ACTION(b, 0, 1);}
 #define SET_RECOV_INTR(b){SET_FIR_ACTION(b, 1, 0);}
 #define SET_MALF_ALERT(b){SET_FIR_ACTION(b, 1, 1);}
 #define SET_FIR_MASKED(b){SET_FIR_MASK(b,1);}
 
-
-typedef fapi::ReturnCode (*p8_pm_firinit_FP_t) (const fapi::Target&  );
+// function pointer typedef definition for HWP call support
+typedef fapi::ReturnCode (*p8_pm_firinit_FP_t) (const fapi::Target& , uint32_t mode );
 
 
 extern "C" {
@@ -114,8 +97,16 @@ extern "C" {
 /// \calls p8_pm_occ_firinit
 
 
+const uint32_t        PCB_FIR_REGISTER_LENGTH = 43 ;
+const uint32_t        PMC_FIR_REGISTER_LENGTH = 49 ;
+const uint32_t        PBA_FIR_REGISTER_LENGTH = 46 ;
+const uint32_t        OHA_FIR_REGISTER_LENGTH = 6 ;
+const uint32_t        OCC_FIR_REGISTER_LENGTH = 64 ;
+
 /// \  input chip_target
-fapi::ReturnCode p8_pm_firinit(const fapi::Target& i_target );
+fapi::ReturnCode p8_pm_firinit(const fapi::Target& i_target , uint32_t mode);
  
 
 } // extern "C"
+
+#endif