summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Sanner <dsanner@us.ibm.com>2018-04-13 12:58:14 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2018-04-16 13:42:07 -0400
commit739ec89c67cde105301ab9aa11adf2c420efa6eb (patch)
treee946b5e719d65c4092dd87662da45a0378aedc8d
parent5b97c0cf5636b7d109a4d0a085d94000e2bd81fe (diff)
downloadtalos-hostboot-739ec89c67cde105301ab9aa11adf2c420efa6eb.tar.gz
talos-hostboot-739ec89c67cde105301ab9aa11adf2c420efa6eb.zip
When FSI initialized by SP only use enable reg for detection
FSI protocol indicates that when a port is enabled the MLEVP0 can toggle. Thus slave detect can only rely on MENP0. Change-Id: I197813217196ae03aed7c090e674fdfe946163d4 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57187 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com> CI-Ready: Dean Sanner <dsanner@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r--src/usr/fsi/fsidd.C11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/usr/fsi/fsidd.C b/src/usr/fsi/fsidd.C
index bbbdce165..c1d29f20c 100644
--- a/src/usr/fsi/fsidd.C
+++ b/src/usr/fsi/fsidd.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2011,2017 */
+/* Contributors Listed Below - COPYRIGHT 2011,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -2375,15 +2375,12 @@ errlHndl_t FsiDD::initMasterControl(TARGETING::Target* i_master,
l_err = read( ctl_reg|FSI_MLEVP0_018, &databuf );
if( l_err ) { break; }
- //Read what FSP actually enabled as well if they initialized it
+ //When FSP has init'ed the bus, MLEVP is toggling,
+ //rely only on MENP
if( spfuncs.fsiSlaveInit )
{
- uint32_t databuf2 = 0;
- l_err = read( ctl_reg|FSI_MENP0_010, &databuf2 );
+ l_err = read( ctl_reg|FSI_MENP0_010, &databuf );
if( l_err ) { break; }
-
- //Only use slaves that we sense and FSP has enabled
- databuf = databuf & databuf2;
}
// Only looking at the top bits
OpenPOWER on IntegriCloud