Skip to contentSkip to conversation

Adis IRQ fixes and minor improvements

PATCH Superseded Nuno Sa 5 participants 27 messages Apr 13, 2021 – Apr 19, 2021

Subsystems (4)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Nuno Sa

author maintainer
#0 lore raw

cover Adis IRQ fixes and minor improvements

The primary goal of this series was to fix the return value on some trigger handlers as spotted in [1]. While doing it, I found some minor improvements that I think are simple enough to include in this series.

As for the first 2 patches, I opted to not do any functional change so I'm keeping the 'if (!adis->buffer)' check. However, 'adis-buffer' is allocated in 'update_scan_mode' hook which means we should be sure that the buffer is allocated and the check is really not needed. I did not went into the details but is there any way for the trigger handler to be called before the 'update_scan_mode' hook? If not, I'm happy in sending a v2 where we just remove the 'if'...

[1]: https://marc.info/?l=linux-iio&m=161815197426882&w=2

Nuno Sa (7):
iio: adis_buffer: do not return ints in irq handlers
iio: adis16400: do not return ints in irq handlers
iio: adis16475: do not return ints in irq handlers
iio: adis16475: re-set max spi transfer
iio: adis_buffer: check return value on page change
iio: adis_buffer: don't push data to buffers on failure
iio: adis_buffer: update device page after changing it

 drivers/iio/imu/adis16400.c   |  3 ++-
 drivers/iio/imu/adis16475.c   |  6 ++++--
 drivers/iio/imu/adis_buffer.c | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 10 deletions(-)
Signature · 1 line
2.31.1
author maintainer
#1 lore raw

PATCH 1/7 iio: adis_buffer: do not return ints in irq handlers

On an IRQ handler we should return normal error codes as 'irqreturn_t' is expected.

Fixes ccd2b52f4ac69 ("staging:iio: Add common ADIS library")
---
 drivers/iio/imu/adis_buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/imu/adis_buffer.c +2 -1
index ac354321f63a..f89bce10090a 100644
@@ -130,7 +130,7 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 	int ret;
 
 	if (!adis->buffer)
-		return -ENOMEM;
+		goto irq_done;
 
 	if (adis->data->has_paging) {
 		mutex_lock(&adis->state_lock);
@@ -154,6 +154,7 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 	iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
 		pf->timestamp);
 
+irq_done:
 	iio_trigger_notify_done(indio_dev->trig);
 
 	return IRQ_HANDLED;
Signature · 1 line
2.31.1
Reviewed-by on v1 1/7
#2 lore raw

Re: [PATCH 1/7] iio: adis_buffer: do not return ints in irq handlers

Quoted 4 lines · Nuno Sa

On an IRQ handler we should return normal error codes as 'irqreturn_t' is expected.

Quoted 30 lines
Fixes ccd2b52f4ac69 ("staging:iio: Add common ADIS library")
---
 drivers/iio/imu/adis_buffer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/imu/adis_buffer.c +2 -2
index ac354321f63a..f89bce10090a 100644
@@ -130,7 +130,7 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
        int ret;
 
        if (!adis->buffer)
-               return -ENOMEM;
+               goto irq_done;
 
        if (adis->data->has_paging) {
                mutex_lock(&adis->state_lock);
@@ -154,6 +154,7 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
        iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
                pf->timestamp);
 
+irq_done:
        iio_trigger_notify_done(indio_dev->trig);
 
        return IRQ_HANDLED;
--

2.31.1

author maintainer
#3 lore raw

PATCH 2/7 iio: adis16400: do not return ints in irq handlers

In reply to Nuno Sa

On an IRQ handler we should return normal error codes as 'irqreturn_t' is expected.

Fixes 5eda3550a3cc1 ("staging:iio:adis16400: Preallocate transfer message")
---
 drivers/iio/imu/adis16400.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/imu/adis16400.c +2 -1
index 768aa493a1a6..c2362a9ee3c3 100644
@@ -646,7 +646,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
 	int ret;
 
 	if (!adis->buffer)
-		return -ENOMEM;
+		goto irq_done;
 
 	if (!(st->variant->flags & ADIS16400_NO_BURST) &&
 		st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
@@ -671,6 +671,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
 	iio_push_to_buffers_with_timestamp(indio_dev, buffer,
 		pf->timestamp);
 
+irq_done:
 	iio_trigger_notify_done(indio_dev->trig);
 
 	return IRQ_HANDLED;
Signature · 1 line
2.31.1
Reviewed-by on v1 2/7
#4 lore raw

Re: [PATCH 2/7] iio: adis16400: do not return ints in irq handlers

Quoted 4 lines · Nuno Sa

On an IRQ handler we should return normal error codes as 'irqreturn_t' is expected.

Quoted 30 lines
Fixes 5eda3550a3cc1 ("staging:iio:adis16400: Preallocate transfer message")
---
 drivers/iio/imu/adis16400.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/imu/adis16400.c +2 -2
index 768aa493a1a6..c2362a9ee3c3 100644
@@ -646,7 +646,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
        int ret;
 
        if (!adis->buffer)
-               return -ENOMEM;
+               goto irq_done;
 
        if (!(st->variant->flags & ADIS16400_NO_BURST) &&
                st->adis.spi->max_speed_hz > ADIS16400_SPI_BURST) {
@@ -671,6 +671,7 @@ static irqreturn_t adis16400_trigger_handler(int irq, void *p)
        iio_push_to_buffers_with_timestamp(indio_dev, buffer,
                pf->timestamp);
 
+irq_done:
        iio_trigger_notify_done(indio_dev->trig);
 
        return IRQ_HANDLED;
--

2.31.1

author maintainer
#5 lore raw

PATCH 3/7 iio: adis16475: do not return ints in irq handlers

In reply to Nuno Sa

On an IRQ handler we should return normal error codes as 'irqreturn_t' is expected.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +1 -1
index 1de62fc79e0f..51b76444db0b 100644
@@ -1068,7 +1068,7 @@ static irqreturn_t adis16475_trigger_handler(int irq, void *p)
 
 	ret = spi_sync(adis->spi, &adis->msg);
 	if (ret)
-		return ret;
+		goto check_burst32;
 
 	adis->spi->max_speed_hz = cached_spi_speed_hz;
 	buffer = adis->buffer;
Signature · 1 line
2.31.1
#6 lore raw

Re: [PATCH 3/7] iio: adis16475: do not return ints in irq handlers

Quoted 16 lines · Nuno Sa

On an IRQ handler we should return normal error codes as 'irqreturn_t' is expected.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +0 -0
index 1de62fc79e0f..51b76444db0b 100644

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1071

Quoted 5 lines
drivers/iio/imu/adis16475.c +1 -1
@@ -1068,7 +1068,7 @@ static irqreturn_t adis16475_trigger_handler(int irq, void *p)
 
        ret = spi_sync(adis->spi, &adis->msg);
        if (ret)
-               return ret;
+               goto check_burst32;

This is also going to call adis16475_burst32_check(). Which in itself is [probably] an undesired behavior change.

Maybe this needs a new 'irq_done' label?

Quoted 6 lines
drivers/iio/imu/adis16475.c +0 -1
        adis->spi->max_speed_hz = cached_spi_speed_hz;
        buffer = adis->buffer;
--

2.31.1

author maintainer
#7 lore raw

RE: [PATCH 3/7] iio: adis16475: do not return ints in irq handlers

Quoted 39 lines

From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:27 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 3/7] iio: adis16475: do not return ints in irq handlers

[External]

Quoted 2 lines · Nuno Sa

On an IRQ handler we should return normal error codes as

'irqreturn_t'

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 14 lines

is expected.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +0 -0
index 1de62fc79e0f..51b76444db0b 100644
@@ -1068,7 +1068,7 @@ static irqreturn_t

adis16475_trigger_handler(int irq, void *p)

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1071

Quoted 5 lines
drivers/iio/imu/adis16475.c +1 -1
        ret = spi_sync(adis->spi, &adis->msg);
        if (ret)
-               return ret;
+               goto check_burst32;
Quoted 4 lines

This is also going to call adis16475_burst32_check(). Which in itself is [probably] an undesired behavior change.

Maybe this needs a new 'irq_done' label?

That was intentional. If someone changed the decimation or the FIR filters so that we can change to burst32, we can just do it now...

#8 lore raw

Re: [PATCH 3/7] iio: adis16475: do not return ints in irq handlers

Quoted 40 lines · Nuno
Quoted 40 lines

From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:27 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 3/7] iio: adis16475: do not return ints in irq handlers

[External]

Quoted 2 lines · Nuno Sa

On an IRQ handler we should return normal error codes as

'irqreturn_t'

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 14 lines

is expected.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +0 -0
index 1de62fc79e0f..51b76444db0b 100644
@@ -1068,7 +1068,7 @@ static irqreturn_t

adis16475_trigger_handler(int irq, void *p)

Quoted 5 lines
drivers/iio/imu/adis16475.c +1 -1
        ret = spi_sync(adis->spi, &adis->msg);
        if (ret)
-               return ret;
+               goto check_burst32;
Quoted 8 lines
Quoted 4 lines

This is also going to call adis16475_burst32_check(). Which in itself is [probably] an undesired behavior change.

Maybe this needs a new 'irq_done' label?

That was intentional. If someone changed the decimation or the FIR filters so that we can change to burst32, we can just do it now...

ack

author maintainer
#9 lore raw

PATCH 4/7 iio: adis16475: re-set max spi transfer

In reply to Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi transfer which is not the one the user expects it to be. Hence, we need to re-set it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +3 -1
index 51b76444db0b..9dca7e506200 100644
@@ -1067,8 +1067,10 @@ static irqreturn_t adis16475_trigger_handler(int irq, void *p)
 	adis->spi->max_speed_hz = ADIS16475_BURST_MAX_SPEED;
 
 	ret = spi_sync(adis->spi, &adis->msg);
-	if (ret)
+	if (ret) {
+		adis->spi->max_speed_hz = cached_spi_speed_hz;
 		goto check_burst32;
+	}
 
 	adis->spi->max_speed_hz = cached_spi_speed_hz;
 	buffer = adis->buffer;
Signature · 1 line
2.31.1
#10 lore raw

Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 16 lines · Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi transfer which is not the one the user expects it to be. Hence, we need to re-set it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +0 -0
index 51b76444db0b..9dca7e506200 100644

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1069

Quoted 3 lines
drivers/iio/imu/adis16475.c +0 -0
@@ -1067,8 +1067,10 @@ static irqreturn_t adis16475_trigger_handler(int irq, void *p)
        adis->spi->max_speed_hz = ADIS16475_BURST_MAX_SPEED;
 
        ret = spi_sync(adis->spi, &adis->msg);

Purely stylistic here.
But, the restore from the cached variable could be done here in a single line. So. just moving [1] here.

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1075

Quoted 7 lines
drivers/iio/imu/adis16475.c +3 -1
-       if (ret)
+       if (ret) {
+               adis->spi->max_speed_hz = cached_spi_speed_hz;
                goto check_burst32;
+       }
 
        adis->spi->max_speed_hz = cached_spi_speed_hz;

[1]

Quoted 4 lines
drivers/iio/imu/adis16475.c +0 -1
        buffer = adis->buffer;
--

2.31.1

author maintainer
#11 lore raw

RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 34 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:29 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 3 lines · Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi transfer which is not the one the user expects it to be. Hence, we need to re-

set

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 13 lines

it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/iio/imu/adis16475.c +0 -0
index 51b76444db0b..9dca7e506200 100644
@@ -1067,8 +1067,10 @@ static irqreturn_t

adis16475_trigger_handler(int irq, void *p)

Quoted 8 lines

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1069

Quoted 3 lines
drivers/iio/imu/adis16475.c +0 -0
        adis->spi->max_speed_hz = ADIS16475_BURST_MAX_SPEED;
 
        ret = spi_sync(adis->spi, &adis->msg);

Purely stylistic here.
But, the restore from the cached variable could be done here in a single line.
So. just moving [1] here.

You mean also doing it in the label? I thought about that and the reason why I didn't is that on a normal run, I want to reset the max freq as soon as possible so that if someone concurrently tries to read 'direct mode' attrs gets the max freq. This was my reasoning but I admit that it's not that important so I will leave this to Jonathan's preference...

Hmm now that I spoke about the concurrently access to IIO attr and being paranoid about the compiler, I wonder if we should not use WRITE_ONCE(adis->spi->max_speed_hz, ADIS16475_BURST_MAX_SPEED)...

author maintainer
#12 lore raw

RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 68 lines

-----Original Message-----
From: Sa, Nuno <[email protected]>
Sent: Thursday, April 15, 2021 9:54 AM
To: Alexandru Ardelean <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 10 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:29 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 7 lines

[External]

Quoted 3 lines · Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi transfer which is not the one the user expects it to be. Hence, we need to

re-

Quoted 10 lines

set

Review

Quoted 9 lines

it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/iio/imu/adis16475.c

Quoted 5 lines

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 4 lines

index 51b76444db0b..9dca7e506200 100644

drivers/iio/imu/adis16475.c +0 -0
@@ -1067,8 +1067,10 @@ static irqreturn_t

adis16475_trigger_handler(int irq, void *p)

Quoted 8 lines

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1069

Quoted 3 lines
drivers/iio/imu/adis16475.c +0 -0
        adis->spi->max_speed_hz = ADIS16475_BURST_MAX_SPEED;
 
        ret = spi_sync(adis->spi, &adis->msg);

Purely stylistic here.
But, the restore from the cached variable could be done here in a single line.
So. just moving [1] here.

You mean also doing it in the label? I thought about that and the reason
why I didn't is that on a normal run, I want to reset the max freq as soon
as possible so that if someone concurrently tries to read 'direct mode' attrs
gets the max freq. This was my reasoning but I admit that it's not that important so I will leave this to Jonathan's preference...

Quoted 5 lines

Hmm now that I spoke about the concurrently access to IIO attr and being paranoid about
the compiler, I wonder if we should not use WRITE_ONCE(adis->spi->max_speed_hz, ADIS16475_BURST_MAX_SPEED)...

