From patchwork Mon Aug 8 07:44:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: margeyang X-Patchwork-Id: 12938556 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 257E2C00140 for ; Mon, 8 Aug 2022 07:44:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241877AbiHHHoO (ORCPT ); Mon, 8 Aug 2022 03:44:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241970AbiHHHoL (ORCPT ); Mon, 8 Aug 2022 03:44:11 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7074612D34 for ; Mon, 8 Aug 2022 00:44:09 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id s5-20020a17090a13c500b001f4da9ffe5fso13708375pjf.5 for ; Mon, 08 Aug 2022 00:44:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=synaptics-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=q0PpEdhAzjWfrS8KqkDG8t0AFuVuP/HgT71GVF2po4w=; b=zq+BRRHkA4wQmh7m3Y8Ef3cENPETLN+x3xJXj+Il4KNImg8h6XPot4DnEhPp/JkCrI B8JjqRS9rWpDtzemgVfvTeYNM2Bni+l/Wi2ZNqDkBO1tiBMpf3KERekjyc7m4G72j/n1 JiL3qLYiBdXjBe06Y3vE5Qx9jPHXRLhIdZimRMwKkV56YiR8SQPNOm1ZQ43ZVwfKRLAI qSJ3KabKOWlPUIyqaHR6MN0tZLB5q280RpQDPYpO//p558moDmCstxwx7mEqJeO5wSeu Qc2XYaV/SmY+bhtakfhbC5bQ97WBdYSsJtUgwcZL6zCXRYAich/WDBm++yJ2Bv3/P+qC qbsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=q0PpEdhAzjWfrS8KqkDG8t0AFuVuP/HgT71GVF2po4w=; b=z138m1H5DFotCTKwP4guUIZQkpny760gXxv9QSpS3wx7Z8p+e3zZMkfuS9tmKB9RvO kaSri1L0BM9nQzEEtEbn+UJrbuC5Ev0iVCLnCB97l/k1FG/b4i/n6t9j7kPVvzuneh4t u87SR+cDTVytPiE+TSDKz1aBUHN4WIcZ5wjZdSHpcG34CLL7vAk5HMZNAIBHFZ6qSCqr iBJNmHE521LPLRsGmXcl7+VjP3rUgTZdsgiHm0lWr8DEtB0DuTUeThTyrsrdPxSn4DsR F0aUbQe8e31cbkQZkO/zz8pKzxtSeojdsciZ1ydajCOc0I4QJkC7Uc81hRGdUWGsZSEp Gdjg== X-Gm-Message-State: ACgBeo0Ly71a7vjjjMr1Jyimio41LaaN0h+0ElTtPVznfOy/TqUTdD3M VrzFLETKD/lKIdWqeP6jhJe1LQ== X-Google-Smtp-Source: AA6agR5KmrNKpDFH4eHwVEbctbsY8KMW94KGWECIZ7TMsvm7fvojvYqN4fVUr2pZcdGT8FSynRUmCw== X-Received: by 2002:a17:90a:9286:b0:1f1:bf7b:7602 with SMTP id n6-20020a17090a928600b001f1bf7b7602mr28196483pjo.83.1659944648881; Mon, 08 Aug 2022 00:44:08 -0700 (PDT) Received: from localhost.localdomain ([63.222.17.38]) by smtp.gmail.com with ESMTPSA id q63-20020a17090a17c500b001f303b06d2asm10031919pja.14.2022.08.08.00.44.05 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Aug 2022 00:44:08 -0700 (PDT) From: margeyang To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, hdegoede@redhat.com, benjamin.tissoires@redhat.com Cc: marge.yang@tw.synaptics.com, derek.cheng@tw.synaptcs.com, vincent.huang@tw.synaptics.com, Marge Yang Subject: [PATCH] Input: synaptics-rmi4 - filter incomplete relative packet. Date: Mon, 8 Aug 2022 15:44:01 +0800 Message-Id: <1659944641-2625-1-git-send-email-marge.yang@synaptics.corp-partner.google.com> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Marge Yang RMI4 F03 supports the Stick function, it's designed to support relative packet. This patch supports the following case. When relative packet can't be reported completely, it may miss one byte or two byte. New Synaptics firmware will report PARITY error. When timeout error or parity error happens, RMI4 driver will sends 0xFE command and ask FW to Re-send stick packet again. Signed-off-by: Marge Yang --- drivers/input/rmi4/rmi_f03.c | 82 ++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c index c194b1664b10..57f03dfcb4ff 100644 --- a/drivers/input/rmi4/rmi_f03.c +++ b/drivers/input/rmi4/rmi_f03.c @@ -23,8 +23,12 @@ #define RMI_F03_BYTES_PER_DEVICE_SHIFT 4 #define RMI_F03_QUEUE_LENGTH 0x0F +#define RMI_F03_RESET_STYK 0xFE + #define PSMOUSE_OOB_EXTRA_BTNS 0x01 +#define RELATIVE_PACKET_SIZE 0x03 + struct f03_data { struct rmi_function *fn; @@ -36,7 +40,8 @@ struct f03_data { u8 device_count; u8 rx_queue_length; }; - +int iwritecommandcounter; +unsigned int ipacketindex; int rmi_f03_overwrite_button(struct rmi_function *fn, unsigned int button, int value) { @@ -87,7 +92,7 @@ static int rmi_f03_pt_write(struct serio *id, unsigned char val) __func__, error); return error; } - + iwritecommandcounter++; return 0; } @@ -197,10 +202,12 @@ static int rmi_f03_register_pt(struct f03_data *f03) static int rmi_f03_probe(struct rmi_function *fn) { + struct device *dev = &fn->dev; struct f03_data *f03; int error; - + iwritecommandcounter = 0; + ipacketindex = 0; f03 = devm_kzalloc(dev, sizeof(struct f03_data), GFP_KERNEL); if (!f03) return -ENOMEM; @@ -251,9 +258,12 @@ static irqreturn_t rmi_f03_attention(int irq, void *ctx) const u8 ob_len = f03->rx_queue_length * RMI_F03_OB_SIZE; u8 obs[RMI_F03_QUEUE_LENGTH * RMI_F03_OB_SIZE]; u8 ob_status; + static u8 ob_dataArry[RELATIVE_PACKET_SIZE]; u8 ob_data; unsigned int serio_flags; + static unsigned int serio_flagsArry[RELATIVE_PACKET_SIZE]; int i; + int error; if (drvdata->attn_data.data) { @@ -284,6 +294,22 @@ static irqreturn_t rmi_f03_attention(int irq, void *ctx) ob_data = obs[i + RMI_F03_OB_DATA_OFFSET]; serio_flags = 0; + if (ob_status & (RMI_F03_OB_FLAG_TIMEOUT | RMI_F03_OB_FLAG_PARITY)) { + // Send resend command to stick when timeout or parity error. + // Driver can receive the last stick packet. + + error = rmi_write(f03->fn->rmi_dev, f03->fn->fd.data_base_addr, + RMI_F03_RESET_STYK); + if (error) { + dev_err(&f03->fn->dev, + "%s: Failed to rmi_write to F03 TX register (%d).\n", + __func__, error); + return error; + } + ipacketindex = 0; + break; + } + if (!(ob_status & RMI_F03_RX_DATA_OFB)) continue; @@ -298,9 +324,57 @@ static irqreturn_t rmi_f03_attention(int irq, void *ctx) serio_flags & SERIO_TIMEOUT ? 'Y' : 'N', serio_flags & SERIO_PARITY ? 'Y' : 'N'); - serio_interrupt(f03->serio, ob_data, serio_flags); + if (iwritecommandcounter > 0) { + // Read Acknowledge Byte after writing the PS2 command. + // It is not trackpoint data. + serio_interrupt(f03->serio, ob_data, serio_flags); + + } else { + // The relative-mode PS/2 packet format is as follows: + // + // bit position position (as array of bytes) + // 7 6 5 4 3 2 1 0 + // =================================+ + // Yov Xov DY8 DX8 1 M R L | DATA[0] + // DX[7:0] | DATA[1] + // DY[7:0] | DATA[2] + // =================================+ + // Yov: Y overflow + // Xov: X overflow + if ((ipacketindex == 0) && (ob_data & ((BIT(7)|BIT(6))))) { + dev_err(&f03->fn->dev, + "%s: X or Y is overflow. (%x)\n", + __func__, ob_data); + break; + } else if ((ipacketindex == 0) && !(ob_data & BIT(3))) { + dev_err(&f03->fn->dev, + "%s: New BIT 3 is not 1 for the first byte\n", + __func__); + } else { + if (ipacketindex >= RELATIVE_PACKET_SIZE) { + ipacketindex = 0; + } else { + ob_dataArry[ipacketindex] = ob_data; + serio_flagsArry[ipacketindex] = serio_flags; + ipacketindex++; + } + if (ipacketindex == RELATIVE_PACKET_SIZE) { + serio_interrupt(f03->serio, ob_dataArry[0], + serio_flagsArry[0]); + serio_interrupt(f03->serio, ob_dataArry[1], + serio_flagsArry[1]); + serio_interrupt(f03->serio, ob_dataArry[2], + serio_flagsArry[2]); + ipacketindex = 0; + } + } + } } + if (iwritecommandcounter > 0) { + ipacketindex = 0; + iwritecommandcounter = iwritecommandcounter - 1; + } return IRQ_HANDLED; }