xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: aspeed: Reset the i2c controller when timeout occurs

Browse Source 
commit fee465150b458351b6d9b9f66084f3cc3022b88b upstream.

Reset the i2c controller when an i2c transfer timeout occurs.
The remaining interrupts and device should be reset to avoid
unpredictable controller behavior.

Fixes: 2e57b7cebb ("i2c: aspeed: Add multi-master use case support")
Cc: <stable@vger.kernel.org> # v5.1+
Signed-off-by: Tommy Huang <tommy_huang@aspeedtech.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tommy Huang
2023-09-06 08:49:10 +08:00
committed by Greg Kroah-Hartman
parent f5e303fce3
commit 993bb01d22
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/i2c/busses/i2c-aspeed.c
View File

@@ -693,13 +693,16 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap,
if (time_left == 0) { if (time_left == 0) {
/* /*
* If timed out and bus is still busy in a multi master * In a multi-master setup, if a timeout occurs, attempt
* environment, attempt recovery at here. * recovery. But if the bus is idle, we still need to reset the
* i2c controller to clear the remaining interrupts.
*/ */
if (bus->multi_master && if (bus->multi_master &&
(readl(bus->base + ASPEED_I2C_CMD_REG) & (readl(bus->base + ASPEED_I2C_CMD_REG) &
ASPEED_I2CD_BUS_BUSY_STS)) ASPEED_I2CD_BUS_BUSY_STS))
aspeed_i2c_recover_bus(bus); aspeed_i2c_recover_bus(bus);
else
aspeed_i2c_reset(bus);
/* /*
* If timed out and the state is still pending, drop the pending * If timed out and the state is still pending, drop the pending