mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 13:55:32 +00:00
Code Issues Releases Wiki Activity

Input: atmel_mxt_ts - refactor config update code to add context struct

Browse source 
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Nick Dyer 2018-07-27 11:46:29 -07:00 committed by Dmitry Torokhov
parent 15082bdbd9
commit f865df7364
1 changed files with 56 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
drivers/input/touchscreen/atmel_mxt_ts.c
View file

@ -277,6 +277,19 @@ enum mxt_suspend_mode {
MXT_SUSPEND_T9_CTRL = 1, MXT_SUSPEND_T9_CTRL = 1,
}; };
/* Config update context */
struct mxt_cfg {
const u8 *raw;
size_t raw_size;
off_t raw_pos;
u8 *mem;
size_t mem_size;
int start_ofs;
struct mxt_info info;
};
/* Each client has this additional data */ /* Each client has this additional data */
struct mxt_data { struct mxt_data {
struct i2c_client *client; struct i2c_client *client;
@ -1282,12 +1295,7 @@ static u32 mxt_calculate_crc(u8 *base, off_t start_off, off_t end_off)
return crc; return crc;
} }
static int mxt_prepare_cfg_mem(struct mxt_data *data, static int mxt_prepare_cfg_mem(struct mxt_data *data, struct mxt_cfg *cfg)
const struct firmware *cfg,
unsigned int data_pos,
unsigned int cfg_start_ofs,
u8 *config_mem,
size_t config_mem_size)
{ {
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
struct mxt_object *object; struct mxt_object *object;
@ -1298,9 +1306,9 @@ static int mxt_prepare_cfg_mem(struct mxt_data *data,
u16 reg; u16 reg;
u8 val; u8 val;
while (data_pos < cfg->size) { while (cfg->raw_pos < cfg->raw_size) {
/* Read type, instance, length */ /* Read type, instance, length */
ret = sscanf(cfg->data + data_pos, "%x %x %x%n", ret = sscanf(cfg->raw + cfg->raw_pos, "%x %x %x%n",
&type, &instance, &size, &offset); &type, &instance, &size, &offset);
if (ret == 0) { if (ret == 0) {
/* EOF */ /* EOF */
@ -1309,20 +1317,20 @@ static int mxt_prepare_cfg_mem(struct mxt_data *data,
dev_err(dev, "Bad format: failed to parse object\n"); dev_err(dev, "Bad format: failed to parse object\n");
return -EINVAL; return -EINVAL;
} }
data_pos += offset; cfg->raw_pos += offset;
object = mxt_get_object(data, type); object = mxt_get_object(data, type);
if (!object) { if (!object) {
/* Skip object */ /* Skip object */
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
ret = sscanf(cfg->data + data_pos, "%hhx%n", ret = sscanf(cfg->raw + cfg->raw_pos, "%hhx%n",
&val, &offset); &val, &offset);
if (ret != 1) { if (ret != 1) {
dev_err(dev, "Bad format in T%d at %d\n", dev_err(dev, "Bad format in T%d at %d\n",
type, i); type, i);
return -EINVAL; return -EINVAL;
} }
data_pos += offset; cfg->raw_pos += offset;
} }
continue; continue;
} }
@ -1357,7 +1365,7 @@ static int mxt_prepare_cfg_mem(struct mxt_data *data,
reg = object->start_address + mxt_obj_size(object) * instance; reg = object->start_address + mxt_obj_size(object) * instance;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
ret = sscanf(cfg->data + data_pos, "%hhx%n", ret = sscanf(cfg->raw + cfg->raw_pos, "%hhx%n",
&val, &val,
&offset); &offset);
if (ret != 1) { if (ret != 1) {
@ -1365,15 +1373,15 @@ static int mxt_prepare_cfg_mem(struct mxt_data *data,
type, i); type, i);
return -EINVAL; return -EINVAL;
} }
data_pos += offset; cfg->raw_pos += offset;
if (i > mxt_obj_size(object)) if (i > mxt_obj_size(object))
continue; continue;
byte_offset = reg + i - cfg_start_ofs; byte_offset = reg + i - cfg->start_ofs;
if (byte_offset >= 0 && byte_offset < config_mem_size) { if (byte_offset >= 0 && byte_offset < cfg->mem_size) {
*(config_mem + byte_offset) = val; *(cfg->mem + byte_offset) = val;
} else { } else {
dev_err(dev, "Bad object: reg:%d, T%d, ofs=%d\n", dev_err(dev, "Bad object: reg:%d, T%d, ofs=%d\n",
reg, object->type, byte_offset); reg, object->type, byte_offset);
@ -1385,22 +1393,21 @@ static int mxt_prepare_cfg_mem(struct mxt_data *data,
return 0; return 0;
} }
static int mxt_upload_cfg_mem(struct mxt_data *data, unsigned int cfg_start, static int mxt_upload_cfg_mem(struct mxt_data *data, struct mxt_cfg *cfg)
u8 *config_mem, size_t config_mem_size)
{ {
unsigned int byte_offset = 0; unsigned int byte_offset = 0;
int error; int error;
/* Write configuration as blocks */ /* Write configuration as blocks */
while (byte_offset < config_mem_size) { while (byte_offset < cfg->mem_size) {
unsigned int size = config_mem_size - byte_offset; unsigned int size = cfg->mem_size - byte_offset;
if (size > MXT_MAX_BLOCK_WRITE) if (size > MXT_MAX_BLOCK_WRITE)
size = MXT_MAX_BLOCK_WRITE; size = MXT_MAX_BLOCK_WRITE;
error = __mxt_write_reg(data->client, error = __mxt_write_reg(data->client,
cfg_start + byte_offset, cfg->start_ofs + byte_offset,
size, config_mem + byte_offset); size, cfg->mem + byte_offset);
if (error) { if (error) {
dev_err(&data->client->dev, dev_err(&data->client->dev,
"Config write error, ret=%d\n", error); "Config write error, ret=%d\n", error);
@ -1434,66 +1441,65 @@ static int mxt_init_t7_power_cfg(struct mxt_data *data);
* <SIZE> - 2-byte object size as hex * <SIZE> - 2-byte object size as hex
* <CONTENTS> - array of <SIZE> 1-byte hex values * <CONTENTS> - array of <SIZE> 1-byte hex values
*/ */
static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg) static int mxt_update_cfg(struct mxt_data *data, const struct firmware *fw)
{ {
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
struct mxt_info cfg_info; struct mxt_cfg cfg;
int ret; int ret;
int offset; int offset;
int data_pos;
int i; int i;
int cfg_start_ofs;
u32 info_crc, config_crc, calculated_crc; u32 info_crc, config_crc, calculated_crc;
u8 *config_mem;
size_t config_mem_size;
u16 crc_start = 0; u16 crc_start = 0;
cfg.raw = fw->data;
cfg.raw_size = fw->size;
mxt_update_crc(data, MXT_COMMAND_REPORTALL, 1); mxt_update_crc(data, MXT_COMMAND_REPORTALL, 1);
if (strncmp(cfg->data, MXT_CFG_MAGIC, strlen(MXT_CFG_MAGIC))) { if (strncmp(cfg.raw, MXT_CFG_MAGIC, strlen(MXT_CFG_MAGIC))) {
dev_err(dev, "Unrecognised config file\n"); dev_err(dev, "Unrecognised config file\n");
return -EINVAL; return -EINVAL;
} }
data_pos = strlen(MXT_CFG_MAGIC); cfg.raw_pos = strlen(MXT_CFG_MAGIC);
/* Load information block and check */ /* Load information block and check */
for (i = 0; i < sizeof(struct mxt_info); i++) { for (i = 0; i < sizeof(struct mxt_info); i++) {
ret = sscanf(cfg->data + data_pos, "%hhx%n", ret = sscanf(cfg.raw + cfg.raw_pos, "%hhx%n",
(unsigned char *)&cfg_info + i, (unsigned char *)&cfg.info + i,
&offset); &offset);
if (ret != 1) { if (ret != 1) {
dev_err(dev, "Bad format\n"); dev_err(dev, "Bad format\n");
return -EINVAL; return -EINVAL;
} }
data_pos += offset; cfg.raw_pos += offset;
} }
if (cfg_info.family_id != data->info->family_id) { if (cfg.info.family_id != data->info->family_id) {
dev_err(dev, "Family ID mismatch!\n"); dev_err(dev, "Family ID mismatch!\n");
return -EINVAL; return -EINVAL;
} }
if (cfg_info.variant_id != data->info->variant_id) { if (cfg.info.variant_id != data->info->variant_id) {
dev_err(dev, "Variant ID mismatch!\n"); dev_err(dev, "Variant ID mismatch!\n");
return -EINVAL; return -EINVAL;
} }
/* Read CRCs */ /* Read CRCs */
ret = sscanf(cfg->data + data_pos, "%x%n", &info_crc, &offset); ret = sscanf(cfg.raw + cfg.raw_pos, "%x%n", &info_crc, &offset);
if (ret != 1) { if (ret != 1) {
dev_err(dev, "Bad format: failed to parse Info CRC\n"); dev_err(dev, "Bad format: failed to parse Info CRC\n");
return -EINVAL; return -EINVAL;
} }
data_pos += offset; cfg.raw_pos += offset;
ret = sscanf(cfg->data + data_pos, "%x%n", &config_crc, &offset); ret = sscanf(cfg.raw + cfg.raw_pos, "%x%n", &config_crc, &offset);
if (ret != 1) { if (ret != 1) {
dev_err(dev, "Bad format: failed to parse Config CRC\n"); dev_err(dev, "Bad format: failed to parse Config CRC\n");
return -EINVAL; return -EINVAL;
} }
data_pos += offset; cfg.raw_pos += offset;
/* /*
* The Info Block CRC is calculated over mxt_info and the object * The Info Block CRC is calculated over mxt_info and the object
@ -1519,16 +1525,15 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg)
} }
/* Malloc memory to store configuration */ /* Malloc memory to store configuration */
cfg_start_ofs = MXT_OBJECT_START + cfg.start_ofs = MXT_OBJECT_START +
data->info->object_num * sizeof(struct mxt_object) + data->info->object_num * sizeof(struct mxt_object) +
MXT_INFO_CHECKSUM_SIZE; MXT_INFO_CHECKSUM_SIZE;
config_mem_size = data->mem_size - cfg_start_ofs; cfg.mem_size = data->mem_size - cfg.start_ofs;
config_mem = kzalloc(config_mem_size, GFP_KERNEL); cfg.mem = kzalloc(cfg.mem_size, GFP_KERNEL);
if (!config_mem) if (!cfg.mem)
return -ENOMEM; return -ENOMEM;
ret = mxt_prepare_cfg_mem(data, cfg, data_pos, cfg_start_ofs, ret = mxt_prepare_cfg_mem(data, &cfg);
config_mem, config_mem_size);
if (ret) if (ret)
goto release_mem; goto release_mem;
@ -1540,18 +1545,17 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg)
else else
dev_warn(dev, "Could not find CRC start\n"); dev_warn(dev, "Could not find CRC start\n");
if (crc_start > cfg_start_ofs) { if (crc_start > cfg.start_ofs) {
calculated_crc = mxt_calculate_crc(config_mem, calculated_crc = mxt_calculate_crc(cfg.mem,
crc_start - cfg_start_ofs, crc_start - cfg.start_ofs,
config_mem_size); cfg.mem_size);
if (config_crc > 0 && config_crc != calculated_crc) if (config_crc > 0 && config_crc != calculated_crc)
dev_warn(dev, "Config CRC in file inconsistent, calculated=%06X, file=%06X\n", dev_warn(dev, "Config CRC in file inconsistent, calculated=%06X, file=%06X\n",
calculated_crc, config_crc); calculated_crc, config_crc);
} }
ret = mxt_upload_cfg_mem(data, cfg_start_ofs, ret = mxt_upload_cfg_mem(data, &cfg);
config_mem, config_mem_size);
if (ret) if (ret)
goto release_mem; goto release_mem;
@ -1567,7 +1571,7 @@ static int mxt_update_cfg(struct mxt_data *data, const struct firmware *cfg)
mxt_init_t7_power_cfg(data); mxt_init_t7_power_cfg(data);
release_mem: release_mem:
kfree(config_mem); kfree(cfg.mem);
return ret; return ret;
} }