* [PATCH v2] iio: adc: mcp3422: fix locking scope
@ 2020-08-19 7:53 Angelo Compagnucci
0 siblings, 0 replies; 3+ messages in thread
From: Angelo Compagnucci @ 2020-08-19 7:53 UTC (permalink / raw)
To: linux-iio; +Cc: Angelo Compagnucci
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Locking should be held for the entire reading sequence involving setting
the channel, waiting for the channel switch and reading from the
channel.
If not, reading from a channel can result mixing with the reading from
another channel.
Fixes: 07914c84ba30 ("iio: adc: Add driver for Microchip MCP3422/3/4 high resolution ADC")
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
drivers/iio/adc/mcp3422.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index d86c0b5d80a3..02a60fb164cd 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -96,16 +96,12 @@ static int mcp3422_update_config(struct mcp3422 *adc, u8 newconfig)
{
int ret;
- mutex_lock(&adc->lock);
-
ret = i2c_master_send(adc->i2c, &newconfig, 1);
if (ret > 0) {
adc->config = newconfig;
ret = 0;
}
- mutex_unlock(&adc->lock);
-
return ret;
}
@@ -138,6 +134,8 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
u8 config;
u8 req_channel = channel->channel;
+ mutex_lock(&adc->lock);
+
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
@@ -150,7 +148,11 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
- return mcp3422_read(adc, value, &config);
+ ret = mcp3422_read(adc, value, &config);
+
+ mutex_unlock(&adc->lock);
+
+ return ret;
}
static int mcp3422_read_raw(struct iio_dev *iio,
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2] iio: adc: mcp3422: fix locking scope
@ 2020-08-19 7:55 angelo.compagnucci
2020-08-29 17:21 ` Jonathan Cameron
0 siblings, 1 reply; 3+ messages in thread
From: angelo.compagnucci @ 2020-08-19 7:55 UTC (permalink / raw)
To: linux-iio; +Cc: Angelo Compagnucci
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Locking should be held for the entire reading sequence involving setting
the channel, waiting for the channel switch and reading from the
channel.
If not, reading from a channel can result mixing with the reading from
another channel.
Fixes: 07914c84ba30 ("iio: adc: Add driver for Microchip MCP3422/3/4 high resolution ADC")
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
drivers/iio/adc/mcp3422.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
index d86c0b5d80a3..02a60fb164cd 100644
--- a/drivers/iio/adc/mcp3422.c
+++ b/drivers/iio/adc/mcp3422.c
@@ -96,16 +96,12 @@ static int mcp3422_update_config(struct mcp3422 *adc, u8 newconfig)
{
int ret;
- mutex_lock(&adc->lock);
-
ret = i2c_master_send(adc->i2c, &newconfig, 1);
if (ret > 0) {
adc->config = newconfig;
ret = 0;
}
- mutex_unlock(&adc->lock);
-
return ret;
}
@@ -138,6 +134,8 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
u8 config;
u8 req_channel = channel->channel;
+ mutex_lock(&adc->lock);
+
if (req_channel != MCP3422_CHANNEL(adc->config)) {
config = adc->config;
config &= ~MCP3422_CHANNEL_MASK;
@@ -150,7 +148,11 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
}
- return mcp3422_read(adc, value, &config);
+ ret = mcp3422_read(adc, value, &config);
+
+ mutex_unlock(&adc->lock);
+
+ return ret;
}
static int mcp3422_read_raw(struct iio_dev *iio,
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] iio: adc: mcp3422: fix locking scope
2020-08-19 7:55 angelo.compagnucci
@ 2020-08-29 17:21 ` Jonathan Cameron
0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2020-08-29 17:21 UTC (permalink / raw)
To: angelo.compagnucci; +Cc: linux-iio
On Wed, 19 Aug 2020 09:55:25 +0200
angelo.compagnucci@gmail.com wrote:
> From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
>
> Locking should be held for the entire reading sequence involving setting
> the channel, waiting for the channel switch and reading from the
> channel.
> If not, reading from a channel can result mixing with the reading from
> another channel.
>
> Fixes: 07914c84ba30 ("iio: adc: Add driver for Microchip MCP3422/3/4 high resolution ADC")
> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
> ---
> drivers/iio/adc/mcp3422.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c
> index d86c0b5d80a3..02a60fb164cd 100644
> --- a/drivers/iio/adc/mcp3422.c
> +++ b/drivers/iio/adc/mcp3422.c
> @@ -96,16 +96,12 @@ static int mcp3422_update_config(struct mcp3422 *adc, u8 newconfig)
> {
> int ret;
>
> - mutex_lock(&adc->lock);
> -
> ret = i2c_master_send(adc->i2c, &newconfig, 1);
> if (ret > 0) {
> adc->config = newconfig;
> ret = 0;
> }
>
> - mutex_unlock(&adc->lock);
> -
> return ret;
> }
>
> @@ -138,6 +134,8 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
> u8 config;
> u8 req_channel = channel->channel;
>
> + mutex_lock(&adc->lock);
> +
> if (req_channel != MCP3422_CHANNEL(adc->config)) {
> config = adc->config;
> config &= ~MCP3422_CHANNEL_MASK;
> @@ -150,7 +148,11 @@ static int mcp3422_read_channel(struct mcp3422 *adc,
> msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]);
> }
>
> - return mcp3422_read(adc, value, &config);
> + ret = mcp3422_read(adc, value, &config);
> +
> + mutex_unlock(&adc->lock);
> +
> + return ret;
> }
>
> static int mcp3422_read_raw(struct iio_dev *iio,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-29 17:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-19 7:53 [PATCH v2] iio: adc: mcp3422: fix locking scope Angelo Compagnucci
2020-08-19 7:55 angelo.compagnucci
2020-08-29 17:21 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).