p9_sbe_tp_switch_gears, p9_sbe_gear_switcher: Level 3

Change-Id: Ie0bef712a4053eef0022b4f01c3cda9c3c3c8aba
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38795
Reviewed-by: Joachim Fenkes <fenkes@de.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38797
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

6 files changed, 108 insertions, 30 deletions

diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C
index 709719ca..8778d245 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.C
@@ -32,7 +32,7 @@
 // *HWP HW Backup Owner : Srinivas V Naga <srinivan@in.ibm.com>
 // *HWP FW Owner        : sunil kumar <skumar8j@in.ibm.com>
 // *HWP Team            : Perv
-// *HWP Level           : 2
+// *HWP Level           : 3
 // *HWP Consumed by     : SBE
 //------------------------------------------------------------------------------
 
@@ -138,8 +138,12 @@ fapi2::ReturnCode p9_sbe_gear_switcher_i2c_stop_sequence(
     FAPI_INF("Loop Count :%d", l_timeout);
 
     FAPI_ASSERT(l_timeout > 0,
-                fapi2::BUS_STATUS_BUSY_0(),
-                "ERROR:BUS_STSTUS_BUSY_0 NOT SET TO 0");
+                fapi2::BUS_STATUS_BUSY_0()
+                .set_TARGET_CHIP(i_target_chip)
+                .set_STATUS_REGISTER_B(l_data64)
+                .set_LOOP_COUNT(BUS_STATUS_BUSY_POLL_COUNT)
+                .set_BACKUP_SEEPROM_ATTR(l_read_attr),
+                "ERROR:BUS_STATUS_BUSY_0 NOT SET TO 0");
 
     FAPI_DBG("Exiting ...");
 
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H
index a6a96665..47708af6 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gear_switcher.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -32,7 +32,7 @@
 // *HWP HW Backup Owner : Srinivas V Naga <srinivan@in.ibm.com>
 // *HWP FW Owner        : sunil kumar <skumar8j@in.ibm.com>
 // *HWP Team            : Perv
-// *HWP Level           : 2
+// *HWP Level           : 3
 // *HWP Consumed by     : SBE
 //------------------------------------------------------------------------------
 
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
index 357b612c..77711bea 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.C
@@ -31,7 +31,7 @@
 // *HWP HW Backup Owner : Srinivas V Naga <srinivan@in.ibm.com>
 // *HWP FW Owner        : sunil kumar <skumarj8@in.ibm.com>
 // *HWP Team            : Perv
-// *HWP Level           : 2
+// *HWP Level           : 3
 // *HWP Consumed by     : SBE
 //------------------------------------------------------------------------------
 
@@ -158,7 +158,8 @@ fapi2::ReturnCode p9_sbe_tp_switch_gears_check_magicnumber(
                 fapi2::I2C_BUS_STATUS_BUSY()
                 .set_MASTER_CHIP(i_target_chip)
                 .set_STATUS_REGISTER_B(l_data64)
-                .set_LOOP_COUNT(l_timeout),
+                .set_LOOP_COUNT(BUS_STATUS_BUSY_POLL_COUNT)
+                .set_BACKUP_SEEPROM_ATTR(l_read_attr),
                 "ERROR:BUS_STSTUS_BUSY_0 NOT SET TO 0");
 
     FAPI_DBG("Reading the value of DATA0TO7_REGISTER_B");
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H
index 7a546a23..ac4ec634 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_tp_switch_gears.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,7 +31,7 @@
 // *HWP HW Backup Owner : Srinivas V Naga <srinivan@in.ibm.com>
 // *HWP FW Owner        : sunil kumar <skumarj8@in.ibm.com>
 // *HWP Team            : Perv
-// *HWP Level           : 2
+// *HWP Level           : 3
 // *HWP Consumed by     : SBE
 //------------------------------------------------------------------------------
 
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml
index f72b663d..8393118d 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_gear_switcher_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2016                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -31,7 +31,43 @@
   <hwpError>
     <sbeError/>
     <rc>RC_BUS_STATUS_BUSY_0</rc>
