SW313490: IPL: BC10090F - RC_PROC_EXTRACT_SBE_RC_I2C_ERROR proc_check_slave_sbe_

Change-Id: I6535fbd3aaafea9681217b0591e4a50259ab07f1
CQ:SW313490
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20589
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20592
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 30 insertions, 4 deletions

diff --git a/src/usr/hwpf/hwp/include/p8_scom_addresses.H b/src/usr/hwpf/hwp/include/p8_scom_addresses.H
index a01834f97..b0f9f52fe 100755
--- a/src/usr/hwpf/hwp/include/p8_scom_addresses.H
+++ b/src/usr/hwpf/hwp/include/p8_scom_addresses.H
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: p8_scom_addresses.H,v 1.198 2015/08/04 22:06:23 baiocchi Exp $
+// $Id: p8_scom_addresses.H,v 1.199 2015/09/16 19:33:47 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/p8_scom_addresses.H,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
@@ -568,8 +568,15 @@ CONST_UINT64_T( PIBMEM_REPAIR_0x00088007              , ULL(0x00088007) );
 //------------------------------------------------------------------------------
 //      I2C MASTER (MODE)
 //------------------------------------------------------------------------------
-CONST_UINT64_T( I2CM_MODE_REGISTER_0_0x000A0006       , ULL(0x000A0006) );
-
+CONST_UINT64_T( I2CM_MODE_REGISTER_0_0x000A0006          , ULL(0x000A0006) );
+CONST_UINT64_T( I2CM_WATER_MARK_0_0x000A0007             , ULL(0x000A0007) );
+CONST_UINT64_T( I2CM_INTERRUPT_MASK_0_0x000A0008         , ULL(0x000A0008) );
+CONST_UINT64_T( I2CM_INTERRUPT_COND_0_0x000A0009         , ULL(0x000A0009) );
+CONST_UINT64_T( I2CM_INTERRUPTS_0_0x000A000A             , ULL(0x000A000A) );
+CONST_UINT64_T( I2CM_STATUS_REGISTER_ENGINE_0_0x000A000B , ULL(0x000A000B) );
+CONST_UINT64_T( I2CM_EXTENDED_STATUS_0_0x000A000C        , ULL(0x000A000C) );
+CONST_UINT64_T( I2CM_RESIDUAL_FE_BE_LENGTH_0_0x000A000D  , ULL(0x000A000D) );
+CONST_UINT64_T( I2CM_BUSY_REGISTER_0_0x000A000E          , ULL(0x000A000E) );
 
 //------------------------------------------------------------------------------
 //      I2C MASTER (MEMS1)
@@ -2265,6 +2272,9 @@ This section is automatically updated by CVS when you check in this file.
 Be sure to create CVS comments when you commit so that they can be included here.
 
 $Log: p8_scom_addresses.H,v $
+Revision 1.199  2015/09/16 19:33:47  jmcgill
+add I2CM registers for SBE FFDC collection
+
 Revision 1.198  2015/08/04 22:06:23  baiocchi
 Updating Support for starting the SBEs without a FSP
 
diff --git a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml
index bd114067f..8deb98ba7 100644
--- a/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml
+++ b/src/usr/hwpf/hwp/slave_sbe/proc_check_slave_sbe_seeprom_complete/proc_extract_sbe_rc_errors.xml
@@ -22,7 +22,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
-<!-- $Id: proc_extract_sbe_rc_errors.xml,v 1.19 2015/04/15 18:40:56 dcrowell Exp $ -->
+<!-- $Id: proc_extract_sbe_rc_errors.xml,v 1.20 2015/09/16 19:34:24 jmcgill Exp $ -->
 <!-- Error definitions for proc_extract_sbe_rc procedure -->
 <hwpErrors>
   <!-- *********************************************************************** -->
@@ -98,6 +98,10 @@
     </description>
     <ffdc>I2C_BAD_STATUS_0_3</ffdc>
     <ffdc>FI2C_HANG</ffdc>
+    <collectRegisterFfdc>
+      <id>REG_FFDC_I2C_ERROR_REGS</id>
+      <target>CHIP</target>
+    </collectRegisterFfdc>
     <callout>
       <target>CHIP</target>
       <priority>HIGH</priority>
@@ -479,6 +483,18 @@
     </deconfigure>
   </hwpError>
   <!-- *********************************************************************** -->
+  <registerFfdc>
+    <id>REG_FFDC_I2C_ERROR_REGS</id>
+    <scomRegister>I2CM_MODE_REGISTER_0_0x000A0006</scomRegister>
+    <scomRegister>I2CM_WATER_MARK_0_0x000A0007</scomRegister>
+    <scomRegister>I2CM_INTERRUPT_MASK_0_0x000A0008</scomRegister>
+    <scomRegister>I2CM_INTERRUPT_COND_0_0x000A0009</scomRegister>
+    <scomRegister>I2CM_INTERRUPTS_0_0x000A000A</scomRegister>
+    <scomRegister>I2CM_STATUS_REGISTER_ENGINE_0_0x000A000B</scomRegister>
+    <scomRegister>I2CM_EXTENDED_STATUS_0_0x000A000C</scomRegister>
+    <scomRegister>I2CM_RESIDUAL_FE_BE_LENGTH_0_0x000A000D</scomRegister>
+    <scomRegister>I2CM_BUSY_REGISTER_0_0x000A000E</scomRegister>
+  </registerFfdc>
 </hwpErrors>