Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i2c: mux: pca9541: Use I2C adapter timeout value for arbitration timeout 

Remove existing arbitration timeout macros and use I2C adapter timeout
value for arbitration timeout and forceful bus ownership.

I2C adapter timeout can be configurable from user space, so using it
for arbitration timeout helps in configuring the arbitration timeout
from user space depending on the use case.

Signed-off-by: Manikanta Guntupalli <manikanta.guntupalli@amd.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
This commit is contained in:
Manikanta Guntupalli 2025-07-31 18:25:35 +05:30 committed by Wolfram Sang
parent f77a13df57
commit c90fa5493f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/i2c/muxes/i2c-mux-pca9541.c
View File

@ -63,10 +63,6 @@
#define mybus(x) (!((x) & MYBUS) || ((x) & MYBUS) == MYBUS) #define mybus(x) (!((x) & MYBUS) || ((x) & MYBUS) == MYBUS)
#define busoff(x) (!((x) & BUSON) || ((x) & BUSON) == BUSON) #define busoff(x) (!((x) & BUSON) || ((x) & BUSON) == BUSON)
/* arbitration timeouts, in jiffies */
#define ARB_TIMEOUT (HZ / 8) /* 125 ms until forcing bus ownership */
#define ARB2_TIMEOUT (HZ / 4) /* 250 ms until acquisition failure */
/* arbitration retry delays, in us */ /* arbitration retry delays, in us */
#define SELECT_DELAY_SHORT 50 #define SELECT_DELAY_SHORT 50
#define SELECT_DELAY_LONG 1000 #define SELECT_DELAY_LONG 1000
@ -229,6 +225,9 @@ static int pca9541_arbitrate(struct i2c_client *client)
*/ */
data->select_timeout = SELECT_DELAY_LONG; data->select_timeout = SELECT_DELAY_LONG;
if (time_is_before_eq_jiffies(data->arb_timeout)) { if (time_is_before_eq_jiffies(data->arb_timeout)) {
dev_warn(&client->dev,
"Arbitration timeout on I2C bus, forcing bus ownership\n");
/* Time is up, take the bus and reset it. */ /* Time is up, take the bus and reset it. */
pca9541_reg_write(client, pca9541_reg_write(client,
PCA9541_CONTROL, PCA9541_CONTROL,
@ -251,10 +250,10 @@ static int pca9541_select_chan(struct i2c_mux_core *muxc, u32 chan)
struct pca9541 *data = i2c_mux_priv(muxc); struct pca9541 *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
int ret; int ret;
unsigned long timeout = jiffies + ARB2_TIMEOUT; unsigned long timeout = jiffies + (2 * client->adapter->timeout);
/* give up after this time */ /* give up after this time */
data->arb_timeout = jiffies + ARB_TIMEOUT; data->arb_timeout = jiffies + client->adapter->timeout;
/* force bus ownership after this time */ /* force bus ownership after this time */
do { do {
@ -267,6 +266,7 @@ static int pca9541_select_chan(struct i2c_mux_core *muxc, u32 chan)
else else
msleep(data->select_timeout / 1000); msleep(data->select_timeout / 1000);
} while (time_is_after_eq_jiffies(timeout)); } while (time_is_after_eq_jiffies(timeout));
dev_warn(&client->dev, "Failed to acquire I2C bus, timed out\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }