SW275724: MPV:ITC820:Brazos:TOD - Bitterroot hard bug ground TOD1 clk - Unable t

Change-Id: I564d79781b6f2ad1099af25babde292c7c4a6c92
CQ:SW275724
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13330
Reviewed-by: James N. Klazynski <jklazyns@us.ibm.com>
Reviewed-by: MATTHEW A. PLOETZ <maploetz@us.ibm.com>
Tested-by: MATTHEW A. PLOETZ <maploetz@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13338
Tested-by: Jenkins Server
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

3 files changed, 46 insertions, 15 deletions

diff --git a/src/usr/hwpf/hwp/tod_init/proc_tod_init/proc_tod_init.C b/src/usr/hwpf/hwp/tod_init/proc_tod_init/proc_tod_init.C
index 7c702acab..a07889146 100644
--- a/src/usr/hwpf/hwp/tod_init/proc_tod_init/proc_tod_init.C
+++ b/src/usr/hwpf/hwp/tod_init/proc_tod_init/proc_tod_init.C
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_tod_init.C,v 1.10 2014/07/09 18:20:13 jklazyns Exp $
+// $Id: proc_tod_init.C,v 1.11 2014/09/09 16:23:42 jklazyns Exp $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
 // *! All Rights Reserved -- Property of IBM
@@ -69,7 +69,7 @@ fapi::ReturnCode proc_tod_init(const tod_topology_node* i_tod_node)
     {
         if (i_tod_node == NULL)
         {
-            FAPI_ERR("proc_tod_setup: null node passed into function!");
+            FAPI_ERR("proc_tod_init: null node passed into function!");
             FAPI_SET_HWP_ERROR(rc, RC_PROC_TOD_NULL_NODE);
             break;
         }
@@ -77,7 +77,7 @@ fapi::ReturnCode proc_tod_init(const tod_topology_node* i_tod_node)
         rc = proc_tod_clear_error_reg(i_tod_node);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_tod_setup: Failure clearing TOD error registers!");
+            FAPI_ERR("proc_tod_init: Failure clearing TOD error registers!");
             break;
         }
 
@@ -85,7 +85,7 @@ fapi::ReturnCode proc_tod_init(const tod_topology_node* i_tod_node)
         rc = init_tod_node(i_tod_node);
         if (!rc.ok())
         {
-            FAPI_ERR("proc_tod_setup: Failure initializing TOD!");
+            FAPI_ERR("proc_tod_init: Failure initializing TOD!");
             break;
         }
 
@@ -341,10 +341,23 @@ fapi::ReturnCode init_tod_node(const tod_topology_node* i_tod_node)
         }
         if (data.getDoubleWord(0) != 0)
         {
-            FAPI_ERR("init_tod_node: FIR bit active! (TOD_ERROR_REG = 0x%016llX)",data.getDoubleWord(0));
             const fapi::Target & CHIP_TARGET = *target;
             const uint64_t TOD_ERROR_REG = data.getDoubleWord(0);
-            FAPI_SET_HWP_ERROR(rc, RC_PROC_TOD_INIT_ERROR);
+            if (data.isBitSet(TOD_ERROR_REG_M_PATH_0_STEP_CHECK_ERROR))
+            {
+                FAPI_ERR("init_tod_node: M_PATH_0_STEP_CHECK_ERROR! (TOD_ERROR_REG = 0x%016llX)",data.getDoubleWord(0));
+                FAPI_SET_HWP_ERROR(rc, RC_PROC_TOD_INIT_M_PATH_0_STEP_CHECK_ERROR);
+            }
+            else if (data.isBitSet(TOD_ERROR_REG_M_PATH_1_STEP_CHECK_ERROR))
+            {
+                FAPI_ERR("init_tod_node: M_PATH_1_STEP_CHECK_ERROR! (TOD_ERROR_REG = 0x%016llX)",data.getDoubleWord(0));
+                FAPI_SET_HWP_ERROR(rc, RC_PROC_TOD_INIT_M_PATH_1_STEP_CHECK_ERROR);
+            }
+            else
+            {
+                FAPI_ERR("init_tod_node: FIR bit active! (TOD_ERROR_REG = 0x%016llX)",data.getDoubleWord(0));
+                FAPI_SET_HWP_ERROR(rc, RC_PROC_TOD_INIT_ERROR);
+            }
             break;
         }
 
