Skip to content

Commit 85fc8d7

Browse files
MichaelZaidmangregkh
authored andcommitted
HID: ft260: improve i2c large reads performance
[ Upstream commit 54410c1 ] The patch increases the read buffer size to 180 bytes. It reduces the number of ft260_i2c_read() calls by three, improving the big reads performance. $ sudo i2ctransfer -y -f 13 w2@0x51 0x0 0x0 r180 Before: [ +4.071878] ft260_i2c_write_read: off 0x0 rlen 180 wlen 2 [ +0.000005] ft260_i2c_write: rep 0xd0 addr 0x51 off 0 len 2 wlen 2 flag 0x2 d[0] 0x0 [ +0.001097] ft260_xfer_status: bus_status 0x41, clock 100 [ +0.000175] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000004] ft260_i2c_read: rep 0xc2 addr 0x51 len 180 rlen 60 flag 0x3 [ +0.008579] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000208] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000001] ft260_i2c_read: rep 0xc2 addr 0x51 len 120 rlen 60 flag 0x0 [ +0.008794] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000181] ft260_xfer_status: bus_status 0x40, clock 100 [ +0.000002] ft260_i2c_read: rep 0xc2 addr 0x51 len 60 rlen 60 flag 0x4 [ +0.008817] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000223] ft260_xfer_status: bus_status 0x20, clock 100 After: [ +11.611642] ft260_i2c_write_read: off 0x0 rlen 180 wlen 2 [ +0.000005] ft260_i2c_write: rep 0xd0 addr 0x51 off 0 len 2 wlen 2 flag 0x2 d[0] 0x0 [ +0.008001] ft260_xfer_status: bus_status 0x20, clock 100 [ +0.000001] ft260_i2c_read: rep 0xc2 addr 0x51 len 180 rlen 180 flag 0x7 [ +0.008994] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.007987] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.007992] ft260_raw_event: i2c resp: rep 0xde len 60 [ +0.000206] ft260_xfer_status: bus_status 0x20, clock 100 Suggested-by: Enrik Berkhan <Enrik.Berkhan@inka.de> Signed-off-by: Michael Zaidman <michael.zaidman@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Stable-dep-of: bf3e39d ("HID: ft260: fix stack-use-after-return write in I2C read race") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 21b4caf commit 85fc8d7

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

drivers/hid/hid-ft260.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,19 @@ MODULE_PARM_DESC(debug, "Toggle FT260 debugging messages");
3030

3131
#define FT260_REPORT_MAX_LENGTH (64)
3232
#define FT260_I2C_DATA_REPORT_ID(len) (FT260_I2C_REPORT_MIN + (len - 1) / 4)
33+
3334
/*
34-
* The input report format assigns 62 bytes for the data payload, but ft260
35-
* returns 60 and 2 in two separate transactions. To minimize transfer time
36-
* in reading chunks mode, set the maximum read payload length to 60 bytes.
37-
*/
38-
#define FT260_RD_DATA_MAX (60)
35+
* The ft260 input report format defines 62 bytes for the data payload, but
36+
* when requested 62 bytes, the controller returns 60 and 2 in separate input
37+
* reports. To achieve better performance with the multi-report read data
38+
* transfers, we set the maximum read payload length to a multiple of 60.
39+
* With a 100 kHz I2C clock, one 240 bytes read takes about 1/27 second,
40+
* which is excessive; On the other hand, some higher layer drivers like at24
41+
* or optoe limit the i2c reads to 128 bytes. To not block other drivers out
42+
* of I2C for potentially troublesome amounts of time, we select the maximum
43+
* read payload length to be 180 bytes.
44+
*/
45+
#define FT260_RD_DATA_MAX (180)
3946
#define FT260_WR_DATA_MAX (60)
4047

4148
/*

0 commit comments

Comments
 (0)