SW292677:INITPROC: FSP&Hostboot - NPU updates

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

3 files changed, 147 insertions, 4 deletions

diff --git a/src/usr/hwpf/hwp/initfiles/p8.npu.scom.initfile b/src/usr/hwpf/hwp/initfiles/p8.npu.scom.initfile
new file mode 100644
index 000000000..7371070c4
--- /dev/null
+++ b/src/usr/hwpf/hwp/initfiles/p8.npu.scom.initfile
@@ -0,0 +1,113 @@
+#-- $Id: p8.npu.scom.initfile,v 1.2 2014/12/11 00:24:12 camille Exp $
+#-------------------------------------------------------------------------------
+#--
+#-- (C) Copyright International Business Machines Corp. 2011
+#-- All Rights Reserved -- Property of IBM
+#-- ***  ***
+#--
+#-- TITLE       : p8.npu.scom.initfile
+#-- DESCRIPTION : Perform NPU configuration
+#--
+#-- OWNER NAME  : Lonny Lambrecht         Email: lonny@us.ibm.com
+#--
+#--------------------------------------------------------------------------------
+
+SyntaxVersion = 1
+
+#--******************************************************************************
+# -- ESNPUFIR
+#--******************************************************************************
+# spy name  ES.NPU.NP_AT.REG.FIR_MASK_REG
+scom 0x0000000008013D83 {
+     bits,   	 scom_data        ;
+    0:63,  	0xE0002C02000F5F3F      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.FIR_ACTION0_REG
+scom 0x0000000008013D86 {
+    bits, 	scom_data        		;
+    0:63, 	0x1CBFC1FCB7F0A300      ;
+      }
+
+# spy name  ES.NPU.NP_AT.REG.FIR_ACTION1_REG
+scom 0x0000000008013D87 {
+   bits,   	 scom_data   	      ;
+    0:63,  	0xFFFFFFFFFFFFFFFF      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_LR_ER    (Lem enable)
+scom 0x0000000008013D9C {
+     bits,   	 scom_data        ;
+    0:63,  	0xFFFFF00000000000      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_SI_ER    (LSI enable)
+scom 0x0000000008013D9D {
+     bits,   	 scom_data        ;
+    0:63,  	0xE000240200000000      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_FR_ER    (freeze enable)
+scom 0x0000000008013D9E {
+     bits,   	 scom_data        ;
+    0:63,  	0xE00024020C000000      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_FE_ER    (fence enable)
+scom 0x0000000008013D9F {
+     bits,   	 scom_data        ;
+    0:63,  	0x1CBFC1FCB7F0A000      ;
+    }
+
+# spy name  ES.NPU.SL_WRAP0.NTL_WRAP0.NTL_PMU_CONTROL (ntl00 pmu counter)
+scom 0x0000000008013C27 {
+     bits,   	 scom_data        ;
+    0:63,  	0xF21045C200000000      ;
+    }
+
+# spy name  ES.NPU.SL_WRAP0.NTL_WRAP1.NTL_PMU_CONTROL (ntl00 pmu counter)
+scom 0x0000000008013C67 {
+     bits,   	 scom_data        ;
+    0:63,  	0xF21045C200000000      ;
+    }
+
+# spy name  ES.NPU.SL_WRAP2.NTL_WRAP0.NTL_PMU_CONTROL (ntl20 pmu counter)
+scom 0x0000000008013D27 {
+     bits,   	 scom_data        ;
+    0:63,  	0xF21045C200000000      ;
+    }
+
+# spy name  ES.NPU.SL_WRAP2.NTL_WRAP1.NTL_PMU_CONTROL (ntl20 pmu counter)
+scom 0x0000000008013D67 {
+     bits,   	 scom_data        ;
+    0:63,  	0xF21045C200000000      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_PMU_CTRL    (at pmu counter)
+scom 0x0000000008013DA6 {
+     bits,   	 scom_data        ;
+    0:63,  	0xF210145000000000      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_DEBUG  (Debug/trace control)
+scom 0x0000000008013DAB {
+     bits,   	 scom_data        ;
+    0:63,  	0x7000000000000000      ;
+    }
+
+# spy name  ES.NPU.NP_AT.REG.NPU_AT_CNFG0    (npu bar select)
+scom 0x0000000008013DA9 {
+     bits,   	 scom_data        ;
+    0:63,  	0x0211000043500000      ;
+    }
+
+# spy name  ES.NPU.SL_WRAP0.NP_CQ.NP_CQ_LNK0.NXCQ_SCOM.NP_BUID_REG   (npu bar select)
+scom 0x0000000008013C13 {
+     bits,   	 scom_data        ;
+    0:63,  	0x0800000043500000      ;
+    }
+
+
+# NPCQ control register?  scom-only        ??
+# NPCQ Int_lvl_REG register?  scom-only        ??
+
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 b0b1cd34e..f9682e848 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
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_chiplet_scominit.C,v 1.26 2014/11/20 18:00:37 jmcgill Exp $
+// $Id: proc_chiplet_scominit.C,v 1.27 2014/12/11 21:11:43 szhong Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.C,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -437,7 +437,36 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target)
                          i_target.toEcmdString());
                 break;
             }
-
+            //execute NV scominit file
+            FAPI_INF("proc_chiplet_scominit: Executing  %s on %s",
+                     PROC_CHIPLET_SCOMINIT_NPU_IF, i_target.toEcmdString());
+            uint8_t exist_NV=0x00;
+            rc=FAPI_ATTR_GET(ATTR_CHIP_EC_FEATURE_NV_PRESENT, &i_target, exist_NV);
+            if(!rc.ok())
+            {
+                    FAPI_ERR("proc_chiplet_scominit: error getting attribute value ATTR_CHIP_EC_FEATURE_NV_PRESENT");
+                    break;
+            }
+            if(exist_NV)
+            {
+                    FAPI_INF("NV link exist, run npu scominit");
+                    FAPI_EXEC_HWP(
+                            rc,
+                            fapiHwpExecInitFile,
+                            initfile_targets,
+                            PROC_CHIPLET_SCOMINIT_NPU_IF);
+                    if (!rc.ok())
+                    {
+                            FAPI_ERR("proc_chiplet_scominit: Error from fapiHwpExecInitfile executing %s on %s",
+                                     PROC_CHIPLET_SCOMINIT_NPU_IF,
+                                     i_target.toEcmdString());
+                            break;
+                    }
+            }
+            else
+            {
+                    FAPI_INF("NV link does not exist, skip npu scominit");
+            }
             // determine set of functional MCS chiplets
             rc = fapiGetChildChiplets(i_target,
                                       fapi::TARGET_TYPE_MCS_CHIPLET,
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 92d5626c7..e1330aca6 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
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: proc_chiplet_scominit.H,v 1.15 2013/11/09 21:06:39 jmcgill Exp $
+// $Id: proc_chiplet_scominit.H,v 1.16 2014/12/11 21:11:59 szhong Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_chiplet_scominit.H,v $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -58,6 +58,7 @@ 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_CXA_IF         = "p8.cxa.scom.if";
 const char * const PROC_CHIPLET_SCOMINIT_A_X_PCI_DMI_IF = "p8.a_x_pci_dmi_fir.scom.if";
+const char * const PROC_CHIPLET_SCOMINIT_NPU_IF = "p8.npu.scom.if";
 const char * const PROC_CHIPLET_SCOMINIT_MCS_IF         = "p8.mcs.scom.if";