iio: adc: qcom-spmi-adc5-gen3: fix lock annotations on mutex helpers
Subsystems (2)
PATCH v3 1/1 iio: adc: qcom-spmi-adc5-gen3: fix lock annotations on mutex helpers
Since commit 5b63d0ae94cc ("compiler-context-analysis: Remove Sparse support"), __acquires() and __releases() only feed context analysis. Their argument is parsed before the function body, where only dev is in scope, so with analysis enabled for this file the build fails:
error: use of undeclared identifier 'adc'
These helpers take and drop the lock for the ADC_TM driver, which only sees their declarations in the header. Naming the lock there would mean exposing struct adc5_chip, and with no annotation at all the analysis flags the unbalanced locking. Mark both __context_unsafe().
---
Cc: Marco Elver <[email protected]>
Cc: Bart Van Assche <[email protected]>
Cc: Jishnu Prakash <[email protected]>
v3: drop Fixes tag (Jonathan), trailer cleanup (Andy)
v2: __context_unsafe() explained in commit message (Andy)
https://lore.kernel.org/linux-iio/[email protected]/
v1: https://lore.kernel.org/linux-iio/[email protected]/
Found by building with CONTEXT_ANALYSIS_qcom-spmi-adc5-gen3.o=y, which the driver does not set today. Enabling it comes later, with the IIO core annotations. Build tested only, no hardware here. Patch and commit message drafted with an LLM coding assistant.
drivers/iio/adc/qcom-spmi-adc5-gen3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/qcom-spmi-adc5-gen3.c +2 -2
@@ -663,7 +663,7 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc) }void adc5_gen3_mutex_lock (struct device *dev) - __acquires(&adc->lock) +__context_unsafe (/* returns with adc->lock held */ ) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);
@@ -673,7 +673,7 @@ void adc5_gen3_mutex_lock(struct device *dev)EXPORT_SYMBOL_NS_GPL (adc5_gen3_mutex_lock,"QCOM_SPMI_ADC5_GEN3" );void adc5_gen3_mutex_unlock (struct device *dev) - __releases(&adc->lock) +__context_unsafe (/* releases adc->lock */ ) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);
base-commit: c9dbe2a47f635465c9985b7af74d2ae310e98125
Signature · 1 line
2.43.0
Quoted 1 line · Rupesh Majhi
Found by building with CONTEXT_ANALYSIS_qcom-spmi-adc5-gen3.o=y
Please include the CONTEXT_ANALYSIS_qcom-spmi-adc5-gen3.o=y change in your patch.
Quoted 23 lines
drivers/iio/adc/qcom-spmi-adc5-gen3.c +2
-2@@ -663,7 +663,7 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc) }void adc5_gen3_mutex_lock (struct device *dev) - __acquires(&adc->lock) +__context_unsafe (/* returns with adc->lock held */ ) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);@@ -673,7 +673,7 @@ void adc5_gen3_mutex_lock(struct device *dev)EXPORT_SYMBOL_NS_GPL (adc5_gen3_mutex_lock,"QCOM_SPMI_ADC5_GEN3" );void adc5_gen3_mutex_unlock (struct device *dev) - __releases(&adc->lock) +__context_unsafe (/* releases adc->lock */ ) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);
Quoted 1 line
base-commit:
c9dbe2a47f635465c9985b7af74d2ae310e98125
Please consider replacing the above with the patch below:
drivers/iio/adc/qcom-spmi-adc5-gen3.c +2 -2
@@ -663,7 +663,7 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc) }void adc5_gen3_mutex_lock (struct device *dev) - __acquires(&adc->lock) + __acquires(&((struct adc5_chip *)iio_priv(dev_get_drvdata(dev->parent)))->lock) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);
@@ -673,7 +673,7 @@ void adc5_gen3_mutex_lock(struct device *dev)EXPORT_SYMBOL_NS_GPL (adc5_gen3_mutex_lock,"QCOM_SPMI_ADC5_GEN3" );void adc5_gen3_mutex_unlock (struct device *dev) - __releases(&adc->lock) + __releases(&((struct adc5_chip *)iio_priv(dev_get_drvdata(dev->parent)))->lock) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);
Thanks,
Bart.
Jonathan Cameron
maintainerQuoted 6 lines · On Sun, 25 Oct 2026 13:10:26 -0700 Bart Van Assche <[email protected]> wrote:
Quoted 1 line · Rupesh Majhi
Found by building with CONTEXT_ANALYSIS_qcom-spmi-adc5-gen3.o=y
Please include the CONTEXT_ANALYSIS_qcom-spmi-adc5-gen3.o=y change in your patch.
I asked that we didn't do this because intent is to follow with remaining fixes to be able to enable this IIO tree wide. I'd rather avoid the churn of piecewise makefile updates if we are going to be there soon.
Rupesh, if you think that is coming soon then please just make next version of this the first patch in that series.
If not I don't mind merging this sooner with the makefile change to ensure this gets used in the meantime.
Thanks,
Jonathan
Quoted 57 lines
Quoted 23 lines
drivers/iio/adc/qcom-spmi-adc5-gen3.c +2
-2@@ -663,7 +663,7 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc) }void adc5_gen3_mutex_lock (struct device *dev) - __acquires(&adc->lock) +__context_unsafe (/* returns with adc->lock held */ ) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);@@ -673,7 +673,7 @@ void adc5_gen3_mutex_lock(struct device *dev)EXPORT_SYMBOL_NS_GPL (adc5_gen3_mutex_lock,"QCOM_SPMI_ADC5_GEN3" );void adc5_gen3_mutex_unlock (struct device *dev) - __releases(&adc->lock) +__context_unsafe (/* releases adc->lock */ ) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc =iio_priv (indio_dev);Quoted 1 line
base-commit:
c9dbe2a47f635465c9985b7af74d2ae310e98125Please consider replacing the above with the patch below:
drivers/iio/adc/qcom-spmi-adc5-gen3.c +1
-1@@ -663,7 +663,7 @@ static int adc5_gen3_add_aux_tm_device(struct adc5_chip *adc) }void adc5_gen3_mutex_lock (struct device *dev) - __acquires(&adc->lock) + __acquires(&((struct adc5_chip *)iio_priv(dev_get_drvdata(dev->parent)))->lock) {struct iio_dev *indio_dev = dev_get_drvdata(dev->parent); struct adc5_chip *adc = iio_priv(indio_dev);drivers/iio/adc/qcom-spmi-adc5-gen3.c +1
-1@@ -673,7 +673,7 @@ void adc5_gen3_mutex_lock(struct device *dev)EXPORT_SYMBOL_NS_GPL (adc5_gen3_mutex_lock,"QCOM_SPMI_ADC5_GEN3" );void adc5_gen3_mutex_unlock (struct device *dev) - __releases(&adc->lock) + __releases(&((struct adc5_chip *)iio_priv(dev_get_drvdata(dev->parent)))->lock) {struct iio_dev *indio_dev =dev_get_drvdata (dev->parent);struct adc5_chip *adc = iio_priv(indio_dev);Thanks,
Bart.
Quoted 10 lines · Jonathan Cameron
I asked that we didn't do this because intent is to follow with remaining fixes to be able to enable this IIO tree wide. I'd rather avoid the churn of piecewise makefile updates if we are going to be there soon.
Rupesh, if you think that is coming soon then please just make next version of this the first patch in that series.
If not I don't mind merging this sooner with the makefile change to ensure this gets used in the meantime.
As maintainer it is of course your call how to proceed.
In case anyone would be interested in working on a patch series that annotates all IIO drivers at once, feel free to borrow annotations from this kernel branch (entirely untested):
https://github.com/bvanassche/linux/tree/thread-safety
That branch has lock context annotations for all drivers in the entire kernel tree. I'm sending the code from that branch upstream in small chunks as time permits.
Thanks,
Bart.
Quoted 2 lines · Jonathan Cameron
Rupesh, if you think that is coming soon then please just make next version of this the first patch in that series.
It is close. The other fixes are done and build clean, and most of them match Bart's branch. I'll send them as one series with this as the first patch.