package/i2c-tools: add upstream post-4.2 i2ctransfer fix
PATCH 1/1 package/i2c-tools: add upstream post-4.2 i2ctransfer fix
i2c-tools 4.2 contained an invalid check, leading to verbose false-positive warning messages when the variable length ({r,w}?) option is used:
https://www.spinics.net/lists/linux-i2c/msg50032.html
Unfortunately upstream does not make bugfix releases, instead opting to list such bugfixes on the wiki:
https://i2c.wiki.kernel.org/index.php/I2C_Tools
So add the patch here.
--- ...transfer-add-check-for-returned-leng.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch
package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch new file +41 -0
@@ -0,0 +1,41 @@ +From 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb Mon Sep 17 00:00:00 2001 +From: Wolfram Sang <[email protected]> +Date: Tue, 9 Feb 2021 12:05:56 +0100 +Subject: [PATCH] Revert "tools: i2ctransfer: add check for returned length + from driver" + +This reverts commit 34806fc4e7090b34e32fa1110d546ab5ce01a6a0. It was +developed against an experimental kernel. The regular kernel does not +update the new message length to userspace, so the check is always false +positive. We can't change the kernel behaviour because it would break +the ABI. So revert this commit. + +Signed-off-by: Wolfram Sang <[email protected]> +Signed-off-by: Wolfram Sang <[email protected]> +[Peter: drop CHANGES update] +Signed-off-by: Peter Korsgaard <[email protected]> +--- + tools/i2ctransfer.c | 7 +------ + 1 file changed, 1 insertions(+), 6 deletions(-) + +diff --git a/tools/i2ctransfer.c b/tools/i2ctransfer.c +index f2a4df8..b0e8d43 100644 +--- a/tools/i2ctransfer.c ++++ b/tools/i2ctransfer.c +@@ -88,12 +88,7 @@ static void print_msgs(struct i2c_msg *msgs, __u32 nmsgs, unsigned flags) + int recv_len = msgs[i].flags & I2C_M_RECV_LEN; + int print_buf = (read && (flags & PRINT_READ_BUF)) || + (!read && (flags & PRINT_WRITE_BUF)); +- __u16 len = msgs[i].len; +- +- if (recv_len && print_buf && len != msgs[i].buf[0] + 1) { +- fprintf(stderr, "Correcting wrong msg length after recv_len! Please fix the I2C driver and/or report.\n"); +- len = msgs[i].buf[0] + 1; +- } ++ __u16 len = recv_len ? msgs[i].buf[0] + 1 : msgs[i].len; + + if (flags & PRINT_HEADER) { + fprintf(output, "msg %u: addr 0x%02x, %s, len ", +-- +2.20.1 +
Signature · 1 line
2.20.1
PATCH 1/1 package/i2c-tools: add upstream post-4.2 i2ctransfer fix
Hi Peter,
Quoted 4 lines · Peter Korsgaard
i2c-tools 4.2 contained an invalid check, leading to verbose false-positive warning messages when the variable length ({r,w}?) option is used:
Maybe also add a link to Jean's response:
https://www.spinics.net/lists/linux-i2c/msg50253.html
Quoted 8 lines
Unfortunately upstream does not make bugfix releases, instead opting to list such bugfixes on the wiki:
https://i2c.wiki.kernel.org/index.php/I2C_Tools
So add the patch here.
Signed-off-by Peter Korsgaard <[email protected]>
Thanks,
baruch
Quoted 52 lines
--- ...transfer-add-check-for-returned-leng.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patchpackage/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch new file +41
-0@@ -0,0 +1,41 @@ +From 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb Mon Sep 17 00:00:00 2001 +From: Wolfram Sang <[email protected]> +Date: Tue, 9 Feb 2021 12:05:56 +0100 +Subject: [PATCH] Revert "tools: i2ctransfer: add check for returned length + from driver" + +This reverts commit 34806fc4e7090b34e32fa1110d546ab5ce01a6a0. It was +developed against an experimental kernel. The regular kernel does not +update the new message length to userspace, so the check is always false +positive. We can't change the kernel behaviour because it would break +the ABI. So revert this commit. + +Signed-off-by: Wolfram Sang <[email protected]> +Signed-off-by: Wolfram Sang <[email protected]> +[Peter: drop CHANGES update] +Signed-off-by: Peter Korsgaard <[email protected]> +--- + tools/i2ctransfer.c | 7 +------ + 1 file changed, 1 insertions(+), 6 deletions(-) + +diff --git a/tools/i2ctransfer.c b/tools/i2ctransfer.c +index f2a4df8..b0e8d43 100644 +--- a/tools/i2ctransfer.c ++++ b/tools/i2ctransfer.c +@@ -88,12 +88,7 @@ static void print_msgs(struct i2c_msg *msgs, __u32 nmsgs, unsigned flags) + int recv_len = msgs[i].flags & I2C_M_RECV_LEN; + int print_buf = (read && (flags & PRINT_READ_BUF)) || + (!read && (flags & PRINT_WRITE_BUF)); +- __u16 len = msgs[i].len; +- +- if (recv_len && print_buf && len != msgs[i].buf[0] + 1) { +- fprintf(stderr, "Correcting wrong msg length after recv_len! Please fix the I2C driver and/or report.\n"); +- len = msgs[i].buf[0] + 1; +- } ++ __u16 len = recv_len ? msgs[i].buf[0] + 1 : msgs[i].len; + + if (flags & PRINT_HEADER) { + fprintf(output, "msg %u: addr 0x%02x, %s, len ", +-- +2.20.1 +
Signature · 3 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -PATCH 1/1 package/i2c-tools: add upstream post-4.2 i2ctransfer fix
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Hi Peter,
On Sat, Apr 10 2021, Peter Korsgaard wrote:
Quoted 8 lines
Quoted 4 lines
i2c-tools 4.2 contained an invalid check, leading to verbose false-positive warning messages when the variable length ({r,w}?) option is used:
Maybe also add a link to Jean's response:
Committed with the link added, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/i2c-tools: add upstream post-4.2 i2ctransfer fix
Quoted 9 lines
Quoted 9 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
"Peter" == Peter Korsgaard <[email protected]> writes:
"Baruch" == Baruch Siach <[email protected]> writes:
Hi Peter,
Quoted 3 lines · Peter Korsgaard
i2c-tools 4.2 contained an invalid check, leading to verbose false-positive warning messages when the variable length ({r,w}?) option is used:
Quoted 7 lines
Quoted 5 lines
Maybe also add a link to Jean's response:
Committed with the link added, thanks.
Committed to 2021.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard