Skip to contentSkip to conversation

iio: proximity: sx9310: keep the IRQ balanced across suspend and resume

PATCH In review Arnav Kapoor 3 participants 3 messages Oct 26 – Oct 27 IIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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. Without an interrupt line, client->irq is 0 and both callbacks act on IRQ 0, which the driver doesn't own.

Disable the interrupt only once the device is asleep, always enable it in resume, and skip both when there is no interrupt.

Fixes 72ad02b15d63 ("iio: Add SEMTECH SX9310/9311 sensor driver")

---
I'm sending the same fix for sx9310, sx9324 and sx9360 as separate patches, as the Fixes tags differ.

Compile-tested only (W=1); I don't have SX9310 hardware and haven't reproduced a failing suspend.

 drivers/iio/proximity/sx9310.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)
drivers/iio/proximity/sx9310.c +17 -12
index 79ba46d8a0aa..f462e8f9765f 100644
@@ -943,8 +943,6 @@ static int sx9310_suspend(struct device *dev)
 	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);
@@ -956,7 +954,15 @@ static int sx9310_suspend(struct device *dev)
 	if (ret)
 		return ret;
 
-	return regmap_write(data->regmap, SX9310_REG_PAUSE, 0);
+	ret = regmap_write(data->regmap, SX9310_REG_PAUSE, 0);
+	if (ret)
+		return ret;
+
+	/* Only once nothing can fail, as resume isn't called on failure. */
+	if (data->client->irq)
+		disable_irq_nosync(data->client->irq);
+
+	return 0;
 }
 
 static int sx9310_resume(struct device *dev)
@@ -966,17 +972,16 @@ static int sx9310_resume(struct device *dev)
 
 	scoped_guard(mutex, &data->mutex) {
 		ret = regmap_write(data->regmap, SX9310_REG_PAUSE, 1);
-		if (ret)
-			return ret;
-
-		ret = regmap_write(data->regmap, SX9310_REG_PROX_CTRL0,
-				   data->suspend_ctrl);
-		if (ret)
-			return ret;
+		if (!ret)
+			ret = regmap_write(data->regmap, SX9310_REG_PROX_CTRL0,
+					   data->suspend_ctrl);
 	}
 
-	enable_irq(data->client->irq);
-	return 0;
+	/* Balance the suspend even if the device couldn't be woken up. */
+	if (data->client->irq)
+		enable_irq(data->client->irq);
+
+	return ret;
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(sx9310_pm_ops, sx9310_suspend, sx9310_resume);

base-commit: 2ef6f5c4ee56e90c237c5f7687f09e635f7d30a9

Signature · 1 line
2.53.0
#1 lore raw
Quoted 9 lines · Arnav Kapoor

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. Without an interrupt line, client->irq is 0 and both callbacks act on IRQ 0, which the driver doesn't own.

Disable the interrupt only once the device is asleep, always enable it in resume, and skip both when there is no interrupt.

...

drivers/iio/proximity/sx9310.c static int sx9310_resume(struct device *dev) · line 975

Quoted 12 lines

static int sx9310_resume(struct device *dev)

drivers/iio/proximity/sx9310.c +1 -7
 	scoped_guard(mutex, &data->mutex) {
 		ret = regmap_write(data->regmap, SX9310_REG_PAUSE, 1);
-		if (ret)
-			return ret;
-
-		ret = regmap_write(data->regmap, SX9310_REG_PROX_CTRL0,
-				   data->suspend_ctrl);
-		if (ret)
-			return ret;
+		if (!ret)

Can't we rather move to guard()() and use normal sequence here? It might require to have this be moved to another helper function.

Quoted 12 lines
drivers/iio/proximity/sx9310.c +7 -2
+			ret = regmap_write(data->regmap, SX9310_REG_PROX_CTRL0,
+					   data->suspend_ctrl);
 	}
 
-	enable_irq(data->client->irq);
-	return 0;
+	/* Balance the suspend even if the device couldn't be woken up. */
+	if (data->client->irq)
+		enable_irq(data->client->irq);
+
+	return ret;
 }
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#2 lore raw
In reply to Arnav Kapoor
Quoted 7 lines · Arnav Kapoor

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. Without an interrupt line, client->irq is 0 and both callbacks act on IRQ 0, which the driver doesn't own.

Quoted 9 lines

Disable the interrupt only once the device is asleep, always enable it in resume, and skip both when there is no interrupt.

Fixes 72ad02b15d63 ("iio: Add SEMTECH SX9310/9311 sensor driver")

---
I'm sending the same fix for sx9310, sx9324 and sx9360 as separate patches, as the Fixes tags differ.

Please group them in patchset to make reviewing and applying easier. Or rejecting, or even commenting that something is wrong. Previously you were sending AI slop and this resembles recent AI-bot spamming.

Best regards,
Krzysztof