From patchwork Tue Mar 31 10:50:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 207980 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, 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 5C79BC2D0EE for ; Tue, 31 Mar 2020 10:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CA5B2145D for ; Tue, 31 Mar 2020 10:54:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731012AbgCaKyC (ORCPT ); Tue, 31 Mar 2020 06:54:02 -0400 Received: from esa4.mentor.iphmx.com ([68.232.137.252]:43597 "EHLO esa4.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731003AbgCaKyB (ORCPT ); Tue, 31 Mar 2020 06:54:01 -0400 IronPort-SDR: LfYK4xXidlKhgWxwGVYhbfep5kZnennVjBl3ds599EZUOJCCrf0fNItbyEuwmao4Xji0D0WbGg d/EBeIbaGDY75CmBOS9wsX0915GiCNSrOq/GTotjM0YYEcLvV4kadApp3S6HMjcnOQmMZ7u5m+ jlubRW1FFe4D7U2DT1WlPfN8dy0WNLINxUwqOv2mPrCVr6nr6uw46P64F2vujPkk0KfI5LCLxo GthR4+R/w/5BonaPdje5j1IaS4laxMWc+Ah8wl3Dpriv3XbRoQ0wnGlAeQoaH6wQGRv4XIek+y fqA= X-IronPort-AV: E=Sophos;i="5.72,327,1580803200"; d="scan'208";a="47330849" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 31 Mar 2020 02:54:01 -0800 IronPort-SDR: fIo6CUoCqI+lV6D2t1nx4/2oUiJ8JKYojbFpAkU+lPjYaFzWEUfG4ecyY4AaTi4ConJUNnCf7t EyAoC3oI1Pm7SrVVVQ7Nnxxv8OqakFjn49z9WRLznL1ivmjiBhteDyzYczlHGEr/5ZsqMjdFSV 2EWCvfca8XU3N05zQ1ND7GdaM0xsbZg+Tc5p6Gk/MeT8LYpI6L5Kn9Ez8COnKuWVFbcUDagf40 LiHMqpb/VbBbbyEbhNSvBYIIMtgIoqP9ZCfEsocQr9NvjvhQoV/6BKWB5eWxfa9+u0AyEvIItH iyI= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v10 49/55] Input: Atmel: handle ReportID "0x00" while processing T5 messages Date: Tue, 31 Mar 2020 03:50:45 -0700 Message-ID: <20200331105051.58896-50-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: Deepak Das ReportID "0x00" is reserved by Atmel and should not be used by any Atmel touch controller. reportID is the first byte retrieved from T5 message payload. Currently Atmel driver continues to process the T5 messages even if the reportID "0x00" is returned by Touch Controller. This commit modifies Atmel touch driver to return -EINVAL if ReportID "0x00" is received while processing T5 messages. Signed-off-by: Deepak Das Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index ed357e958f07..496b1f67d9a5 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -76,6 +76,7 @@ #define MXT_PROCI_TOUCHSEQUENCELOGGER 93 #define MXT_TOUCH_MULTITOUCHSCREEN_T100 100 #define MXT_PROCI_ACTIVESTYLUS_T107 107 +#define MXT_RPTID_RESERVED 0 /* MXT_GEN_MESSAGE_T5 object */ #define MXT_RPTID_NOMSG 0xff @@ -1381,6 +1382,11 @@ static int mxt_proc_message(struct mxt_data *data, u8 *message) u8 report_id = message[0]; bool dump = data->debug_enabled; + if (report_id == MXT_RPTID_RESERVED) { + dev_err(&data->client->dev, + "Received Reserved ReportID 0x00\n"); + return -EINVAL; + } if (report_id == MXT_RPTID_NOMSG) return 0; @@ -1451,6 +1457,8 @@ static int mxt_read_and_process_messages(struct mxt_data *data, u8 count) ret = mxt_proc_message(data, data->msg_buf + data->T5_msg_size * i); + if (ret < 0) + return ret; if (ret == 1) num_valid++; }