From: Jiada Wang <jiada_wang@mentor.com>
To: <jikos@kernel.org>, <benjamin.tissoires@redhat.com>,
<rydberg@bitmath.org>, <dmitry.torokhov@gmail.com>,
<nick@shmanahar.org>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jiada_wang@mentor.com>, <erosca@de.adit-jv.com>,
<Andrew_Gabbasov@mentor.com>
Subject: [PATCH v5 25/48] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators
Date: Wed, 6 Nov 2019 16:01:23 +0900 [thread overview]
Message-ID: <20191106070146.18759-26-jiada_wang@mentor.com> (raw)
In-Reply-To: <20191106070146.18759-1-jiada_wang@mentor.com>
From: Nick Dyer <nick.dyer@itdev.co.uk>
The path of enabling the IRQ in the probe function is not safe in level
triggered operation, if it was already powered up and there is a message
waiting on the device (eg finger down) because the object table has not yet
been read. This forces the ISR into a hard loop.
Delay enabling the interrupt until it is first needed.
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
(cherry picked from ndyer/linux/for-upstream commit 64c9dadc4a3250a185baf06ab0f628be45d5d9a0)
[gdavis: Resolve forward port conflicts due to v4.14-rc1 commit
8cc8446b9b62 ("Input: atmel_mxt_ts - use more managed
resources") and applying upstream commit 96a938aa214e ("Input:
atmel_mxt_ts - remove platform data support").]
Signed-off-by: George G. Davis <george_davis@mentor.com>
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 40 +++++++++++++++---------
1 file changed, 26 insertions(+), 14 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 842d407efc86..f5d67e43a786 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1451,9 +1451,24 @@ static int mxt_acquire_irq(struct mxt_data *data)
{
int error;
- enable_irq(data->irq);
+ if (!data->irq) {
+ error = devm_request_threaded_irq(&data->client->dev,
+ data->client->irq,
+ NULL, mxt_interrupt,
+ IRQF_ONESHOT,
+ data->client->name, data);
+ if (error) {
+ dev_err(&data->client->dev, "Error requesting irq\n");
+ return error;
+ }
+
+ /* Presence of data->irq means IRQ initialised */
+ data->irq = data->client->irq;
+ } else {
+ enable_irq(data->irq);
+ }
- if (data->use_retrigen_workaround) {
+ if (data->object_table && data->use_retrigen_workaround) {
error = mxt_process_messages_until_invalid(data);
if (error)
return error;
@@ -3373,7 +3388,9 @@ static int mxt_load_fw(struct device *dev)
goto release_firmware;
}
- enable_irq(data->irq);
+ ret = mxt_acquire_irq(data);
+ if (ret)
+ goto release_firmware;
/* Poll after 0.1s if no interrupt received */
schedule_delayed_work(&data->flash->work, msecs_to_jiffies(100));
@@ -3800,7 +3817,6 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
client->adapter->nr, client->addr);
data->client = client;
- data->irq = client->irq;
i2c_set_clientdata(client, data);
init_completion(&data->chg_completion);
@@ -3828,26 +3844,22 @@ static int mxt_probe(struct i2c_client *client, const struct i2c_device_id *id)
return error;
}
- error = devm_request_threaded_irq(&client->dev, client->irq,
- NULL, mxt_interrupt, IRQF_ONESHOT,
- client->name, data);
- if (error) {
- dev_err(&client->dev, "Failed to register interrupt\n");
- return error;
- }
-
if (data->suspend_mode == MXT_SUSPEND_REGULATOR) {
+ error = mxt_acquire_irq(data);
+ if (error)
+ return error;
+
error = mxt_probe_regulators(data);
if (error)
return error;
+
+ disable_irq(data->irq);
} else if (data->reset_gpio) {
msleep(MXT_RESET_GPIO_TIME);
gpiod_set_value(data->reset_gpio, 1);
msleep(MXT_RESET_INVALID_CHG);
}
- disable_irq(data->irq);
-
error = mxt_initialize(data);
if (error)
return error;
--
2.17.1
next prev parent reply other threads:[~2019-11-06 7:04 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 7:00 [PATCH v5 00/48] atmel_mxt_ts misc Jiada Wang
2019-11-06 7:00 ` [PATCH v5 01/48] Input: introduce input_mt_report_slot_inactive Jiada Wang
2019-11-06 21:11 ` Henrik Rydberg
[not found] ` <20191114094424.GF6910@shao2-debian>
2019-11-15 19:29 ` [Input] 9290ec3cea: suspend_stress.fail Dmitry Torokhov
2019-11-06 7:01 ` [PATCH v5 02/48] Input: atmel_mxt_ts - rework sysfs init/remove Jiada Wang
2019-11-06 7:01 ` [PATCH v5 03/48] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary Jiada Wang
2019-11-06 7:01 ` [PATCH v5 04/48] Input: atmel_mxt_ts - split large i2c transfers into blocks Jiada Wang
2019-11-06 7:01 ` [PATCH v5 05/48] Input: atmel_mxt_ts - output status from T48 Noise Supression Jiada Wang
2019-11-06 7:01 ` [PATCH v5 06/48] Input: atmel_mxt_ts - output status from T42 Touch Suppression Jiada Wang
2019-11-06 7:01 ` [PATCH v5 07/48] Input: atmel_mxt_ts - implement T9 vector/orientation support Jiada Wang
2019-11-06 7:01 ` [PATCH v5 08/48] Input: atmel_mxt_ts - implement T15 Key Array support Jiada Wang
2019-11-06 7:01 ` [PATCH v5 09/48] Input: atmel_mxt_ts - handle reports from T47 Stylus object Jiada Wang
2019-11-06 7:01 ` [PATCH v5 10/48] Input: atmel_mxt_ts - implement support for T107 active stylus Jiada Wang
2019-11-06 7:01 ` [PATCH v5 11/48] Input: atmel_mxt_ts - add debug for T92 gesture and T93 touch seq msgs Jiada Wang
2019-11-06 7:01 ` [PATCH v5 12/48] Input: atmel_mxt_ts - release touch state during suspend Jiada Wang
2019-11-06 7:01 ` [PATCH v5 13/48] Input: atmel_mxt_ts - add regulator control support Jiada Wang
2019-11-06 7:01 ` [PATCH v5 14/48] Input: atmel_mxt_ts - report failures in suspend/resume Jiada Wang
2019-11-06 7:01 ` [PATCH v5 15/48] Input: atmel_mxt_ts - allow specification of firmware file name Jiada Wang
2019-11-06 7:01 ` [PATCH v5 16/48] Input: atmel_mxt_ts - handle cfg filename via pdata/sysfs Jiada Wang
2019-11-06 7:01 ` [PATCH v5 17/48] Input: atmel_mxt_ts - allow input name to be specified in platform data Jiada Wang
2019-11-06 7:01 ` [PATCH v5 18/48] Input: atmel_mxt_ts - add config checksum attribute to sysfs Jiada Wang
2019-11-06 7:01 ` [PATCH v5 19/48] Input: atmel_mxt_ts - refactor firmware flash to extract context into struct Jiada Wang
2019-11-06 7:01 ` [PATCH v5 20/48] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Jiada Wang
2019-11-06 7:01 ` [PATCH v5 21/48] Input: atmel_mxt_ts - combine bootloader version query with probe Jiada Wang
2019-11-06 7:01 ` [PATCH v5 22/48] Input: atmel_mxt_ts - improve bootloader state machine handling Jiada Wang
2019-11-06 7:01 ` [PATCH v5 23/48] Input: atmel_mxt_ts - rename bl_completion to chg_completion Jiada Wang
2019-11-06 7:01 ` [PATCH v5 24/48] Input: atmel_mxt_ts - make bootloader interrupt driven Jiada Wang
2019-11-06 7:01 ` Jiada Wang [this message]
2019-11-06 7:01 ` [PATCH v5 26/48] Input: atmel_mxt_ts - implement I2C retries Jiada Wang
2019-11-06 7:01 ` [PATCH v5 27/48] Input: atmel_mxt_ts - orientation is not present in hover Jiada Wang
2019-11-06 7:01 ` [PATCH v5 28/48] Input: atmel_mxt_ts - implement debug output for messages Jiada Wang
2019-11-06 7:01 ` [PATCH v5 29/48] Input: atmel_mxt_ts - implement improved debug message interface Jiada Wang
2019-11-06 7:01 ` [PATCH v5 30/48] Input: atmel_mxt_ts - eliminate data->raw_info_block Jiada Wang
2019-11-06 7:01 ` [PATCH v5 31/48] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Jiada Wang
2019-11-06 7:01 ` [PATCH v5 32/48] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc Jiada Wang
2019-11-06 7:01 ` [PATCH v5 33/48] input: atmel_mxt_ts: export GPIO reset line via sysfs Jiada Wang
2019-11-06 7:01 ` [PATCH v5 34/48] input: atmel_mxt_ts: Add Missing Delay for reset handling of Atmel touch panel controller in detachable displays Jiada Wang
2019-11-06 7:01 ` [PATCH v5 35/48] Input: atmel_mxt_ts: Add support for run self-test routine Jiada Wang
2019-11-06 7:01 ` [PATCH v5 36/48] Input: atmel_mxt_ts: Limit the max bytes transferred in an i2c transaction Jiada Wang
2019-11-06 7:01 ` [PATCH v5 37/48] Input: atmel_mxt_ts: return error from mxt_process_messages_until_invalid() Jiada Wang
2019-11-06 7:01 ` [PATCH v5 38/48] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2019-11-06 7:01 ` [PATCH v5 39/48] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2019-11-06 7:01 ` [PATCH v5 40/48] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2019-11-06 7:01 ` [PATCH v5 41/48] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2019-11-06 7:01 ` [PATCH v5 42/48] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
2019-11-06 7:01 ` [PATCH v5 43/48] Input: Atmel: use T44 object to process " Jiada Wang
2019-11-06 7:01 ` [PATCH v5 44/48] Input: atmel_mxt_ts: use gpiod_set_value_cansleep for reset pin Jiada Wang
2019-11-06 7:01 ` [PATCH v5 45/48] input: touchscreen: atmel_mxt_ts: Added sysfs entry for touchscreen status Jiada Wang
2019-11-06 7:01 ` [PATCH v5 46/48] input: atmel_mxt_ts: added sysfs interface to update atmel T38 data Jiada Wang
2019-11-06 7:01 ` [PATCH v5 47/48] Input: atmel_mxt_ts: Implement synchronization during various operation Jiada Wang
2019-11-06 7:01 ` [PATCH v5 48/48] Input: atmel_mxt_ts - Fix compilation warning Jiada Wang
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=20191106070146.18759-26-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=Andrew_Gabbasov@mentor.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=erosca@de.adit-jv.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick@shmanahar.org \
--cc=rydberg@bitmath.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).