i2c: stm32f7: recover the bus on access timeout

Alain Volmat · wsakernel · commit b933d1faf8fa · 2021-11-30T10:22:07.000+01:00
When getting an access timeout, ensure that the bus is in a proper state prior to returning the error. Fixes: aeb068c ("i2c: i2c-stm32f7: add driver") Signed-off-by: Alain Volmat <alain.volmat@foss.st.com> Reviewed-by: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com> Signed-off-by: Wolfram Sang <wsa@kernel.org>
diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
@@ -1712,6 +1712,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap,
 			i2c_dev->msg->addr);
 		if (i2c_dev->use_dma)
 			dmaengine_terminate_all(dma->chan_using);
+		stm32f7_i2c_wait_free_bus(i2c_dev);
 		ret = -ETIMEDOUT;
 	}
 
@@ -1769,6 +1770,7 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
 		dev_dbg(dev, "Access to slave 0x%x timed out\n", f7_msg->addr);
 		if (i2c_dev->use_dma)
 			dmaengine_terminate_all(dma->chan_using);
+		stm32f7_i2c_wait_free_bus(i2c_dev);
 		ret = -ETIMEDOUT;
 		goto pm_free;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1712,6 +1712,7 @@ static int stm32f7_i2c_xfer(struct i2c_adapter *i2c_adap,`
`1712`	`1712`	`i2c_dev->msg->addr);`
`1713`	`1713`	`if (i2c_dev->use_dma)`
`1714`	`1714`	`dmaengine_terminate_all(dma->chan_using);`
	`1715`	`+ stm32f7_i2c_wait_free_bus(i2c_dev);`
`1715`	`1716`	`ret = -ETIMEDOUT;`
`1716`	`1717`	`}`
`1717`	`1718`
`@@ -1769,6 +1770,7 @@ static int stm32f7_i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,`
`1769`	`1770`	`dev_dbg(dev, "Access to slave 0x%x timed out\n", f7_msg->addr);`
`1770`	`1771`	`if (i2c_dev->use_dma)`
`1771`	`1772`	`dmaengine_terminate_all(dma->chan_using);`
	`1773`	`+ stm32f7_i2c_wait_free_bus(i2c_dev);`
`1772`	`1774`	`ret = -ETIMEDOUT;`
`1773`	`1775`	`goto pm_free;`
`1774`	`1776`	`}`