From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: "Heiko Stübner" <heiko@sntech.de>, linux-input@vger.kernel.org
Cc: Andreas Kemnade <andreas@kemnade.info>, linux-kernel@vger.kernel.org
Subject: [PATCH 07/18] Input: zforce_ts - ensure that pm_stay_awake() and pm_relax() are balanced
Date: Fri, 23 Aug 2024 22:50:31 -0700 [thread overview]
Message-ID: <20240824055047.1706392-8-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20240824055047.1706392-1-dmitry.torokhov@gmail.com>
There is a small chance that ts->suspending flag may change while the
interrupt handler is running. To make sure call to pm_relax() is not
skipped on accident use a temporary to hold the original value at the
beginning of interrupt. Use READ_ONCE() so that the value is actually
fetched at the right time.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/touchscreen/zforce_ts.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index afeafa589928..004ef728fb90 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -454,6 +454,7 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
int ret;
u8 payload_buffer[FRAME_MAXSIZE];
u8 *payload;
+ bool suspending;
/*
* When still suspended, return.
@@ -467,7 +468,8 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
dev_dbg(&client->dev, "handling interrupt\n");
/* Don't emit wakeup events from commands run by zforce_suspend */
- if (!ts->suspending && device_may_wakeup(&client->dev))
+ suspending = READ_ONCE(ts->suspending);
+ if (!suspending && device_may_wakeup(&client->dev))
pm_stay_awake(&client->dev);
/*
@@ -495,7 +497,7 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
* Always report touch-events received while
* suspending, when being a wakeup source
*/
- if (ts->suspending && device_may_wakeup(&client->dev))
+ if (suspending && device_may_wakeup(&client->dev))
pm_wakeup_event(&client->dev, 500);
zforce_touch_event(ts, &payload[RESPONSE_DATA]);
break;
@@ -548,7 +550,7 @@ static irqreturn_t zforce_irq_thread(int irq, void *dev_id)
}
} while (gpiod_get_value_cansleep(ts->gpio_int));
- if (!ts->suspending && device_may_wakeup(&client->dev))
+ if (!suspending && device_may_wakeup(&client->dev))
pm_relax(&client->dev);
dev_dbg(&client->dev, "finished interrupt\n");
@@ -584,7 +586,9 @@ static int zforce_suspend(struct device *dev)
int ret = 0;
mutex_lock(&input->mutex);
- ts->suspending = true;
+
+ WRITE_ONCE(ts->suspending, true);
+ smp_mb();
/*
* When configured as a wakeup source device should always wake
@@ -615,7 +619,9 @@ static int zforce_suspend(struct device *dev)
ts->suspended = true;
unlock:
- ts->suspending = false;
+ smp_mb();
+ WRITE_ONCE(ts->suspending, false);
+
mutex_unlock(&input->mutex);
return ret;
--
2.46.0.295.g3b9ea8a38a-goog
next prev parent reply other threads:[~2024-08-24 5:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-24 5:50 [PATCH 00/18] zforse_ts: assorted cleanups Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 01/18] Input: zforce_ts - use devm_add_action_or_reset() Dmitry Torokhov
2024-08-24 11:13 ` Heiko Stübner
2024-08-29 17:54 ` Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 02/18] Input: zforce_ts - simplify reporting of slot state Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 03/18] Input: zforce_ts - remove support for platfrom data Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 04/18] Input: zforce_ts - do not explicitly set EV_SYN, etc bits Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 05/18] Input: zforce_ts - handle errors from input_mt_init_sots() Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 06/18] Input: zforce_ts - remove unneeded locking Dmitry Torokhov
2024-08-24 5:50 ` Dmitry Torokhov [this message]
2024-08-24 5:50 ` [PATCH 08/18] Input: zforce_ts - use guard notation when acquiring mutexes Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 09/18] Input: zforce_ts - switch to using get_unaligned_le16 Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 10/18] Input: zforce_ts - make parsing of contacts less confusing Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 11/18] Input: zforce_ts - do not ignore errors when acquiring regulator Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 12/18] Input: zforce_ts - use dev_err_probe() where appropriate Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 13/18] Input: zforce_ts - make zforce_idtable constant Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 14/18] Input: zforce_ts - stop treating VDD regulator as optional Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 15/18] Input: zforce_ts - switch to using devm_regulator_get_enable() Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 16/18] Input: zforce_ts - do not hardcode interrupt level Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 17/18] Input: zforce_ts - remove assert/deassert wrappers Dmitry Torokhov
2024-08-24 5:50 ` [PATCH 18/18] Input: zforce_ts - switch to using asynchronous probing Dmitry Torokhov
2024-09-02 8:08 ` [PATCH 00/18] zforse_ts: assorted cleanups Andreas Kemnade
2024-09-06 5:49 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240824055047.1706392-8-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=andreas@kemnade.info \
--cc=heiko@sntech.de \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).