summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike Baiocchi <baiocchi@us.ibm.com>2015-03-25 16:47:54 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2015-03-26 07:12:20 -0500
commit30e63fce6ed55d1166f340e956c4750276304e10 (patch)
treeee894b5959bebd63608d3f546eabab943e3931a3 /src
parent443e443dd12dd902ab58143a19c6489a27307abd (diff)
downloadtalos-hostboot-30e63fce6ed55d1166f340e956c4750276304e10.tar.gz
talos-hostboot-30e63fce6ed55d1166f340e956c4750276304e10.zip
Limit I2C Reset on Processors to engine 0 - fixed
Fixed a bug with the initial commit that when I2C Reset is called for procesors, the reset is only done on I2C Master Engine 0. Change-Id: I7ac5f6bee5fee9beb286b029b7fdab187685460b CQ: SW300339 Backport: release-fips830 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16637 Tested-by: Jenkins Server Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
-rwxr-xr-xsrc/usr/i2c/i2c.C7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index 6748dca81..1f2b8a095 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -2531,7 +2531,7 @@ errlHndl_t i2cProcessActiveMasters ( i2cProcessType i_processType,
io_args.engine = engine;
// Only reset engine 0 for FSI
- if ( (i_processType & I2C_OP_RESET ) &&
+ if ( (i_processOperation & I2C_OP_RESET ) &&
( engine != 0 ) &&
(io_args.switches.useFsiI2C == 1) )
{
@@ -2541,7 +2541,7 @@ errlHndl_t i2cProcessActiveMasters ( i2cProcessType i_processType,
// @todo RTC 126069 - only resetting engine 0 for now
// -- only processors have an engine 1
// (separate block from above to avoid merge issues)
- if ( ( i_processType & I2C_OP_RESET ) &&
+ if ( ( i_processOperation & I2C_OP_RESET ) &&
( engine != 0 ) )
{
continue;
@@ -2605,7 +2605,8 @@ errlHndl_t i2cProcessActiveMasters ( i2cProcessType i_processType,
engine );
TRACUCOMP( g_trac_i2c,INFO_MRK
- "i2cProcessActiveMasters: Reset 0x%X engine = %d",
+ "i2cProcessActiveMasters: Setup/Reset "
+ "0x%X engine = %d",
TARGETING::get_huid(tgt), engine );
// Setup Bus Speed
OpenPOWER on IntegriCloud