From patchwork Tue Mar 31 10:50:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 208000 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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 CB3A6C43331 for ; Tue, 31 Mar 2020 10:51:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA86320772 for ; Tue, 31 Mar 2020 10:51:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730527AbgCaKvN (ORCPT ); Tue, 31 Mar 2020 06:51:13 -0400 Received: from esa4.mentor.iphmx.com ([68.232.137.252]:43515 "EHLO esa4.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730424AbgCaKvN (ORCPT ); Tue, 31 Mar 2020 06:51:13 -0400 IronPort-SDR: CLqJfG46vJa2aBd6gTzLHPAQ+nZzQAoqQNZA782rvjL+YO0LiTGut6WtIB7OByGLAqeIC24+V9 nr6ZAp8v/+V8fZZYPbWSuhgIzv5lb8Ln+Io1ESW0zdy6U5bc+vwXGUlblo2SMU7EgKbQwkFtEj BNDHlYNkvoqrtb/SX5Sa4oYZTByiiqaMQ+I6EzM62hBHJhIfrAB9JIpjji5HdFnXbfDnZ5Gl0r hCN2SyePW8HGgdAkY13VAFoQRrnuEZ55TkD4IpoJzbvIOVh1HWGJlWAwSJk8pKRbddHM2O/XkT 0Kk= X-IronPort-AV: E=Sophos;i="5.72,327,1580803200"; d="scan'208";a="47330719" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 31 Mar 2020 02:51:12 -0800 IronPort-SDR: MZNJWNuQ59fLGae+UTcZN6oQXcccZ3qvvKHiQ4T9QaRj9rVIVyFQgl5MvyNJzUR/K54iJsm/7h Z3n2TgYDuxfJUUTgDkGVbrYT4muMD/r1PRR6/S25avRBOI9G2d/FeK+8hxnw0Y2u/2TslWOV0V ktkhcwhkZE8hp4kUqZZL4nHQQVapfekHFNx8xnPYB3KJiR3H8MOgP899aQeHhGk0urmHkdHBep 7ucV1nPcGL+n0uHODk+sVY259/VlG5HUSpBiu4Q2UljvX28tnW4QXULqqGE79XnxfLZRMruVYQ 2AE= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v10 04/55] Input: atmel_mxt_ts - split large i2c transfers into blocks Date: Tue, 31 Mar 2020 03:50:00 -0700 Message-ID: <20200331105051.58896-5-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200331105051.58896-1-jiada_wang@mentor.com> References: <20200331105051.58896-1-jiada_wang@mentor.com> MIME-Version: 1.0 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 3f1ebe14802f..7e6a66e3e1e0 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) {