From: Jiada Wang <jiada_wang@mentor.com>
To: <nick@shmanahar.org>, <dmitry.torokhov@gmail.com>,
<jikos@kernel.org>, <benjamin.tissoires@redhat.com>,
<bsz@semihalf.com>, <rydberg@bitmath.org>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<erosca@de.adit-jv.com>, <Andrew_Gabbasov@mentor.com>,
<jiada_wang@mentor.com>
Subject: [PATCH v9 30/55] Input: atmel_mxt_ts - make bootloader interrupt driven
Date: Wed, 25 Mar 2020 06:33:09 -0700 [thread overview]
Message-ID: <20200325133334.19346-31-jiada_wang@mentor.com> (raw)
In-Reply-To: <20200325133334.19346-1-jiada_wang@mentor.com>
From: Nick Dyer <nick.dyer@itdev.co.uk>
Make bootloader interrupt driven
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
(cherry picked from ndyer/linux/for-upstream commit 67a3eea0cfc724c3c2a7410ac064f74227c7c6ef)
[gdavis: Resolve forward port conflicts due to applying upstream
commit 96a938aa214e ("Input: atmel_mxt_ts - remove platform
data support").]
Signed-off-by: George G. Davis <george_davis@mentor.com>
[jiada: Replace two use msecs_to_jiffies() instead of HZ,
remove check of &data->flash->work
don't poll to call mxt_check_bootloader() in mxt_check_bootloader()]
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
drivers/input/touchscreen/atmel_mxt_ts.c | 127 ++++++++++-------------
1 file changed, 57 insertions(+), 70 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index ed142b24d12d..62f11afb26ae 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -27,6 +27,7 @@
#include <linux/gpio/consumer.h>
#include <asm/unaligned.h>
#include <linux/regulator/consumer.h>
+#include <linux/workqueue.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include <media/videobuf2-v4l2.h>
@@ -218,6 +219,7 @@ enum t100_type {
#define MXT_REGULATOR_DELAY 150 /* msec */
#define MXT_CHG_DELAY 100 /* msec */
#define MXT_POWERON_DELAY 150 /* msec */
+#define MXT_BOOTLOADER_WAIT 36E5 /* 1 minute */
/* Command to unlock bootloader */
#define MXT_UNLOCK_CMD_MSB 0xaa
@@ -299,6 +301,7 @@ struct mxt_fw_frame {
/* Firmware update context */
struct mxt_flash {
+ struct mxt_data *data;
const struct firmware *fw;
struct mxt_fw_frame *frame;
loff_t pos;
@@ -306,8 +309,8 @@ struct mxt_flash {
unsigned int count;
unsigned int retry;
u8 previous;
- bool complete;
- bool wait;
+ struct completion flash_completion;
+ struct delayed_work work;
};
/* Each client has this additional data */
@@ -356,6 +359,7 @@ struct mxt_data {
char *cfg_name;
const char *pcfg_name;
const char *input_name;
+ struct mxt_flash *flash;
/* Cached parameters from object table */
u16 T5_address;
@@ -600,35 +604,19 @@ static int mxt_write_firmware_frame(struct mxt_data *data, struct mxt_flash *f)
f->frame_size);
}
-static int mxt_check_bootloader(struct mxt_data *data, struct mxt_flash *f)
+static int mxt_check_bootloader(struct mxt_data *data)
{
struct device *dev = &data->client->dev;
+ struct mxt_flash *f = data->flash;
u8 state;
int ret;
- if (f->wait) {
- /*
- * In application update mode, the interrupt
- * line signals state transitions. We must wait for the
- * CHG assertion before reading the status byte.
- * Once the status byte has been read, the line is deasserted.
- */
- ret = mxt_wait_for_completion(data, &data->chg_completion,
- MXT_FW_CHG_TIMEOUT);
- if (ret) {
- /*
- * TODO: handle -ERESTARTSYS better by terminating
- * fw update process before returning to userspace
- * by writing length 0x000 to device (iff we are in
- * WAITING_FRAME_DATA state).
- */
- dev_warn(dev, "Update wait error %d\n", ret);
- return ret;
- }
+ /* Handle interrupt after download/flash process */
+ if (f->pos >= f->fw->size) {
+ complete(&f->flash_completion);
+ return 0;
}
- f->wait = false;
-
ret = mxt_bootloader_read(data, &state, 1);
if (ret)
return ret;
@@ -643,7 +631,6 @@ static int mxt_check_bootloader(struct mxt_data *data, struct mxt_flash *f)
ret = mxt_send_bootloader_cmd(data, true);
if (ret)
return ret;
- f->wait = true;
break;
@@ -657,14 +644,11 @@ static int mxt_check_bootloader(struct mxt_data *data, struct mxt_flash *f)
if (ret)
return ret;
- f->wait = true;
-
break;
case MXT_FRAME_CRC_CHECK:
if (f->previous != MXT_WAITING_FRAME_DATA)
goto unexpected;
- f->wait = true;
break;
case MXT_FRAME_CRC_PASS:
@@ -675,16 +659,13 @@ static int mxt_check_bootloader(struct mxt_data *data, struct mxt_flash *f)
f->retry = 0;
f->pos += f->frame_size;
f->count++;
- f->wait = true;
- if (f->pos >= f->fw->size) {
- f->complete = true;
+ if (f->pos >= f->fw->size)
dev_info(dev, "Sent %u frames, %zu bytes\n",
f->count, f->fw->size);
- } else if (f->count % 50 == 0) {
+ else if (f->count % 50 == 0)
dev_dbg(dev, "Sent %u frames, %lld/%zu bytes\n",
f->count, f->pos, f->fw->size);
- }
break;
@@ -697,7 +678,6 @@ static int mxt_check_bootloader(struct mxt_data *data, struct mxt_flash *f)
/* Back off by 20ms per retry */
dev_dbg(dev, "Bootloader frame CRC failure\n");
f->retry++;
- f->wait = true;
msleep(f->retry * 20);
break;
@@ -1415,7 +1395,11 @@ static irqreturn_t mxt_interrupt(int irq, void *dev_id)
if (data->in_bootloader) {
complete(&data->chg_completion);
- return IRQ_HANDLED;
+
+ if (data->flash)
+ cancel_delayed_work_sync(&data->flash->work);
+
+ return IRQ_RETVAL(mxt_check_bootloader(data));
}
if (!data->object_table)
@@ -3316,16 +3300,13 @@ static int mxt_enter_bootloader(struct mxt_data *data)
if (data->suspend_mode == MXT_SUSPEND_REGULATOR)
mxt_regulator_enable(data);
- if (data->suspend_mode == MXT_SUSPEND_DEEP_SLEEP)
- enable_irq(data->irq);
-
data->suspended = false;
}
if (!data->in_bootloader) {
- /* Change to the bootloader mode */
- data->in_bootloader = true;
+ disable_irq(data->irq);
+ /* Change to the bootloader mode */
ret = mxt_t6_command(data, MXT_COMMAND_RESET,
MXT_BOOT_VALUE, false);
if (ret)
@@ -3338,67 +3319,73 @@ static int mxt_enter_bootloader(struct mxt_data *data)
if (ret)
return ret;
+ data->in_bootloader = true;
mxt_sysfs_remove(data);
mxt_free_input_device(data);
mxt_free_object_table(data);
- } else {
- enable_irq(data->irq);
}
- reinit_completion(&data->chg_completion);
+ dev_dbg(&data->client->dev, "Entered bootloader\n");
return 0;
}
+static void mxt_fw_work(struct work_struct *work)
+{
+ struct mxt_flash *f =
+ container_of(work, struct mxt_flash, work.work);
+
+ mxt_check_bootloader(f->data);
+}
+
static int mxt_load_fw(struct device *dev)
{
struct mxt_data *data = dev_get_drvdata(dev);
- struct mxt_flash f = { 0, };
int ret;
- ret = request_firmware(&f.fw, data->fw_name, dev);
+ data->flash = devm_kzalloc(dev, sizeof(struct mxt_flash), GFP_KERNEL);
+ if (!data->flash)
+ return -ENOMEM;
+
+ data->flash->data = data;
+
+ ret = request_firmware(&data->flash->fw, data->fw_name, dev);
if (ret) {
dev_err(dev, "Unable to open firmware %s\n", data->fw_name);
- return ret;
+ goto free;
}
/* Check for incorrect enc file */
- ret = mxt_check_firmware_format(dev, f.fw);
+ ret = mxt_check_firmware_format(dev, data->flash->fw);
if (ret)
goto release_firmware;
- ret = mxt_enter_bootloader(data);
- if (ret)
- goto release_firmware;
+ init_completion(&data->flash->flash_completion);
+ INIT_DELAYED_WORK(&data->flash->work, mxt_fw_work);
+ reinit_completion(&data->flash->flash_completion);
- while (true) {
- ret = mxt_check_bootloader(data, &f);
+ if (!data->in_bootloader) {
+ ret = mxt_enter_bootloader(data);
if (ret)
- return ret;
-
- if (f.complete)
- break;
+ goto release_firmware;
}
- /* Wait for flash. */
- ret = mxt_wait_for_completion(data, &data->chg_completion,
- MXT_FW_RESET_TIME);
- if (ret)
- goto disable_irq;
+ enable_irq(data->irq);
+ /* Poll after 0.1s if no interrupt received */
+ schedule_delayed_work(&data->flash->work, msecs_to_jiffies(100));
- /*
- * Wait for device to reset. Some bootloader versions do not assert
- * the CHG line after bootloading has finished, so ignore potential
- * errors.
- */
- mxt_wait_for_completion(data, &data->chg_completion, MXT_FW_RESET_TIME);
+ /* Wait for flash. */
+ ret = mxt_wait_for_completion(data, &data->flash->flash_completion,
+ MXT_BOOTLOADER_WAIT);
- data->in_bootloader = false;
-disable_irq:
disable_irq(data->irq);
+ cancel_delayed_work_sync(&data->flash->work);
+ data->in_bootloader = false;
release_firmware:
- release_firmware(f.fw);
+ release_firmware(data->flash->fw);
+free:
+ devm_kfree(dev, data->flash);
return ret;
}
--
2.17.1
next prev parent reply other threads:[~2020-03-25 13:35 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 13:32 [PATCH v9 00/55] atmel_mxt_ts misc Jiada Wang
2020-03-25 13:32 ` [PATCH v9 01/55] Input: introduce input_mt_report_slot_inactive Jiada Wang
2020-03-25 13:32 ` [PATCH v9 02/55] Input: atmel_mxt_ts - rework sysfs init/remove Jiada Wang
2020-03-25 13:32 ` [PATCH v9 03/55] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary Jiada Wang
2020-03-25 13:32 ` [PATCH v9 04/55] Input: atmel_mxt_ts - split large i2c transfers into blocks Jiada Wang
2020-03-25 13:32 ` [PATCH v9 05/55] Input: atmel_mxt_ts - output status from T48 Noise Supression Jiada Wang
2020-03-25 13:32 ` [PATCH v9 06/55] Input: atmel_mxt_ts - output status from T42 Touch Suppression Jiada Wang
2020-03-25 13:32 ` [PATCH v9 07/55] Input: atmel_mxt_ts - implement T9 vector/orientation support Jiada Wang
2020-03-25 13:32 ` [PATCH v9 08/55] Input: atmel_mxt_ts - implement T15 Key Array support Jiada Wang
2020-03-25 13:32 ` [PATCH v9 09/55] Input: atmel_mxt_ts - handle reports from T47 Stylus object Jiada Wang
2020-03-25 13:32 ` [PATCH v9 10/55] Input: atmel_mxt_ts - implement support for T107 active stylus Jiada Wang
2020-03-25 13:32 ` [PATCH v9 11/55] Input: atmel_mxt_ts - add debug for T92 gesture and T93 touch seq msgs Jiada Wang
2020-03-25 13:32 ` [PATCH v9 12/55] Input: atmel_mxt_ts - release touch state during suspend Jiada Wang
2020-03-25 13:32 ` [PATCH v9 13/55] Input: atmel_mxt_ts - add regulator control support Jiada Wang
2020-03-25 19:05 ` Dmitry Osipenko
2020-03-27 11:09 ` Wang, Jiada
2020-03-29 18:54 ` Dmitry Osipenko
2020-03-30 4:10 ` Wang, Jiada
2020-03-25 13:32 ` [PATCH v9 14/55] dt-bindings: input: atmel: add suspend mode support Jiada Wang
2020-03-25 13:32 ` [PATCH v9 15/55] Input: atmel_mxt_ts - report failures in suspend/resume Jiada Wang
2020-03-25 13:32 ` [PATCH v9 16/55] Input: atmel_mxt_ts - allow specification of firmware file name Jiada Wang
2020-03-25 13:32 ` [PATCH v9 17/55] Input: atmel_mxt_ts: Rename mxt_fw_version_show to fw_version_show Jiada Wang
2020-03-25 13:32 ` [PATCH v9 18/55] Input: atmel_mxt_ts: Rename mxt_hw_version_show to hw_version_show Jiada Wang
2020-03-25 13:32 ` [PATCH v9 19/55] Input: atmel_mxt_ts: rename mxt_update_fw_store to update_fw_store Jiada Wang
2020-03-25 13:32 ` [PATCH v9 20/55] Input: atmel_mxt_ts - handle cfg filename via pdata/sysfs Jiada Wang
2020-03-25 13:33 ` [PATCH v9 21/55] dt-bindings: input: atmel: provide name of configuration file Jiada Wang
2020-03-25 13:33 ` [PATCH v9 22/55] Input: atmel_mxt_ts - allow input name to be specified in platform data Jiada Wang
2020-03-25 13:33 ` [PATCH v9 23/55] dt-bindings: input: atmel: support to specify input name Jiada Wang
2020-03-25 13:33 ` [PATCH v9 24/55] Input: atmel_mxt_ts - add config checksum attribute to sysfs Jiada Wang
2020-03-25 13:33 ` [PATCH v9 25/55] Input: atmel_mxt_ts - refactor firmware flash to extract context into struct Jiada Wang
2020-03-25 13:33 ` [PATCH v9 26/55] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Jiada Wang
2020-03-25 13:33 ` [PATCH v9 27/55] Input: atmel_mxt_ts - combine bootloader version query with probe Jiada Wang
2020-03-25 13:33 ` [PATCH v9 28/55] Input: atmel_mxt_ts - improve bootloader state machine handling Jiada Wang
2020-03-25 13:33 ` [PATCH v9 29/55] Input: atmel_mxt_ts - rename bl_completion to chg_completion Jiada Wang
2020-03-25 13:33 ` Jiada Wang [this message]
2020-03-25 13:33 ` [PATCH v9 31/55] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators Jiada Wang
2020-03-25 13:33 ` [PATCH v9 32/55] Input: atmel_mxt_ts - implement I2C retries Jiada Wang
2020-03-25 13:33 ` [PATCH v9 33/55] Input: atmel_mxt_ts - orientation is not present in hover Jiada Wang
2020-03-25 13:33 ` [PATCH v9 34/55] Input: atmel_mxt_ts - implement debug output for messages Jiada Wang
2020-03-25 13:33 ` [PATCH v9 35/55] Input: atmel_mxt_ts - implement improved debug message interface Jiada Wang
2020-03-25 13:33 ` [PATCH v9 36/55] Input: atmel_mxt_ts - eliminate data->raw_info_block Jiada Wang
2020-03-25 13:33 ` [PATCH v9 37/55] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Jiada Wang
2020-03-25 13:33 ` [PATCH v9 38/55] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc Jiada Wang
2020-03-25 13:33 ` [PATCH v9 39/55] input: atmel_mxt_ts: export GPIO reset line via sysfs Jiada Wang
2020-03-25 13:33 ` [PATCH v9 40/55] input: atmel_mxt_ts: Add Missing Delay for reset handling of Atmel touch panel controller in detachable displays Jiada Wang
2020-03-25 13:33 ` [PATCH v9 41/55] Input: atmel_mxt_ts: Add support for run self-test routine Jiada Wang
2020-03-25 13:33 ` [PATCH v9 42/55] Input: atmel_mxt_ts: Limit the max bytes transferred in an i2c transaction Jiada Wang
2020-03-25 13:33 ` [PATCH v9 43/55] dt-bindings: input: atmel: support to set max bytes transferred Jiada Wang
2020-03-25 13:33 ` [PATCH v9 44/55] Input: atmel_mxt_ts: return error from mxt_process_messages_until_invalid() Jiada Wang
2020-03-25 13:33 ` [PATCH v9 45/55] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2020-03-25 13:33 ` [PATCH v9 46/55] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2020-03-25 13:33 ` [PATCH v9 47/55] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2020-03-25 13:33 ` [PATCH v9 48/55] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2020-03-25 13:33 ` [PATCH v9 49/55] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
2020-03-25 13:33 ` [PATCH v9 50/55] Input: Atmel: use T44 object to process " Jiada Wang
2020-03-25 13:33 ` [PATCH v9 51/55] Input: atmel_mxt_ts: use gpiod_set_value_cansleep for reset pin Jiada Wang
2020-03-25 13:33 ` [PATCH v9 52/55] input: touchscreen: atmel_mxt_ts: Added sysfs entry for touchscreen status Jiada Wang
2020-03-25 19:35 ` Dmitry Osipenko
2020-03-25 19:41 ` Dmitry Osipenko
2020-03-27 12:49 ` Wang, Jiada
2020-03-27 13:37 ` Dmitry Osipenko
2020-03-27 13:43 ` Dmitry Osipenko
2020-03-25 13:33 ` [PATCH v9 53/55] input: atmel_mxt_ts: added sysfs interface to update atmel T38 data Jiada Wang
2020-03-25 13:33 ` [PATCH v9 54/55] Input: atmel_mxt_ts: Implement synchronization during various operation Jiada Wang
2020-03-25 13:33 ` [PATCH v9 55/55] 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=20200325133334.19346-31-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=Andrew_Gabbasov@mentor.com \
--cc=benjamin.tissoires@redhat.com \
--cc=bsz@semihalf.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).