Hmmm, actually WRITE_ONCE would not be any help since the spi core does not use READ_ONCE. So, if we are going to be paranoid about the compiler and load/store tearing, I guess the only safe way here is to acquire the adis lock [btw, I'm a bit paranoid with this stuff :)]...

Anyways, arguably the likelihood for this to happen is really, really small...

maintainer
#13 lore raw

Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 72 lines · Nuno
Quoted 66 lines

-----Original Message-----
From: Sa, Nuno <[email protected]>
Sent: Thursday, April 15, 2021 9:54 AM
To: Alexandru Ardelean <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 10 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:29 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 7 lines

[External]

Quoted 3 lines · Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi transfer which is not the one the user expects it to be. Hence, we need to

re-

Quoted 10 lines

set

Review

Quoted 9 lines

it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/iio/imu/adis16475.c

Quoted 5 lines

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 4 lines

index 51b76444db0b..9dca7e506200 100644

drivers/iio/imu/adis16475.c +0 -0
@@ -1067,8 +1067,10 @@ static irqreturn_t  

adis16475_trigger_handler(int irq, void *p)

Quoted 8 lines

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1069

Quoted 3 lines
drivers/iio/imu/adis16475.c +0 -0
        adis->spi->max_speed_hz = ADIS16475_BURST_MAX_SPEED;
 
        ret = spi_sync(adis->spi, &adis->msg);  

Purely stylistic here.
But, the restore from the cached variable could be done here in a single line.
So. just moving [1] here.

You mean also doing it in the label? I thought about that and the reason
why I didn't is that on a normal run, I want to reset the max freq as soon
as possible so that if someone concurrently tries to read 'direct mode' attrs
gets the max freq. This was my reasoning but I admit that it's not that important so I will leave this to Jonathan's preference...

Quoted 5 lines

Hmm now that I spoke about the concurrently access to IIO attr and being paranoid about
the compiler, I wonder if we should not use WRITE_ONCE(adis->spi->max_speed_hz, ADIS16475_BURST_MAX_SPEED)...

Quoted 6 lines

Hmmm, actually WRITE_ONCE would not be any help since the spi core does not use READ_ONCE. So, if we are going to be paranoid about the compiler and load/store tearing, I guess the only safe way here is to acquire the adis lock [btw, I'm a bit paranoid with this stuff :)]...

Anyways, arguably the likelihood for this to happen is really, really small...

Really small, but needs fixing. We shouldn't have a window in which this can happen. So either we need to stop those attributes from reading whilst we are in buffered mode (via claim_direct_mode pattern) or we need to put a lock around this. As an alternative, could we use the speed_hz field in appropriate spi_transfer structures to tweak in this path without affecting others? That should make this concurrency problem an issue for the spi core (which I'd assume handles this).

I'm going to hold this series for now on basis we should resolve this whilst here.

Jonathan

author maintainer
#14 lore raw

RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 99 lines

-----Original Message-----
From: Jonathan Cameron <[email protected]>
Sent: Sunday, April 18, 2021 12:21 PM
To: Sa, Nuno <[email protected]>
Cc: Alexandru Ardelean <[email protected]>; linux-iio <linux- [email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 24 lines · Nuno
Quoted 24 lines

-----Original Message-----
From: Sa, Nuno <[email protected]>
Sent: Thursday, April 15, 2021 9:54 AM
To: Alexandru Ardelean <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 10 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:29 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

[External]

Quoted 2 lines · Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi

transfer

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

which is not the one the user expects it to be. Hence, we need

to

Quoted 10 lines
Quoted 10 lines

re-

Quoted 9 lines

set

Quoted 8 lines

it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 8 lines
Quoted 8 lines
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/iio/imu/adis16475.c

Quoted 6 lines

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 4 lines

index 51b76444db0b..9dca7e506200 100644

drivers/iio/imu/adis16475.c +0 -0
@@ -1067,8 +1067,10 @@ static irqreturn_t

adis16475_trigger_handler(int irq, void *p)

Quoted 1 line
drivers/iio/imu/adis16475.c +0 -0
        adis->spi->max_speed_hz =

ADIS16475_BURST_MAX_SPEED;

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1069

Quoted 2 lines
drivers/iio/imu/adis16475.c +0 -0
        ret = spi_sync(adis->spi, &adis->msg);

Purely stylistic here.
But, the restore from the cached variable could be done here in a single line.
So. just moving [1] here.

Quoted 5 lines
Quoted 5 lines

You mean also doing it in the label? I thought about that and the reason
why I didn't is that on a normal run, I want to reset the max freq as soon
as possible so that if someone concurrently tries to read 'direct

mode'

Quoted 2 lines
Quoted 2 lines

attrs
gets the max freq. This was my reasoning but I admit that it's not

that

Quoted 3 lines
Quoted 3 lines

important so I will leave this to Jonathan's preference...

Hmm now that I spoke about the concurrently access to IIO attr

and

Quoted 6 lines
Quoted 4 lines

being paranoid about
the compiler, I wonder if we should not use WRITE_ONCE(adis->spi->max_speed_hz, ADIS16475_BURST_MAX_SPEED)...

Hmmm, actually WRITE_ONCE would not be any help since the spi

core

Quoted 1 line

does not use READ_ONCE. So, if we are going to be paranoid about

the

Quoted 8 lines
Quoted 4 lines

compiler and load/store tearing, I guess the only safe way here is to acquire the adis lock [btw, I'm a bit paranoid with this stuff :)]...

Anyways, arguably the likelihood for this to happen is really, really

small...

Really small, but needs fixing. We shouldn't have a window in which this

Agreed!

Quoted 8 lines

can happen. So either we need to stop those attributes from reading whilst
we are in buffered mode (via claim_direct_mode pattern) or we need to put
a lock around this. As an alternative, could we use the speed_hz field in appropriate spi_transfer structures to tweak in this path without affecting others? That should make this concurrency problem an issue for the spi core (which I'd assume handles this).

Hmm, I like the 'speed_hz' approach as there's no reason to grab the lock because of a spi core tweak. As you said, with this, we push things to spi core. Going one step further, I think the most appropriate thing to do is actually come up with a new member in the 'adis_data' struct (like burst_max_speed_hz) and tweak the burst mode transfers accordingly in 'adis_update_scan_mode_burst()' (as there's no need to set this on every burst sample)...

If we are going the above path, what would be your preference? To add the patches to this series? Or to just fix this patch and [1] and push another series with the above changes? Hmm, since [1] would also depend on this, I guess the later approach would be better?

[1]: https://patchwork.kernel.org/project/linux-iio/patch/[email protected]/

- Nuno Sá

#15 lore raw

Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 125 lines · Nuno
Quoted 97 lines

-----Original Message-----
From: Jonathan Cameron <[email protected]>
Sent: Sunday, April 18, 2021 12:21 PM
To: Sa, Nuno <[email protected]>
Cc: Alexandru Ardelean <[email protected]>; linux-iio <linux- [email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 24 lines · Nuno
Quoted 24 lines

-----Original Message-----
From: Sa, Nuno <[email protected]>
Sent: Thursday, April 15, 2021 9:54 AM
To: Alexandru Ardelean <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: RE: [PATCH 4/7] iio: adis16475: re-set max spi transfer

[External]

Quoted 10 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:29 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 4/7] iio: adis16475: re-set max spi transfer

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

[External]

Quoted 2 lines · Nuno Sa

In case 'spi_sync()' fails, we would be left with a max spi

transfer

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

which is not the one the user expects it to be. Hence, we need

to

Quoted 10 lines
Quoted 10 lines

re-

Quoted 9 lines

set

Quoted 8 lines

it also in this error path.

Fixes fff7352bf7a3c ("iio: imu: Add support for adis16475")
---
 drivers/iio/imu/adis16475.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 8 lines
Quoted 8 lines
Quoted 1 line

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/iio/imu/adis16475.c

Quoted 6 lines

drivers/iio/imu/adis16475.c static irqreturn_t

Quoted 4 lines

index 51b76444db0b..9dca7e506200 100644

drivers/iio/imu/adis16475.c +0 -0
@@ -1067,8 +1067,10 @@ static irqreturn_t  

adis16475_trigger_handler(int irq, void *p)

Quoted 1 line
drivers/iio/imu/adis16475.c +0 -0
        adis->spi->max_speed_hz =  

ADIS16475_BURST_MAX_SPEED;

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

drivers/iio/imu/adis16475.c static irqreturn_t adis16475_trigger_handler(int irq, void *p) · line 1069

Quoted 2 lines
drivers/iio/imu/adis16475.c +0 -0
        ret = spi_sync(adis->spi, &adis->msg);  

Purely stylistic here.
But, the restore from the cached variable could be done here in a single line.
So. just moving [1] here.

Quoted 5 lines
Quoted 5 lines

You mean also doing it in the label? I thought about that and the reason
why I didn't is that on a normal run, I want to reset the max freq as soon
as possible so that if someone concurrently tries to read 'direct

mode'

Quoted 2 lines
Quoted 2 lines

attrs
gets the max freq. This was my reasoning but I admit that it's not

that

Quoted 3 lines
Quoted 3 lines

important so I will leave this to Jonathan's preference...

Hmm now that I spoke about the concurrently access to IIO attr

and

Quoted 6 lines
Quoted 4 lines

being paranoid about
the compiler, I wonder if we should not use WRITE_ONCE(adis->spi->max_speed_hz, ADIS16475_BURST_MAX_SPEED)...

Hmmm, actually WRITE_ONCE would not be any help since the spi

core

Quoted 1 line

does not use READ_ONCE. So, if we are going to be paranoid about

the

Quoted 8 lines
Quoted 4 lines

compiler and load/store tearing, I guess the only safe way here is to acquire the adis lock [btw, I'm a bit paranoid with this stuff :)]...

Anyways, arguably the likelihood for this to happen is really, really

small...

Really small, but needs fixing. We shouldn't have a window in which this

Agreed!

Quoted 8 lines

can happen. So either we need to stop those attributes from reading whilst
we are in buffered mode (via claim_direct_mode pattern) or we need to put
a lock around this. As an alternative, could we use the speed_hz field in appropriate spi_transfer structures to tweak in this path without affecting others? That should make this concurrency problem an issue for the spi core (which I'd assume handles this).

Hmm, I like the 'speed_hz' approach as there's no reason to grab the lock because of a spi core tweak. As you said, with this, we push things to spi core. Going one step further, I think the most appropriate thing to do is actually come up with a new member in the 'adis_data' struct (like burst_max_speed_hz) and tweak the burst mode transfers accordingly in 'adis_update_scan_mode_burst()' (as there's no need to set this on every burst sample)...

Quoted 6 lines

If we are going the above path, what would be your preference? To add the patches to this series? Or to just fix this patch and [1] and push another series with the above changes? Hmm, since [1] would also depend on this, I guess the later approach would be better?

[1]: https://patchwork.kernel.org/project/linux-iio/patch/[email protected]/

Make a new version of this series with the fix, then provide an update of [1] that is probably going to be dependent on this series.

Given this is a fix, ideally we'll backport it which we don't need to do for the new code introduced in [1].

Thanks,

Jonathan

Quoted 2 lines

- Nuno Sá

author maintainer
#16 lore raw

PATCH 5/7 iio: adis_buffer: check return value on page change

In reply to Nuno Sa

On the trigger handler, we might need to change the device page. Hence, we should check the return value from 'spi_write()' and act accordingly.

---
 drivers/iio/imu/adis_buffer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iio/imu/adis_buffer.c +5 -1
index f89bce10090a..7ab15c08889f 100644
@@ -137,7 +137,11 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 		if (adis->current_page != 0) {
 			adis->tx[0] = ADIS_WRITE_REG(ADIS_REG_PAGE_ID);
 			adis->tx[1] = 0;
-			spi_write(adis->spi, adis->tx, 2);
+			ret = spi_write(adis->spi, adis->tx, 2);
+			if (ret) {
+				dev_err(&adis->spi->dev, "Failed to change device page: %d\n", ret);
+				goto irq_done;
+			}
 		}
 	}
 
Signature · 1 line
2.31.1
#17 lore raw

Re: [PATCH 5/7] iio: adis_buffer: check return value on page change

Quoted 14 lines · Nuno Sa

On the trigger handler, we might need to change the device page. Hence, we should check the return value from 'spi_write()' and act accordingly.

---
 drivers/iio/imu/adis_buffer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/iio/imu/adis_buffer.c +0 -0
index f89bce10090a..7ab15c08889f 100644

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p) · line 144

Quoted 9 lines
drivers/iio/imu/adis_buffer.c +5 -1
@@ -137,7 +137,11 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
                if (adis->current_page != 0) {
                        adis->tx[0] = ADIS_WRITE_REG(ADIS_REG_PAGE_ID);
                        adis->tx[1] = 0;
-                       spi_write(adis->spi, adis->tx, 2);
+                       ret = spi_write(adis->spi, adis->tx, 2);
+                       if (ret) {
+                               dev_err(&adis->spi->dev, "Failed to change device page: %d\n", ret);
+                               goto irq_done;
+                       }

The &adis->state_lock is not being unlocked on this error path. This probably needs a bit of re-organization of this block:

    if (adis->data->has_paging) {
        adis->current_page = 0;
        mutex_unlock(&adis->state_lock);
    }
Quoted 6 lines
drivers/iio/imu/adis_buffer.c +0 -1
                }
        }
 
--

2.31.1

author maintainer
#18 lore raw

RE: [PATCH 5/7] iio: adis_buffer: check return value on page change

Quoted 46 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:34 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 5/7] iio: adis_buffer: check return value on page change

[External]

Quoted 2 lines · Nuno Sa

On the trigger handler, we might need to change the device page.

Hence,

Quoted 1 line

we should check the return value from 'spi_write()' and act

accordingly.

Review

Quoted 7 lines
---
 drivers/iio/imu/adis_buffer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
(quoted diff) +0 -0

b/drivers/iio/imu/adis_buffer.c

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int

Quoted 4 lines

index f89bce10090a..7ab15c08889f 100644

drivers/iio/imu/adis_buffer.c +0 -0
@@ -137,7 +137,11 @@ static irqreturn_t adis_trigger_handler(int

irq, void *p)

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p)

Quoted 7 lines
drivers/iio/imu/adis_buffer.c +3 -1
                if (adis->current_page != 0) {
                        adis->tx[0] = ADIS_WRITE_REG(ADIS_REG_PAGE_ID);
                        adis->tx[1] = 0;
-                       spi_write(adis->spi, adis->tx, 2);
+                       ret = spi_write(adis->spi, adis->tx, 2);
+                       if (ret) {
+                               dev_err(&adis->spi->dev, "Failed to change device

page: %d\n", ret);

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p) · line 144

Quoted 2 lines
drivers/iio/imu/adis_buffer.c +2 -0
+                               goto irq_done;
+                       }
Quoted 7 lines

The &adis->state_lock is not being unlocked on this error path. This probably needs a bit of re-organization of this block:

    if (adis->data->has_paging) {
        adis->current_page = 0;
        mutex_unlock(&adis->state_lock);
    }

Arghhh, good catch. Not sure where I had my head to not see this...

Thanks!

author maintainer
#19 lore raw

PATCH 6/7 iio: adis_buffer: don't push data to buffers on failure

In reply to Nuno Sa

There's no point in pushing data to IIO buffers in case 'spi_sync()' fails.

---
 drivers/iio/imu/adis_buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iio/imu/adis_buffer.c +3 -2
index 7ab15c08889f..73790b71102b 100644
@@ -146,9 +146,10 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 	}
 
 	ret = spi_sync(adis->spi, &adis->msg);
