From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0532C5DF63 for ; Wed, 6 Nov 2019 07:05:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8BCDD206DF for ; Wed, 6 Nov 2019 07:05:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731314AbfKFHCK (ORCPT ); Wed, 6 Nov 2019 02:02:10 -0500 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:22383 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726772AbfKFHCK (ORCPT ); Wed, 6 Nov 2019 02:02:10 -0500 IronPort-SDR: 69A0iHsNSEFKwJ7ISCfMEoEZ2AnzaoOScdXmKIp2mTcaozM9jHJ63H3iUp44Huk/LIlQOhNKRD aMrFNX16iuuHpAqi3SEpYfrqgLNR4kLZIlwPNmmY+gTtu5/9GHs/IKT7WI01mgQRsTRDJW0ZvJ B7i0yYDcoWc+LYVjRlGRM+DpztNTcXNeNnCBeuR1kNKTCMjggkAOYE86SBO0SZXP9/1USjk4Li +GWkvCRiqrxHDG/xmJPs5FZloLFNkwhPUcHMpNfVVAPBn7wb7sHzzeWHCJfBG5WtSeRitEpJ+n oSQ= X-IronPort-AV: E=Sophos;i="5.68,272,1569312000"; d="scan'208";a="42848223" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 05 Nov 2019 23:02:09 -0800 IronPort-SDR: FT5uXwhhg/0QG3aJm5/Wj0qUbJlqB1ygYZrrw1cC90cTWN/RsZKWZn6qdqOxhDCkNrWP73oIuR h2KMPLANQ/C7pF2L9J4VWFQZryPv/fOAVNEu804t5k2+RM06IifA7oMLGTOm5GkdxLiYA+MnQh Q+O1w4Dd/Fvzp+NYJyudLPUL+wt1WYpkgIxwgKSAO7qGXrDZKd9JSKKYtH/xh4cEMyThX4HQQ/ GH2eqC/7JcoQkWjKg9RHY4mYtEWdE+6QnzrSJn4BEsmcYzps1L6WvtjL8C/tlXGLtznvyEkKn8 51Y= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v5 04/48] Input: atmel_mxt_ts - split large i2c transfers into blocks Date: Wed, 6 Nov 2019 16:01:02 +0900 Message-ID: <20191106070146.18759-5-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191106070146.18759-1-jiada_wang@mentor.com> References: <20191106070146.18759-1-jiada_wang@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Nick Dyer On some firmware variants, the size of the info block exceeds what can be read in a single transfer. Signed-off-by: Nick Dyer (cherry picked from ndyer/linux/for-upstream commit 74c4f5277cfa403d43fafc404119dc57a08677db) [gdavis: Forward port and fix conflicts due to v4.14.51 commit 960fe000b1d3 ("Input: atmel_mxt_ts - fix the firmware update").] Signed-off-by: George G. Davis [jiada: Change mxt_read_blks() to __mxt_read_reg(), original __mxt_read_reg() to __mxt_read_chunk()] Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 28 +++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index ce5a069b62d4..9088b2d3266b 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -40,7 +40,7 @@ #define MXT_OBJECT_START 0x07 #define MXT_OBJECT_SIZE 6 #define MXT_INFO_CHECKSUM_SIZE 3 -#define MXT_MAX_BLOCK_WRITE 256 +#define MXT_MAX_BLOCK_WRITE 255 /* Object types */ #define MXT_DEBUG_DIAGNOSTIC_T37 37 @@ -624,8 +624,8 @@ static int mxt_send_bootloader_cmd(struct mxt_data *data, bool unlock) return 0; } -static int __mxt_read_reg(struct i2c_client *client, - u16 reg, u16 len, void *val) +static int __mxt_read_chunk(struct i2c_client *client, + u16 reg, u16 len, void *val) { struct i2c_msg xfer[2]; u8 buf[2]; @@ -659,6 +659,28 @@ static int __mxt_read_reg(struct i2c_client *client, return ret; } +static int __mxt_read_reg(struct i2c_client *client, + u16 reg, u16 len, void *buf) +{ + u16 offset = 0; + int error; + u16 size; + + while (offset < len) { + size = min(MXT_MAX_BLOCK_WRITE, len - offset); + + error = __mxt_read_chunk(client, + reg + offset, + size, buf + offset); + if (error) + return error; + + offset += size; + } + + return 0; +} + static int __mxt_write_reg(struct i2c_client *client, u16 reg, u16 len, const void *val) { -- 2.17.1