Commit 44654114 authored Sep 06, 2023 by Tommy Huang Committed by Greg Kroah-Hartman Sep 23, 2023

i2c: aspeed: Reset the i2c controller when timeout occurs



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: 2e57b7ce ("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>

parent ce47fe53

drivers/i2c/busses/i2c-aspeed.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -693,13 +693,16 @@ static int aspeed_i2c_master_xfer(struct i2c_adapter *adap,

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

		/*
		* If timed out and the state is still pending, drop the pending