-	if (ret)
+	if (ret) {
 		dev_err(&adis->spi->dev, "Failed to read data: %d", ret);
-
+		goto irq_done;
+	}
 
 	if (adis->data->has_paging) {
 		adis->current_page = 0;
Signature · 1 line
2.31.1
#20 lore raw

Re: [PATCH 6/7] iio: adis_buffer: don't push data to buffers on failure

Quoted 14 lines · Nuno Sa

There's no point in pushing data to IIO buffers in case 'spi_sync()' fails.

---
 drivers/iio/imu/adis_buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iio/imu/adis_buffer.c +0 -0
index 7ab15c08889f..73790b71102b 100644

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p) · line 152

Quoted 9 lines
drivers/iio/imu/adis_buffer.c +3 -2
@@ -146,9 +146,10 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
        }
 
        ret = spi_sync(adis->spi, &adis->msg);
-       if (ret)
+       if (ret) {
                dev_err(&adis->spi->dev, "Failed to read data: %d", ret);
-
+               goto irq_done;
+       }

This also has some issue with not unlocking the &adis->state_lock.

Quoted 6 lines
drivers/iio/imu/adis_buffer.c +0 -1
        if (adis->data->has_paging) {
                adis->current_page = 0;
--

2.31.1

author maintainer
#21 lore raw

RE: [PATCH 6/7] iio: adis_buffer: don't push data to buffers on failure

Quoted 43 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:35 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 6/7] iio: adis_buffer: don't push data to buffers on failure

