All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Korsgaard <peter@korsgaard.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/i2c-tools: add upstream post-4.2 i2ctransfer fix
Date: Sat, 10 Apr 2021 10:12:52 +0200	[thread overview]
Message-ID: <20210410081252.17180-1-peter@korsgaard.com> (raw)

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.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 ...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

diff --git a/package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch b/package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch
new file mode 100644
index 0000000000..7173efe219
--- /dev/null
+++ b/package/i2c-tools/0001-Revert-tools-i2ctransfer-add-check-for-returned-leng.patch
@@ -0,0 +1,41 @@
+From 06a1909ae1e8ae1edc70dc48dd22a32ba5eceecb Mon Sep 17 00:00:00 2001
+From: Wolfram Sang <wsa+renesas@sang-engineering.com>
+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 <wsa+renesas@sang-engineering.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+[Peter: drop CHANGES update]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ 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
+
-- 
2.20.1

             reply	other threads:[~2021-04-10  8:12 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-10  8:12 Peter Korsgaard [this message]
2021-04-11  5:41 ` [Buildroot] [PATCH] package/i2c-tools: add upstream post-4.2 i2ctransfer fix Baruch Siach
2021-04-11  9:37   ` Peter Korsgaard
2021-04-25  6:52     ` Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210410081252.17180-1-peter@korsgaard.com \
    --to=peter@korsgaard.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.