-    <description>Status busy check</description>
+    <description>I2C stop sequence did not complete within timeout after switching SBE to PLL speed</description>
+    <collectRegisterFfdc>
+      <id>ROOT_CTRL_REGISTERS</id>
+      <target>TARGET_CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
+    <collectRegisterFfdc>
+      <id>PERV_CTRL_REGISTERS</id>
+      <target>TARGET_CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
+    <collectRegisterFfdc>
+      <id>I2C_REGISTERS</id>
+      <target>TARGET_CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    </collectRegisterFfdc>
+    <ffdc>TARGET_CHIP</ffdc>
+    <ffdc>STATUS_REGISTER_B</ffdc>
+    <ffdc>LOOP_COUNT</ffdc>
+    <ffdc>BACKUP_SEEPROM_ATTR</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+    <callout>
+      <hw>
+        <hwid>SBE_SEEPROM_PART</hwid>
+        <refTarget>TARGET_CHIP</refTarget>
+      </hw>
+      <priority>MEDIUM</priority>
+    </callout>
+    <!--
+        not deconfiguring or garding anything here;
+        HWSV will have special handling for the SBE_SEEPROM_PART callout
+        that will first attempt to boot from the backup SEEPROM and gard
+        the chip if that fails.
+    -->
   </hwpError>
   <!-- ******************************************************************** -->
 </hwpErrors>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml
index dc19c862..6bf41a91 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_tp_switch_gears_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2016                             -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2017                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -34,22 +34,41 @@
       <rc>RC_I2C_BUS_STATUS_BUSY</rc>
       <description>I2C seeprom port is not responding</description>
       <collectRegisterFfdc>
-	   <id>ROOT_CTRL_REGISTERS</id>
-	   <target>MASTER_CHIP</target>
-	   <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+           <id>ROOT_CTRL_REGISTERS</id>
+           <target>MASTER_CHIP</target>
+           <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
       <collectRegisterFfdc>
-	   <id>PERV_CTRL_REGISTERS</id>
-	   <target>MASTER_CHIP</target>
-	   <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+           <id>PERV_CTRL_REGISTERS</id>
+           <target>MASTER_CHIP</target>
+           <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
       <collectRegisterFfdc>
-	   <id>I2C_REGISTERS</id>
-	   <target>MASTER_CHIP</target>
-	   <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+           <id>I2C_REGISTERS</id>
+           <target>MASTER_CHIP</target>
+           <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
+      <ffdc>MASTER_CHIP</ffdc>
       <ffdc>STATUS_REGISTER_B</ffdc>
       <ffdc>LOOP_COUNT</ffdc>
+      <ffdc>BACKUP_SEEPROM_ATTR</ffdc>
+      <callout>
+        <hw>
+          <hwid>SBE_SEEPROM_PART</hwid>
+          <refTarget>MASTER_CHIP</refTarget>
+        </hw>
+        <priority>HIGH</priority>
+      </callout>
+      <callout>
+        <target>MASTER_CHIP</target>
+        <priority>MEDIUM</priority>
+      </callout>
+      <!--
+          not deconfiguring or garding anything here;
+          HWSV will have special handling for the SBE_SEEPROM_PART callout
+          that will first attempt to boot from the backup SEEPROM and gard
+          the chip if that fails.
+      -->
   </hwpError>
   <!-- ******************************************************************** -->
   <hwpError>
@@ -59,23 +78,41 @@
          read with Fused number in OTPROM
       </description>
       <collectRegisterFfdc>
-	   <id>ROOT_CTRL_REGISTERS</id>
-	   <target>MASTER_CHIP</target>
-	   <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+           <id>ROOT_CTRL_REGISTERS</id>
+           <target>MASTER_CHIP</target>
+           <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
       <collectRegisterFfdc>
-	   <id>PERV_CTRL_REGISTERS</id>
-	   <target>MASTER_CHIP</target>
-	   <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+           <id>PERV_CTRL_REGISTERS</id>
+           <target>MASTER_CHIP</target>
+           <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
       <collectRegisterFfdc>
-	   <id>I2C_REGISTERS</id>
-	   <target>MASTER_CHIP</target>
-	   <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+           <id>I2C_REGISTERS</id>
+           <target>MASTER_CHIP</target>
+           <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
+      <ffdc>MASTER_CHIP</ffdc>
       <ffdc>DATA0TO7_REGISTER_B</ffdc>
       <ffdc>MAGIC_NUMBER_VALUE</ffdc>
       <ffdc>BACKUP_SEEPROM_ATTR</ffdc>
+      <callout>
+        <hw>
+          <hwid>SBE_SEEPROM_PART</hwid>
+          <refTarget>MASTER_CHIP</refTarget>
+        </hw>
+        <priority>HIGH</priority>
+      </callout>
+      <callout>
+        <target>MASTER_CHIP</target>
+        <priority>MEDIUM</priority>
+      </callout>
+      <!--
+          not deconfiguring or garding anything here;
+          HWSV will have special handling for the SBE_SEEPROM_PART callout
+          that will first attempt to boot from the backup SEEPROM and gard
+          the chip if that fails.
+      -->
    </hwpError>
   <!-- ******************************************************************** -->
 </hwpErrors>