diff --git a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H
index d9935eefd..1ca669dde 100644
--- a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H
+++ b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.H
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_tod_utils.H,v 1.13 2013/03/05 23:21:15 jklazyns Exp $
+// $Id: proc_tod_utils.H,v 1.14 2014/09/09 18:45:59 jklazyns Exp $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
 // *! All Rights Reserved -- Property of IBM
@@ -299,12 +299,14 @@ const uint32_t PB_A_MODE_LINK_A2_ROUND_TRIP_DELAY = 56;
 const uint32_t LINK_ROUND_TRIP_DELAY_LEN = 8;
 
 //Bit definitions for TOD_ERROR_REG
-const uint32_t TOD_ERROR_REG_RX_TTYPE_0      = 38;
-const uint32_t TOD_ERROR_REG_RX_TTYPE_1      = 39;
-const uint32_t TOD_ERROR_REG_RX_TTYPE_2      = 40;
-const uint32_t TOD_ERROR_REG_RX_TTYPE_3      = 41;
-const uint32_t TOD_ERROR_REG_RX_TTYPE_4      = 42;
-const uint32_t TOD_ERROR_REG_RX_TTYPE_5      = 43;
+const uint32_t TOD_ERROR_REG_M_PATH_0_STEP_CHECK_ERROR = 14;
+const uint32_t TOD_ERROR_REG_M_PATH_1_STEP_CHECK_ERROR = 15;
+const uint32_t TOD_ERROR_REG_RX_TTYPE_0                = 38;
+const uint32_t TOD_ERROR_REG_RX_TTYPE_1                = 39;
+const uint32_t TOD_ERROR_REG_RX_TTYPE_2                = 40;
+const uint32_t TOD_ERROR_REG_RX_TTYPE_3                = 41;
+const uint32_t TOD_ERROR_REG_RX_TTYPE_4                = 42;
+const uint32_t TOD_ERROR_REG_RX_TTYPE_5                = 43;
 
 //Bit definitions for TFMR
 const uint32_t TFMR_MAX_CYC_BET_STEPS       = 0;
diff --git a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml
index 802ae9e7d..c3eb51aa2 100644
--- a/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml
+++ b/src/usr/hwpf/hwp/tod_init/proc_tod_utils/proc_tod_utils.xml
@@ -5,7 +5,9 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- COPYRIGHT International Business Machines Corp. 2013,2014              -->
+<!-- Contributors Listed Below - COPYRIGHT 2013,2014                        -->
+<!-- [+] 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.       -->
@@ -20,7 +22,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_tod_utils.xml,v 1.9 2014/03/27 03:38:24 jmcgill Exp $ -->
+<!-- $Id: proc_tod_utils.xml,v 1.10 2014/09/09 16:23:44 jklazyns Exp $ -->
 <!-- Error codes for proc_tod_utils (used by setup, init, status) -->
 <hwpErrors>
   <!-- ******************************************************************** -->
@@ -78,6 +80,20 @@
   </hwpError>
   <!-- ******************************************************************** -->
   <hwpError>
+    <rc>RC_PROC_TOD_INIT_M_PATH_0_STEP_CHECK_ERROR</rc>
+    <description>Master Path 0 step check error is active after starting the TOD topology</description>
+    <ffdc>CHIP_TARGET</ffdc>
+    <ffdc>TOD_ERROR_REG</ffdc>
+  </hwpError>
+  <!-- ******************************************************************** -->
+  <hwpError>
+    <rc>RC_PROC_TOD_INIT_M_PATH_1_STEP_CHECK_ERROR</rc>
+    <description>Master Path 1 step check error is active after starting the TOD topology</description>
+    <ffdc>CHIP_TARGET</ffdc>
+    <ffdc>TOD_ERROR_REG</ffdc>
+  </hwpError>
+  <!-- ******************************************************************** -->
+  <hwpError>
     <rc>RC_PROC_TOD_NULL_NODE</rc>
     <description>An null node has been passed into the procedure</description>
     <callout>