* [PATCH v3 39/49] Input: Atmel: improve error handling in mxt_start()
@ 2019-09-17 9:42 Jiada Wang
2019-09-17 9:42 ` [PATCH v3 40/49] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jiada Wang @ 2019-09-17 9:42 UTC (permalink / raw)
To: nick, dmitry.torokhov, jikos, benjamin.tissoires, rydberg
Cc: linux-input, linux-kernel, jiada_wang
From: Deepak Das <deepak_das@mentor.com>
mxt_start() does not return error in any of
the failure cases which will allow input_dev->open()
to return success even in case of any failure.
This commit modifies mxt_start() to return error
in failure cases.
Signed-off-by: Deepak Das <deepak_das@mentor.com>
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 | 31 ++++++++++++------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index f2fa62289577..2fac43da0a2b 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3974,12 +3974,13 @@ static int mxt_start(struct mxt_data *data)
switch (data->suspend_mode) {
case MXT_SUSPEND_T9_CTRL:
- mxt_soft_reset(data);
-
+ ret = mxt_soft_reset(data);
+ if (ret)
+ break;
/* Touch enable */
/* 0x83 = SCANEN | RPTEN | ENABLE */
- mxt_write_object(data,
- MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0x83);
+ ret = mxt_write_object(data,
+ MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0x83);
break;
case MXT_SUSPEND_REGULATOR:
@@ -3993,27 +3994,26 @@ static int mxt_start(struct mxt_data *data)
* Discard any touch messages still in message buffer
* from before chip went to sleep
*/
- mxt_process_messages_until_invalid(data);
+ ret = mxt_process_messages_until_invalid(data);
+ if (ret)
+ break;
ret = mxt_set_t7_power_cfg(data, MXT_POWER_CFG_RUN);
if (ret)
- return ret;
+ break;
/* Recalibrate since chip has been in deep sleep */
ret = mxt_t6_command(data, MXT_COMMAND_CALIBRATE, 1, false);
if (ret)
- return ret;
+ break;
ret = mxt_acquire_irq(data);
- if (ret)
- return ret;
-
- break;
}
- data->suspended = false;
+ if (!ret)
+ data->suspended = false;
- return 0;
+ return ret;
}
static int mxt_stop(struct mxt_data *data)
@@ -4334,6 +4334,7 @@ static int __maybe_unused mxt_resume(struct device *dev)
struct i2c_client *client = to_i2c_client(dev);
struct mxt_data *data = i2c_get_clientdata(client);
struct input_dev *input_dev = data->input_dev;
+ int ret = 0;
if (!input_dev)
return 0;
@@ -4341,11 +4342,11 @@ static int __maybe_unused mxt_resume(struct device *dev)
mutex_lock(&input_dev->mutex);
if (input_dev->users)
- mxt_start(data);
+ ret = mxt_start(data);
mutex_unlock(&input_dev->mutex);
- return 0;
+ return ret;
}
static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
--
2.19.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 40/49] Input: Atmel: improve error handling in mxt_initialize()
2019-09-17 9:42 [PATCH v3 39/49] Input: Atmel: improve error handling in mxt_start() Jiada Wang
@ 2019-09-17 9:42 ` Jiada Wang
2019-09-17 9:42 ` [PATCH v3 41/49] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jiada Wang @ 2019-09-17 9:42 UTC (permalink / raw)
To: nick, dmitry.torokhov, jikos, benjamin.tissoires, rydberg
Cc: linux-input, linux-kernel, jiada_wang
From: Deepak Das <deepak_das@mentor.com>
Currently mxt_initialize() tries to probe bootloader mode
even if valid bootloader address is not specified.
This commit modifies mxt_initialize() to return error
if Device is not in appmode and bootloader address is
not specified.
This commit also returns error code from mxt_send_bootloader_cmd()
in mxt_initialize().
Signed-off-by: Deepak Das <deepak_das@mentor.com>
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 | 58 +++++++++++++++++-------
1 file changed, 41 insertions(+), 17 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 2fac43da0a2b..b260ac155b5e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -716,17 +716,13 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data, bool retry)
return 0;
}
-static int mxt_probe_bootloader(struct mxt_data *data, bool alt_address)
+static int mxt_probe_bootloader(struct mxt_data *data)
{
struct device *dev = &data->client->dev;
int error;
u8 buf[3];
bool crc_failure, extended_id;
- error = mxt_lookup_bootloader_address(data, alt_address);
- if (error)
- return error;
-
/* Check bootloader status and version information */
error = mxt_bootloader_read(data, buf, sizeof(buf));
if (error)
@@ -2923,6 +2919,32 @@ static void mxt_config_cb(const struct firmware *cfg, void *ctx)
release_firmware(cfg);
}
+static int mxt_bootloader_status(struct mxt_data *data)
+{
+ struct i2c_client *client = data->client;
+ int error;
+
+ error = mxt_lookup_bootloader_address(data, false);
+ if (error) {
+ dev_info(&client->dev,
+ "Bootloader address is not specified\n");
+ return error;
+ }
+ /* Check bootloader state */
+ error = mxt_probe_bootloader(data);
+ if (error) {
+ dev_info(&client->dev, "Trying alternate bootloader address\n");
+ mxt_lookup_bootloader_address(data, true);
+ error = mxt_probe_bootloader(data);
+ if (error) {
+ dev_err(&client->dev,
+ "Chip is not in appmode or bootloader mode\n");
+ return error;
+ }
+ }
+ return 0;
+}
+
static int mxt_initialize(struct mxt_data *data)
{
struct i2c_client *client = data->client;
@@ -2934,16 +2956,13 @@ static int mxt_initialize(struct mxt_data *data)
if (!error)
break;
- /* Check bootloader state */
- error = mxt_probe_bootloader(data, false);
- if (error) {
- dev_info(&client->dev, "Trying alternate bootloader address\n");
- error = mxt_probe_bootloader(data, true);
- if (error) {
- /* Chip is not in appmode or bootloader mode */
- return error;
- }
- }
+ dev_info(&client->dev,
+ "info block read failed (%d), so try bootloader method\n",
+ error);
+
+ error = mxt_bootloader_status(data);
+ if (error)
+ return error;
/* OK, we are in bootloader, see if we can recover */
if (++recovery_attempts > 1) {
@@ -2957,7 +2976,9 @@ static int mxt_initialize(struct mxt_data *data)
}
/* Attempt to exit bootloader into app mode */
- mxt_send_bootloader_cmd(data, false);
+ error = mxt_send_bootloader_cmd(data, false);
+ if (error)
+ return error;
msleep(MXT_FW_RESET_TIME);
}
@@ -3649,8 +3670,11 @@ static int mxt_enter_bootloader(struct mxt_data *data)
msleep(MXT_RESET_TIME);
+ ret = mxt_lookup_bootloader_address(data, false);
+ if (ret)
+ return ret;
/* Do not need to scan since we know family ID */
- ret = mxt_probe_bootloader(data, 0);
+ ret = mxt_probe_bootloader(data);
if (ret)
return ret;
--
2.19.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 41/49] Input: Atmel: improve error handling in mxt_update_cfg()
2019-09-17 9:42 [PATCH v3 39/49] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 40/49] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
@ 2019-09-17 9:42 ` Jiada Wang
2019-09-17 9:42 ` [PATCH v3 42/49] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 43/49] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
3 siblings, 0 replies; 5+ messages in thread
From: Jiada Wang @ 2019-09-17 9:42 UTC (permalink / raw)
To: nick, dmitry.torokhov, jikos, benjamin.tissoires, rydberg
Cc: linux-input, linux-kernel, jiada_wang
From: Deepak Das <deepak_das@mentor.com>
mxt_update_cfg() failed to propagate the error
code from mxt_init_t7_power_cfg() so return the error code.
Signed-off-by: Deepak Das <deepak_das@mentor.com>
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 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index b260ac155b5e..6198149438c3 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2186,7 +2186,9 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
dev_info(dev, "Config successfully updated\n");
/* T7 config may have changed */
- mxt_init_t7_power_cfg(data);
+ ret = mxt_init_t7_power_cfg(data);
+ if (ret)
+ dev_warn(dev, "Power Config failed to update\n");
release_mem:
kfree(cfg.mem);
--
2.19.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 42/49] Input: Atmel: Improve error handling in mxt_initialize_input_device()
2019-09-17 9:42 [PATCH v3 39/49] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 40/49] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 41/49] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
@ 2019-09-17 9:42 ` Jiada Wang
2019-09-17 9:42 ` [PATCH v3 43/49] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
3 siblings, 0 replies; 5+ messages in thread
From: Jiada Wang @ 2019-09-17 9:42 UTC (permalink / raw)
To: nick, dmitry.torokhov, jikos, benjamin.tissoires, rydberg
Cc: linux-input, linux-kernel, jiada_wang
From: Deepak Das <deepak_das@mentor.com>
Currently Driver probe continues with a warning message when it fails to
get the proper multitouch object configurations like TouchScreen resolution.
But Driver probe should fail in case of above scneario because it will not behave
as expected without the proper touchscreen configurations.
This commit modifies mxt_initialize_input_device() to return error when it fails
to get the proper touch screen configurations.
Signed-off-by: Deepak Das <deepak_das@mentor.com>
Signed-off-by: Dean Jenkins <Dean_Jenkins@mentor.com>
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 | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 6198149438c3..a13d6938de1e 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2762,15 +2762,19 @@ static int mxt_initialize_input_device(struct mxt_data *data)
case MXT_TOUCH_MULTI_T9:
num_mt_slots = data->T9_reportid_max - data->T9_reportid_min + 1;
error = mxt_read_t9_resolution(data);
- if (error)
- dev_warn(dev, "Failed to initialize T9 resolution\n");
+ if (error) {
+ dev_err(dev, "Failed to initialize T9 resolution\n");
+ return error;
+ }
break;
case MXT_TOUCH_MULTITOUCHSCREEN_T100:
num_mt_slots = data->num_touchids;
error = mxt_read_t100_config(data);
- if (error)
- dev_warn(dev, "Failed to read T100 config\n");
+ if (error) {
+ dev_err(dev, "Failed to read T100 config\n");
+ return error;
+ }
break;
default:
--
2.19.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3 43/49] Input: Atmel: handle ReportID "0x00" while processing T5 messages
2019-09-17 9:42 [PATCH v3 39/49] Input: Atmel: improve error handling in mxt_start() Jiada Wang
` (2 preceding siblings ...)
2019-09-17 9:42 ` [PATCH v3 42/49] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
@ 2019-09-17 9:42 ` Jiada Wang
3 siblings, 0 replies; 5+ messages in thread
From: Jiada Wang @ 2019-09-17 9:42 UTC (permalink / raw)
To: nick, dmitry.torokhov, jikos, benjamin.tissoires, rydberg
Cc: linux-input, linux-kernel, jiada_wang
From: Deepak Das <deepak_das@mentor.com>
ReportID "0x00" is reserved by Atmel and should not be used by any
Atmel touch controller.
reportID is the first byte retrieved from T5 message payload.
Currently Atmel driver continues to process the T5 messages even if
the reportID "0x00" is returned by Touch Controller.
This commit modifies Atmel touch driver to return -EINVAL if ReportID
"0x00" is received while processing T5 messages.
Signed-off-by: Deepak Das <deepak_das@mentor.com>
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 | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index a13d6938de1e..93bb19cad7e1 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -76,6 +76,7 @@
#define MXT_PROCI_TOUCHSEQUENCELOGGER 93
#define MXT_TOUCH_MULTITOUCHSCREEN_T100 100
#define MXT_PROCI_ACTIVESTYLUS_T107 107
+#define MXT_RPTID_RESERVED 0
/* MXT_GEN_MESSAGE_T5 object */
#define MXT_RPTID_NOMSG 0xff
@@ -1384,6 +1385,11 @@ static int mxt_proc_message(struct mxt_data *data, u8 *message)
u8 report_id = message[0];
bool dump = data->debug_enabled;
+ if (report_id == MXT_RPTID_RESERVED) {
+ dev_err(&data->client->dev,
+ "Received Reserved ReportID 0x00\n");
+ return -EINVAL;
+ }
if (report_id == MXT_RPTID_NOMSG)
return 0;
@@ -1454,6 +1460,8 @@ static int mxt_read_and_process_messages(struct mxt_data *data, u8 count)
ret = mxt_proc_message(data,
data->msg_buf + data->T5_msg_size * i);
+ if (ret < 0)
+ return ret;
if (ret == 1)
num_valid++;
}
--
2.19.2
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-09-17 9:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-17 9:42 [PATCH v3 39/49] Input: Atmel: improve error handling in mxt_start() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 40/49] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 41/49] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 42/49] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2019-09-17 9:42 ` [PATCH v3 43/49] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®