From patchwork Tue Jan 7 17:17:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 11321481 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 85C9A109A for ; Tue, 7 Jan 2020 17:17:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D97A207E0 for ; Tue, 7 Jan 2020 17:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728358AbgAGRRm (ORCPT ); Tue, 7 Jan 2020 12:17:42 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:32883 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728211AbgAGRRm (ORCPT ); Tue, 7 Jan 2020 12:17:42 -0500 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iosU9-00057y-AG; Tue, 07 Jan 2020 18:17:41 +0100 From: Lucas Stach To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, patchwork-lst@pengutronix.de, kernel@pengutronix.de, Chris Healy Subject: [PATCH 1/4] Input: exc3000: split MT event handling from IRQ handler Date: Tue, 7 Jan 2020 18:17:37 +0100 Message-Id: <20200107171741.10856-1-l.stach@pengutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Split out the multitouch event handling into its own function to allow other events to be handled in the IRQ handler without disturbing the MT handling. Signed-off-by: Lucas Stach Tested-by: Chris Healy --- drivers/input/touchscreen/exc3000.c | 92 +++++++++++++++++------------ 1 file changed, 54 insertions(+), 38 deletions(-) diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c index e007e2e8f626..3458d02310dd 100644 --- a/drivers/input/touchscreen/exc3000.c +++ b/drivers/input/touchscreen/exc3000.c @@ -58,6 +58,11 @@ static void exc3000_timer(struct timer_list *t) input_sync(data->input); } +static inline void exc3000_schedule_timer(struct exc3000_data *data) +{ + mod_timer(&data->timer, jiffies + msecs_to_jiffies(EXC3000_TIMEOUT_MS)); +} + static int exc3000_read_frame(struct i2c_client *client, u8 *buf) { int ret; @@ -76,54 +81,35 @@ static int exc3000_read_frame(struct i2c_client *client, u8 *buf) if (ret != EXC3000_LEN_FRAME) return -EIO; - if (get_unaligned_le16(buf) != EXC3000_LEN_FRAME || - buf[2] != EXC3000_MT_EVENT) + if (get_unaligned_le16(buf) != EXC3000_LEN_FRAME) return -EINVAL; return 0; } -static int exc3000_read_data(struct i2c_client *client, - u8 *buf, int *n_slots) +static int exc3000_handle_mt_event(struct exc3000_data *data) { - int error; - - error = exc3000_read_frame(client, buf); - if (error) - return error; + struct input_dev *input = data->input; + int ret, total_slots; + u8 *buf = data->buf; - *n_slots = buf[3]; - if (!*n_slots || *n_slots > EXC3000_NUM_SLOTS) - return -EINVAL; + total_slots = buf[3]; + if (!total_slots || total_slots > EXC3000_NUM_SLOTS) { + ret = -EINVAL; + goto out_fail; + } - if (*n_slots > EXC3000_SLOTS_PER_FRAME) { + if (total_slots > EXC3000_SLOTS_PER_FRAME) { /* Read 2nd frame to get the rest of the contacts. */ - error = exc3000_read_frame(client, buf + EXC3000_LEN_FRAME); - if (error) - return error; + ret = exc3000_read_frame(data->client, buf + EXC3000_LEN_FRAME); + if (ret) + goto out_fail; /* 2nd chunk must have number of contacts set to 0. */ - if (buf[EXC3000_LEN_FRAME + 3] != 0) - return -EINVAL; - } - - return 0; -} - -static irqreturn_t exc3000_interrupt(int irq, void *dev_id) -{ - struct exc3000_data *data = dev_id; - struct input_dev *input = data->input; - u8 *buf = data->buf; - int slots, total_slots; - int error; - - error = exc3000_read_data(data->client, buf, &total_slots); - if (error) { - /* Schedule a timer to release "stuck" contacts */ - mod_timer(&data->timer, - jiffies + msecs_to_jiffies(EXC3000_TIMEOUT_MS)); - goto out; + if (buf[EXC3000_LEN_FRAME + 3] != 0) { + ret = -EINVAL; + goto out_fail; + } } /* @@ -132,7 +118,7 @@ static irqreturn_t exc3000_interrupt(int irq, void *dev_id) del_timer_sync(&data->timer); while (total_slots > 0) { - slots = min(total_slots, EXC3000_SLOTS_PER_FRAME); + int slots = min(total_slots, EXC3000_SLOTS_PER_FRAME); exc3000_report_slots(input, &data->prop, buf + 4, slots); total_slots -= slots; buf += EXC3000_LEN_FRAME; @@ -141,6 +127,36 @@ static irqreturn_t exc3000_interrupt(int irq, void *dev_id) input_mt_sync_frame(input); input_sync(input); + return 0; + +out_fail: + /* Schedule a timer to release "stuck" contacts */ + exc3000_schedule_timer(data); + + return ret; +} + +static irqreturn_t exc3000_interrupt(int irq, void *dev_id) +{ + struct exc3000_data *data = dev_id; + u8 *buf = data->buf; + int ret; + + ret = exc3000_read_frame(data->client, buf); + if (ret) { + /* Schedule a timer to release "stuck" contacts */ + exc3000_schedule_timer(data); + goto out; + } + + switch (buf[2]) { + case EXC3000_MT_EVENT: + exc3000_handle_mt_event(data); + break; + default: + break; + } + out: return IRQ_HANDLED; } From patchwork Tue Jan 7 17:17:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 11321487 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 34B45139A for ; Tue, 7 Jan 2020 17:17:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C36C207E0 for ; Tue, 7 Jan 2020 17:17:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728348AbgAGRRn (ORCPT ); Tue, 7 Jan 2020 12:17:43 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:56001 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728262AbgAGRRn (ORCPT ); Tue, 7 Jan 2020 12:17:43 -0500 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iosU9-00057y-Bl; Tue, 07 Jan 2020 18:17:41 +0100 From: Lucas Stach To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, patchwork-lst@pengutronix.de, kernel@pengutronix.de, Chris Healy Subject: [PATCH 2/4] Input: exc3000: query and show type, model and firmware revision info Date: Tue, 7 Jan 2020 18:17:38 +0100 Message-Id: <20200107171741.10856-2-l.stach@pengutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107171741.10856-1-l.stach@pengutronix.de> References: <20200107171741.10856-1-l.stach@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org It's very useful to have this information in the log, as differences in behavior can be tied to the controller firmware. Signed-off-by: Lucas Stach --- drivers/input/touchscreen/exc3000.c | 116 ++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c index 3458d02310dd..accee4fd1b97 100644 --- a/drivers/input/touchscreen/exc3000.c +++ b/drivers/input/touchscreen/exc3000.c @@ -22,7 +22,9 @@ #define EXC3000_NUM_SLOTS 10 #define EXC3000_SLOTS_PER_FRAME 5 #define EXC3000_LEN_FRAME 66 +#define EXC3000_LEN_VENDOR_REQUEST 68 #define EXC3000_LEN_POINT 10 +#define EXC3000_VENDOR_EVENT 3 #define EXC3000_MT_EVENT 6 #define EXC3000_TIMEOUT_MS 100 @@ -32,6 +34,9 @@ struct exc3000_data { struct touchscreen_properties prop; struct timer_list timer; u8 buf[2 * EXC3000_LEN_FRAME]; + struct mutex vendor_data_lock; + struct completion vendor_data_done; + char *type, *model, *fw_rev; }; static void exc3000_report_slots(struct input_dev *input, @@ -136,6 +141,13 @@ static int exc3000_handle_mt_event(struct exc3000_data *data) return ret; } +static int exc3000_handle_vendor_event(struct exc3000_data *data) +{ + complete(&data->vendor_data_done); + + return 0; +} + static irqreturn_t exc3000_interrupt(int irq, void *dev_id) { struct exc3000_data *data = dev_id; @@ -153,6 +165,9 @@ static irqreturn_t exc3000_interrupt(int irq, void *dev_id) case EXC3000_MT_EVENT: exc3000_handle_mt_event(data); break; + case EXC3000_VENDOR_EVENT: + exc3000_handle_vendor_event(data); + break; default: break; } @@ -161,6 +176,89 @@ static irqreturn_t exc3000_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } +static int exc3000_vendor_data_request(struct exc3000_data *data, u8 *request, + u8 request_len, u8 *response) +{ + u8 buf[EXC3000_LEN_VENDOR_REQUEST] = { 0x67, 0x00, 0x42, 0x00, 0x03 }; + int ret; + + mutex_lock(&data->vendor_data_lock); + + reinit_completion(&data->vendor_data_done); + + buf[5] = request_len; + memcpy(&buf[6], request, request_len); + + ret = i2c_master_send(data->client, buf, EXC3000_LEN_VENDOR_REQUEST); + if (ret < 0) + goto out_unlock; + + if (response) { + wait_for_completion(&data->vendor_data_done); + memcpy(response, &data->buf[4], data->buf[3]); + ret = data->buf[3]; + } + +out_unlock: + mutex_unlock(&data->vendor_data_lock); + + return ret; +} +static int exc3000_populate_device_info(struct exc3000_data *data) +{ + struct device *dev = &data->client->dev; + u8 response[EXC3000_LEN_FRAME]; + int ret; + + /* query type info */ + ret = exc3000_vendor_data_request(data, (u8[]){0x46}, 1, response); + if (ret < 0) + return -ENODEV; + + data->type = devm_kmemdup(dev, &response[1], ret - 1, GFP_KERNEL); + + /* query model info */ + ret = exc3000_vendor_data_request(data, (u8[]){0x45}, 1, response); + if (ret < 0) + return -ENODEV; + + data->model = devm_kmemdup(dev, &response[1], ret - 1, GFP_KERNEL); + + /* query bootloader info */ + ret = exc3000_vendor_data_request(data, + (u8[]){0x39, 0x02}, 2, response); + if (ret < 0) + return -ENODEV; + + /* + * If the bootloader version is non-zero then the device is in + * bootloader mode and won't answer a query for the application FW + * version, so we just use the bootloader version info. + */ + if (response[2] || response[3]) { + char bl_version[8]; + + snprintf(bl_version, 8, "%d.%d", response[2], response[3]); + data->fw_rev = devm_kmemdup(dev, bl_version, + strlen(bl_version), GFP_KERNEL); + } else { + /* query application firmware version */ + ret = exc3000_vendor_data_request(data, + (u8[]){0x44}, 1, response); + if (ret < 0) + return -ENODEV; + + data->fw_rev = devm_kmemdup(dev, &response[1], + ret - 1, GFP_KERNEL); + } + + dev_info(&data->client->dev, + "found type %s, model %s, firmware revision %s", + data->type, data->model, data->fw_rev); + + return 0; +} + static int exc3000_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -174,6 +272,18 @@ static int exc3000_probe(struct i2c_client *client, data->client = client; timer_setup(&data->timer, exc3000_timer, 0); + mutex_init(&data->vendor_data_lock); + init_completion(&data->vendor_data_done); + + error = devm_request_threaded_irq(&client->dev, client->irq, + NULL, exc3000_interrupt, IRQF_ONESHOT, + client->name, data); + if (error) + return error; + + error = exc3000_populate_device_info(data); + if (error) + return error; input = devm_input_allocate_device(&client->dev); if (!input) @@ -197,12 +307,6 @@ static int exc3000_probe(struct i2c_client *client, if (error) return error; - error = devm_request_threaded_irq(&client->dev, client->irq, - NULL, exc3000_interrupt, IRQF_ONESHOT, - client->name, data); - if (error) - return error; - return 0; } From patchwork Tue Jan 7 17:17:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 11321485 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 DC1F31871 for ; Tue, 7 Jan 2020 17:17:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C39F7207E0 for ; Tue, 7 Jan 2020 17:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728321AbgAGRRn (ORCPT ); Tue, 7 Jan 2020 12:17:43 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:55501 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728348AbgAGRRn (ORCPT ); Tue, 7 Jan 2020 12:17:43 -0500 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iosU9-00057y-EP; Tue, 07 Jan 2020 18:17:41 +0100 From: Lucas Stach To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, patchwork-lst@pengutronix.de, kernel@pengutronix.de, Chris Healy Subject: [PATCH 3/4] Input: exc3000: expose type, model and firmware revision as sysfs attributes Date: Tue, 7 Jan 2020 18:17:39 +0100 Message-Id: <20200107171741.10856-3-l.stach@pengutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107171741.10856-1-l.stach@pengutronix.de> References: <20200107171741.10856-1-l.stach@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This can be used by userspace to determine if a firmware update should be started. Signed-off-by: Lucas Stach --- drivers/input/touchscreen/exc3000.c | 54 +++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c index accee4fd1b97..ce83914d65ff 100644 --- a/drivers/input/touchscreen/exc3000.c +++ b/drivers/input/touchscreen/exc3000.c @@ -259,6 +259,47 @@ static int exc3000_populate_device_info(struct exc3000_data *data) return 0; } +static ssize_t exc3000_sysfs_type_show(struct device *dev, + struct device_attribute *dattr, + char *buf) +{ + struct exc3000_data *data = dev_get_drvdata(dev); + + return scnprintf(buf, PAGE_SIZE, "%s\n", data->type); +} +static DEVICE_ATTR(type, 0444, exc3000_sysfs_type_show, NULL); + +static ssize_t exc3000_sysfs_model_show(struct device *dev, + struct device_attribute *dattr, + char *buf) +{ + struct exc3000_data *data = dev_get_drvdata(dev); + + return scnprintf(buf, PAGE_SIZE, "%s\n", data->model); +} +static DEVICE_ATTR(model, 0444, exc3000_sysfs_model_show, NULL); + +static ssize_t exc3000_sysfs_fw_rev_show(struct device *dev, + struct device_attribute *dattr, + char *buf) +{ + struct exc3000_data *data = dev_get_drvdata(dev); + + return scnprintf(buf, PAGE_SIZE, "%s\n", data->fw_rev); +} +static DEVICE_ATTR(fw_rev, 0444, exc3000_sysfs_fw_rev_show, NULL); + +static struct attribute *exc3000_attrs[] = { + &dev_attr_type.attr, + &dev_attr_model.attr, + &dev_attr_fw_rev.attr, + NULL +}; + +static const struct attribute_group exc3000_attr_group = { + .attrs = exc3000_attrs, +}; + static int exc3000_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -285,6 +326,11 @@ static int exc3000_probe(struct i2c_client *client, if (error) return error; + dev_set_drvdata(&client->dev, data); + error = sysfs_create_group(&client->dev.kobj, &exc3000_attr_group); + if (error) + return error; + input = devm_input_allocate_device(&client->dev); if (!input) return -ENOMEM; @@ -310,6 +356,13 @@ static int exc3000_probe(struct i2c_client *client, return 0; } +int exc3000_remove(struct i2c_client *client) +{ + sysfs_remove_group(&client->dev.kobj, &exc3000_attr_group); + + return 0; +} + static const struct i2c_device_id exc3000_id[] = { { "exc3000", 0 }, { } @@ -331,6 +384,7 @@ static struct i2c_driver exc3000_driver = { }, .id_table = exc3000_id, .probe = exc3000_probe, + .remove = exc3000_remove, }; module_i2c_driver(exc3000_driver); From patchwork Tue Jan 7 17:17:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Stach X-Patchwork-Id: 11321483 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 B2344921 for ; Tue, 7 Jan 2020 17:17:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9A48E207E0 for ; Tue, 7 Jan 2020 17:17:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728211AbgAGRRn (ORCPT ); Tue, 7 Jan 2020 12:17:43 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:47061 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728321AbgAGRRn (ORCPT ); Tue, 7 Jan 2020 12:17:43 -0500 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iosU9-00057y-H2; Tue, 07 Jan 2020 18:17:41 +0100 From: Lucas Stach To: Dmitry Torokhov Cc: linux-input@vger.kernel.org, patchwork-lst@pengutronix.de, kernel@pengutronix.de, Chris Healy Subject: [PATCH 4/4] Input: exc3000: add firmware update support Date: Tue, 7 Jan 2020 18:17:40 +0100 Message-Id: <20200107171741.10856-4-l.stach@pengutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200107171741.10856-1-l.stach@pengutronix.de> References: <20200107171741.10856-1-l.stach@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org This change allows the device firmware to be updated by putting a firmware file in /lib/firmware and providing the name of the file via the update_fw sysfs property. The driver will then flash the firmware image into the controller internal storage and restart the controller to activate the new firmware. The implementation was done by looking at the the messages passed between the controller and proprietary vendor update tool. Not every detail of the protocol is totally well understood, so the implementation still has some "monkey see, monkey do" parts, as far as they have been found to be required for the update to succeed. Signed-off-by: Lucas Stach --- drivers/input/touchscreen/exc3000.c | 248 +++++++++++++++++++++++++++- 1 file changed, 246 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/exc3000.c b/drivers/input/touchscreen/exc3000.c index ce83914d65ff..f9a9820dc232 100644 --- a/drivers/input/touchscreen/exc3000.c +++ b/drivers/input/touchscreen/exc3000.c @@ -3,8 +3,8 @@ * Driver for I2C connected EETI EXC3000 multiple touch controller * * Copyright (C) 2017 Ahmet Inan - * - * minimal implementation based on egalax_ts.c and egalax_i2c.c + * Copyright (C) 2019 Pengutronix + * Copyright (C) 2019 Zodiac Inflight Innovations */ #include @@ -18,6 +18,8 @@ #include #include #include +#include +#include #define EXC3000_NUM_SLOTS 10 #define EXC3000_SLOTS_PER_FRAME 5 @@ -37,6 +39,7 @@ struct exc3000_data { struct mutex vendor_data_lock; struct completion vendor_data_done; char *type, *model, *fw_rev; + int update_status; }; static void exc3000_report_slots(struct input_dev *input, @@ -215,6 +218,8 @@ static int exc3000_populate_device_info(struct exc3000_data *data) if (ret < 0) return -ENODEV; + if (data->type) + devm_kfree(dev, data->type); data->type = devm_kmemdup(dev, &response[1], ret - 1, GFP_KERNEL); /* query model info */ @@ -222,6 +227,8 @@ static int exc3000_populate_device_info(struct exc3000_data *data) if (ret < 0) return -ENODEV; + if (data->model) + devm_kfree(dev, data->model); data->model = devm_kmemdup(dev, &response[1], ret - 1, GFP_KERNEL); /* query bootloader info */ @@ -239,6 +246,8 @@ static int exc3000_populate_device_info(struct exc3000_data *data) char bl_version[8]; snprintf(bl_version, 8, "%d.%d", response[2], response[3]); + if (data->fw_rev) + devm_kfree(dev, data->fw_rev); data->fw_rev = devm_kmemdup(dev, bl_version, strlen(bl_version), GFP_KERNEL); } else { @@ -248,6 +257,8 @@ static int exc3000_populate_device_info(struct exc3000_data *data) if (ret < 0) return -ENODEV; + if (data->fw_rev) + devm_kfree(dev, data->fw_rev); data->fw_rev = devm_kmemdup(dev, &response[1], ret - 1, GFP_KERNEL); } @@ -289,10 +300,243 @@ static ssize_t exc3000_sysfs_fw_rev_show(struct device *dev, } static DEVICE_ATTR(fw_rev, 0444, exc3000_sysfs_fw_rev_show, NULL); +static void exc3000_generate_unlock_response(u8 *challenge, u8 *response) +{ + u8 op, rot, sum; + int i; + + op = challenge[0] + challenge[3]; + rot = challenge[1] + challenge[2]; + sum = challenge[0] + challenge[1] + challenge[2] + challenge[3]; + + for (i = 0; i < 4; i++) { + if ((op >> i) & 0x1) { + response[i] = sum + challenge[(rot + i) & 0x3]; + } else { + response[i] = sum - challenge[(rot + i) & 0x3]; + } + } +} + +static int exc3000_firmware_update(struct exc3000_data *data, + const struct firmware *fw) +{ + struct device *dev = &data->client->dev; + u8 resp[EXC3000_LEN_FRAME]; + int ret, i; + + dev_info(dev, "starting firmware update\n"); + + /* 1: check device state */ + ret = exc3000_vendor_data_request(data, (u8[]){0x39, 0x02}, 2, resp); + if (ret < 0) + goto out; + + /* 2: switch state from app to bootloader mode if necessary */ + if (!resp[2] && !resp[3]) { + u8 unlock_req[6] = { 0x3a, 0xfc }; + + dev_dbg(dev, "device in app mode, switching to bootloader\n"); + + /* 2.1 request unlock challenge */ + ret = exc3000_vendor_data_request(data, + (u8[]){0x3a, 0xfb}, 2, resp); + if (ret < 0) + goto out; + + /* 2.2 generate and send response */ + exc3000_generate_unlock_response(&resp[2], &unlock_req[2]); + ret = exc3000_vendor_data_request(data, unlock_req, 6, resp); + if (ret < 0) + goto out; + + if (resp[2] != 0x01) { + dev_err(dev, "device unlock failed, aborting\n"); + ret = -EINVAL; + goto out; + } + + /* 2.3 unknown, but required and invariant data */ + ret = exc3000_vendor_data_request(data, + (u8[]){0x3a, 0xfe, 0x34, + 0x43, 0xcc}, 5, resp); + if (ret < 0) + goto out; + + /* 2.4 reset controller */ + ret = exc3000_vendor_data_request(data, (u8[]){0x3a, 0xff}, + 2, NULL); + if (ret < 0) + goto out; + + /* wait for controller init after reset */ + msleep(500); + + /* 2.5: check communication after reset */ + ret = exc3000_vendor_data_request(data, (u8[]){0x39, 0x01}, + 2, resp); + if (ret < 0) + goto out; + + if (resp[1] != 0x02) { + dev_err(dev, "device ping request NACK, aborting\n"); + ret = -EINVAL; + goto out; + } + + /* 2.6: check device mode again */ + ret = exc3000_vendor_data_request(data, (u8[]){0x39, 0x02}, + 2, resp); + if (ret < 0) + goto out; + + if (!resp[2] && !resp[3]) { + dev_err(dev, "device still app mode, aborting\n"); + ret = -EINVAL; + goto out; + } + } + + /* 3: start firmware upload */ + dev_dbg(dev, "start firmware upload\n"); + ret = exc3000_vendor_data_request(data, (u8[]){0x3a, 0x04}, 2, resp); + if (ret < 0) + goto out; + + if (resp[2] != 0x01) { + dev_err(dev, "firmware update start NACK, aborting\n"); + ret = -EINVAL; + goto out; + } + + /* 4: upload firmware */ + for (i = 0x56; i < fw->size; i += 36) { + u8 fw_chunk[37] = { 0x3a, 0x01, fw->data[i], + fw->data[i+1],fw->data[i+34] }; + + memcpy(&fw_chunk[5], &fw->data[i+2], 32); + ret = exc3000_vendor_data_request(data, fw_chunk, 37, resp); + if (ret < 0) + goto out; + + if (resp[2] != fw->data[i] || resp[3] != fw->data[i+1] || + resp[4] != fw->data[i+34]) { + dev_err(dev, + "firmware update readback wrong, aborting\n"); + ret = -EINVAL; + goto out; + } + + data->update_status = DIV_ROUND_UP(i * 100, fw->size); + } + + /* 5: end firmware upload */ + ret = exc3000_vendor_data_request(data, + (u8[]){0x3a, 0x05, fw->data[0x37], + fw->data[0x38], fw->data[0x39], + fw->data[0x1f], fw->data[0x20]}, + 7, resp); + if (ret < 0) + goto out; + + if (resp[2] != 0x01) { + dev_err(dev, "firmware update end NACK, aborting\n"); + ret = -EINVAL; + goto out; + } + + /* 6: switch back to app mode */ + ret = exc3000_vendor_data_request(data, (u8[]){0x3a, 0xff}, 2, NULL); + if (ret < 0) + goto out; + + /* wait for controller init after reset */ + msleep(500); + + /* 7: check communication */ + ret = exc3000_vendor_data_request(data, (u8[]){0x39, 0x01}, 2, resp); + if (ret < 0) + goto out; + + if (resp[1] != 0x02) { + dev_err(dev, "device ping request NACK, aborting\n"); + ret = -EINVAL; + goto out; + } + + /* 8: check if we are in app mode again */ + ret = exc3000_vendor_data_request(data, (u8[]){0x39, 0x02}, 2, resp); + if (ret < 0) + goto out; + + if (resp[2] || resp[3]) { + dev_err(dev, "device still bootloader mode, aborting\n"); + ret = -EINVAL; + goto out; + } + + dev_info(dev, "firmware update complete\n"); + + exc3000_populate_device_info(data); + + data->update_status = 0; + + return 0; + +out: + data->update_status = ret; + return ret; +} + +static ssize_t exc3000_update_fw_store(struct device *dev, + struct device_attribute *dattr, + const char *buf, size_t count) +{ + struct exc3000_data *data = dev_get_drvdata(dev); + char fw_name[NAME_MAX]; + const struct firmware *fw; + size_t copy_count = count; + int ret; + + if (count == 0 || count >= NAME_MAX) + return -EINVAL; + + if (buf[count - 1] == '\0' || buf[count - 1] == '\n') + copy_count -= 1; + + strncpy(fw_name, buf, copy_count); + fw_name[copy_count] = '\0'; + + ret = request_firmware(&fw, fw_name, dev); + if (ret) + return ret; + + dev_info(dev, "Flashing %s\n", fw_name); + + ret = exc3000_firmware_update(data, fw); + + release_firmware(fw); + + return ret ?: count; +} +static DEVICE_ATTR(update_fw, 0200, NULL, exc3000_update_fw_store); + +static ssize_t exc3000_update_fw_status_show(struct device *dev, + struct device_attribute *dattr, + char *buf) +{ + struct exc3000_data *data = dev_get_drvdata(dev); + + return scnprintf(buf, PAGE_SIZE, "%d\n", data->update_status); +} +static DEVICE_ATTR(update_fw_status, 0444, exc3000_update_fw_status_show, NULL); + static struct attribute *exc3000_attrs[] = { &dev_attr_type.attr, &dev_attr_model.attr, &dev_attr_fw_rev.attr, + &dev_attr_update_fw.attr, + &dev_attr_update_fw_status.attr, NULL };