[External]

Review

Quoted 10 lines · Nuno Sa

There's no point in pushing data to IIO buffers in case 'spi_sync()' fails.

---
 drivers/iio/imu/adis_buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/iio/imu/adis_buffer.c

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int

Quoted 4 lines

index 7ab15c08889f..73790b71102b 100644

drivers/iio/imu/adis_buffer.c +0 -0
@@ -146,9 +146,10 @@ static irqreturn_t adis_trigger_handler(int

irq, void *p)

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p) · line 152

Quoted 9 lines
drivers/iio/imu/adis_buffer.c +3 -2
        }
 
        ret = spi_sync(adis->spi, &adis->msg);
-       if (ret)
+       if (ret) {
                dev_err(&adis->spi->dev, "Failed to read data: %d", ret);
-
+               goto irq_done;
+       }
Quoted 1 line

This also has some issue with not unlocking the &adis->state_lock.

Ditto :facepalm:

Thanks!

author maintainer
#22 lore raw

PATCH 7/7 iio: adis_buffer: update device page after changing it

In reply to Nuno Sa

With commit 41f2770a07e0 ("iio: adis_buffer: don't push data to buffers on failure"), we return if 'spi_sync()' fails which would leave 'adis->current_page' in an incoherent state. Hence, set this variable right after we change the device page.

---
 drivers/iio/imu/adis_buffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/imu/adis_buffer.c +3 -3
index 73790b71102b..aa37981c28f1 100644
@@ -142,6 +142,8 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 				dev_err(&adis->spi->dev, "Failed to change device page: %d\n", ret);
 				goto irq_done;
 			}
+
+			adis->current_page = 0;
 		}
 	}
 
@@ -151,10 +153,8 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
 		goto irq_done;
 	}
 
-	if (adis->data->has_paging) {
-		adis->current_page = 0;
+	if (adis->data->has_paging)
 		mutex_unlock(&adis->state_lock);
-	}
 
 	iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
 		pf->timestamp);
Signature · 1 line
2.31.1
#23 lore raw

Re: [PATCH 7/7] iio: adis_buffer: update device page after changing it

Quoted 16 lines · Nuno Sa

With commit 41f2770a07e0 ("iio: adis_buffer: don't push data to buffers on failure"), we return if 'spi_sync()' fails which would leave 'adis->current_page' in an incoherent state. Hence, set this variable right after we change the device page.

---
 drivers/iio/imu/adis_buffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iio/imu/adis_buffer.c +0 -0
index 73790b71102b..aa37981c28f1 100644

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p) · line 146

Quoted 5 lines
drivers/iio/imu/adis_buffer.c +2 -0
@@ -142,6 +142,8 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
                                dev_err(&adis->spi->dev, "Failed to change device page: %d\n", ret);
                                goto irq_done;
                        }
+
+                       adis->current_page = 0;

If the above spi_write() fails, this adis->current_page isn't reset. Maybe reset this as the first thing in this if block?

