Input: atmel_mxt_ts - implement bootloader frame retries
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:
parent
e57a66aa85
commit
f943c74ad8
|
@ -510,8 +510,12 @@ recheck:
|
||||||
val &= ~MXT_BOOT_STATUS_MASK;
|
val &= ~MXT_BOOT_STATUS_MASK;
|
||||||
break;
|
break;
|
||||||
case MXT_FRAME_CRC_PASS:
|
case MXT_FRAME_CRC_PASS:
|
||||||
if (val == MXT_FRAME_CRC_CHECK)
|
if (val == MXT_FRAME_CRC_CHECK) {
|
||||||
goto recheck;
|
goto recheck;
|
||||||
|
} else if (val == MXT_FRAME_CRC_FAIL) {
|
||||||
|
dev_err(dev, "Bootloader CRC fail\n");
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -1187,6 +1191,7 @@ static int mxt_load_fw(struct device *dev, const char *fn)
|
||||||
const struct firmware *fw = NULL;
|
const struct firmware *fw = NULL;
|
||||||
unsigned int frame_size;
|
unsigned int frame_size;
|
||||||
unsigned int pos = 0;
|
unsigned int pos = 0;
|
||||||
|
unsigned int retry = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = request_firmware(&fw, fn, dev);
|
ret = request_firmware(&fw, fn, dev);
|
||||||
|
@ -1224,9 +1229,7 @@ static int mxt_load_fw(struct device *dev, const char *fn)
|
||||||
|
|
||||||
frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1));
|
frame_size = ((*(fw->data + pos) << 8) | *(fw->data + pos + 1));
|
||||||
|
|
||||||
/* We should add 2 at frame size as the the firmware data is not
|
/* Take account of CRC bytes */
|
||||||
* included the CRC bytes.
|
|
||||||
*/
|
|
||||||
frame_size += 2;
|
frame_size += 2;
|
||||||
|
|
||||||
/* Write one frame to device */
|
/* Write one frame to device */
|
||||||
|
@ -1235,10 +1238,20 @@ static int mxt_load_fw(struct device *dev, const char *fn)
|
||||||
goto disable_irq;
|
goto disable_irq;
|
||||||
|
|
||||||
ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS);
|
ret = mxt_check_bootloader(data, MXT_FRAME_CRC_PASS);
|
||||||
if (ret)
|
if (ret) {
|
||||||
goto disable_irq;
|
retry++;
|
||||||
|
|
||||||
pos += frame_size;
|
/* Back off by 20ms per retry */
|
||||||
|
msleep(retry * 20);
|
||||||
|
|
||||||
|
if (retry > 20) {
|
||||||
|
dev_err(dev, "Retry count exceeded\n");
|
||||||
|
goto disable_irq;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
retry = 0;
|
||||||
|
pos += frame_size;
|
||||||
|
}
|
||||||
|
|
||||||
dev_dbg(dev, "Updated %d bytes / %zd bytes\n", pos, fw->size);
|
dev_dbg(dev, "Updated %d bytes / %zd bytes\n", pos, fw->size);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue