From 4b2ff3f87f78756922a1a9c1bfa49d823b51d64d Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Tue, 8 Oct 2013 14:49:21 -0500 Subject: Brazos FSI workarounds Two changes in here: 1) Ignore 2 error bits that are turned on at FSP standby and never get cleared. 2) Avoid using xscom to do direct master operations so that we never use the flipped alt-master ports. See CQ SW224509 for more information. Change-Id: I12591fd9e7b368393ac8d062ab6bee7ba34d02c7 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6560 Tested-by: Jenkins Server Reviewed-by: Dean Sanner Reviewed-by: A. Patrick Williams III --- src/usr/fsi/fsidd.C | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C index 4413ed129..0ee03d4f2 100644 --- a/src/usr/fsi/fsidd.C +++ b/src/usr/fsi/fsidd.C @@ -451,6 +451,15 @@ errlHndl_t FsiDD::initializeHardware() } } + //@fixme-RTC:87909 - temporary simics workaround + if( (iv_master->getAttr() + == TARGETING::MODEL_VENICE) ) + { + // Ignore bits 16 and 24 + // 16: cMFSI any-master-error + // 24: MFSI any-master-error + iv_opbErrorMask &= 0xFFFF7F7F; + } typedef struct { TARGETING::Target* targ; @@ -1427,7 +1436,11 @@ errlHndl_t FsiDD::genFullFsiAddr(FsiAddrInfo_t& io_addrInfo) } //powerbus is alive - if( (fsi_info.master)->getAttr().useXscom ) + if( (fsi_info.master)->getAttr().useXscom + && + // do not use direct mastering on Brazos for now + !(iv_master->getAttr() + == TARGETING::MODEL_VENICE) ) //@fixme-RTC:35041 { io_addrInfo.opbTarg = fsi_info.master; // Note: no need to append the MFSI port since it is now local -- cgit v1.2.3