iio: proximity: sx93xx: keep the IRQ balanced across suspend and resume
v5 cover iio: proximity: sx93xx: keep the IRQ balanced across suspend and resume
sx9310, sx9324 and sx9360 disable the interrupt in suspend before anything that can fail, and don't enable it again when suspend or resume fails. One patch per driver, as the Fixes tags differ.
Changes in v5:
- Disable the interrupt with disable_irq() before taking the mutex, and enable it again if suspend fails. v4 called disable_irq_nosync() at the end of suspend, so a threaded handler woken during the register writes could run after suspend returned. Found by Sashiko.
- Move the register accesses into a *_sleep() helper per driver so the mutex is released before the interrupt is re-enabled on failure
- Rebase on fixes-togreg
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1:
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/all/[email protected]/
https://lore.kernel.org/all/[email protected]/
Compile-tested only (W=1); I don't have the hardware and haven't reproduced a failing suspend.
Arnav Kapoor (3):
iio: proximity: sx9310: keep the IRQ balanced across suspend and
resume
iio: proximity: sx9324: keep the IRQ balanced across suspend and
resume
iio: proximity: sx9360: keep the IRQ balanced across suspend and
resume
drivers/iio/proximity/sx9310.c | 54 ++++++++++++++++++++++------------ drivers/iio/proximity/sx9324.c | 43 ++++++++++++++++++--------- drivers/iio/proximity/sx9360.c | 45 ++++++++++++++++++---------- 3 files changed, 94 insertions(+), 48 deletions(-)
base-commit: a6d9114f68c4b5507b2d945bd6d1e37415f913c5
Signature · 1 line
2.53.0
PATCH v5 1/3 iio: proximity: sx9310: keep the IRQ balanced across suspend and resume
sx9310_suspend() disables the interrupt first and returns with it still disabled if a register access fails. Resume isn't called after a failed suspend, so the interrupt is never enabled again. sx9310_resume() also returns without enabling it on error.
Enable the interrupt again when suspend fails, and enable it as the first step of resume, before anything can fail, so resume mirrors suspend. Use disable_irq() rather than disable_irq_nosync(), and call it before taking the mutex, which the threaded handlers also take, so none of them is left to run once suspend has returned. The driver works without an interrupt line, so skip these calls when client->irq is 0, as sx_common already does.
--- drivers/iio/proximity/sx9310.c | 54 ++++++++++++++++++++++------------ 1 file changed, 35 insertions(+), 19 deletions(-)
drivers/iio/proximity/sx9310.c +35 -19
@@ -937,46 +937,62 @@ static int sx9310_probe(struct i2c_client *client)return sx_common_probe (client, &sx9310_chip_info, &sx9310_regmap_config); } -static int sx9310_suspend (struct device *dev) +static int sx9310_sleep (struct sx_common_data *data) { -struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); +struct regmap *map = data->regmap;u8 ctrl0;int ret; -disable_irq_nosync (data->client->irq); -guard (mutex)(&data->mutex); - ret =regmap_read (data->regmap,SX9310_REG_PROX_CTRL0 , - &data->suspend_ctrl); + + ret =regmap_read (map,SX9310_REG_PROX_CTRL0 , &data->suspend_ctrl);if (ret)return ret; ctrl0 = data->suspend_ctrl & ~SX9310_REG_PROX_CTRL0_SENSOREN_MASK ; - ret =regmap_write (data->regmap,SX9310_REG_PROX_CTRL0 , ctrl0); + ret =regmap_write (map,SX9310_REG_PROX_CTRL0 , ctrl0);if (ret)return ret; -return regmap_write (data->regmap,SX9310_REG_PAUSE ,0 ); +return regmap_write (map,SX9310_REG_PAUSE ,0 ); +} + +static int sx9310_suspend (struct device *dev) +{ +struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); +int ret; + +/* +* Before taking the mutex, as disable_irq() waits for the threaded +* handlers and they take it too. +*/ +if (data->client->irq) +disable_irq (data->client->irq); + + ret =sx9310_sleep (data); +/* Resume isn't called if suspend fails. */ +if (ret && data->client->irq) +enable_irq (data->client->irq); + +return ret; }static int sx9310_resume (struct device *dev) {struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); +struct regmap *map = data->regmap;int ret; - scoped_guard(mutex, &data->mutex) { - ret =regmap_write (data->regmap,SX9310_REG_PAUSE ,1 ); -if (ret) -return ret; +if (data->client->irq) +enable_irq (data->client->irq); - ret =regmap_write (data->regmap,SX9310_REG_PROX_CTRL0 , - data->suspend_ctrl); -if (ret) -return ret; - } +guard (mutex)(&data->mutex); -enable_irq (data->client->irq); -return 0 ; + ret =regmap_write (map,SX9310_REG_PAUSE ,1 ); +if (ret) +return ret; + +return regmap_write (map,SX9310_REG_PROX_CTRL0 , data->suspend_ctrl); } static DEFINE_SIMPLE_DEV_PM_OPS(sx9310_pm_ops, sx9310_suspend, sx9310_resume);
Signature · 1 line
2.53.0
PATCH v5 2/3 iio: proximity: sx9324: keep the IRQ balanced across suspend and resume
In reply to Arnav Kapoorsx9324_suspend() disables the interrupt first and returns with it still disabled if a register access fails. Resume isn't called after a failed suspend, so the interrupt is never enabled again. sx9324_resume() also returns without enabling it on error.
Enable the interrupt again when suspend fails, and enable it as the first step of resume, before anything can fail, so resume mirrors suspend. Use disable_irq() rather than disable_irq_nosync(), and call it before taking the mutex, which the threaded handlers also take, so none of them is left to run once suspend has returned. The driver works without an interrupt line, so skip these calls when client->irq is 0, as sx_common already does.
--- drivers/iio/proximity/sx9324.c | 43 +++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 14 deletions(-)
drivers/iio/proximity/sx9324.c +29 -14
@@ -1091,15 +1091,13 @@ static int sx9324_probe(struct i2c_client *client)return sx_common_probe (client, &sx9324_chip_info, &sx9324_regmap_config); } -static int sx9324_suspend (struct device *dev) +static int sx9324_sleep (struct sx_common_data *data) { -struct sx_common_data *data =iio_priv (dev_get_drvdata (dev));unsigned int regval;int ret; -disable_irq_nosync (data->client->irq); -guard (mutex)(&data->mutex); + ret =regmap_read (data->regmap,SX9324_REG_GNRL_CTRL1 , ®val);if (ret <0 )return ret;
@@ -1107,25 +1105,42 @@ static int sx9324_suspend(struct device *dev) data->suspend_ctrl =FIELD_GET (SX9324_REG_GNRL_CTRL1_PHEN_MASK , regval); -/* Disable all phases, send the device to sleep. */ return regmap_write (data->regmap,SX9324_REG_GNRL_CTRL1 ,0 ); } +static int sx9324_suspend (struct device *dev) +{ +struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); +int ret; + +/* +* Before taking the mutex, as disable_irq() waits for the threaded +* handlers and they take it too. +*/ +if (data->client->irq) +disable_irq (data->client->irq); + + ret =sx9324_sleep (data); +/* Resume isn't called if suspend fails. */ +if (ret && data->client->irq) +enable_irq (data->client->irq); + +return ret; +} +static int sx9324_resume (struct device *dev) {struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); - scoped_guard(mutex, &data->mutex) { -int ret =regmap_write (data->regmap,SX9324_REG_GNRL_CTRL1 , - data->suspend_ctrl | -SX9324_REG_GNRL_CTRL1_PAUSECTRL ); -if (ret) -return ret; - } +if (data->client->irq) +enable_irq (data->client->irq); -enable_irq (data->client->irq); -return 0 ; +guard (mutex)(&data->mutex); + +return regmap_write (data->regmap,SX9324_REG_GNRL_CTRL1 , + data->suspend_ctrl | +SX9324_REG_GNRL_CTRL1_PAUSECTRL ); } static DEFINE_SIMPLE_DEV_PM_OPS(sx9324_pm_ops, sx9324_suspend, sx9324_resume);
Signature · 1 line
2.53.0
PATCH v5 3/3 iio: proximity: sx9360: keep the IRQ balanced across suspend and resume
In reply to Arnav Kapoorsx9360_suspend() disables the interrupt first and returns with it still disabled if a register access fails. Resume isn't called after a failed suspend, so the interrupt is never enabled again. sx9360_resume() also returns without enabling it on error.
Enable the interrupt again when suspend fails, and enable it as the first step of resume, before anything can fail, so resume mirrors suspend. Use disable_irq() rather than disable_irq_nosync(), and call it before taking the mutex, which the threaded handlers also take, so none of them is left to run once suspend has returned. The driver works without an interrupt line, so skip these calls when client->irq is 0, as sx_common already does.
--- drivers/iio/proximity/sx9360.c | 45 ++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 15 deletions(-)
drivers/iio/proximity/sx9360.c +30 -15
@@ -808,15 +808,13 @@ static int sx9360_probe(struct i2c_client *client)return sx_common_probe (client, &sx9360_chip_info, &sx9360_regmap_config); } -static int sx9360_suspend (struct device *dev) +static int sx9360_sleep (struct sx_common_data *data) { -struct sx_common_data *data =iio_priv (dev_get_drvdata (dev));unsigned int regval;int ret; -disable_irq_nosync (data->client->irq); -guard (mutex)(&data->mutex); + ret =regmap_read (data->regmap,SX9360_REG_GNRL_CTRL0 , ®val);if (ret <0 )return ret;
@@ -824,25 +822,42 @@ static int sx9360_suspend(struct device *dev) data->suspend_ctrl =FIELD_GET (SX9360_REG_GNRL_CTRL0_PHEN_MASK , regval); -/* Disable all phases, send the device to sleep. */ return regmap_write (data->regmap,SX9360_REG_GNRL_CTRL0 ,0 ); } +static int sx9360_suspend (struct device *dev) +{ +struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); +int ret; + +/* +* Before taking the mutex, as disable_irq() waits for the threaded +* handlers and they take it too. +*/ +if (data->client->irq) +disable_irq (data->client->irq); + + ret =sx9360_sleep (data); +/* Resume isn't called if suspend fails. */ +if (ret && data->client->irq) +enable_irq (data->client->irq); + +return ret; +} +static int sx9360_resume (struct device *dev) {struct sx_common_data *data =iio_priv (dev_get_drvdata (dev)); - scoped_guard(mutex, &data->mutex) { -int ret =regmap_update_bits (data->regmap, -SX9360_REG_GNRL_CTRL0 , -SX9360_REG_GNRL_CTRL0_PHEN_MASK , - data->suspend_ctrl); -if (ret) -return ret; - } -enable_irq (data->client->irq); -return 0 ; +if (data->client->irq) +enable_irq (data->client->irq); + +guard (mutex)(&data->mutex); + +return regmap_update_bits (data->regmap,SX9360_REG_GNRL_CTRL0 , +SX9360_REG_GNRL_CTRL0_PHEN_MASK , + data->suspend_ctrl); } static DEFINE_SIMPLE_DEV_PM_OPS(sx9360_pm_ops, sx9360_suspend, sx9360_resume);
Signature · 1 line
2.53.0