| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1477345917-25326-6-git-send-email-nick@shmanahar.org>
Date: Mon, 24 Oct 2016 22:51:55 +0100
From: Nick Dyer <nick@...anahar.org>
To: Dmitry Torokhov <dmitry.torokhov@...il.com>,
Andrew Duggan <aduggan@...aptics.com>
Cc: Chris Healy <cphealy@...il.com>,
Henrik Rydberg <rydberg@...math.org>,
Benjamin Tissoires <benjamin.tissoires@...hat.com>,
Linus Walleij <linus.walleij@...aro.org>,
Bjorn Andersson <bjorn.andersson@...aro.org>,
linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
Nick Dyer <nick@...anahar.org>
Subject: [PATCH v5 5/7] Input: synaptics-rmi4 - add sysfs attribute update_fw_status
The status is the percentage complete, or once complete, zero for
success or a negative return code.
Signed-off-by: Nick Dyer <nick@...anahar.org>
---
drivers/input/rmi4/rmi_f34.c | 34 ++++++++++++++++++++++++++++++++++
drivers/input/rmi4/rmi_f34.h | 4 ++++
drivers/input/rmi4/rmi_f34v7.c | 14 ++++++++++++++
3 files changed, 52 insertions(+)
diff --git a/drivers/input/rmi4/rmi_f34.c b/drivers/input/rmi4/rmi_f34.c
index a4c159e..9124a1e 100644
--- a/drivers/input/rmi4/rmi_f34.c
+++ b/drivers/input/rmi4/rmi_f34.c
@@ -157,6 +157,9 @@ static int rmi_f34_write_blocks(struct f34_data *f34, const void *data,
i + 1, block_count);
data += f34->v5.block_size;
+ f34->update_progress += f34->v5.block_size;
+ f34->update_status = (f34->update_progress * 100) /
+ f34->update_size;
}
return 0;
@@ -186,6 +189,8 @@ static int rmi_f34_flash_firmware(struct f34_data *f34,
struct rmi_function *fn = f34->fn;
int ret;
+ f34->update_progress = 0;
+ f34->update_size = syn_fw->image_size + syn_fw->config_size;
if (syn_fw->image_size) {
dev_info(&fn->dev, "Erasing firmware...\n");
ret = rmi_f34_command(f34, F34_ERASE_ALL,
@@ -277,12 +282,24 @@ int rmi_f34_update_firmware(struct f34_data *f34, const struct firmware *fw)
ret = rmi_f34_flash_firmware(f34, syn_fw);
+ f34->update_status = ret;
mutex_unlock(&f34->v5.flash_mutex);
out:
return ret;
}
+int rmi_f34_status(struct rmi_function *fn)
+{
+ struct f34_data *f34 = dev_get_drvdata(&fn->dev);
+
+ /*
+ * The status is the percentage complete, or once complete,
+ * zero for success or a negative return code.
+ */
+ return f34->update_status;
+}
+
static int rmi_firmware_update(struct rmi_driver_data *data,
const struct firmware *fw)
{
@@ -401,8 +418,25 @@ static ssize_t rmi_driver_update_fw_store(struct device *dev,
static DEVICE_ATTR(update_fw, 0200, NULL, rmi_driver_update_fw_store);
+static ssize_t rmi_driver_update_fw_status_show(struct device *dev,
+ struct device_attribute *dattr,
+ char *buf)
+{
+ struct rmi_driver_data *data = dev_get_drvdata(dev);
+ int update_status = 0;
+
+ if (data->f34_container)
+ update_status = rmi_f34_status(data->f34_container);
+
+ return scnprintf(buf, PAGE_SIZE, "%d\n", update_status);
+}
+
+static DEVICE_ATTR(update_fw_status, 0444,
+ rmi_driver_update_fw_status_show, NULL);
+
static struct attribute *rmi_firmware_attrs[] = {
&dev_attr_update_fw.attr,
+ &dev_attr_update_fw_status.attr,
NULL
};
diff --git a/drivers/input/rmi4/rmi_f34.h b/drivers/input/rmi4/rmi_f34.h
index 2c93d40..8df9fea 100644
--- a/drivers/input/rmi4/rmi_f34.h
+++ b/drivers/input/rmi4/rmi_f34.h
@@ -425,6 +425,10 @@ struct f34_data {
unsigned char bootloader_id[5];
unsigned char configuration_id[SYNAPTICS_RMI4_CONFIG_ID_SIZE*2 + 1];
+ int update_status;
+ int update_progress;
+ int update_size;
+
union {
struct f34v5_data v5;
struct f34v7_data v7;
diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c
index 52ca604..5718165 100644
--- a/drivers/input/rmi4/rmi_f34v7.c
+++ b/drivers/input/rmi4/rmi_f34v7.c
@@ -926,6 +926,11 @@ static int rmi_f34v7_write_f34v7_blocks(struct f34_data *f34,
block_ptr += (transfer * f34->v7.block_size);
remaining -= transfer;
+
+ if (command == v7_CMD_WRITE_FW)
+ f34->update_status = 80 - 70*remaining/block_cnt;
+ else if (command == v7_CMD_WRITE_CONFIG)
+ f34->update_status = 90 - 10*remaining/block_cnt;
} while (remaining);
return 0;
@@ -1281,6 +1286,8 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
if (ret < 0)
goto fail;
+ f34->update_status = 5;
+
if (!f34->v7.new_partition_table) {
ret = rmi_f34v7_check_ui_firmware_size(f34);
if (ret < 0)
@@ -1320,6 +1327,7 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
__func__);
}
+ f34->update_status = 10;
dev_info(&f34->fn->dev, "Writing firmware (%d bytes)...\n",
f34->v7.img.ui_firmware.size);
@@ -1344,6 +1352,8 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
goto fail;
}
+ f34->update_status = 95;
+
if (f34->v7.new_partition_table) {
if (f34->v7.has_guest_code && f34->v7.img.contains_guest_code) {
dev_info(&f34->fn->dev, "Writing guest code...\n");
@@ -1354,7 +1364,11 @@ int rmi_f34v7_do_reflash(struct f34_data *f34, const struct firmware *fw)
}
}
+ f34->update_status = 0;
+ return 0;
+
fail:
+ f34->update_status = ret;
return ret;
}
--
2.7.4
Powered by blists - more mailing lists