From: Rupesh Majhi <zoone.rupert@gmail.com>
To: "Andy Shevchenko" <andy@kernel.org>,
"Bill Wendling" <morbo@google.com>,
"David Lechner" <dlechner@baylibre.com>,
"Eddie James" <eajames@linux.ibm.com>,
"Jonathan Cameron" <jic23@kernel.org>,
"Justin Stitt" <justinstitt@google.com>,
"Nathan Chancellor" <nathan@kernel.org>,
"Nick Desaulniers" <ndesaulniers@google.com>,
"Nuno Sá" <nuno.sa@analog.com>
Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
llvm@lists.linux.dev, Rupesh Majhi <zoone.rupert@gmail.com>,
Andy Shevchenko <andriy.shevchenko@intel.com>
Subject: [PATCH v10 4/4] iio: pressure: dps310: assert the lock at runtime too
Date: Wed, 30 Sep 2026 13:01:58 +0300 [thread overview]
Message-ID: <20260930100158.957977-5-zoone.rupert@gmail.com> (raw)
In-Reply-To: <20260930100158.957977-1-zoone.rupert@gmail.com>
__must_hold() is clang only and does nothing in GCC builds. Add
lockdep_assert_held() next to each, so lockdep catches a missing lock
too.
Suggested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Assisted-by: LLM
Signed-off-by: Rupesh Majhi <zoone.rupert@gmail.com>
---
drivers/iio/pressure/dps310.c | 41 +++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/drivers/iio/pressure/dps310.c b/drivers/iio/pressure/dps310.c
index 01fca139433a..791ff22b0304 100644
--- a/drivers/iio/pressure/dps310.c
+++ b/drivers/iio/pressure/dps310.c
@@ -12,6 +12,7 @@
#include <linux/cleanup.h>
#include <linux/i2c.h>
#include <linux/limits.h>
+#include <linux/lockdep.h>
#include <linux/math64.h>
#include <linux/module.h>
#include <linux/regmap.h>
@@ -358,6 +359,8 @@ static int dps310_set_pres_precision(struct dps310_data *data, int val)
int rc;
u8 shift_en;
+ lockdep_assert_held(&data->lock);
+
if (val < 0 || val > 128)
return -EINVAL;
@@ -377,6 +380,8 @@ static int dps310_set_temp_precision(struct dps310_data *data, int val)
int rc;
u8 shift_en;
+ lockdep_assert_held(&data->lock);
+
if (val < 0 || val > 128)
return -EINVAL;
@@ -395,6 +400,8 @@ static int dps310_set_pres_samp_freq(struct dps310_data *data, int freq)
{
u8 val;
+ lockdep_assert_held(&data->lock);
+
if (freq < 0 || freq > 128)
return -EINVAL;
@@ -409,6 +416,8 @@ static int dps310_set_temp_samp_freq(struct dps310_data *data, int freq)
{
u8 val;
+ lockdep_assert_held(&data->lock);
+
if (freq < 0 || freq > 128)
return -EINVAL;
@@ -508,6 +517,8 @@ static int dps310_ready(struct dps310_data *data, int ready_bit, int timeout)
{
int rc;
+ lockdep_assert_held(&data->lock);
+
rc = dps310_ready_status(data, ready_bit, timeout);
if (rc) {
if (rc == -ETIMEDOUT && !data->timeout_recovery_failed) {
@@ -538,6 +549,8 @@ static int dps310_read_pres_raw_locked(struct dps310_data *data)
int timeout;
u8 val[3];
+ lockdep_assert_held(&data->lock);
+
rc = dps310_get_pres_samp_freq(data, &rate);
if (rc)
return rc;
@@ -564,6 +577,8 @@ static int dps310_read_temp_ready(struct dps310_data *data)
int rc;
u8 val[3];
+ lockdep_assert_held(&data->lock);
+
rc = regmap_bulk_read(data->regmap, DPS310_TMP_BASE, val, sizeof(val));
if (rc < 0)
return rc;
@@ -580,6 +595,8 @@ static int dps310_read_temp_raw_locked(struct dps310_data *data)
int rate;
int timeout;
+ lockdep_assert_held(&data->lock);
+
rc = dps310_get_temp_samp_freq(data, &rate);
if (rc)
return rc;
@@ -601,6 +618,8 @@ static void dps310_refresh_temp_locked(struct dps310_data *data)
int rc;
int t_ready;
+ lockdep_assert_held(&data->lock);
+
rc = regmap_read(data->regmap, DPS310_MEAS_CFG, &t_ready);
if (rc)
return;
@@ -706,6 +725,8 @@ static int dps310_calculate_pressure(struct dps310_data *data, int *val)
s64 kp;
s64 kt;
+ lockdep_assert_held(&data->lock);
+
rc = dps310_get_pres_k(data, &kpi);
if (rc)
return rc;
@@ -831,6 +852,8 @@ static int dps310_calculate_temp(struct dps310_data *data, int *val)
s64 t;
int kt, rc;
+ lockdep_assert_held(&data->lock);
+
rc = dps310_get_temp_k(data, &kt);
if (rc)
return rc;
@@ -939,6 +962,8 @@ static int dps310_fill_channels(struct dps310_data *data,
unsigned int i;
int rc;
+ lockdep_assert_held(&data->lock);
+
/* Compensation needs a temperature, so it is sampled either way */
rc = dps310_read_temp_raw_locked(data);
if (rc)
@@ -969,12 +994,16 @@ static int dps310_fill_channels(struct dps310_data *data,
static int dps310_fifo_hw_flush(struct dps310_data *data)
__must_hold(&data->lock)
{
+ lockdep_assert_held(&data->lock);
+
return regmap_write(data->regmap, DPS310_RESET, DPS310_FIFO_FLUSH);
}
static int dps310_fifo_set_enable(struct dps310_data *data, bool enable)
__must_hold(&data->lock)
{
+ lockdep_assert_held(&data->lock);
+
return regmap_assign_bits(data->regmap, DPS310_CFG_REG, DPS310_FIFO_EN,
enable);
}
@@ -1015,6 +1044,8 @@ static int dps310_fifo_read_entry(struct dps310_data *data, s32 *value)
s32 raw;
int rc;
+ lockdep_assert_held(&data->lock);
+
/* Entries come out of the pressure registers whichever made them */
rc = regmap_bulk_read(data->regmap, DPS310_PRS_BASE, val, sizeof(val));
if (rc < 0)
@@ -1039,6 +1070,8 @@ static int dps310_fifo_push_scan(struct dps310_data *data, s32 temp_raw,
unsigned int i;
int rc;
+ lockdep_assert_held(&data->lock);
+
/* Direct-mode claim keeps sysfs reads off these */
data->temp_raw = temp_raw;
data->pressure_raw = pressure_raw;
@@ -1065,6 +1098,8 @@ static int dps310_fifo_push_scan(struct dps310_data *data, s32 temp_raw,
static void dps310_fifo_hold(struct dps310_data *data, s32 pressure_raw)
__must_hold(&data->lock)
{
+ lockdep_assert_held(&data->lock);
+
if (data->fifo_held < data->fifo_hold_max)
data->fifo_hold[data->fifo_held++] = pressure_raw;
}
@@ -1076,6 +1111,8 @@ static unsigned int dps310_fifo_push_held(struct dps310_data *data)
unsigned int pushed = 0;
unsigned int i;
+ lockdep_assert_held(&data->lock);
+
for (i = 0; i < data->fifo_held; i++) {
if (!dps310_fifo_push_scan(data, data->fifo_temp_raw,
data->fifo_hold[i]))
@@ -1109,6 +1146,8 @@ static int dps310_fifo_drain(struct dps310_data *data, unsigned int max_scans)
bool is_pressure;
int rc;
+ lockdep_assert_held(&data->lock);
+
for (cnt = 0; cnt < DPS310_FIFO_DEPTH; cnt++) {
if (max_scans && scans >= max_scans)
break;
@@ -1180,6 +1219,8 @@ static int dps310_fifo_hold_alloc(struct dps310_data *data, int prs_rate,
int tmp_rate)
__must_hold(&data->lock)
{
+ lockdep_assert_held(&data->lock);
+
data->fifo_temp_valid = false;
data->fifo_held = 0;
data->fifo_hold = NULL;
--
2.43.0
next prev parent reply other threads:[~2026-09-30 10:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 10:01 [PATCH v10 0/4] iio: pressure: dps310: hardware FIFO support Rupesh Majhi
2026-09-30 10:01 ` [PATCH v10 1/4] iio: pressure: dps310: read buffered samples from the hardware FIFO Rupesh Majhi
2026-09-30 10:35 ` Andy Shevchenko
2026-10-01 11:25 ` Rupesh Majhi
2026-10-01 11:26 ` Rupesh Majhi
2026-09-30 10:01 ` [PATCH v10 2/4] iio: pressure: dps310: derive the drain interval from the watermark Rupesh Majhi
2026-09-30 14:01 ` Andy Shevchenko
2026-09-30 10:01 ` [PATCH v10 3/4] iio: pressure: dps310: implement .hwfifo_flush_to_buffer() Rupesh Majhi
2026-09-30 10:01 ` Rupesh Majhi [this message]
2026-09-30 12:08 ` [PATCH v10 4/4] iio: pressure: dps310: assert the lock at runtime too Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260930100158.957977-5-zoone.rupert@gmail.com \
--to=zoone.rupert@gmail.com \
--cc=andriy.shevchenko@intel.com \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=eajames@linux.ibm.com \
--cc=jic23@kernel.org \
--cc=justinstitt@google.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nuno.sa@analog.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®