evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: atmel_mxt_ts - handle APP_CRC_FAIL on startup

Browse source 
If the bootloader on the touchscreen controller fails to initialise the
firmware image, it stays in bootloader mode and reports a failure. It is
possible to reflash a working firmware image from this state.

Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Nick Dyer 2014-07-23 12:41:58 -07:00 • committed by Dmitry Torokhov
parent 4ce6fa017f
commit a9fdd1e6de
1 changed files with 43 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,6 +404,30 @@ static int mxt_lookup_bootloader_address(struct mxt_data *data)
return 0; return 0;
} }
static int mxt_probe_bootloader(struct mxt_data *data)
{
struct device *dev = &data->client->dev;
int ret;
u8 val;
bool crc_failure;
ret = mxt_lookup_bootloader_address(data);
if (ret)
return ret;
ret = mxt_bootloader_read(data, &val, 1);
if (ret)
return ret;
/* Check app crc fail mode */
crc_failure = (val & ~MXT_BOOT_STATUS_MASK) == MXT_APP_CRC_FAIL;
dev_err(dev, "Detected bootloader, status:%02X%s\n",
val, crc_failure ? ", APP_CRC_FAIL" : "");
return 0;
}
static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val) static u8 mxt_get_bootloader_version(struct mxt_data *data, u8 val)
{ {
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
@ -463,6 +487,7 @@ recheck:
switch (state) { switch (state) {
case MXT_WAITING_BOOTLOAD_CMD: case MXT_WAITING_BOOTLOAD_CMD:
case MXT_WAITING_FRAME_DATA: case MXT_WAITING_FRAME_DATA:
case MXT_APP_CRC_FAIL:
val &= ~MXT_BOOT_STATUS_MASK; val &= ~MXT_BOOT_STATUS_MASK;
break; break;
case MXT_FRAME_CRC_PASS: case MXT_FRAME_CRC_PASS:
@ -1451,9 +1476,15 @@ static int mxt_initialize(struct mxt_data *data)
int error; int error;
error = mxt_get_info(data); error = mxt_get_info(data);
if (error) {
error = mxt_probe_bootloader(data);
if (error) if (error)
return error; return error;
data->in_bootloader = true;
return 0;
}
/* Get object table information */ /* Get object table information */
error = mxt_get_object_table(data); error = mxt_get_object_table(data);
if (error) { if (error) {
@ -1630,15 +1661,19 @@ static int mxt_load_fw(struct device *dev, const char *fn)
if (ret) if (ret)
goto release_firmware; goto release_firmware;
if (!data->in_bootloader) {
/* Change to the bootloader mode */ /* Change to the bootloader mode */
data->in_bootloader = true; data->in_bootloader = true;
ret = mxt_t6_command(data, MXT_COMMAND_RESET, MXT_BOOT_VALUE, false); ret = mxt_t6_command(data, MXT_COMMAND_RESET,
MXT_BOOT_VALUE, false);
if (ret) if (ret)
goto release_firmware; goto release_firmware;
msleep(MXT_RESET_TIME); msleep(MXT_RESET_TIME);
}
mxt_free_object_table(data);
reinit_completion(&data->bl_completion); reinit_completion(&data->bl_completion);
ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD); ret = mxt_check_bootloader(data, MXT_WAITING_BOOTLOAD_CMD);
@ -1723,8 +1758,6 @@ static ssize_t mxt_update_fw_store(struct device *dev,
} else { } else {
dev_info(dev, "The firmware update succeeded\n"); dev_info(dev, "The firmware update succeeded\n");
mxt_free_object_table(data);
error = mxt_initialize(data); error = mxt_initialize(data);
if (error) if (error)
return error; return error;