mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] iio: light: bh1745: fix 16-bit register accesses
@ 2026-11-17 11:03 Arnav Kapoor
  2026-11-17 14:21 ` Andy Shevchenko
  0 siblings, 1 reply; 3+ messages in thread
From: Arnav Kapoor @ 2026-11-17 11:03 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Mudit Sharma, Andy Shevchenko, David Lechner, Nuno Sá,
	Andy Shevchenko, linux-iio, linux-kernel, Arnav Kapoor

The 16-bit colour data and threshold registers are little-endian
LSB/MSB pairs, but the driver accesses them through regmap_bulk_read()
and regmap_bulk_write() with an int or u16 buffer and no byte-order
conversion:

- bh1745_read_raw() reads 2 bytes into an uninitialised int, so the
  upper 16 bits returned to user space are stack contents.
- bh1745_read_thresh() reads 2 bytes straight into *val, which the IIO
  core leaves uninitialised, with the same result for the event
  threshold attributes.
- bh1745_write_thresh() writes the first 2 bytes of an int, which are
  the upper (zero) bytes on big-endian.
- bh1745_trigger_handler() pushes the raw register bytes, which are
  little-endian, in a u16 to a buffer whose scan type is IIO_CPU, so
  user space gets the samples byte-swapped on big-endian.

Use an __le16 buffer for all of them and convert with le16_to_cpu() /
cpu_to_le16().

Fixes: eab35358aae7 ("iio: light: ROHM BH1745 colour sensor")
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Arnav Kapoor <kapoorarnav43@gmail.com>
---
Changes in v2:
- Include asm/byteorder.h for le16_to_cpu() / cpu_to_le16() (Andy)
- Reword the trigger handler bullet: the samples are byte-swapped on
  big-endian because the scan type is IIO_CPU (Andy)
- Add Andy's Reviewed-by

v1: https://lore.kernel.org/all/20261116194214.45174-1-kapoorarnav43@gmail.com/

Compile-tested only (W=1, checkpatch --strict clean); I don't have
BH1745 hardware.

 drivers/iio/light/bh1745.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/drivers/iio/light/bh1745.c b/drivers/iio/light/bh1745.c
index 2b8ff36071b8..e2c03cd0d1e3 100644
--- a/drivers/iio/light/bh1745.c
+++ b/drivers/iio/light/bh1745.c
@@ -17,6 +17,8 @@
 #include <linux/bits.h>
 #include <linux/bitfield.h>
 
+#include <asm/byteorder.h>
+
 #include <linux/iio/iio.h>
 #include <linux/iio/sysfs.h>
 #include <linux/iio/trigger.h>
@@ -421,19 +423,20 @@ static int bh1745_read_raw(struct iio_dev *indio_dev,
 			   int *val, int *val2, long mask)
 {
 	struct bh1745_data *data = iio_priv(indio_dev);
+	__le16 value;
 	int ret;
-	int value;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
 		if (!iio_device_claim_direct(indio_dev))
 			return -EBUSY;
 
-		ret = regmap_bulk_read(data->regmap, chan->address, &value, 2);
+		ret = regmap_bulk_read(data->regmap, chan->address, &value,
+				       sizeof(value));
 		iio_device_release_direct(indio_dev);
 		if (ret)
 			return ret;
-		*val = value;
+		*val = le16_to_cpu(value);
 
 		return IIO_VAL_INT;
 
@@ -503,6 +506,7 @@ static int bh1745_read_thresh(struct iio_dev *indio_dev,
 			      enum iio_event_info info, int *val, int *val2)
 {
 	struct bh1745_data *data = iio_priv(indio_dev);
+	__le16 value;
 	int ret;
 
 	switch (info) {
@@ -510,18 +514,22 @@ static int bh1745_read_thresh(struct iio_dev *indio_dev,
 		switch (dir) {
 		case IIO_EV_DIR_RISING:
 			ret = regmap_bulk_read(data->regmap, BH1745_TH_LSB,
-					       val, 2);
+					       &value, sizeof(value));
 			if (ret)
 				return ret;
 
+			*val = le16_to_cpu(value);
+
 			return IIO_VAL_INT;
 
 		case IIO_EV_DIR_FALLING:
 			ret = regmap_bulk_read(data->regmap, BH1745_TL_LSB,
-					       val, 2);
+					       &value, sizeof(value));
 			if (ret)
 				return ret;
 
+			*val = le16_to_cpu(value);
+
 			return IIO_VAL_INT;
 
 		default:
@@ -547,6 +555,7 @@ static int bh1745_write_thresh(struct iio_dev *indio_dev,
 			       enum iio_event_info info, int val, int val2)
 {
 	struct bh1745_data *data = iio_priv(indio_dev);
+	__le16 value;
 	int ret;
 
 	switch (info) {
@@ -554,10 +563,12 @@ static int bh1745_write_thresh(struct iio_dev *indio_dev,
 		if (val < 0x0 || val > 0xFFFF)
 			return -EINVAL;
 
+		value = cpu_to_le16(val);
+
 		switch (dir) {
 		case IIO_EV_DIR_RISING:
 			ret = regmap_bulk_write(data->regmap, BH1745_TH_LSB,
-						&val, 2);
+						&value, sizeof(value));
 			if (ret)
 				return ret;
 
@@ -565,7 +576,7 @@ static int bh1745_write_thresh(struct iio_dev *indio_dev,
 
 		case IIO_EV_DIR_FALLING:
 			ret = regmap_bulk_write(data->regmap, BH1745_TL_LSB,
-						&val, 2);
+						&value, sizeof(value));
 			if (ret)
 				return ret;
 
@@ -741,18 +752,18 @@ static irqreturn_t bh1745_trigger_handler(int interrupt, void *p)
 		u16 chans[4];
 		aligned_s64 timestamp;
 	} scan = { };
-	u16 value;
+	__le16 value;
 	int ret;
 	int i;
 	int j = 0;
 
 	iio_for_each_active_channel(indio_dev, i) {
 		ret = regmap_bulk_read(data->regmap, BH1745_RED_LSB + 2 * i,
-				       &value, 2);
+				       &value, sizeof(value));
 		if (ret)
 			goto err;
 
-		scan.chans[j++] = value;
+		scan.chans[j++] = le16_to_cpu(value);
 	}
 
 	iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan),

base-commit: a6d9114f68c4b5507b2d945bd6d1e37415f913c5
-- 
2.53.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] iio: light: bh1745: fix 16-bit register accesses
  2026-11-17 11:03 [PATCH v2] iio: light: bh1745: fix 16-bit register accesses Arnav Kapoor
@ 2026-11-17 14:21 ` Andy Shevchenko
  2026-11-17 14:23   ` Andy Shevchenko
  0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2026-11-17 14:21 UTC (permalink / raw)
  To: Arnav Kapoor, Matti Vaittinen
  Cc: Jonathan Cameron, Mudit Sharma, David Lechner, Nuno Sá,
	Andy Shevchenko, linux-iio, linux-kernel

+ Cc: Matti (even he is not listed as maintainer) for possible another pair of
eyes and/or having an answer why this was missed at the time of the driver
submission (from my perspective this patch is correct).

On Tue, Nov 17, 2026 at 04:33:25PM +0530, Arnav Kapoor wrote:
> The 16-bit colour data and threshold registers are little-endian
> LSB/MSB pairs, but the driver accesses them through regmap_bulk_read()
> and regmap_bulk_write() with an int or u16 buffer and no byte-order
> conversion:
> 
> - bh1745_read_raw() reads 2 bytes into an uninitialised int, so the
>   upper 16 bits returned to user space are stack contents.
> - bh1745_read_thresh() reads 2 bytes straight into *val, which the IIO
>   core leaves uninitialised, with the same result for the event
>   threshold attributes.
> - bh1745_write_thresh() writes the first 2 bytes of an int, which are
>   the upper (zero) bytes on big-endian.
> - bh1745_trigger_handler() pushes the raw register bytes, which are
>   little-endian, in a u16 to a buffer whose scan type is IIO_CPU, so
>   user space gets the samples byte-swapped on big-endian.
> 
> Use an __le16 buffer for all of them and convert with le16_to_cpu() /
> cpu_to_le16().
> 
> Fixes: eab35358aae7 ("iio: light: ROHM BH1745 colour sensor")
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
> Signed-off-by: Arnav Kapoor <kapoorarnav43@gmail.com>
> ---
> Changes in v2:
> - Include asm/byteorder.h for le16_to_cpu() / cpu_to_le16() (Andy)
> - Reword the trigger handler bullet: the samples are byte-swapped on
>   big-endian because the scan type is IIO_CPU (Andy)
> - Add Andy's Reviewed-by
> 
> v1: https://lore.kernel.org/all/20261116194214.45174-1-kapoorarnav43@gmail.com/
> 
> Compile-tested only (W=1, checkpatch --strict clean); I don't have
> BH1745 hardware.
> 
>  drivers/iio/light/bh1745.c | 31 +++++++++++++++++++++----------
>  1 file changed, 21 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/iio/light/bh1745.c b/drivers/iio/light/bh1745.c
> index 2b8ff36071b8..e2c03cd0d1e3 100644
> --- a/drivers/iio/light/bh1745.c
> +++ b/drivers/iio/light/bh1745.c
> @@ -17,6 +17,8 @@
>  #include <linux/bits.h>
>  #include <linux/bitfield.h>
>  
> +#include <asm/byteorder.h>
> +
>  #include <linux/iio/iio.h>
>  #include <linux/iio/sysfs.h>
>  #include <linux/iio/trigger.h>
> @@ -421,19 +423,20 @@ static int bh1745_read_raw(struct iio_dev *indio_dev,
>  			   int *val, int *val2, long mask)
>  {
>  	struct bh1745_data *data = iio_priv(indio_dev);
> +	__le16 value;
>  	int ret;
> -	int value;
>  
>  	switch (mask) {
>  	case IIO_CHAN_INFO_RAW:
>  		if (!iio_device_claim_direct(indio_dev))
>  			return -EBUSY;
>  
> -		ret = regmap_bulk_read(data->regmap, chan->address, &value, 2);
> +		ret = regmap_bulk_read(data->regmap, chan->address, &value,
> +				       sizeof(value));
>  		iio_device_release_direct(indio_dev);
>  		if (ret)
>  			return ret;
> -		*val = value;
> +		*val = le16_to_cpu(value);
>  
>  		return IIO_VAL_INT;
>  
> @@ -503,6 +506,7 @@ static int bh1745_read_thresh(struct iio_dev *indio_dev,
>  			      enum iio_event_info info, int *val, int *val2)
>  {
>  	struct bh1745_data *data = iio_priv(indio_dev);
> +	__le16 value;
>  	int ret;
>  
>  	switch (info) {
> @@ -510,18 +514,22 @@ static int bh1745_read_thresh(struct iio_dev *indio_dev,
>  		switch (dir) {
>  		case IIO_EV_DIR_RISING:
>  			ret = regmap_bulk_read(data->regmap, BH1745_TH_LSB,
> -					       val, 2);
> +					       &value, sizeof(value));
>  			if (ret)
>  				return ret;
>  
> +			*val = le16_to_cpu(value);
> +
>  			return IIO_VAL_INT;
>  
>  		case IIO_EV_DIR_FALLING:
>  			ret = regmap_bulk_read(data->regmap, BH1745_TL_LSB,
> -					       val, 2);
> +					       &value, sizeof(value));
>  			if (ret)
>  				return ret;
>  
> +			*val = le16_to_cpu(value);
> +
>  			return IIO_VAL_INT;
>  
>  		default:
> @@ -547,6 +555,7 @@ static int bh1745_write_thresh(struct iio_dev *indio_dev,
>  			       enum iio_event_info info, int val, int val2)
>  {
>  	struct bh1745_data *data = iio_priv(indio_dev);
> +	__le16 value;
>  	int ret;
>  
>  	switch (info) {
> @@ -554,10 +563,12 @@ static int bh1745_write_thresh(struct iio_dev *indio_dev,
>  		if (val < 0x0 || val > 0xFFFF)
>  			return -EINVAL;
>  
> +		value = cpu_to_le16(val);
> +
>  		switch (dir) {
>  		case IIO_EV_DIR_RISING:
>  			ret = regmap_bulk_write(data->regmap, BH1745_TH_LSB,
> -						&val, 2);
> +						&value, sizeof(value));
>  			if (ret)
>  				return ret;
>  
> @@ -565,7 +576,7 @@ static int bh1745_write_thresh(struct iio_dev *indio_dev,
>  
>  		case IIO_EV_DIR_FALLING:
>  			ret = regmap_bulk_write(data->regmap, BH1745_TL_LSB,
> -						&val, 2);
> +						&value, sizeof(value));
>  			if (ret)
>  				return ret;
>  
> @@ -741,18 +752,18 @@ static irqreturn_t bh1745_trigger_handler(int interrupt, void *p)
>  		u16 chans[4];
>  		aligned_s64 timestamp;
>  	} scan = { };
> -	u16 value;
> +	__le16 value;
>  	int ret;
>  	int i;
>  	int j = 0;
>  
>  	iio_for_each_active_channel(indio_dev, i) {
>  		ret = regmap_bulk_read(data->regmap, BH1745_RED_LSB + 2 * i,
> -				       &value, 2);
> +				       &value, sizeof(value));
>  		if (ret)
>  			goto err;
>  
> -		scan.chans[j++] = value;
> +		scan.chans[j++] = le16_to_cpu(value);
>  	}
>  
>  	iio_push_to_buffers_with_ts(indio_dev, &scan, sizeof(scan),
> 
> base-commit: a6d9114f68c4b5507b2d945bd6d1e37415f913c5

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] iio: light: bh1745: fix 16-bit register accesses
  2026-11-17 14:21 ` Andy Shevchenko
@ 2026-11-17 14:23   ` Andy Shevchenko
  0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2026-11-17 14:23 UTC (permalink / raw)
  To: Arnav Kapoor, Matti Vaittinen
  Cc: Jonathan Cameron, Mudit Sharma, David Lechner, Nuno Sá,
	Andy Shevchenko, linux-iio, linux-kernel

On Tue, Nov 17, 2026 at 04:21:25PM +0200, Andy Shevchenko wrote:
> + Cc: Matti (even he is not listed as maintainer) for possible another pair of
> eyes and/or having an answer why this was missed at the time of the driver
> submission (from my perspective this patch is correct).
> 
> On Tue, Nov 17, 2026 at 04:33:25PM +0530, Arnav Kapoor wrote:

...

> >  #include <linux/bits.h>
> >  #include <linux/bitfield.h>

Looking again at this, I just realise that we also need

+ types.h here.

> >  
> > +#include <asm/byteorder.h>

-- 
With Best Regards,
Andy Shevchenko



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-11-17 14:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-17 11:03 [PATCH v2] iio: light: bh1745: fix 16-bit register accesses Arnav Kapoor
2026-11-17 14:21 ` Andy Shevchenko
2026-11-17 14:23   ` Andy Shevchenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®