summaryrefslogtreecommitdiffstats
path: root/src/usr/i2c/i2c.C
diff options
context:
space:
mode:
authorMike Baiocchi <baiocchi@us.ibm.com>2015-04-17 17:39:59 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2015-04-24 11:25:11 -0500
commitfd19d6a67096de27c5b417dceb5fbb89a3833590 (patch)
treef39f94e9d7dbb36cfa7adbacd58b488785b1a65b /src/usr/i2c/i2c.C
parent818d0f7995d0023a62fe53d42372f78d662c8c9f (diff)
downloadtalos-hostboot-fd19d6a67096de27c5b417dceb5fbb89a3833590.tar.gz
talos-hostboot-fd19d6a67096de27c5b417dceb5fbb89a3833590.zip
Allow I2C Resets on Processor Engine 1
This commit removes a workaround that limited all I2C resets to just engine 0 on processors. (Centaurs only use engine 0). Now, if there is a device off of one of the buses connected to engine 1 (port 0, 1, or 2), then a reset will be issued on the bus. Change-Id: Id2091b44d931be5321420c091fe91a803cc5df65 CQ: SW300339 Backport: release-fips830 CMVC-Prereq: 955865 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17309 Tested-by: Jenkins Server Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/i2c/i2c.C')
-rwxr-xr-xsrc/usr/i2c/i2c.C11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index b7a68381d..098d217c3 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -2542,7 +2542,7 @@ errlHndl_t i2cProcessActiveMasters ( i2cProcessType i_processType,
(speed_array) ) )
{
TRACFCOMP( g_trac_i2c,
- ERR_MRK"i2cSendSlaveStop() - Cannot find "
+ ERR_MRK"i2cProcessActiveMasters: - Cannot find "
"ATTR_I2C_BUS_SPEED_ARRAY needed for operation");
/*@
@@ -2612,15 +2612,6 @@ errlHndl_t i2cProcessActiveMasters ( i2cProcessType i_processType,
continue;
}
- // @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_processOperation & I2C_OP_RESET ) &&
- ( engine != 0 ) )
- {
- continue;
- }
-
// Look for any device on this engine based on speed_array
bool skip = true;
for ( size_t j = 0; j < I2C_BUS_ATTR_MAX_PORT; j++ )
OpenPOWER on IntegriCloud