Making zcal errors visible

Change-Id: I6a4dff7d58441bb2783ecd206254c3ccf125c3b6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43802
Reviewed-by: Gary A. Peterson <garyp@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43815
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 28 insertions, 21 deletions

diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C
index 0625422c5..4627435c2 100644
--- a/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C
+++ b/src/import/chips/p9/procedures/hwp/io/p9_io_obus_dccal.C
@@ -108,28 +108,28 @@ fapi2::ReturnCode tx_zcal_verify_results( uint32_t& io_pvalx4, uint32_t& io_nval
 
     if( io_pvalx4 > X4_MAX )
     {
-        FAPI_INF("Warning: IO Obus Tx Zcal Pval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O Obus Tx Zcal Pval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_pvalx4, X4_MAX, X4_MAX);
         io_pvalx4 = X4_MAX;
     }
 
     if( io_nvalx4 > X4_MAX )
     {
-        FAPI_INF("Warning: IO Obus Tx Zcal Nval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O Obus Tx Zcal Nval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_nvalx4, X4_MAX, X4_MAX);
         io_nvalx4 = X4_MAX;
     }
 
     if( io_pvalx4 < X4_MIN )
     {
-        FAPI_INF("Warning: IO Obus Tx Zcal Pval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O Obus Tx Zcal Pval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_pvalx4, X4_MIN, X4_MIN);
         io_pvalx4 = X4_MIN;
     }
 
     if( io_nvalx4 < X4_MIN )
     {
-        FAPI_INF("Warning: IO Obus Tx Zcal Nval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O Obus Tx Zcal Nval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_nvalx4, X4_MIN, X4_MIN);
         io_nvalx4 = X4_MIN;
     }
@@ -194,18 +194,22 @@ fapi2::ReturnCode tx_run_zcal( const OBUS_TGT i_tgt )
         FAPI_TRY( io::read( OPT_TX_IMPCAL_PB, i_tgt, GRP0, LN0, l_data ) );
     }
 
-
+    // Check for Zcal Done
     if( io::get( OPT_TX_ZCAL_DONE, l_data ) == 1 )
     {
-        FAPI_DBG( "tx_run_zcal: I/O Obus Tx Zcal Poll Completed(%d/%d).", l_count, TIMEOUT );
+        FAPI_DBG( "I/O Obus Tx Zcal Poll Completed(%d/%d).", l_count, TIMEOUT );
     }
-    else if( io::get( OPT_TX_ZCAL_ERROR, l_data ) == 1 )
+
+    // Check for Zcal Error
+    if( io::get( OPT_TX_ZCAL_ERROR, l_data ) == 1 )
     {
-        FAPI_INF( "tx_run_zcal: WARNING: Tx Z Calibration Error" );
+        FAPI_ERR( "I/O Obus Tx Z Calibration Error" );
     }
-    else
+
+    // Check for Zcal Timeout
+    if( l_count >= TIMEOUT)
     {
-        FAPI_INF( "tx_run_zcal: WARNING: Tx Z Calibration Timeout: Loops(%d)", l_count );
+        FAPI_ERR( "I/O Obus Tx Z Calibration Timeout: Loops(%d)", l_count );
     }
 
 fapi_try_exit:
diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_dccal.C b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_dccal.C
index 60441042c..ecb1f7fdc 100644
--- a/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_dccal.C
+++ b/src/import/chips/p9/procedures/hwp/io/p9_io_xbus_dccal.C
@@ -199,28 +199,28 @@ fapi2::ReturnCode tx_zcal_verify_results(
 
     if( io_pvalx4 > X4_MAX )
     {
-        FAPI_INF("Warning: IO Xbus Tx Zcal Pval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O EDI+ Xbus Tx Zcal Pval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_pvalx4, X4_MAX, X4_MAX);
         io_pvalx4 = X4_MAX;
     }
 
     if( io_nvalx4 > X4_MAX )
     {
-        FAPI_INF("Warning: IO Xbus Tx Zcal Nval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O EDI+ Xbus Tx Zcal Nval(0x%X) > Max Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_nvalx4, X4_MAX, X4_MAX);
         io_nvalx4 = X4_MAX;
     }
 
     if( io_pvalx4 < X4_MIN )
     {
-        FAPI_INF("Warning: IO Xbus Tx Zcal Pval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O EDI+ Xbus Tx Zcal Pval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_pvalx4, X4_MIN, X4_MIN);
         io_pvalx4 = X4_MIN;
     }
 
     if( io_nvalx4 < X4_MIN )
     {
-        FAPI_INF("Warning: IO Xbus Tx Zcal Nval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
+        FAPI_ERR("I/O EDI+ Xbus Tx Zcal Nval(0x%X) < Min Allowed(0x%X); Code will override with 0x%X and continue.",
                  io_nvalx4, X4_MIN, X4_MIN);
         io_nvalx4 = X4_MIN;
     }
@@ -290,18 +290,22 @@ fapi2::ReturnCode tx_zcal_run_bus( const XBUS_TGT i_tgt )
                   "tx_zcal_run_sm: Reading Tx Impcal Pb Failed" );
     }
 
-
+    // Check for Zcal Done
     if( io::get( EDIP_TX_ZCAL_DONE, l_data ) == 1 )
     {
-        FAPI_DBG( "tx_zcal_run_sm: I/O EDI+ Xbus Tx Zcal Poll Completed(%d/%d).", l_count, TIMEOUT );
+        FAPI_DBG( "I/O EDI+ Xbus Tx Zcal Poll Completed(%d/%d).", l_count, TIMEOUT );
     }
-    else if( io::get( EDIP_TX_ZCAL_ERROR, l_data ) == 1 )
+
+    // Check for Zcal Error
+    if( io::get( EDIP_TX_ZCAL_ERROR, l_data ) == 1 )
     {
-        FAPI_INF( "tx_zcal_run_sm: WARNING: Tx Z Calibration Error" );
+        FAPI_ERR( "I/O EDI+ Xbus Tx Z Calibration Error" );
     }
-    else
+
+    // Check for Zcal Timeout
+    if( l_count >= TIMEOUT)
     {
-        FAPI_INF( "tx_zcal_run_sm: WARNING: Tx Z Calibration Timeout: Loops(%d)", l_count );
+        FAPI_ERR( "I/O EDI+ Xbus Tx Z Calibration Timeout: Loops(%d)", l_count );
     }
 
 fapi_try_exit:
@@ -845,4 +849,3 @@ fapi_try_exit:
     FAPI_IMP( "rx_dccal_poll_grp: I/O EDI+ Xbus Exiting" );
     return fapi2::current_err;
 }
-