diff options
| author | Thi Tran <thi@us.ibm.com> | 2015-09-10 14:40:05 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-09-11 13:07:12 -0500 |
| commit | 8f43ff9551b5237a2a98fcc74c32caa33c8fd480 (patch) | |
| tree | 66fad84c0a92fef3a0089b13d973882b3f613c69 | |
| parent | 75ab80725a26b4d0a6bc2163076c9c8cf1decfa2 (diff) | |
| download | talos-hostboot-8f43ff9551b5237a2a98fcc74c32caa33c8fd480.tar.gz talos-hostboot-8f43ff9551b5237a2a98fcc74c32caa33c8fd480.zip | |
SW321046: INITPROC: Hostboot -set NPU FIR mask outside of SCOM initfile, to prev
Change-Id: I27d433e247724c750c397eb04f9695535787c462
CQ:SW321046
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20441
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20447
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/usr/hwpf/hwp/nest_chiplets/proc_chiplet_scominit/proc_chiplet_scominit.C | 23 |
1 files changed, 20 insertions, 3 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 bb307582e..ef92513d4 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.28 2015/03/17 18:54:28 jmcgill Exp $ +// $Id: proc_chiplet_scominit.C,v 1.29 2015/08/10 15:15:06 jmcgill 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 @@ -448,6 +448,24 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target) } if (exist_NV) { + // mask NPU FIR bit 27 + rc_ecmd = data.flushTo0(); + rc_ecmd = data.setBit(NPU_FIR_NTL_DL2TL_PARITY_ERR_BIT); + if (rc_ecmd) + { + FAPI_ERR("proc_chiplet_scominit: Error 0x%Xforming NPU FIR mask data buffer", + rc_ecmd); + rc.setEcmdError(rc_ecmd); + break; + } + rc = fapiPutScom(i_target, NPU_FIR_MASK_OR_0x08013D85, data); + if (!rc.ok()) + { + FAPI_ERR("proc_chiplet_scominit: fapiPutScom error (NPU_FIR_MASK_OR_0x08013D85) on %s", + i_target.toEcmdString()); + break; + } + FAPI_INF("proc_chiplet_scominit: Executing %s on %s", PROC_CHIPLET_SCOMINIT_NPU_IF, i_target.toEcmdString()); FAPI_EXEC_HWP( @@ -464,8 +482,7 @@ fapi::ReturnCode proc_chiplet_scominit(const fapi::Target & i_target) } // cleanup FIR bit (NPU FIR bit 27) caused by NDL/NTL parity error - rc_ecmd = data.flushTo1(); - rc_ecmd = data.clearBit(NPU_FIR_NTL_DL2TL_PARITY_ERR_BIT); + rc_ecmd = data.invert(); if (rc_ecmd) { FAPI_ERR("proc_chiplet_scominit: Error 0x%Xforming NPU FIR cleanup data buffer", |
