diff options
author | Prachi Gupta <pragupta@us.ibm.com> | 2015-03-26 10:06:08 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-03-26 13:59:05 -0500 |
commit | e912f647e06fcf9efa601e419785552b6341ecf0 (patch) | |
tree | e7282c9abbc73a89e6e9a5b855b9358700c15713 /src/usr/hwpf/hwp/nest_chiplets | |
parent | 91f1fe257f0b14cb39440d5c100e1d01d8025b20 (diff) | |
download | talos-hostboot-e912f647e06fcf9efa601e419785552b6341ecf0.tar.gz talos-hostboot-e912f647e06fcf9efa601e419785552b6341ecf0.zip |
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>
Diffstat (limited to 'src/usr/hwpf/hwp/nest_chiplets')
-rw-r--r-- | src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C | 33 | ||||
-rw-r--r-- | src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.H | 5 |
2 files changed, 34 insertions, 4 deletions
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"; |