SW302085: FIPS840:INITPROC: FSP&Hostboot - hwp changes for week of 3/30

CQ:SW302085
Change-Id: I9ee482729104da81fcc538d33d6f5fb6455847cf
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17094
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Sangeetha T S <sangeet2@in.ibm.com>
Tested-by: Sangeetha T S <sangeet2@in.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18096
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 13 insertions, 4 deletions

diff --git a/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C b/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C
index 4e227ef7f..c128825a3 100644
--- a/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C
+++ b/src/usr/hwpf/hwp/dmi_training/proc_cen_framelock/proc_cen_framelock.C
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_cen_framelock.C,v 1.29 2015/01/08 16:04:52 bwieman Exp $
+// $Id: proc_cen_framelock.C,v 1.31 2015/03/31 20:53:36 baysah Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_cen_framelock.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -41,6 +41,11 @@
 // Version | who      |Date     | Comment
 // -----------------------------------------------------------------------------
 //         |          |         |
+//   1.31  | baysah   |31-MAR-15| Defect SW298496 was rejected by mustfix board due to assumed risk with no real benefits of the function to customers.
+//         |          |         |
+//   1.30  | baysah   |24-MAR-15| Defect SW298496 required MCIFIR(32) to be unmasked and set as recoverable to allow PRD
+//         |          |         | to threshold on Mirror channel before shutting down a channel.
+//         |          |         |
 //   1.29  | bwieman  |08-jan-14| revert of 1.28
 //   1.28  | baysah   |12-DEC-14| Masked MCIFIR(26) MCIFIRQ_POWERBUS_PROTOCOL_ERROR due to CAPI defect HW281374
 //         |          |         |
@@ -2013,6 +2018,7 @@ fapi::ReturnCode proc_cen_framelock_cloned(const fapi::Target& i_pu_target,
    // l_ecmdRc |= mci_data.setBit(23);    //Replay Buffer Overrun
     l_ecmdRc |= mci_data.setBit(24);    //MCIFIRQ_MCS_RECOVERABLE_ERROR
     l_ecmdRc |= mci_data.setBit(27);    //MCS Command List Timeout due to PowerBus
+    //l_ecmdRc |= mci_data.setBit(32);    //MCIFIRQ_MIRROR_ACTION_OCCURRED
     l_ecmdRc |= mci_data.setBit(35);    //PowerBus Write Data Buffer CE
     l_ecmdRc |= mci_data.setBit(36);    //PowerBus Write Data Buffer UE
 
@@ -2087,6 +2093,7 @@ fapi::ReturnCode proc_cen_framelock_cloned(const fapi::Target& i_pu_target,
     l_ecmdRc |= mci_data.setBit(28);    //Multiple RCMD or CRESP active
     l_ecmdRc |= mci_data.setBit(29);    //Inband Bar Hit with Incorrect TTYPE (xstop)
     l_ecmdRc |= mci_data.setBit(30);    //Multiple Bar Hit (xstop)
+    //l_ecmdRc |= mci_data.setBit(32);    //MCIFIRQ_MIRROR_ACTION_OCCURRED
     l_ecmdRc |= mci_data.setBit(33);    //Invalid Foreign Bar Access (xstop)
     l_ecmdRc |= mci_data.setBit(35);    //PowerBus Write Data Buffer CE
     l_ecmdRc |= mci_data.setBit(36);    //PowerBus Write Data Buffer UE
@@ -2127,6 +2134,7 @@ fapi::ReturnCode proc_cen_framelock_cloned(const fapi::Target& i_pu_target,
     l_ecmdRc |= mci_data.clearBit(28);    //Multiple RCMD or CRESP active
     l_ecmdRc |= mci_data.clearBit(29);    //Inband Bar Hit with Incorrect TTYPE (xstop)
     l_ecmdRc |= mci_data.clearBit(30);    //Multiple Bar Hit (xstop)
+    //l_ecmdRc |= mci_data.clearBit(32);    //MCIFIRQ_MIRROR_ACTION_OCCURRED
     l_ecmdRc |= mci_data.clearBit(33);    //Invalid Foreign Bar Access (xstop)
     l_ecmdRc |= mci_data.clearBit(35);    //PowerBus Write Data Buffer CE
     l_ecmdRc |= mci_data.clearBit(36);    //PowerBus Write Data Buffer UE
diff --git a/src/usr/hwpf/hwp/initfiles/p8.a_x_pci_dmi_fir.scom.initfile b/src/usr/hwpf/hwp/initfiles/p8.a_x_pci_dmi_fir.scom.initfile
index f5a6dfd7e..0b3e7d369 100644
--- a/src/usr/hwpf/hwp/initfiles/p8.a_x_pci_dmi_fir.scom.initfile
+++ b/src/usr/hwpf/hwp/initfiles/p8.a_x_pci_dmi_fir.scom.initfile
@@ -1,4 +1,4 @@
-#-- $Id: p8.a_x_pci_dmi_fir.scom.initfile,v 1.12 2014/11/18 17:21:01 jmcgill Exp $
+#-- $Id: p8.a_x_pci_dmi_fir.scom.initfile,v 1.13 2015/03/18 22:54:37 jmcgill Exp $
 #-------------------------------------------------------------------------------
 #--
 #-- (C) Copyright International Business Machines Corp. 2011
@@ -663,7 +663,8 @@ scom 0x08010C07 {
 #-- NVBUS0.BUSCTL.SCOM.FIR_MASK_REG
 scom 0x08010C03 {
     bits, scom_data,          expr;
-    0:63, 0xDFFFFFFFFFFFC000, (abus_enabled);
+    0:63, 0xDFFFFFFFFFFFC000, (abus_enabled) && (!nv_present);
+    0:63, 0x1FFFFFFFFFFFC000, (abus_enabled) && (nv_present);
 }
 
 #-- NVBUS1.BUSCTL.SCOM.FIR_ACTION0_REG
@@ -681,7 +682,7 @@ scom 0x08010C47 {
 #-- NVBUS1.BUSCTL.SCOM.FIR_MASK_REG
 scom 0x08010C43 {
     bits, scom_data,          expr;
-    0:63, 0xDFFFFFFFFFFFC000, (abus_enabled) && (nv_present);
+    0:63, 0x1FFFFFFFFFFFC000, (abus_enabled) && (nv_present);
 }
 
 #-- ABUS bus initialization/powerdown settings