From patchwork Wed May 25 07:47:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Zaidman X-Patchwork-Id: 576364 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 26F76C433F5 for ; Wed, 25 May 2022 07:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242194AbiEYHsu (ORCPT ); Wed, 25 May 2022 03:48:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233874AbiEYHsp (ORCPT ); Wed, 25 May 2022 03:48:45 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F0FC77F3F; Wed, 25 May 2022 00:48:44 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id er5so25906442edb.12; Wed, 25 May 2022 00:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qj2qVWqqLCW4wt2qnLg7N/C1U3pSsjcBWbFI/p2DKxo=; b=iMCw1g8NbI+EJvFWr/N4GGCYOCmtfzEYCbFiBjG20E7Y3KUNy+YCDeJ817+zWQ/nv3 6XvytPmWARu0mNA9ZOGXu8ugQ9BIn8L1AO2HT/5Wz3ZEAZPBfG5SxKpYfZbJChHpXomx ROPlVZtwqoIZdlXJNtJOhiYxd63dcZlXKI0AW/vDWHkB0d27h5Wr9pTg0dD0SD2znIFo IGUxoQiy53lPRE2RftdN///o7+G6m1WfpOl6d2eL/Zp/Zt4X3pDSVwZ69pVPZTq5Hysm Z+x7jddj/5yRnlAlKtnBCkL1G7MKEhcLLXyIX+oByDKYVwNnXucf014S5zTu+RMHtDwE Rouw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=qj2qVWqqLCW4wt2qnLg7N/C1U3pSsjcBWbFI/p2DKxo=; b=QcYW/Tv8RWnP4zpxUyAj9lc6TkAdPOr5wdBLtG0nf+pAYwm9miuwHDighsYxWg6J1y 3IZ7J2u1DK9H+P7TSMMhoQZcRpTvPKscZmZENRvg/3VXUjRmeUAC8+5VfeMySSWqyqTk GK6Ld+kx4q133Ny5k4/Y35mMRf3o9GsDOn1KAYgVSPMDnwQz7k6gskGosRKm/WbS1A4s jW2Ox0sDafUWldMfAM61AstTl/5MbAa+QUN+9LsrjEcj9H6TBkXoawJMYRzBZbZX0lqS v+OcXNZUv6rT3mOvuUI4IplVkcdPT4pWJjDj75VdifhkguPz4gwCyD0/uRJKx+vkEEZL 9iEw== X-Gm-Message-State: AOAM5312cOVKUPODVLmc+j0e3dC6UhSAD0sRYpQHBNLLHKrjCs+IF+Dq p4upwj6TDJ5JZ0uOLKC5x7Q= X-Google-Smtp-Source: ABdhPJz26cECGka/7zgeIiSFkCp4S4KgagTzg/c1mQ/039Cm0lhzI0oaQemXIJvbRE7ioTqpmneJ4Q== X-Received: by 2002:aa7:d94b:0:b0:42a:b93b:c54f with SMTP id l11-20020aa7d94b000000b0042ab93bc54fmr32766944eds.246.1653464922551; Wed, 25 May 2022 00:48:42 -0700 (PDT) Received: from localhost.localdomain (109-186-136-71.bb.netvision.net.il. [109.186.136.71]) by smtp.googlemail.com with ESMTPSA id v1-20020aa7d641000000b0042acd78014esm10230533edr.11.2022.05.25.00.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 00:48:42 -0700 (PDT) From: Michael Zaidman To: jikos@kernel.org, benjamin.tissoires@redhat.com, wsa@kernel.org Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-i2c@vger.kernel.org, champagne.guillaume.c@gmail.com, mathieu.gallichand@sonatest.com, Michael Zaidman Subject: [PATCH v1 1/5] HID: ft260: ft260_xfer_status routine cleanup Date: Wed, 25 May 2022 10:47:53 +0300 Message-Id: <20220525074757.7519-2-michael.zaidman@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220525074757.7519-1-michael.zaidman@gmail.com> References: <20220525074757.7519-1-michael.zaidman@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org After clarifying with FTDI's support, it turned out that the error condition (bit 1) in byte 1 of the i2c status HID report is a status bit reflecting all error conditions. When bits 2, 3, or 4 are raised to 1, bit 1 is set to 1 also. Since the ft260_xfer_status routine tests the error condition bit and exits in the case of an error, the program flow never reaches the conditional expressions for 2, 3, and 4 bits when any of them indicates an error state. Though these expressions are never evaluated to true, they are checked several times per IO, increasing the ft260_xfer_status polling cycle duration. The patch removes the conditional expressions for 2, 3, and 4 bits in byte 1 of the i2c status HID report. Signed-off-by: Michael Zaidman --- drivers/hid/hid-ft260.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/hid/hid-ft260.c b/drivers/hid/hid-ft260.c index 79505c64dbfe..a35201d68b15 100644 --- a/drivers/hid/hid-ft260.c +++ b/drivers/hid/hid-ft260.c @@ -313,27 +313,17 @@ static int ft260_xfer_status(struct ft260_device *dev) if (report.bus_status & FT260_I2C_STATUS_CTRL_BUSY) return -EAGAIN; - if (report.bus_status & FT260_I2C_STATUS_BUS_BUSY) - return -EBUSY; - - if (report.bus_status & FT260_I2C_STATUS_ERROR) + /* + * The error condition (bit 1) is a status bit reflecting any + * error conditions. When any of the bits 2, 3, or 4 are raised + * to 1, bit 1 is also set to 1. + */ + if (report.bus_status & FT260_I2C_STATUS_ERROR) { + hid_err(hdev, "i2c bus error: %#02x\n", report.bus_status); return -EIO; + } - ret = -EIO; - - if (report.bus_status & FT260_I2C_STATUS_ADDR_NO_ACK) - ft260_dbg("unacknowledged address\n"); - - if (report.bus_status & FT260_I2C_STATUS_DATA_NO_ACK) - ft260_dbg("unacknowledged data\n"); - - if (report.bus_status & FT260_I2C_STATUS_ARBITR_LOST) - ft260_dbg("arbitration loss\n"); - - if (report.bus_status & FT260_I2C_STATUS_CTRL_IDLE) - ret = 0; - - return ret; + return 0; } static int ft260_hid_output_report(struct hid_device *hdev, u8 *data, @@ -376,7 +366,7 @@ static int ft260_hid_output_report_check_status(struct ft260_device *dev, break; } while (--try); - if (ret == 0 || ret == -EBUSY) + if (ret == 0) return 0; ft260_i2c_reset(hdev); From patchwork Wed May 25 07:47:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Zaidman X-Patchwork-Id: 576363 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 DB2D7C433F5 for ; Wed, 25 May 2022 07:48:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241528AbiEYHsw (ORCPT ); Wed, 25 May 2022 03:48:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235342AbiEYHsu (ORCPT ); Wed, 25 May 2022 03:48:50 -0400 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA0D47A441; Wed, 25 May 2022 00:48:49 -0700 (PDT) Received: by mail-ed1-x533.google.com with SMTP id t5so2587005edc.2; Wed, 25 May 2022 00:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u9UJOS66i5yFUQsYYMbxlzi5aNdbaP9eMSKq+XXNp0c=; b=S3DJSeHecnZFxubSfPF0Z0w6xU+HxVkyDmhQd1s+4oAAiDhj+RGPz3G9zgndmoo8K8 5bu7O6nJN/puyMuLNB5wU05y0mXAZUz3Uewto6vJau20hppEMFbfgDlQ4Hi3nfu0WwFh dgwgTUBKUQBhZg0TDHM62fVngJjdbYGqup0j5dOzheZx2psnB6PH/6YPwOXBYcsyTEXR CRhIPvyPODvaHLXpXt9b+THbUwM5e2UftrkAIl/Y0C/cfshcJ/wv5tC2kOlGgrMly57k 9+mf5LrumWlBSePfZu/mfLkbigxCiKjbdt5OQp2Of61C2T1W9d25bMuN2nPY3LK/Spl5 9pRA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=u9UJOS66i5yFUQsYYMbxlzi5aNdbaP9eMSKq+XXNp0c=; b=MxPgXRopjEpEw7T2ZN+1LyBqkDiS7LfahUFR4+4os6+UBA+3wsRb2lHo6+mz8aZuOr 6neqNHmhs21gK3pZIDmz4fHUCveBxyCSRHEKUxb/kJv/ch+1E4NzJtDj0uF3HsYxVmAd iP/gV59OwZysCddwXzmAIQrenAKDKdL+HymwGEM/4DqPgAOkBuDGgSTlendqjaaL8RYR qaIwKj9yh+WwhczoqiHvLPCNsiZ1sAJPkdZ0VoiOJf0D1r61dRnwrRuzDMH18l/RyX/1 FcWMoDcBFEluoJtI1z41Jl4XmZA3hbDAQc31Y/qMtvNps39OY0CTEUvh9l5rPsnA+Lu9 6LPg== X-Gm-Message-State: AOAM533/QnM/pdzyu32wXwCzCRayJrx5pec6+6qbI4+z7x5oN49vC2p4 TUI1pwXQrR3iYglhOvBO+9M= X-Google-Smtp-Source: ABdhPJzcEWUi3dCkF3+FGXBK8vYUSbguKrAfvazHqmFLxDDMzDy7v0Q9RYwrIDGKS/Z9qKlo1q7Xpw== X-Received: by 2002:a05:6402:1007:b0:428:beb6:f483 with SMTP id c7-20020a056402100700b00428beb6f483mr33044722edu.391.1653464928263; Wed, 25 May 2022 00:48:48 -0700 (PDT) Received: from localhost.localdomain (109-186-136-71.bb.netvision.net.il. [109.186.136.71]) by smtp.googlemail.com with ESMTPSA id v1-20020aa7d641000000b0042acd78014esm10230533edr.11.2022.05.25.00.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 00:48:47 -0700 (PDT) From: Michael Zaidman To: jikos@kernel.org, benjamin.tissoires@redhat.com, wsa@kernel.org Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-i2c@vger.kernel.org, champagne.guillaume.c@gmail.com, mathieu.gallichand@sonatest.com, Michael Zaidman Subject: [PATCH v1 3/5] HID: ft260: support i2c writes larger than HID report size Date: Wed, 25 May 2022 10:47:55 +0300 Message-Id: <20220525074757.7519-4-michael.zaidman@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220525074757.7519-1-michael.zaidman@gmail.com> References: <20220525074757.7519-1-michael.zaidman@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org To support longer than one HID report size write, the driver splits a single i2c message data payload into multiple i2c messages of HID report size. However, it does not replicate the offset bytes within the EEPROM chip in every consequent HID report because it is not and should not be aware of the EEPROM type. It breaks the i2c write message integrity and causes the EEPROM device not to acknowledge the second HID report keeping the i2c bus busy until the ft260 controller reports failure. This patch preserves the i2c write message integrity by manipulating the i2c flag bits across multiple HID reports to be seen by the EEPROM device as a single i2c write transfer. Before: $ sudo ./i2cperf -f 2 -o 2 -s 64 -r 0-0xff 13 0x51 -S Error: Sending messages failed: Input/output error [ +3.667741] ft260_i2c_write: rep 0xde addr 0x51 off 0 len 60 d[0] 0x0 [ +0.007330] ft260_hid_output_report_check_status: wait 6400 usec, len 64 [ +0.000203] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000001] ft260_i2c_write: rep 0xd1 addr 0x51 off 60 len 6 d[0] 0x0 [ +0.002337] ft260_hid_output_report_check_status: wait 1000 usec, len 10 [ +0.000157] ft260_xfer_status: bus_status 0x2e, clock 100 [ +0.000241] ft260_i2c_reset: done [ +0.000003] ft260 0003:0403:6030.000E: ft260_i2c_write: failed to start transfer, ret -5 After: $ sudo ./i2cperf -f 2 -o 2 -s 128 -r 0-0xff 13 0x51 -S Fill block with increment via i2ctransfer by chunks ------------------------------------------------------------------- data rate(bps) efficiency(%) data size(B) total IOs IO size(B) ------------------------------------------------------------------- 58986 86 256 2 128 Signed-off-by: Michael Zaidman --- drivers/hid/hid-ft260.c | 45 ++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/drivers/hid/hid-ft260.c b/drivers/hid/hid-ft260.c index 44106cadd746..bfda5b191a3a 100644 --- a/drivers/hid/hid-ft260.c +++ b/drivers/hid/hid-ft260.c @@ -378,41 +378,50 @@ static int ft260_hid_output_report_check_status(struct ft260_device *dev, } static int ft260_i2c_write(struct ft260_device *dev, u8 addr, u8 *data, - int data_len, u8 flag) + int len, u8 flag) { - int len, ret, idx = 0; + int ret, wr_len, idx = 0; + bool first = true; struct hid_device *hdev = dev->hdev; struct ft260_i2c_write_request_report *rep = (struct ft260_i2c_write_request_report *)dev->write_buf; do { - if (data_len <= FT260_WR_DATA_MAX) - len = data_len; - else - len = FT260_WR_DATA_MAX; + rep->flag = 0; + if (first) { + rep->flag = FT260_FLAG_START; + first = false; + } + + if (len <= FT260_WR_DATA_MAX) { + wr_len = len; + if (flag == FT260_FLAG_START_STOP) + rep->flag |= FT260_FLAG_STOP; + } else { + wr_len = FT260_WR_DATA_MAX; + } - rep->report = FT260_I2C_DATA_REPORT_ID(len); + rep->report = FT260_I2C_DATA_REPORT_ID(wr_len); rep->address = addr; - rep->length = len; - rep->flag = flag; + rep->length = wr_len; - memcpy(rep->data, &data[idx], len); + memcpy(rep->data, &data[idx], wr_len); - ft260_dbg("rep %#02x addr %#02x off %d len %d d[0] %#02x\n", - rep->report, addr, idx, len, data[0]); + ft260_dbg("rep %#02x addr %#02x off %d len %d wlen %d flag %#x d[0] %#02x\n", + rep->report, addr, idx, len, wr_len, + rep->flag, data[0]); ret = ft260_hid_output_report_check_status(dev, (u8 *)rep, - len + 4); + wr_len + 4); if (ret < 0) { - hid_err(hdev, "%s: failed to start transfer, ret %d\n", - __func__, ret); + hid_err(hdev, "%s: failed with %d\n", __func__, ret); return ret; } - data_len -= len; - idx += len; + len -= wr_len; + idx += wr_len; - } while (data_len > 0); + } while (len > 0); return 0; } From patchwork Wed May 25 07:47:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Zaidman X-Patchwork-Id: 576362 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 70475C433FE for ; Wed, 25 May 2022 07:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231828AbiEYHtD (ORCPT ); Wed, 25 May 2022 03:49:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240135AbiEYHs6 (ORCPT ); Wed, 25 May 2022 03:48:58 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 387D37A441; Wed, 25 May 2022 00:48:57 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id f21so26301316ejh.11; Wed, 25 May 2022 00:48:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=chBnq270F5Fwvfl8uan3+Yhvg63sd1rGbqIKPhc1Ois=; b=gA9+T+ilmMK6wfbzNN7GznBvQNcK7a7eQBDJmo+T17hrnf8aY388arsvAt9fdGXrHC AOOwLNFwIwsfEgKNtUSwEDa2iLags4iOsiLxlcQkBrvLIwR7RTW3zyuZedVwbBmQRkET Ahx7pRYkFkr2NSggSV6gc0Y4q0pKUbw2HWs6N7mECPWHjzdPgpd9v2KH/eO1KDDkkcQn 594PaVc7UXpE6q6oqM/JZbAkhusR9rO/rqgkqTEy8+c5fVmo+8eXjQBayvkJiTct1R5u ElBhHMGUpgthQ+fntFIRgn/Ae7f/fjd+3OMnRoUMv1abODx198nKkn926e44fXedIuI7 pLYw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=chBnq270F5Fwvfl8uan3+Yhvg63sd1rGbqIKPhc1Ois=; b=TNqWGi4mF+JZYnd5jmk5k1ghEyr20Zh+uumh27OVo0MW16ZxQ7Ej2AZhnPldMzyuK/ 4qqaEIdaTibuqyqWLLSzGG1Jt+mdaqQmdQC4OSOSORZM0IUeuHPcwq66fJIvQZLutBvE YUR3eu9H/bc3wnBZqZsn3FVr/04nnj11W6UMa4oWgWYa8l+EcaOThFZlBtQwOTEG5igB cUWDWIU/efC+Jf5OSwooPNJvMmliFBTZlz/nMmnRI0Ld/mqassDDAjIvEUNDtViA58b5 cArG2rvzqASFOjdTSXRpNDn6elcrh7YzskYZZ2Ks3T/HSnxx0+rNdH1UkbPfTq1jIl9F huyw== X-Gm-Message-State: AOAM532Gu53Od3o61yHRVMwLiX1WmJBje5b1yUDRQr+6KltAD/WqZKFr j56Gvy7AO4bRM4FfDBHNMQL7j/zvBHk+xw== X-Google-Smtp-Source: ABdhPJzhq7kF+Qf+Mk+9t0TDEQePhUJI1GrBrPYuJkNLpV0eRNt7Cw9Iasn2yHlXPQF2qPUmr6SRUA== X-Received: by 2002:a17:907:6090:b0:6fa:14ca:fba2 with SMTP id ht16-20020a170907609000b006fa14cafba2mr29010902ejc.564.1653464935586; Wed, 25 May 2022 00:48:55 -0700 (PDT) Received: from localhost.localdomain (109-186-136-71.bb.netvision.net.il. [109.186.136.71]) by smtp.googlemail.com with ESMTPSA id v1-20020aa7d641000000b0042acd78014esm10230533edr.11.2022.05.25.00.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 00:48:55 -0700 (PDT) From: Michael Zaidman To: jikos@kernel.org, benjamin.tissoires@redhat.com, wsa@kernel.org Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, linux-i2c@vger.kernel.org, champagne.guillaume.c@gmail.com, mathieu.gallichand@sonatest.com, Michael Zaidman Subject: [PATCH v1 5/5] HID: ft260: improve i2c large reads performance Date: Wed, 25 May 2022 10:47:57 +0300 Message-Id: <20220525074757.7519-6-michael.zaidman@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220525074757.7519-1-michael.zaidman@gmail.com> References: <20220525074757.7519-1-michael.zaidman@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The patch increases the read buffer size to 128 bytes. It reduces the number of ft260_i2c_read calls by three and improves the large data chunks' read performance by about 10%. Before: $ sudo ./i2cperf -d 2 -o 2 -s 128 -r 0-0xff 13 0x51 -S Read block via i2ctransfer by chunks ------------------------------------------------------------------- data rate(bps) efficiency(%) data size(B) total IOs IO size(B) ------------------------------------------------------------------- 43990 85 256 2 128 [ +1.464346] ft260_i2c_write_read: off 0x0 rlen 128 wlen 2 [ +0.000002] ft260_i2c_write: rep 0xd0 addr 0x51 off 0 len 2 wlen 2 flag 0x2 d[0] 0x0 [ +0.001653] ft260_xfer_status: bus_status 0x41, clock 100 [ +0.000188] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000002] ft260_i2c_read: rep 0xc2 addr 0x51 len 128 rlen 60 flag 0x3 [ +0.008609] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000157] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000002] ft260_i2c_read: rep 0xc2 addr 0x51 len 68 rlen 60 flag 0x0 [ +0.008840] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000203] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000002] ft260_i2c_read: rep 0xc2 addr 0x51 len 8 rlen 8 flag 0x4 [ +0.002794] ft260_raw_event: i2c resp: rep 0xd1 len 8 [ +0.000201] ft260_xfer_status: bus_status 0x20, clock 100 [ +0.015171] ft260_i2c_write_read: off 0x80 rlen 128 wlen 2 [ +0.000002] ft260_i2c_write: rep 0xd0 addr 0x51 off 0 len 2 wlen 2 flag 0x2 d[0] 0x0 [ +0.000764] ft260_xfer_status: bus_status 0x41, clock 100 [ +0.000231] ft260_xfer_status: bus_status 0x41, clock 100 [ +0.000148] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000002] ft260_i2c_read: rep 0xc2 addr 0x51 len 128 rlen 60 flag 0x3 [ +0.008488] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000205] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000002] ft260_i2c_read: rep 0xc2 addr 0x51 len 68 rlen 60 flag 0x0 [ +0.008795] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000176] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000001] ft260_i2c_read: rep 0xc2 addr 0x51 len 8 rlen 8 flag 0x4 [ +0.002819] ft260_raw_event: i2c resp: rep 0xd1 len 8 [ +0.000167] ft260_xfer_status: bus_status 0x20, clock 100 After: $ sudo ./i2cperf -d 2 -o 2 -s 128 -r 0-0xff 13 0x51 -S Read block via i2ctransfer by chunks ------------------------------------------------------------------- data rate(bps) efficiency(%) data size(B) total IOs IO size(B) ------------------------------------------------------------------- 49316 85 256 2 128 [ +1.447360] ft260_i2c_write_read: off 0x0 rlen 128 wlen 2 [ +0.000002] ft260_i2c_write: rep 0xd0 addr 0x51 off 0 len 2 wlen 2 flag 0x2 d[0] 0x0 [ +0.001633] ft260_xfer_status: bus_status 0x41, clock 100 [ +0.000190] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000001] ft260_i2c_read: rep 0xc2 addr 0x51 len 128 rlen 128 flag 0x7 [ +0.008617] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.008033] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000954] ft260_raw_event: i2c resp: rep 0xd1 len 8 [ +0.000208] ft260_xfer_status: bus_status 0x20, clock 100 [ +0.015853] ft260_i2c_write_read: off 0x80 rlen 128 wlen 2 [ +0.000002] ft260_i2c_write: rep 0xd0 addr 0x51 off 0 len 2 wlen 2 flag 0x2 d[0] 0x0 [ +0.001182] ft260_xfer_status: bus_status 0x41, clock 100 [ +0.000180] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000001] ft260_i2c_read: rep 0xc2 addr 0x51 len 128 rlen 128 flag 0x7 [ +0.008575] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.008014] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.001001] ft260_raw_event: i2c resp: rep 0xd1 len 8 [ +0.000223] ft260_xfer_status: bus_status 0x20, clock 100 Signed-off-by: Michael Zaidman --- drivers/hid/hid-ft260.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/hid/hid-ft260.c b/drivers/hid/hid-ft260.c index cb8f1782d1f0..c7c3a9d395a2 100644 --- a/drivers/hid/hid-ft260.c +++ b/drivers/hid/hid-ft260.c @@ -30,12 +30,8 @@ MODULE_PARM_DESC(debug, "Toggle FT260 debugging messages"); #define FT260_REPORT_MAX_LENGTH (64) #define FT260_I2C_DATA_REPORT_ID(len) (FT260_I2C_REPORT_MIN + (len - 1) / 4) -/* - * The input report format assigns 62 bytes for the data payload, but ft260 - * returns 60 and 2 in two separate transactions. To minimize transfer time - * in reading chunks mode, set the maximum read payload length to 60 bytes. - */ -#define FT260_RD_DATA_MAX (60) + +#define FT260_RD_DATA_MAX (128) #define FT260_WR_DATA_MAX (60) /*