github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-22 12:44:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Input: elan_i2c - optimize update speed for IC Type 0x19.

Browse Source 
Reduce update time by optimizing the update sequence and removing
unnecessary delays.

Signed-off-by: jingle.wu@emc.com.tw
Link: https://patch.msgid.link/KL1PR01MB5116A253A126179473EDB7ACDCCA2@KL1PR01MB5116.apcprd01.prod.exchangelabs.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Jingle Wu 吳金國 2026-07-29 06:19:19 +00:00 committed by Dmitry Torokhov
parent 785a490556
commit ad255410cb
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/mouse/elan_i2c.h
View File

@ -102,7 +102,8 @@ struct elan_transport_ops {
int (*prepare_fw_update)(struct i2c_client *client, u16 ic_type,
u8 iap_version, u16 fw_page_size);
int (*write_fw_block)(struct i2c_client *client, u16 fw_page_size,
const u8 *page, u16 checksum, int idx);
u16 fw_page_delay, const u8 *page, u16 checksum,
int idx);
int (*finish_fw_update)(struct i2c_client *client,
struct completion *reset_done);

20
drivers/input/mouse/elan_i2c_core.c
View File

@ -86,6 +86,7 @@ struct elan_tp_data {
u16 ic_type;
u16 fw_validpage_count;
u16 fw_page_size;
u16 fw_page_delay;
u32 fw_signature_address;
u8 min_baseline;
@ -127,8 +128,11 @@ static u32 elan_i2c_lookup_quirks(u16 ic_type, u16 product_id)
}
static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count,
u32 *signature_address, u16 *page_size)
u32 *signature_address, u16 *page_size,
u16 *page_delay)
{
*page_delay = 30;
switch (ic_type) {
case 0x00:
case 0x06:
@ -164,6 +168,7 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count,
break;
case 0x19:
*validpage_count = 2032;
*page_delay = 10;
break;
default:
/* unknown ic type clear value */
@ -179,6 +184,7 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count,
if ((ic_type == 0x14 || ic_type == 0x15) && iap_version >= 2) {
*validpage_count /= 8;
*page_size = ETP_FW_PAGE_SIZE_512;
*page_delay = 50;
} else if (ic_type >= 0x0D && iap_version >= 1) {
*validpage_count /= 2;
*page_size = ETP_FW_PAGE_SIZE_128;
@ -368,7 +374,8 @@ static int elan_query_device_info(struct elan_tp_data *data)
error = elan_get_fwinfo(data->ic_type, data->iap_version,
&data->fw_validpage_count,
&data->fw_signature_address,
&data->fw_page_size);
&data->fw_page_size,
&data->fw_page_delay);
if (error)
dev_warn(&data->client->dev,
"unexpected iap version %#04x (ic type: %#04x), firmware update will not work\n",
@ -479,14 +486,16 @@ static int elan_query_device_parameters(struct elan_tp_data *data)
**********************************************************
*/
static int elan_write_fw_block(struct elan_tp_data *data, u16 page_size,
const u8 *page, u16 checksum, int idx)
u16 page_delay, const u8 *page, u16 checksum,
int idx)
{
int retry = ETP_RETRY_COUNT;
int error;
do {
error = data->ops->write_fw_block(data->client, page_size,
page, checksum, idx);
page_delay, page, checksum,
idx);
if (!error)
return 0;
@ -525,7 +534,8 @@ static int __elan_update_firmware(struct elan_tp_data *data,
checksum += ((page[j + 1] << 8) | page[j]);
error = elan_write_fw_block(data, data->fw_page_size,
page, checksum, i);
data->fw_page_delay, page, checksum,
i);
if (error) {
dev_err(dev, "write page %d fail: %d\n", i, error);
return error;

5
drivers/input/mouse/elan_i2c_i2c.c
View File

@ -625,7 +625,8 @@ static int elan_i2c_prepare_fw_update(struct i2c_client *client, u16 ic_type,
}
static int elan_i2c_write_fw_block(struct i2c_client *client, u16 fw_page_size,
const u8 *page, u16 checksum, int idx)
u16 fw_page_delay, const u8 *page, u16 checksum,
int idx)
{
struct device *dev = &client->dev;
u8 val[3];
@ -650,7 +651,7 @@ static int elan_i2c_write_fw_block(struct i2c_client *client, u16 fw_page_size,
}
/* Wait for F/W to update one page ROM data. */
msleep(fw_page_size == ETP_FW_PAGE_SIZE_512 ? 50 : 35);
msleep(fw_page_delay);
error = elan_i2c_read_cmd(client, ETP_I2C_IAP_CTRL_CMD, val);
if (error) {

3
drivers/input/mouse/elan_i2c_smbus.c
View File

@ -416,7 +416,8 @@ static int elan_smbus_prepare_fw_update(struct i2c_client *client, u16 ic_type,
static int elan_smbus_write_fw_block(struct i2c_client *client, u16 fw_page_size,
const u8 *page, u16 checksum, int idx)
u16 fw_page_delay, const u8 *page, u16 checksum,
int idx)
{
struct device *dev = &client->dev;
int error;