Added p8.psi.scom.initfile for recoverable error masking

Change-Id: I92ac5c59b7105c4b25323a03532a30713b95dc59
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Tested-by: Jenkins Server

5 files changed, 56 insertions, 8 deletions

diff --git a/src/makefile b/src/makefile
index eaaa7d535..40a428d03 100644
--- a/src/makefile
+++ b/src/makefile
@@ -87,7 +87,8 @@ hbicore_DATA_MODULES =  sample.if p8.dmi.scom.if cen.dmi.scom.if \
                         procpore.dat ${PRDR_RULE_TABLE_TARGETS} \
                         p8.abus.scom.if p8.xbus.scom.if p8.mcs.scom.if \
                         p8.as.scom.if p8.nx.scom.if p8.dmi.custom.scom.if \
-                        cen.dmi.custom.scom.if p8.abus.custom.scom.if p8.xbus.custom.scom.if
+                        cen.dmi.custom.scom.if p8.abus.custom.scom.if \
+                        p8.xbus.custom.scom.if p8.psi.scom.if
 
 hbicore_test_OBJECTS = ${hbicore_OBJECTS}
 hbicore_test_MODULES = ${hbicore_MODULES}
diff --git a/src/usr/hwpf/hwp/initfiles/p8.psi.scom.initfile b/src/usr/hwpf/hwp/initfiles/p8.psi.scom.initfile
new file mode 100644
index 000000000..dac39ed85
--- /dev/null
+++ b/src/usr/hwpf/hwp/initfiles/p8.psi.scom.initfile
@@ -0,0 +1,30 @@
+#-- $Id: p8.psi.scom.initfile,v 1.2 2013/03/04 17:22:34 jmcgill Exp $
+#-------------------------------------------------------------------------------
+#--
+#-- (C) Copyright International Business Machines Corp. 2011
+#-- All Rights Reserved -- Property of IBM
+#-- *** IBM Confidential ***
+#--
+#-- TITLE       : p8.psi.scom.initfile
+#-- DESCRIPTION : Perform PSI configuration
+#--
+#-- OWNER NAME  : Joe McGill              Email: jmcgill@us.ibm.com
+#--
+#--------------------------------------------------------------------------------
+
+SyntaxVersion = 1
+
+#--------------------------------------------------------------------------------
+#-- Includes
+#--------------------------------------------------------------------------------
+
+
+#--------------------------------------------------------------------------------
+#-- SCOM initializations
+#--------------------------------------------------------------------------------
+
+# PSI Host Bridge FIR Mask Register
+scom 0x02010903 {
+    bits,    scom_data;
+    0:63,    0x9D03F9F800000000;
+}
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C
index edfa740b2..7fc4fd22b 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C
@@ -20,8 +20,8 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_chiplet_scominit.C,v 1.9 2013/01/20 19:29:42 jmcgill Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.C,v $
+// $Id: proc_chiplet_scominit.C,v 1.10 2013/03/04 17:32:59 jmcgill Exp $
+// $Source: /afs/awd.austin.ibm.com/proj/p9/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
 // *! All Rights Reserved -- Property of IBM
@@ -85,6 +85,22 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
                 break;
             }
 
+            // execute PSI SCOM initfile
+            FAPI_INF("proc_chiplet_scominit: Executing %s on %s",
+                     PROC_CHIPLET_SCOMINIT_PSI_IF, i_target.toEcmdString());
+            FAPI_EXEC_HWP(
+                rc,
+                fapiHwpExecInitFile,
+                initfile_targets,
+                PROC_CHIPLET_SCOMINIT_PSI_IF);
+            if (!rc.ok())
+            {
+                FAPI_ERR("proc_chiplet_scominit: Error from fapiHwpExecInitfile executing %s on %s",
+                         PROC_CHIPLET_SCOMINIT_PSI_IF,
+                         i_target.toEcmdString());
+                break;
+            }
+
             // query NX partial good attribute
             rc = FAPI_ATTR_GET(ATTR_PROC_NX_ENABLE,
                                &i_target,
@@ -99,8 +115,6 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
             if (nx_enabled == fapi::ENUM_ATTR_PROC_NX_ENABLE_ENABLE)
             {
                 // execute NX SCOM initfile
-                initfile_targets.clear();
-                initfile_targets.push_back(i_target);
                 FAPI_INF("proc_chiplet_scominit: Executing %s on %s",
                          PROC_CHIPLET_SCOMINIT_NX_IF, i_target.toEcmdString());
                 FAPI_EXEC_HWP(
diff --git a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H
index 15da9670b..75904635a 100644
--- a/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H
+++ b/src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H
@@ -20,8 +20,8 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_chiplet_scominit.H,v 1.8 2013/01/20 19:30:37 jmcgill Exp $
-// $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.H,v $
+// $Id: proc_chiplet_scominit.H,v 1.9 2013/03/04 17:33:04 jmcgill Exp $
+// $Source: /afs/awd.austin.ibm.com/proj/p9/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.H,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
 // *! All Rights Reserved -- Property of IBM
@@ -50,6 +50,7 @@
 //------------------------------------------------------------------------------
 
 const char * const PROC_CHIPLET_SCOMINIT_FBC_IF = "p8.fbc.scom.if";
+const char * const PROC_CHIPLET_SCOMINIT_PSI_IF = "p8.psi.scom.if";
 const char * const PROC_CHIPLET_SCOMINIT_NX_IF  = "p8.nx.scom.if";
 const char * const PROC_CHIPLET_SCOMINIT_AS_IF  = "p8.as.scom.if";
 const char * const PROC_CHIPLET_SCOMINIT_MCS_IF = "p8.mcs.scom.if";
@@ -77,6 +78,7 @@ extern "C" {
  * @param[in] i_target Reference to target
  *                     If TARGET_TYPE_PROC_CHIP, calls:
  *                     - p8.fbc.scom.initfile
+ *                     - p8.psi.scom.initfile
  *                     - p8.nx.scom.initfile
  *                     - p8.as.scom.initfile
  *                     - p8.mcs.scom.initfile for each functional MCS chiplet
diff --git a/src/usr/hwpf/makefile b/src/usr/hwpf/makefile
index 59c9d5960..13f37e7c0 100644
--- a/src/usr/hwpf/makefile
+++ b/src/usr/hwpf/makefile
@@ -131,7 +131,8 @@ HWP_INITFILES = hwp/initfiles/sample.initfile \
                 hwp/initfiles/p8.dmi.custom.scom.initfile \
                 hwp/initfiles/cen.dmi.custom.scom.initfile \
                 hwp/initfiles/p8.abus.custom.scom.initfile \
-                hwp/initfiles/p8.xbus.custom.scom.initfile
+                hwp/initfiles/p8.xbus.custom.scom.initfile \
+                hwp/initfiles/p8.psi.scom.initfile
 
 HWP_IF_DEFINE_DIR = hwp/initfiles