Quoted 18 lines
drivers/iio/imu/adis_buffer.c +1 -4
                }
        }
 
@@ -151,10 +153,8 @@ static irqreturn_t adis_trigger_handler(int irq, void *p)
                goto irq_done;
        }
 
-       if (adis->data->has_paging) {
-               adis->current_page = 0;
+       if (adis->data->has_paging)
                mutex_unlock(&adis->state_lock);
-       }
 
        iio_push_to_buffers_with_timestamp(indio_dev, adis->buffer,
                pf->timestamp);
--

2.31.1

author maintainer
#24 lore raw

RE: [PATCH 7/7] iio: adis_buffer: update device page after changing it

Quoted 37 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:39 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 7/7] iio: adis_buffer: update device page after changing it

[External]

Quoted 2 lines · Nuno Sa

With commit 41f2770a07e0 ("iio: adis_buffer: don't push data to

buffers on

Review

Quoted 10 lines

failure"), we return if 'spi_sync()' fails which would leave 'adis->current_page' in an incoherent state. Hence, set this variable right after we change the device page.

---
 drivers/iio/imu/adis_buffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/iio/imu/adis_buffer.c

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq,

Quoted 4 lines

index 73790b71102b..aa37981c28f1 100644

drivers/iio/imu/adis_buffer.c +0 -0
@@ -142,6 +142,8 @@ static irqreturn_t adis_trigger_handler(int irq,

void *p)

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, · line 142

Quoted 1 line
drivers/iio/imu/adis_buffer.c +0 -0
                                dev_err(&adis->spi->dev, "Failed to change device
Quoted 9 lines

page: %d\n", ret);

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, void *p) · line 146

Quoted 4 lines
drivers/iio/imu/adis_buffer.c +2 -0
                                goto irq_done;
                        }
+
+                       adis->current_page = 0;

If the above spi_write() fails, this adis->current_page isn't reset. Maybe reset this as the first thing in this if block?

If the 'spi_write()' fails it means that we could not change to page0, so we should not update the current_page...

#25 lore raw

Re: [PATCH 7/7] iio: adis_buffer: update device page after changing it

Quoted 44 lines · Nuno
Quoted 44 lines

-----Original Message-----
From: Alexandru Ardelean <[email protected]>
Sent: Wednesday, April 14, 2021 9:39 AM
To: Sa, Nuno <[email protected]>
Cc: linux-iio <[email protected]>; Jonathan Cameron <[email protected]>; Hennerich, Michael <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: Re: [PATCH 7/7] iio: adis_buffer: update device page after changing it

[External]

Quoted 2 lines · Nuno Sa

With commit 41f2770a07e0 ("iio: adis_buffer: don't push data to

buffers on

Review

Quoted 10 lines

failure"), we return if 'spi_sync()' fails which would leave 'adis->current_page' in an incoherent state. Hence, set this variable right after we change the device page.

---
 drivers/iio/imu/adis_buffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/drivers/iio/imu/adis_buffer.c

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq,

Quoted 4 lines

index 73790b71102b..aa37981c28f1 100644

drivers/iio/imu/adis_buffer.c +0 -0
@@ -142,6 +142,8 @@ static irqreturn_t adis_trigger_handler(int irq,

void *p)

drivers/iio/imu/adis_buffer.c static irqreturn_t adis_trigger_handler(int irq, · line 142

Quoted 1 line
drivers/iio/imu/adis_buffer.c +0 -0
                                dev_err(&adis->spi->dev, "Failed to change device

page: %d\n", ret);

Quoted 4 lines
drivers/iio/imu/adis_buffer.c +2 -0
                                goto irq_done;
                        }
+
+                       adis->current_page = 0;
Quoted 6 lines
Quoted 3 lines

If the above spi_write() fails, this adis->current_page isn't reset. Maybe reset this as the first thing in this if block?

If the 'spi_write()' fails it means that we could not change to page0, so we should not update the current_page...

ack

#26 lore raw
In reply to Nuno Sa
Quoted 11 lines · Nuno Sa

The primary goal of this series was to fix the return value on some trigger handlers as spotted in [1]. While doing it, I found some minor improvements that I think are simple enough to include in this series.

As for the first 2 patches, I opted to not do any functional change so I'm keeping the 'if (!adis->buffer)' check. However, 'adis-buffer' is allocated in 'update_scan_mode' hook which means we should be sure that the buffer is allocated and the check is really not needed. I did not went into the details but is there any way for the trigger handler to be called before the 'update_scan_mode' hook? If not, I'm happy in sending a v2 where we just remove the 'if'...

I do remember that the check was deliberate. I do remember of thinking about whether we need this and feeling uncomfortable about not having the check. But I think it is more a instance of defensive programming rather than actually being required.

It was less about the trigger being called before update_scan_mode, but in case it gets called if the allocation in update_scan_mode fails. But I think this should not be possible. So it is probably safe to remove it.

- Lars