From nobody Sat Apr 11 07:54:19 2026 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 DCF9EC32772 for ; Tue, 16 Aug 2022 10:20:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234424AbiHPKUI (ORCPT ); Tue, 16 Aug 2022 06:20:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233539AbiHPKTn (ORCPT ); Tue, 16 Aug 2022 06:19:43 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 411164B4A2 for ; Tue, 16 Aug 2022 02:20:56 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id f65so8720649pgc.12 for ; Tue, 16 Aug 2022 02:20:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=synaptics-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:subject:cc:to:from:from:to:cc; bh=NYMVGkKHTI2397pZiPkc6thZcKXJkTNnoZ83oivJ0hA=; b=3MdnH6Wu+h0/6p9F+Sgw7j7Zn84mdhKm9pp478xVH+Xp2ZCl4a+WzmIBdqHbo0hWVS 6CT6RuTe7l0wSqvznHsR955Z8o4RcpaTM1bNCQ0NM/xZC8tEn5ayEFQYRaH3yzHw8aq5 wejBHEBpZyJyzxqZd5g6JjhDkqTqYnu9ajHalVYW1tUS7aVIBck3/VZvpKLzJu8WIjR1 hpab0KlgWt9FeRf+0C8e/AvO1AVSOAADFn4FjJ4bgTVFjUhKc93YThSznAaKAhmsL/mU 4qyXi3Fyq6uMJoRiP6trVc8oA0bxZyhAgmXKhQ0gbq0DS4vP7EQcIj+mSqkpknux86hK Fx/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=NYMVGkKHTI2397pZiPkc6thZcKXJkTNnoZ83oivJ0hA=; b=vK+6hNPzkb8xiw+kJ+Lq9o1PbKe26UDHHHbMJ5qnxnsFruHNAAHPkEoiMdMy87pyMX wk4zwgU+a82p19HL4q2GS0FtMn8zjVKO6jhUEmFf/pCeQuQ04Nd8ryIEAJ9rBnTjxi82 F+QI0fHZwX3Ums6etbLLM0R9o3qNEMzscCHlaYhh7BzB4sRc/ilEPQZHp8tRMFhcuo8k 37BQ/aCnic5WO33Xi1hDHiYzNXr0p/cYS11BzxWoWm2pPHEaD05JaMwwIepqD++dTmoN 02G2o176iWx5hH6Tqsio2Cko8to7XzPH+GgqGWF8M5hzZuIvHqjVh7N7TG4VyGZfnfgm OWhg== X-Gm-Message-State: ACgBeo2IRMt6m+aLilq949Ok8uWWXvYrgqjGl1AWf0o4r/oBwatcZW7D s02lIxrEe83q3cPVcqbBUMSrmYBfpnbh0CLJ X-Google-Smtp-Source: AA6agR4ycWJjwl2rFgkoYIo9fC0Cg8flQ7zt65qwLV9hxmhCn9wMJd8m0S2RL9ct/jVoxEkqZs0PSw== X-Received: by 2002:a63:6587:0:b0:41b:dacc:1826 with SMTP id z129-20020a636587000000b0041bdacc1826mr16835970pgb.142.1660641655741; Tue, 16 Aug 2022 02:20:55 -0700 (PDT) Received: from margeyang-ThinkPad-T440.synaptics-inc.local ([63.222.17.37]) by smtp.gmail.com with ESMTPSA id i14-20020a056a00004e00b0052db5872d7esm7963897pfk.22.2022.08.16.02.20.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2022 02:20:55 -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.synaptics.com, vincent.huang@tw.synaptics.com, Marge Yang Subject: [PATCH V4] Input: synaptics-rmi4 - filter incomplete relative packet. Date: Tue, 16 Aug 2022 17:20:49 +0800 Message-Id: <1660641649-11929-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-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by is in no way a guarantee that this will get merged. Reviewed-by: Hans de Goede --- drivers/input/rmi4/rmi_f03.c | 74 +++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_f03.c b/drivers/input/rmi4/rmi_f03.c index c194b1664b10..563b40c2dc06 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 =20 +#define RMI_F03_RESET_STYK 0xFE + #define PSMOUSE_OOB_EXTRA_BTNS 0x01 =20 +#define RELATIVE_PACKET_SIZE 3 + struct f03_data { struct rmi_function *fn; =20 @@ -33,6 +37,11 @@ struct f03_data { =20 unsigned int overwrite_buttons; =20 + int iwritecommandcounter; + unsigned int ipacketindex; + unsigned int serio_flagsArry[RELATIVE_PACKET_SIZE]; + u8 ob_dataArry[RELATIVE_PACKET_SIZE]; + u8 device_count; u8 rx_queue_length; }; @@ -88,6 +97,7 @@ static int rmi_f03_pt_write(struct serio *id, unsigned ch= ar val) return error; } =20 + f03->iwritecommandcounter++; return 0; } =20 @@ -107,6 +117,8 @@ static int rmi_f03_initialize(struct f03_data *f03) return error; } =20 + f03->iwritecommandcounter =3D 0; + f03->ipacketindex =3D 0; f03->device_count =3D query1 & RMI_F03_DEVICE_COUNT; bytes_per_device =3D (query1 >> RMI_F03_BYTES_PER_DEVICE_SHIFT) & RMI_F03_BYTES_PER_DEVICE; @@ -284,6 +296,22 @@ static irqreturn_t rmi_f03_attention(int irq, void *ct= x) ob_data =3D obs[i + RMI_F03_OB_DATA_OFFSET]; serio_flags =3D 0; =20 + 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. + unsigned char val =3D RMI_F03_RESET_STYK; + + error =3D rmi_write(f03->fn->rmi_dev, f03->fn->fd.data_base_addr, val); + if (error) { + dev_err(&f03->fn->dev, + "%s: Failed to rmi_write to F03 TX register (%d).\n", + __func__, error); + return error; + } + f03->ipacketindex =3D 0; + break; + } + if (!(ob_status & RMI_F03_RX_DATA_OFB)) continue; =20 @@ -298,7 +326,51 @@ static irqreturn_t rmi_f03_attention(int irq, void *ct= x) serio_flags & SERIO_TIMEOUT ? 'Y' : 'N', serio_flags & SERIO_PARITY ? 'Y' : 'N'); =20 - serio_interrupt(f03->serio, ob_data, serio_flags); + if (f03->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 + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + // Yov Xov DY8 DX8 1 M R L | DATA[0] + // DX[7:0] | DATA[1] + // DY[7:0] | DATA[2] + // =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D+ + // Yov: Y overflow + // Xov: X overflow + if ((f03->ipacketindex =3D=3D 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 ((f03->ipacketindex =3D=3D 0) && !(ob_data & BIT(3))) { + dev_err(&f03->fn->dev, + "%s: New BIT 3 is not 1 for the first byte\n", + __func__); + break; + } + f03->ob_dataArry[f03->ipacketindex] =3D ob_data; + f03->serio_flagsArry[f03->ipacketindex] =3D serio_flags; + f03->ipacketindex++; + + if (f03->ipacketindex =3D=3D RELATIVE_PACKET_SIZE) { + serio_interrupt(f03->serio, f03->ob_dataArry[0], + f03->serio_flagsArry[0]); + serio_interrupt(f03->serio, f03->ob_dataArry[1], + f03->serio_flagsArry[1]); + serio_interrupt(f03->serio, f03->ob_dataArry[2], + f03->serio_flagsArry[2]); + f03->ipacketindex =3D 0; + } + } + } + if (f03->iwritecommandcounter > 0) { + f03->ipacketindex =3D 0; + f03->iwritecommandcounter =3D f03->iwritecommandcounter - 1; } =20 return IRQ_HANDLED; --=20 2.22.0.windows.1