* [PATCH v2] iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock
[not found] <20200826132203.236748-1-alexandru.ardelean@analog.com>
@ 2020-09-16 9:31 ` Alexandru Ardelean
2020-09-19 15:19 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Alexandru Ardelean @ 2020-09-16 9:31 UTC (permalink / raw)
To: linux-iio, linux-arm-kernel, linux-samsung-soc, linux-kernel
Cc: Sergiu Cuciurean, Alexandru Ardelean, kgene, krzk, jic23
From: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
As part of the general cleanup of indio_dev->mlock, this change replaces
it with a local lock, to protect potential concurrent access to the
completion callback during a conversion.
This is part of a bigger cleanup.
Link: https://lore.kernel.org/linux-iio/CA+U=Dsoo6YABe5ODLp+eFNPGFDjk5ZeQEceGkqjxXcVEhLWubw@mail.gmail.com/
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
---
drivers/iio/adc/exynos_adc.c | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index 20477b249f2a..99f4404e9fd1 100644
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -138,6 +138,16 @@ struct exynos_adc {
bool read_ts;
u32 ts_x;
u32 ts_y;
+
+ /*
+ * Lock to protect from potential concurrent access to the
+ * completion callback during a manual conversion. For this driver
+ * a wait-callback is used to wait for the conversion result,
+ * so in the meantime no other read request (or conversion start)
+ * must be performed, otherwise it would interfere with the
+ * current conversion result.
+ */
+ struct mutex lock;
};
struct exynos_adc_data {
@@ -542,7 +552,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
return -EINVAL;
}
- mutex_lock(&indio_dev->mlock);
+ mutex_lock(&info->lock);
reinit_completion(&info->completion);
/* Select the channel to be used and Trigger conversion */
@@ -562,7 +572,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
ret = IIO_VAL_INT;
}
- mutex_unlock(&indio_dev->mlock);
+ mutex_unlock(&info->lock);
return ret;
}
@@ -573,7 +583,7 @@ static int exynos_read_s3c64xx_ts(struct iio_dev *indio_dev, int *x, int *y)
unsigned long timeout;
int ret;
- mutex_lock(&indio_dev->mlock);
+ mutex_lock(&info->lock);
info->read_ts = true;
reinit_completion(&info->completion);
@@ -598,7 +608,7 @@ static int exynos_read_s3c64xx_ts(struct iio_dev *indio_dev, int *x, int *y)
}
info->read_ts = false;
- mutex_unlock(&indio_dev->mlock);
+ mutex_unlock(&info->lock);
return ret;
}
@@ -868,6 +878,8 @@ static int exynos_adc_probe(struct platform_device *pdev)
indio_dev->channels = exynos_adc_iio_channels;
indio_dev->num_channels = info->data->num_channels;
+ mutex_init(&info->lock);
+
ret = request_irq(info->irq, exynos_adc_isr,
0, dev_name(&pdev->dev), info);
if (ret < 0) {
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock
2020-09-16 9:31 ` [PATCH v2] iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock Alexandru Ardelean
@ 2020-09-19 15:19 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2020-09-19 15:19 UTC (permalink / raw)
To: Alexandru Ardelean
Cc: linux-samsung-soc, linux-iio, linux-kernel, krzk,
Sergiu Cuciurean, kgene, linux-arm-kernel
On Wed, 16 Sep 2020 12:31:23 +0300
Alexandru Ardelean <alexandru.ardelean@analog.com> wrote:
> From: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
>
> As part of the general cleanup of indio_dev->mlock, this change replaces
> it with a local lock, to protect potential concurrent access to the
> completion callback during a conversion.
>
> This is part of a bigger cleanup.
> Link: https://lore.kernel.org/linux-iio/CA+U=Dsoo6YABe5ODLp+eFNPGFDjk5ZeQEceGkqjxXcVEhLWubw@mail.gmail.com/
>
> Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
> Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
> Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/adc/exynos_adc.c | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
> index 20477b249f2a..99f4404e9fd1 100644
> --- a/drivers/iio/adc/exynos_adc.c
> +++ b/drivers/iio/adc/exynos_adc.c
> @@ -138,6 +138,16 @@ struct exynos_adc {
> bool read_ts;
> u32 ts_x;
> u32 ts_y;
> +
> + /*
> + * Lock to protect from potential concurrent access to the
> + * completion callback during a manual conversion. For this driver
> + * a wait-callback is used to wait for the conversion result,
> + * so in the meantime no other read request (or conversion start)
> + * must be performed, otherwise it would interfere with the
> + * current conversion result.
> + */
> + struct mutex lock;
> };
>
> struct exynos_adc_data {
> @@ -542,7 +552,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
> return -EINVAL;
> }
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&info->lock);
> reinit_completion(&info->completion);
>
> /* Select the channel to be used and Trigger conversion */
> @@ -562,7 +572,7 @@ static int exynos_read_raw(struct iio_dev *indio_dev,
> ret = IIO_VAL_INT;
> }
>
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&info->lock);
>
> return ret;
> }
> @@ -573,7 +583,7 @@ static int exynos_read_s3c64xx_ts(struct iio_dev *indio_dev, int *x, int *y)
> unsigned long timeout;
> int ret;
>
> - mutex_lock(&indio_dev->mlock);
> + mutex_lock(&info->lock);
> info->read_ts = true;
>
> reinit_completion(&info->completion);
> @@ -598,7 +608,7 @@ static int exynos_read_s3c64xx_ts(struct iio_dev *indio_dev, int *x, int *y)
> }
>
> info->read_ts = false;
> - mutex_unlock(&indio_dev->mlock);
> + mutex_unlock(&info->lock);
>
> return ret;
> }
> @@ -868,6 +878,8 @@ static int exynos_adc_probe(struct platform_device *pdev)
> indio_dev->channels = exynos_adc_iio_channels;
> indio_dev->num_channels = info->data->num_channels;
>
> + mutex_init(&info->lock);
> +
> ret = request_irq(info->irq, exynos_adc_isr,
> 0, dev_name(&pdev->dev), info);
> if (ret < 0) {
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-19 15:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20200826132203.236748-1-alexandru.ardelean@analog.com>
2020-09-16 9:31 ` [PATCH v2] iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock Alexandru Ardelean
2020-09-19 15:19 ` 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).