Skip to contentSkip to conversation

iio: ad7949: fix wrong ADC result due to incorrect bit mask

PATCH Applied Wilfried Wessner 4 participants 7 messages Feb 8, 2021 – Feb 12, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 iio: ad7949: fix wrong ADC result due to incorrect bit mask

Fixes a wrong bit mask used for the ADC's result, which was caused by an improper usage of the GENMASK() macro. The bits higher than ADC's resolution are undefined and if not masked out correctly, a wrong result can be given. The GENMASK() macro indexing is zero based, so the mask has to go from [resolution - 1 , 0].

Fixes 7f40e0614317f ("iio:adc:ad7949: Add AD7949 ADC driver family")

---

The issue was found in combination of an AD7682 ADC with an ARM based iMX7-CPU. The SPI line was analyzed with a logic analyzer and a discrepancy between applied voltage level and the ADC reported value in user space was observed. Digging into the driver code revealed an improper mask used for the ADC-result.

 drivers/iio/adc/ad7949.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7949.c +1 -1
index 5d597e5050f6..1b4b3203e428 100644
@@ -91,7 +91,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val,
 	int ret;
 	int i;
 	int bits_per_word = ad7949_adc->resolution;
-	int mask = GENMASK(ad7949_adc->resolution, 0);
+	int mask = GENMASK(ad7949_adc->resolution - 1, 0);
 	struct spi_message msg;
 	struct spi_transfer tx[] = {
 		{
Signature · 1 line
2.25.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 11 lines · Wilfried Wessner

Fixes a wrong bit mask used for the ADC's result, which was caused by an improper usage of the GENMASK() macro. The bits higher than ADC's resolution are undefined and if not masked out correctly, a wrong result can be given. The GENMASK() macro indexing is zero based, so the mask has to go from [resolution - 1 , 0].

Fixes 7f40e0614317f ("iio:adc:ad7949: Add AD7949 ADC driver family")

Shouldn't be blank like here, but I think Jonathan can fix when applying. Jonathan, can you also amend the subject (I totally forgot about subsubsystem prefix)?
Should be like:
"iio: adc: ad7949: fix wrong results due to incorrect bit mask"

And FWIW,

Quoted 30 lines

---

The issue was found in combination of an AD7682 ADC with an ARM based iMX7-CPU. The SPI line was analyzed with a logic analyzer and a discrepancy between applied voltage level and the ADC reported value in user space was observed. Digging into the driver code revealed an improper mask used for the ADC-result.

 drivers/iio/adc/ad7949.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7949.c +1 -2
index 5d597e5050f6..1b4b3203e428 100644
@@ -91,7 +91,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val,
        int ret;
        int i;
        int bits_per_word = ad7949_adc->resolution;
-       int mask = GENMASK(ad7949_adc->resolution, 0);
+       int mask = GENMASK(ad7949_adc->resolution - 1, 0);
        struct spi_message msg;
        struct spi_transfer tx[] = {
                {
--

2.25.1

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author Reviewed-by Andy Shevchenko Reviewed-by Charles-Antoine Couret
#2 lore raw
Quoted 15 lines · Andy Shevchenko
Quoted 11 lines · Wilfried Wessner

Fixes a wrong bit mask used for the ADC's result, which was caused by an improper usage of the GENMASK() macro. The bits higher than ADC's resolution are undefined and if not masked out correctly, a wrong result can be given. The GENMASK() macro indexing is zero based, so the mask has to go from [resolution - 1 , 0].

Fixes 7f40e0614317f ("iio:adc:ad7949: Add AD7949 ADC driver family")
Quoted 5 lines

Shouldn't be blank like here, but I think Jonathan can fix when applying. Jonathan, can you also amend the subject (I totally forgot about subsubsystem prefix)?
Should be like:
"iio: adc: ad7949: fix wrong results due to incorrect bit mask"

Should I send a v4 with the changes proposed by Andy? It would change the subject.

And if so, should I add the tags:

Please advise, thank you!
Best Regards,
Willi

Quoted 39 lines

And FWIW,

Quoted 28 lines

---

The issue was found in combination of an AD7682 ADC with an ARM based iMX7-CPU. The SPI line was analyzed with a logic analyzer and a discrepancy between applied voltage level and the ADC reported value in user space was observed. Digging into the driver code revealed an improper mask used for the ADC-result.

 drivers/iio/adc/ad7949.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7949.c +1 -2
index 5d597e5050f6..1b4b3203e428 100644
@@ -91,7 +91,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val,
        int ret;
        int i;
        int bits_per_word = ad7949_adc->resolution;
-       int mask = GENMASK(ad7949_adc->resolution, 0);
+       int mask = GENMASK(ad7949_adc->resolution - 1, 0);
        struct spi_message msg;
        struct spi_transfer tx[] = {
                {
--
Quoted 2 lines

2.25.1

--
With Best Regards,
Andy Shevchenko

#3 lore raw
Quoted 4 lines · Wilfried Wessner
Quoted 2 lines · Andy Shevchenko

On Mon, Feb 8, 2021 at 4:27 PM Wilfried Wessner
<[email protected]> wrote:

...

Quoted 8 lines
Quoted 5 lines

Shouldn't be blank like here, but I think Jonathan can fix when applying. Jonathan, can you also amend the subject (I totally forgot about subsubsystem prefix)?
Should be like:
"iio: adc: ad7949: fix wrong results due to incorrect bit mask"

Should I send a v4 with the changes proposed by Andy? It would change the subject.

Depends on you. Jonothan usually processes the queue during weekends, so no hurry.

Quoted 3 lines

And if so, should I add the tags:

If resend, yes, you need to add them.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer Applied
#4 lore raw
Quoted 18 lines · On Thu, 11 Feb 2021 21:24:04 +0200 Andy Shevchenko <[email protected]>…
Quoted 4 lines · Wilfried Wessner
Quoted 2 lines · Andy Shevchenko

On Mon, Feb 8, 2021 at 4:27 PM Wilfried Wessner
<[email protected]> wrote:

...

Quoted 8 lines
Quoted 5 lines

Shouldn't be blank like here, but I think Jonathan can fix when applying. Jonathan, can you also amend the subject (I totally forgot about subsubsystem prefix)?
Should be like:
"iio: adc: ad7949: fix wrong results due to incorrect bit mask"

Should I send a v4 with the changes proposed by Andy? It would change the subject.

Quoted 9 lines

Depends on you. Jonothan usually processes the queue during weekends, so no hurry.

Quoted 3 lines

And if so, should I add the tags:

If resend, yes, you need to add them.

Applied with the minor spacing and title tweak Andy suggested

Applied to the fixes-togreg branch of iio.git. Given this has been there a while, I'm going to wait until after the merge window to send this upstream. So it will be a few weeks.

Thanks,

Jonathan

#5 lore raw
Quoted 33 lines · Jonathan Cameron
Quoted 18 lines · On Thu, 11 Feb 2021 21:24:04 +0200 Andy Shevchenko <[email protected]>…
Quoted 4 lines · Wilfried Wessner
Quoted 2 lines · Andy Shevchenko

On Mon, Feb 8, 2021 at 4:27 PM Wilfried Wessner
<[email protected]> wrote:

...

Quoted 8 lines
Quoted 5 lines

Shouldn't be blank like here, but I think Jonathan can fix when applying. Jonathan, can you also amend the subject (I totally forgot about subsubsystem prefix)?
Should be like:
"iio: adc: ad7949: fix wrong results due to incorrect bit mask"

Should I send a v4 with the changes proposed by Andy? It would change the subject.

Quoted 9 lines

Depends on you. Jonothan usually processes the queue during weekends, so no hurry.

Quoted 3 lines

And if so, should I add the tags:

If resend, yes, you need to add them.

Applied with the minor spacing and title tweak Andy suggested

Quoted 9 lines

Applied to the fixes-togreg branch of iio.git. Given this has been there a while, I'm going to wait until after the merge window to send this upstream. So it will be a few weeks.

Thanks,

Jonathan

Great, thank you!

Best regards,
Willi

Reviewed-by on v3 1/1
#6 lore raw
In reply to Wilfried Wessner

Le 08/02/2021 à 15:27, Wilfried Wessner a écrit :

Quoted 27 lines

Fixes a wrong bit mask used for the ADC's result, which was caused by an improper usage of the GENMASK() macro. The bits higher than ADC's resolution are undefined and if not masked out correctly, a wrong result can be given. The GENMASK() macro indexing is zero based, so the mask has to go from [resolution - 1 , 0].

Fixes 7f40e0614317f ("iio:adc:ad7949: Add AD7949 ADC driver family")

---

The issue was found in combination of an AD7682 ADC with an ARM based iMX7-CPU. The SPI line was analyzed with a logic analyzer and a discrepancy between applied voltage level and the ADC reported value in user space was observed. Digging into the driver code revealed an improper mask used for the ADC-result.

 drivers/iio/adc/ad7949.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/adc/ad7949.c +0 -0
index 5d597e5050f6..1b4b3203e428 100644

drivers/iio/adc/ad7949.c static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, · line 97

Quoted 8 lines
drivers/iio/adc/ad7949.c +1 -1
@@ -91,7 +91,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val,
 	int ret;
 	int i;
 	int bits_per_word = ad7949_adc->resolution;
-	int mask = GENMASK(ad7949_adc->resolution, 0);
+	int mask = GENMASK(ad7949_adc->resolution - 1, 0);
 	struct spi_message msg;
 	struct spi_transfer tx[] = {
 		{

Hi,

Thank you for the fix. :)

Regards,

Charles-Antoine Couret