From patchwork Tue Aug 27 06:29:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11116165 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 946DA13B1 for ; Tue, 27 Aug 2019 06:29:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7D0DE20828 for ; Tue, 27 Aug 2019 06:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725825AbfH0G3h (ORCPT ); Tue, 27 Aug 2019 02:29:37 -0400 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:47201 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725811AbfH0G3g (ORCPT ); Tue, 27 Aug 2019 02:29:36 -0400 IronPort-SDR: 9A+AjCKfagAVucyq6KgxEi+hsm2TUI6BMRFX+ur8b3BB58uAfQT+wfPJawMRh8/OYh6S2rg95K zFPOkuxp+DUfwo9uoEOibg1Jk+FuetNE3CprG+EDrAVL8D+sgtDPju4FSxfaTiCzBzrxWI/o9o iypJC4mbPpC1CnO41lY20gUBU13qrtOKevKnB16EK1VyE1ZnuYFTcMhDgF2rmpx0oUu8CkH281 yTn2lN/rpq4RYd90vLzLYextgvaIJdYVE09VC4jXoZ/APnODBRypORqMcnrCg8401AdiFe3SbY Elk= X-IronPort-AV: E=Sophos;i="5.64,436,1559548800"; d="scan'208";a="40754977" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 26 Aug 2019 22:29:35 -0800 IronPort-SDR: u94K6cX4661u8L/i4XD47u4KIAnhy2Y+wxREjQ0Rs0jGs9EfZwKmN1HR0tG7MfjGAa2TuUtesQ s+l+q8UNhRMmY/mpVaKH4Q3H+6jS0avbV4RCcsR/bJGCVvwgGiIxpoc6erdp7D4Q5vBB3aGNUW WqY25Y+BkudeVcuE5wNfDVTjRWHQvrjqrkWW/zi0DhyESgZtlsF5+rqY1cbJwYFBZ8lGDnuj5e oMHcDblm+wZU6qySsErYM7wjrAoZVqhUO0W0bM06moaHw5rYvfZ4rCrQN0ZICaAtitipEbjkLp JhQ= From: Jiada Wang To: , CC: , , , Subject: [PATCH v2 26/49] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators Date: Tue, 27 Aug 2019 15:29:20 +0900 Message-ID: <20190827062943.20698-2-jiada_wang@mentor.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190827062943.20698-1-jiada_wang@mentor.com> References: <20190827062943.20698-1-jiada_wang@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) To svr-orw-mbx-03.mgc.mentorg.com (147.34.90.203) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Nick Dyer 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 (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 Signed-off-by: Jiada Wang --- 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 cfc84f3b5a9e..daf119c2957d 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)); @@ -3801,7 +3818,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); @@ -3829,26 +3845,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;