FAILED: patch "[PATCH] iio: vcnl4000: Fix i2c swapped word reading." failed to apply to 4.14-stable tree

PATCH [email protected] 2 participants 4 messages Jun 8, 2020 – Jun 9, 2020

Subsystems (2)

Stable branch IIO

lore

Share & tools

lore

[email protected]

author maintainer

2020-06-08 12:24 UTC #0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 18dfb5326370991c81a6d1ed6d1aeee055cb8c05 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <[email protected]>
Date: Sun, 3 May 2020 11:29:55 +0200
Subject: [PATCH] iio: vcnl4000: Fix i2c swapped word reading.

The bytes returned by the i2c reading need to be swapped unconditionally. Otherwise, on be16 platforms, an incorrect value will be returned.

Taking the slow path via next merge window as its been around a while and we have a patch set dependent on this which would be held up.

Fixes 62a1efb9f868 ("iio: add vcnl4000 combined ALS and proximity sensor")

Signed-off-by Mathieu Othacehe <[email protected]>

Cc <[email protected]>

Signed-off-by Jonathan Cameron <[email protected]>

drivers/iio/light/vcnl4000.c +2 -4

index 985cc39ede8e..979746a7d411 100644
@@ -220,7 +220,6 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
 				u8 rdy_mask, u8 data_reg, int *val)
 {
 	int tries = 20;
-	__be16 buf;
 	int ret;
 
 	mutex_lock(&data->vcnl4000_lock);

@@ -247,13 +246,12 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
 		goto fail;
 	}
 
-	ret = i2c_smbus_read_i2c_block_data(data->client,
-		data_reg, sizeof(buf), (u8 *) &buf);
+	ret = i2c_smbus_read_word_swapped(data->client, data_reg);
 	if (ret < 0)
 		goto fail;
 
 	mutex_unlock(&data->vcnl4000_lock);
-	*val = be16_to_cpu(buf);
+	*val = ret;
 
 	return 0;

Sasha Levin

maintainer

2020-06-08 20:41 UTC #1 lore raw

Quoted 21 lines · On Mon, Jun 08, 2020 at 02:24:16PM +0200, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 18dfb5326370991c81a6d1ed6d1aeee055cb8c05 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <[email protected]>
Date: Sun, 3 May 2020 11:29:55 +0200
Subject: [PATCH] iio: vcnl4000: Fix i2c swapped word reading.
The bytes returned by the i2c reading need to be swapped unconditionally. Otherwise, on be16 platforms, an incorrect value will be returned.

Quoted 7 lines

Taking the slow path via next merge window as its been around a while and we have a patch set dependent on this which would be held up.
Fixes 62a1efb9f868 ("iio: add vcnl4000 combined ALS and proximity sensor")
Signed-off-by Mathieu Othacehe <[email protected]>
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>

There were some context conflicts due to renaming of the lock (and it not existing on 4.4). I've fixed it and queued for 4.14-4.4.

Signature · 2 lines

Thanks,
Sasha

Greg KH

author maintainer

2020-06-09 06:11 UTC #2 lore raw

Quoted 25 lines · Sasha Levin

Quoted 24 lines · On Mon, Jun 08, 2020 at 02:24:16PM +0200, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 18dfb5326370991c81a6d1ed6d1aeee055cb8c05 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <[email protected]>
Date: Sun, 3 May 2020 11:29:55 +0200
Subject: [PATCH] iio: vcnl4000: Fix i2c swapped word reading.
The bytes returned by the i2c reading need to be swapped unconditionally. Otherwise, on be16 platforms, an incorrect value will be returned.
Taking the slow path via next merge window as its been around a while and we have a patch set dependent on this which would be held up.

Quoted 7 lines

Quoted 4 lines
Fixes 62a1efb9f868 ("iio: add vcnl4000 combined ALS and proximity sensor")
Signed-off-by Mathieu Othacehe <[email protected]>
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>
There were some context conflicts due to renaming of the lock (and it not existing on 4.4). I've fixed it and queued for 4.14-4.4.

Thanks, but I think you forgot to push your local version of the queue to git.kernel.org :(

Sasha Levin

maintainer

2020-06-09 12:06 UTC #3 lore raw

Quoted 31 lines · Greg KH

Quoted 30 lines · Sasha Levin
Quoted 28 lines · On Mon, Jun 08, 2020 at 02:24:16PM +0200, [email protected] wrote:
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From 18dfb5326370991c81a6d1ed6d1aeee055cb8c05 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <[email protected]>
Date: Sun, 3 May 2020 11:29:55 +0200
Subject: [PATCH] iio: vcnl4000: Fix i2c swapped word reading.
The bytes returned by the i2c reading need to be swapped unconditionally. Otherwise, on be16 platforms, an incorrect value will be returned.
Taking the slow path via next merge window as its been around a while and we have a patch set dependent on this which would be held up.
Fixes 62a1efb9f868 ("iio: add vcnl4000 combined ALS and proximity sensor")
Signed-off-by Mathieu Othacehe <[email protected]>
Cc <[email protected]>
Signed-off-by Jonathan Cameron <[email protected]>

Quoted 5 lines

Quoted 2 lines
There were some context conflicts due to renaming of the lock (and it not existing on 4.4). I've fixed it and queued for 4.14-4.4.
Thanks, but I think you forgot to push your local version of the queue to git.kernel.org :(

Oops, now pushed.

Signature · 2 lines

Thanks,
Sasha