summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArun P. Mohanan <arun.p.m@linux.intel.com>2022-04-27 07:46:47 +0300
committerArun P. Mohanan <arun.p.m@linux.intel.com>2022-04-29 06:26:33 +0300
commitab95859fee776e58934d2b0cc1f4e93810e66508 (patch)
tree66f9efbabbbe44a894ffd907b55cbd8ad3d9f33f /drivers
parent4b3403cf5484c478319b5ba9f64e0e63e30698fa (diff)
downloadlinux-ab95859fee776e58934d2b0cc1f4e93810e66508.tar.xz
i2c: mux: Add mux deselect support on timeout
Add support to deselect the mux when there is a timeout. The mux idle_state settings will be configured on startup. In case of MCTP it is MUX_IDLE_DISCONNECT. But when there is a timeout, mux ends up in connected position and the devices behind the mux will appear under different muxes connected to the same bus. This change fix the same. Signed-off-by: Arun P. Mohanan <arun.p.m@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/i2c-mux.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index ce3c3ad3f129..abdfd7513df2 100644
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -36,9 +36,11 @@ struct i2c_mux_priv {
u32 chan_id;
};
-static void i2c_mux_hold(struct i2c_mux_core *muxc, unsigned long timeout)
+static void i2c_mux_hold(struct i2c_mux_core *muxc, u32 chan_id,
+ unsigned long timeout)
{
mutex_lock(&muxc->hold_lock);
+ muxc->holder_chan_id = chan_id;
schedule_delayed_work(&muxc->unhold_work, timeout);
}
@@ -54,6 +56,9 @@ static void i2c_mux_unhold_work(struct work_struct *work)
struct i2c_mux_core *muxc = container_of(dwork, struct i2c_mux_core,
unhold_work);
+ if (muxc->deselect)
+ muxc->deselect(muxc, muxc->holder_chan_id);
+
mutex_unlock(&muxc->hold_lock);
}
@@ -74,7 +79,7 @@ static int __i2c_mux_master_xfer(struct i2c_adapter *adap,
(u16 *)msgs[num - 1].buf);
if (hold_msg == I2C_HOLD_MSG_SET) {
timeout = msecs_to_jiffies(*(u16 *)msgs[num - 1].buf);
- i2c_mux_hold(muxc, timeout);
+ i2c_mux_hold(muxc, priv->chan_id, timeout);
} else if (hold_msg == I2C_HOLD_MSG_NONE) {
mutex_lock(&muxc->hold_lock);
}
@@ -112,7 +117,7 @@ static int i2c_mux_master_xfer(struct i2c_adapter *adap,
(u16 *)msgs[num - 1].buf);
if (hold_msg == I2C_HOLD_MSG_SET) {
timeout = msecs_to_jiffies(*(u16 *)msgs[num - 1].buf);
- i2c_mux_hold(muxc, timeout);
+ i2c_mux_hold(muxc, priv->chan_id, timeout);
} else if (hold_msg == I2C_HOLD_MSG_NONE) {
mutex_lock(&muxc->hold_lock);
}
@@ -150,7 +155,7 @@ static int __i2c_mux_smbus_xfer(struct i2c_adapter *adap,
&data->word);
if (hold_msg == I2C_HOLD_MSG_SET) {
timeout = msecs_to_jiffies(data->word);
- i2c_mux_hold(muxc, timeout);
+ i2c_mux_hold(muxc, priv->chan_id, timeout);
} else if (hold_msg == I2C_HOLD_MSG_NONE) {
mutex_lock(&muxc->hold_lock);
}
@@ -189,7 +194,7 @@ static int i2c_mux_smbus_xfer(struct i2c_adapter *adap,
&data->word);
if (hold_msg == I2C_HOLD_MSG_SET) {
timeout = msecs_to_jiffies(data->word);
- i2c_mux_hold(muxc, timeout);
+ i2c_mux_hold(muxc, priv->chan_id, timeout);
} else if (hold_msg == I2C_HOLD_MSG_NONE) {
mutex_lock(&muxc->hold_lock);
}