[PATCH v2 10/16] iio: adc: vf610_adc: vf610_adc: do not use internal iio_dev lock

[Bough Chen]

> -----Original Message-----
> From: Nuno Sá <nuno.sa at analog.com>
> Sent: 2022年10月4日 21:49
> To: linux-amlogic at lists.infradead.org; dl-linux-imx <linux-imx at nxp.com>;
> linux-iio at vger.kernel.org; linux-arm-kernel at lists.infradead.org;
> linux-rockchip at lists.infradead.org
> Cc: Heiko Stuebner <heiko at sntech.de>; Martin Blumenstingl
> <martin.blumenstingl at googlemail.com>; Neil Armstrong
> <narmstrong at baylibre.com>; Shawn Guo <shawnguo at kernel.org>; Lars-Peter
> Clausen <lars at metafoo.de>; Jyoti Bhayana <jbhayana at google.com>; Hans de
> Goede <hdegoede at redhat.com>; Andriy Tryshnivskyy
> <andriy.tryshnivskyy at opensynergy.com>; Pengutronix Kernel Team
> <kernel at pengutronix.de>; Miquel Raynal <miquel.raynal at bootlin.com>; Cixi
> Geng <cixi.geng1 at unisoc.com>; Baolin Wang
> <baolin.wang at linux.alibaba.com>; Ciprian Regus <ciprian.regus at analog.com>;
> Fabio Estevam <festevam at gmail.com>; Nuno Sá <nuno.sa at analog.com>;
> Sascha Hauer <s.hauer at pengutronix.de>; Alexandru Ardelean
> <aardelean at deviqon.com>; Florian Boor <florian.boor at kernelconcepts.de>;
> Michael Hennerich <Michael.Hennerich at analog.com>; Orson Zhai
> <orsonzhai at gmail.com>; Chen-Yu Tsai <wens at csie.org>; Chunyan Zhang
> <zhang.lyra at gmail.com>; Vladimir Zapolskiy <vz at mleia.com>; Andy
> Shevchenko <andy.shevchenko at gmail.com>; Jerome Brunet
> <jbrunet at baylibre.com>; Bough Chen <haibo.chen at nxp.com>; Kevin Hilman
> <khilman at baylibre.com>; Jonathan Cameron <jic23 at kernel.org>
> Subject: [PATCH v2 10/16] iio: adc: vf610_adc: vf610_adc: do not use internal
> iio_dev lock
> 
> In order to drop the internal lock usage we needed two different things:
> 
> 1) The first place where 'mlock' was being used was a typical case where
> iio_device_claim_direct_mode() fits perfectly.
> 2) In the second case, it was being used to prevent concurrent accesses to the
> device and shared data but nothing was being enforced with regards to
> buffering (i.e, there was nothing preventing from changing the conversion mode
> while buffering). Hence, in this case, a new lock was introduced in the state
> structure.
> 
> Note that the goal is not to introduce any functional change and that is the
> reason why a new lock was introduced to guarantee 2).
> 
> While at it, properly include "mutex.h" for mutex related APIs.
> 
> Signed-off-by: Nuno Sá <nuno.sa at analog.com>

Reviewed-by: Haibo Chen <haibo.chen at nxp.com>

Thanks!

> ---
>  drivers/iio/adc/vf610_adc.c | 22 ++++++++++++++--------
>  1 file changed, 14 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c index
> a6f9182d7766..ae31aafd2653 100644
> --- a/drivers/iio/adc/vf610_adc.c
> +++ b/drivers/iio/adc/vf610_adc.c
> @@ -7,6 +7,7 @@
> 
>  #include <linux/mod_devicetable.h>
>  #include <linux/module.h>
> +#include <linux/mutex.h>
>  #include <linux/property.h>
>  #include <linux/platform_device.h>
>  #include <linux/interrupt.h>
> @@ -156,6 +157,9 @@ struct vf610_adc {
>  	void __iomem *regs;
>  	struct clk *clk;
> 
> +	/* lock to protect against multiple access to the device */
> +	struct mutex lock;
> +
>  	u32 vref_uv;
>  	u32 value;
>  	struct regulator *vref;
> @@ -467,11 +471,11 @@ static int vf610_set_conversion_mode(struct iio_dev
> *indio_dev,  {
>  	struct vf610_adc *info = iio_priv(indio_dev);
> 
> -	mutex_lock(&indio_dev->mlock);
> +	mutex_lock(&info->lock);
>  	info->adc_feature.conv_mode = mode;
>  	vf610_adc_calculate_rates(info);
>  	vf610_adc_hw_init(info);
> -	mutex_unlock(&indio_dev->mlock);
> +	mutex_unlock(&info->lock);
> 
>  	return 0;
>  }
> @@ -629,12 +633,11 @@ static int vf610_read_sample(struct iio_dev
> *indio_dev,
>  	unsigned int hc_cfg;
>  	int ret;
> 
> -	mutex_lock(&indio_dev->mlock);
> -	if (iio_buffer_enabled(indio_dev)) {
> -		ret = -EBUSY;
> -		goto out_unlock;
> -	}
> +	ret = iio_device_claim_direct_mode(indio_dev);
> +	if (ret)
> +		return ret;
> 
> +	mutex_lock(&info->lock);
>  	reinit_completion(&info->completion);
>  	hc_cfg = VF610_ADC_ADCHC(chan->channel);
>  	hc_cfg |= VF610_ADC_AIEN;
> @@ -669,7 +672,8 @@ static int vf610_read_sample(struct iio_dev *indio_dev,
>  	}
> 
>  out_unlock:
> -	mutex_unlock(&indio_dev->mlock);
> +	mutex_unlock(&info->lock);
> +	iio_device_release_direct_mode(indio_dev);
> 
>  	return ret;
>  }
> @@ -892,6 +896,8 @@ static int vf610_adc_probe(struct platform_device
> *pdev)
>  		goto error_iio_device_register;
>  	}
> 
> +	mutex_init(&info->lock);
> +
>  	ret = iio_device_register(indio_dev);
>  	if (ret) {
>  		dev_err(&pdev->dev, "Couldn't register the device.\n");
> --
> 2.37.3