From 8c18a90bb91ea6775b92ad743fd6929f22fc91dd Mon Sep 17 00:00:00 2001 From: Matt Ploetz Date: Thu, 17 Jul 2014 00:34:01 -0500 Subject: SW268999: p8_ocb_indir_access.C missing OCBCSR_address initialization for Channe Change-Id: Ifada3598e20e4823e71f50935e01c9e082c089e2 CQ:SW268999 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12267 Reviewed-by: MATTHEW A. PLOETZ Tested-by: MATTHEW A. PLOETZ Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12275 Tested-by: Jenkins Server Reviewed-by: Daniel M. Crowell Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/hwp/occ/occ_procedures/p8_ocb_indir_access.C | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/usr/hwpf') diff --git a/src/usr/hwpf/hwp/occ/occ_procedures/p8_ocb_indir_access.C b/src/usr/hwpf/hwp/occ/occ_procedures/p8_ocb_indir_access.C index e7dfc720b..bbd929979 100644 --- a/src/usr/hwpf/hwp/occ/occ_procedures/p8_ocb_indir_access.C +++ b/src/usr/hwpf/hwp/occ/occ_procedures/p8_ocb_indir_access.C @@ -22,7 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: p8_ocb_indir_access.C,v 1.3 2014/03/07 14:55:01 stillgs Exp $ +// $Id: p8_ocb_indir_access.C,v 1.5 2014/07/28 21:34:47 daviddu Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/p8_ocb_indir_access.C,v $ //------------------------------------------------------------------------------ // *! (C) Copyright International Business Machines Corp. 2011 @@ -158,6 +158,7 @@ p8_ocb_indir_access( const fapi::Target& i_target, \ case 3: OCBAR_address = OCB3_ADDRESS_0x0006B070; OCBDR_address = OCB3_DATA_0x0006B075; + OCBCSR_address = OCB3_STATUS_CONTROL_0x0006B071; break; default: FAPI_ERR("Invalid OCB access channel %x", i_ocb_chan); @@ -226,8 +227,8 @@ p8_ocb_indir_access( const fapi::Target& i_target, \ FAPI_ERR("Get SCOM error for address 0x%08llX", temp_address); return rc; } - - if (data.isBitSet(4) && data.isBitSet(5)) + //OCB Channel 3 doesnt do circular operation, therefore no need to check + if (data.isBitSet(4) && data.isBitSet(5) && (i_ocb_chan != 3)) { FAPI_DBG("Put: (MurDD1) Circular mode Put detected. Engage extra checks"); -- cgit v1.2.3