INITPROC: Hostboot SW245922 Fixes for SW240169 MPIPL OCC not active

Change-Id: I5c2d39eddc7dad42948d6fc5712318cd60a8f6d1
CQ:SW245922
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8709
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 363 insertions, 2 deletions

diff --git a/src/usr/hwpf/hwp/occ/makefile b/src/usr/hwpf/hwp/occ/makefile
index 51a499680..34d819ef6 100644
--- a/src/usr/hwpf/hwp/occ/makefile
+++ b/src/usr/hwpf/hwp/occ/makefile
@@ -5,7 +5,7 @@
 #
 # IBM CONFIDENTIAL
 #
-# COPYRIGHT International Business Machines Corp. 2013
+# COPYRIGHT International Business Machines Corp. 2013,2014
 #
 # p1
 #
@@ -64,7 +64,8 @@ OBJS =  occ.o \
         p8_pm_occ_firinit.o \
         p8_pm_pba_firinit.o \
         p8_pm_pmc_firinit.o \
-        p8_cpu_special_wakeup.o
+        p8_cpu_special_wakeup.o \
+        p8_pm_utils.o
 
 #These procedures are included per Stradale's request so
 #they can implement OCC Reset.
diff --git a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C
new file mode 100644
index 000000000..da8b70dd2
--- /dev/null
+++ b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C
@@ -0,0 +1,263 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.C $           */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2014                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* 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.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $Id: p8_pm_utils.C,v 1.2 2014/02/09 02:01:59 stillgs Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pm_utils.C,v $
+//------------------------------------------------------------------------------
+// *! (C) Copyright International Business Machines Corp. 2011
+// *! All Rights Reserved -- Property of IBM
+// *! *** IBM Confidential ***
+//------------------------------------------------------------------------------
+// *! OWNER NAME: Greg Still         Email: stillgs@us.ibm.com
+// *! BACKUP:     Mike Olsen         Email: cmolsen@us.ibm.com
+// *!
+// *!
+/// \file p8_pm_utils.C
+/// \brief Utility functions for PM FAPIs
+///
+//------------------------------------------------------------------------------
+
+#ifndef _P8_PM_UTILS_C_
+#define _P8_PM_UTILS_C_
+
+// ----------------------------------------------------------------------
+// Includes
+// ----------------------------------------------------------------------
+#include "p8_pm.H"
+
+extern "C" {
+
+using namespace fapi;
+
+#include "p8_pm_utils.H"
+
+
+//------------------------------------------------------------------------------
+/**
+ * Trace a set of FIRs (Globals and select Locals)
+ *
+ * @param[in] i_target Chip target
+ * @param[in] i_msg    String to put out in the trace
+ *
+ * @retval ECMD_SUCCESS
+ */
+fapi::ReturnCode
+p8_pm_glob_fir_trace(const fapi::Target& i_target,
+                    const char * i_msg)
+{
+    fapi::ReturnCode                rc;
+    ecmdDataBufferBase              data(64);
+    uint64_t                        address;
+
+    CONST_UINT64_T( GLOB_XSTOP_FIR_0x01040000                                 , ULL(0x01040000) );
+    CONST_UINT64_T( GLOB_RECOV_FIR_0x01040001                                 , ULL(0x01040001) );
+    CONST_UINT64_T( TP_LFIR_0x0104000A                                        , ULL(0x0104000A) );
+
+    do
+    {
+
+        //  Note: i_msg is put on on each record to allow for trace "greps"
+        //  so as to see the "big picture" across when
+
+        //  ******************************************************************
+        //  Check for xstops and recoverables and put in the trace
+        //  ******************************************************************
+        address =  READ_GLOBAL_XSTOP_FIR_0x570F001B;
+        GETSCOM(rc, i_target, address, data);
+
+        if (data.getNumBitsSet(0,64))
+        {
+            FAPI_INF("Xstop is **ACTIVE** %s", i_msg);
+        }
+
+        address =  READ_GLOBAL_RECOV_FIR_0x570F001C;
+        GETSCOM(rc, i_target, address, data);
+        if (data.getNumBitsSet(0,64))
+        {
+            FAPI_INF("Recoverable attention is **ACTIVE** %s", i_msg);
+        }
+
+        address =  READ_GLOBAL_RECOV_FIR_0x570F001C;
+        GETSCOM(rc, i_target, address, data);
+        if (data.getNumBitsSet(0,64))
+        {
+            FAPI_INF("Recoverable attention is **ACTIVE** %s", i_msg);
+        }
+
+        address =  GLOB_XSTOP_FIR_0x01040000;
+        GETSCOM(rc, i_target, address, data);
+        if (data.getNumBitsSet(0,64))
+        {
+            FAPI_INF("Glob Xstop FIR is **ACTIVE** %s", i_msg);
+        }
+
+        address =  GLOB_RECOV_FIR_0x01040001;
+        GETSCOM(rc, i_target, address, data);
+        if (data.getNumBitsSet(0,64))
+        {
+            FAPI_INF("Glob Recov FIR is **ACTIVE** %s", i_msg);
+        }
+
+        address =  TP_LFIR_0x0104000A;
+        GETSCOM(rc, i_target, address, data);
+        if (data.getNumBitsSet(0,64))
+        {
+            FAPI_INF("TP LFIR is **ACTIVE** %s", i_msg);
+        }
+
+    } while(0);
+    return rc;
+}
+
+//------------------------------------------------------------------------------
+/**
+ * Trace PCBS FSMs
+ *
+ * @param[in] i_target Chip target
+ * @param[in] i_msg    String to put out in the trace
+ *
+ * @retval ECMD_SUCCESS
+ * @retval ERROR defined in xml
+ */
+fapi::ReturnCode
+p8_pm_pcbs_fsm_trace_chip(const fapi::Target& i_target,
+                            const char *      i_msg)
+{
+    fapi::ReturnCode                rc;
+    ecmdDataBufferBase              data(64);
+    
+    std::vector<fapi::Target>       l_exChiplets;
+    uint8_t                         l_ex_number = 0;
+
+    do
+    {
+         rc = fapiGetChildChiplets(i_target,
+                                    fapi::TARGET_TYPE_EX_CHIPLET,
+                                    l_exChiplets,
+                                    TARGET_STATE_FUNCTIONAL);
+        if (rc)
+        {
+            FAPI_ERR("fapiGetChildChiplets with rc = 0x%x", (uint32_t)rc);
+            break;
+        }
+
+        // For each chiplet
+        for (uint8_t c=0; c< l_exChiplets.size(); c++)
+        {
+
+            rc = FAPI_ATTR_GET(ATTR_CHIP_UNIT_POS, &l_exChiplets[c], l_ex_number);
+            if (rc)
+            {
+                FAPI_ERR("fapiGetAttribute of ATTR_CHIP_UNIT_POS with rc = 0x%x", (uint32_t)rc);
+                break;
+            }
+
+            FAPI_DBG("\tCore number = %d", l_ex_number);
+
+            rc = p8_pm_pcbs_fsm_trace (i_target, l_ex_number, i_msg);
+            if (!rc.ok())
+            {
+                break;
+            }
+        }
+
+    } while(0);
+    return rc;
+}
+
+//------------------------------------------------------------------------------
+/**
+ * Trace PCBS FSMs for a given EX
+ *
+ * @param[in] i_target Chip target
+ * @param[in] i_msg    String to put out in the trace
+ *
+ * @retval ECMD_SUCCESS
+ */
+fapi::ReturnCode
+p8_pm_pcbs_fsm_trace  ( const fapi::Target& i_target,
+                        uint32_t            i_ex_number,
+                        const char *        i_msg)
+{
+    fapi::ReturnCode                rc;
+    ecmdDataBufferBase              data(64);
+    uint64_t                        address;
+    uint64_t                        ex_offset;
+
+    do
+    {
+        ex_offset = i_ex_number * 0x01000000;
+
+        //  Note: i_msg is put on on each record to allow for trace "greps"
+        //  so as to see the "big picture" across when
+
+        //  ******************************************************************
+        //  Read PCBS FSM Monitor0
+        //  ******************************************************************
+        address =  EX_PCBS_FSM_MONITOR1_REG_0x100F0170 + ex_offset;
+        GETSCOM(rc, i_target, address, data);
+        FAPI_INF("PCBS Monitor0 = 0x%016llX;  %s target:%s" ,
+                                    data.getDoubleWord(0),
+                                    i_msg,
+                                    i_target.toEcmdString());
+
+        //  ******************************************************************
+        //  Read PCBS FSM Monitor1
+        //  ******************************************************************
+        address =  EX_PCBS_FSM_MONITOR2_REG_0x100F0171 + ex_offset;
+        GETSCOM(rc, i_target, address, data);
+        FAPI_INF("PCBS Monitor1 = 0x%016llX;  %s target:%s" ,
+                                    data.getDoubleWord(0),
+                                    i_msg,
+                                    i_target.toEcmdString());
+
+        //  ******************************************************************
+        //  Read PCBS DPLL CPM PARM REG
+        //  ******************************************************************
+        address =  EX_DPLL_CPM_PARM_REG_0x100F0152 + ex_offset;
+        GETSCOM(rc, i_target, address, data);
+        FAPI_INF("DPLLC Monitor = 0x%016llX;  %s target:%s" ,
+                                    data.getDoubleWord(0),
+                                    i_msg,
+                                    i_target.toEcmdString());
+
+        //  ******************************************************************
+        //  Read PCBS PMGP0
+        //  ******************************************************************
+        address =  EX_PMGP0_0x100F0100 + ex_offset;
+        GETSCOM(rc, i_target, address, data);
+        FAPI_INF("PMGP0 Monitor = 0x%016llX;  %s target:%s" ,
+                                    data.getDoubleWord(0),
+                                    i_msg,
+                                    i_target.toEcmdString());
+
+    } while(0);
+    return rc;
+}
+
+
+
+
+} //end extern
+
+#endif // _P8_PM_UTILS_H_
+
diff --git a/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.H b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.H
new file mode 100644
index 000000000..2a8d9f503
--- /dev/null
+++ b/src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.H
@@ -0,0 +1,97 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/occ/occ_procedures/p8_pm_utils.H $           */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2014                   */
+/*                                                                        */
+/* p1                                                                     */
+/*                                                                        */
+/* Object Code Only (OCO) source materials                                */
+/* Licensed Internal Code Source Materials                                */
+/* IBM HostBoot Licensed Internal Code                                    */
+/*                                                                        */
+/* 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.                              */
+/*                                                                        */
+/* Origin: 30                                                             */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $Id: p8_pm_utils.H,v 1.1 2014/02/06 20:05:37 stillgs Exp $
+// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_pm_utils.H,v $
+//------------------------------------------------------------------------------
+// *|
+// *! (C) Copyright International Business Machines Corp. 2011
+// *! All Rights Reserved -- Property of IBM
+// *! *** IBM Confidential ***
+// *|
+// *! TITLE       : p8_pm_utils.H
+// *! DESCRIPTION : Utility functions for PM FAPIs
+// *!
+// *! OWNER NAME  : Greg Still    Email: stillgs@us.ibm.com
+// *! BACKUP NAME : Michael Olsen Email: cmolsen@us.ibm.com
+// *!
+//------------------------------------------------------------------------------
+
+#ifndef _P8_PM_UTILS_H_
+#define _P8_PM_UTILS_H_
+
+//------------------------------------------------------------------------------
+// Includes
+//------------------------------------------------------------------------------
+
+extern "C" {
+
+
+//------------------------------------------------------------------------------
+// Function prototype
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+/**
+ * Trace Global FIRs
+ *
+ * @param[in] i_target Chip target
+ * @param[in] i_msg    String to put out in the trace
+ *
+ * @retval SCOM FAPI RCs
+ */
+fapi::ReturnCode
+p8_pm_glob_fir_trace  (const fapi::Target& i_target,
+                      const char * i_msg);
+                 
+//------------------------------------------------------------------------------
+/**
+ * Trace PCBS FSMs
+ *
+ * @param[in] i_target Chip target
+ * @param[in] i_msg    String to put out in the trace
+ *
+ * @retval SCOM FAPI RCs
+ */
+fapi::ReturnCode
+p8_pm_pcbs_fsm_trace_chip(const fapi::Target& i_target,           
+                            const char *      i_msg);
+                            
+                            
+//------------------------------------------------------------------------------
+/**
+ * Trace PCBS FSMs for a given EX
+ *
+ * @param[in] i_target Chip target
+ * @param[in] i_msg    String to put out in the trace
+ *
+ * @retval ECMD_SUCCESS
+ */
+fapi::ReturnCode
+p8_pm_pcbs_fsm_trace  ( const fapi::Target& i_target,
+                        uint32_t            i_ex_number,           
+                        const char *        i_msg);
+                                                                                                            
+
+} // extern "C"
+
+#endif // _P8_PM_UTILS_H_