From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4DD64FD798 for ; Mon, 21 Sep 2026 18:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790015506; cv=none; b=dmhRIPzCpURQQgM0pm3gRuufnwaZOG7xJgV50tkKygddry+m7J7CeBnPO/x4+Q7k3eDP/XQAEncxUi6dpiTk4OtbSKkIe9ocBC7s/w2YPykl+qzoowqPMUVeWwFLTF6a9xdmODWuzfOB175B+Es1sFzO7gotnYZhJaOtC69LhuM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790015506; c=relaxed/simple; bh=M8fIINHnIxZB6qEGrsAABH8P+wRPzJ0kqqIWTT4CBow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XgE4nwIU4cm+3x4JsEKGydx4KXdGO/K6OynlK+DCU7GLIga28CCOZu7m6hhLi7KS/XuXT7mEvAz7aI8JwJ4BcuVTtUtjs3DtIWomcTEpoa2QyWsEi4L2HbtFb5f35vbEbHTNOiQKuZUFi66N3HL6lvMwG0GgPAuE2C/Xn3KHMiU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KM8beMmJ; arc=none smtp.client-ip=209.85.208.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KM8beMmJ" Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-3a20f06cce6so1831851fa.1 for ; Mon, 21 Sep 2026 11:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790015503; x=1790620303; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4ceWGBhcz2v2+A70YlsGrXNu+jmKzqHeUxRvhPX+bxg=; b=KM8beMmJd9i7NaSo5rojjxT35vRQabjbQkGbrliQPWRxKwdvh7sRjuPxBNW9EQCPMR 8sVlwbzV9Qqvq+KormWhsTsiUmDtH9C41+GjYISYerFeqYQhFsr79ze80ty1UiXdnLQK 25JuR+I2MTZrgwfczbVGzbLCkQq1gZAlbZMeGxBCl2gCqOh+QXVfDzJnQxZesoYsslJl WyaXYiG1nyhsiboTaidCC4w+mtgiot2a19a68hXngzWVNgBTavG5PEttxeGkvrUDnIaY vH2z2AUoTb/aAh05SPjXe3aO/Hzd15dAq4+g/y8WoP4atS1N65V8Atw7dhoJ7PKTLyyL Z2Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790015503; x=1790620303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4ceWGBhcz2v2+A70YlsGrXNu+jmKzqHeUxRvhPX+bxg=; b=CkEsstQuNjGlznIa4RuimOxwtsOjC3SjIl5Viq6ntrtSEgLumMQpmxf+o3DfhJsn/Z l4RgeuluDBlJ+R3o60MQjkWyuujfO63I0ySV1JGfAROaBK1ltjIaklqaPnr4n2GVR0FT WAiT3eOMsttOXR8o0E/faBrPF8sp+PkC5/Ij4h0xpmyFsG+n5Dl62/Kntq1YONaAzIHe IFbBkUWiQImLc7AZWsABJM1ivoK/YB8yt/TMlX+M6w85BhO616FOqkq7gMiXlc8H7cWW 1xcasdanwD0R1MQyUkMJ2OHuZafCtC1PuZG2ID4X5aTOHx4J8tKaWtL37P1tbGOv7nJ5 KnDQ== X-Forwarded-Encrypted: i=1; AKwUvByqCzKCVIeRYgCFuCEqWf+UMWHa5Hfi1c9dxXJL36gCW+aqHwDS1CX9J++7XOr7U4HZbXrM@lists.linux.dev X-Gm-Message-State: AFuF++miWDrvCWne2CCgb+/M/wIZ3JvH1J3eIPNurxYvHn9mFnY4Bnv8 9TCLwfXdYVw/dsH7kKgldNu7EpK8vVlprqJeVvvcYKyB/1ILcM6ztRVk X-Gm-Gg: AYBFou2MB0X0zIZlAKlkkCiQvNMvhZ2T1ZIUaXpD+iFATIJJV6mnAMKkILlJlUqUr6o PD5JvkJ90mJSCB85wSHqZI/1Ubb5/gW0NIOvQ4GhMw0XOWk2QhuBF4TExfsJqcX8DCE+6eRIzwH RWaBaxp+38VZq8wqeYJZaPRPLlscrbNT83YTnEMkPxv0yq1o+0++bP12W1GcWnVKQvZ0etOcEBx xjX0twpIw2Z16xbe79xP6c6psk71M9yhzQRRSRobl+UtHysYqAf4HmxJwPlwAp5o6pZrJOx40Zq KiPMwRK92ciOWey5IkbnY3453+PDsSUOU1epMDgcURSjUOarruVr4thnWvMWKwaQ7e4a15xP7U5 FMuBylITVGGYo7M2TPKPl5CelbkzeAZdb9pjFPtrMr3dGNrjJ4mFN22WdeseS5lEbQspH2MbP/O X+kILQrZcNZgi/sMLnxyAThyI0ABLFqsWU3UfdTZZVM0eE81a/CT8bzTc+iDwoJ8qj0j8D7QZqN b1opVUTsp+PpFh5sj70Y8WwShkCbu1RBwVQT/4nEd0EYFxtcZvV0jq8mHQyuWveJ+X+YQ== X-Received: by 2002:a05:651c:198d:b0:3a4:68f1:8bee with SMTP id 38308e7fff4ca-3a624cb3235mr1051791fa.6.1790015502607; Mon, 21 Sep 2026 11:31:42 -0700 (PDT) Received: from yantra.. (dsl-trebng21-58c187-236.dhcp.inet.fi. [88.193.135.236]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3a60761e5d6sm24260141fa.29.2026.09.21.11.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2026 11:31:41 -0700 (PDT) From: Rupesh Majhi To: Andy Shevchenko , Bill Wendling , David Lechner , Eddie James , Joel Stanley , Jonathan Cameron , Justin Stitt , Nathan Chancellor , Nick Desaulniers , =?UTF-8?q?Nuno=20S=C3=A1?= Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Rupesh Majhi Subject: [PATCH v8 04/10] iio: pressure: dps310: take the lock once per raw read Date: Mon, 21 Sep 2026 21:31:26 +0300 Message-ID: <20260921183132.233136-5-zoone.rupert@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260921183132.233136-1-zoone.rupert@gmail.com> References: <20260921183132.233136-1-zoone.rupert@gmail.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A processed pressure read takes the lock twice: once in the raw read, then again when dps310_calculate_pressure() trylocks to refresh the temperature. The refresh is skipped whenever the lock is busy. Split the raw reads into variants that expect the lock held and give each channel a helper that takes it once for the whole sequence, so the temperature refresh is unconditional. Buffered capture later in this series needs the same shape. Mark the functions that need the lock with __must_hold() rather than a comment, and include cleanup.h, which ACQUIRE() needs and was coming in transitively. Assisted-by: LLM Signed-off-by: Rupesh Majhi --- drivers/iio/pressure/dps310.c | 143 ++++++++++++++++++---------------- 1 file changed, 77 insertions(+), 66 deletions(-) diff --git a/drivers/iio/pressure/dps310.c b/drivers/iio/pressure/dps310.c index e7f173e08e01..8cefca928077 100644 --- a/drivers/iio/pressure/dps310.c +++ b/drivers/iio/pressure/dps310.c @@ -14,6 +14,7 @@ * - Optionally support the FIFO */ +#include #include #include #include @@ -287,8 +288,8 @@ static int dps310_get_temp_precision(struct dps310_data *data, int *val) return 0; } -/* Called with lock held */ static int dps310_set_pres_precision(struct dps310_data *data, int val) + __must_hold(&data->lock) { int rc; u8 shift_en; @@ -306,8 +307,8 @@ static int dps310_set_pres_precision(struct dps310_data *data, int val) DPS310_PRS_PRC_BITS, ilog2(val)); } -/* Called with lock held */ static int dps310_set_temp_precision(struct dps310_data *data, int val) + __must_hold(&data->lock) { int rc; u8 shift_en; @@ -325,8 +326,8 @@ static int dps310_set_temp_precision(struct dps310_data *data, int val) DPS310_TMP_PRC_BITS, ilog2(val)); } -/* Called with lock held */ static int dps310_set_pres_samp_freq(struct dps310_data *data, int freq) + __must_hold(&data->lock) { u8 val; @@ -339,8 +340,8 @@ static int dps310_set_pres_samp_freq(struct dps310_data *data, int freq) DPS310_PRS_RATE_BITS, val); } -/* Called with lock held */ static int dps310_set_temp_samp_freq(struct dps310_data *data, int freq) + __must_hold(&data->lock) { u8 val; @@ -439,6 +440,7 @@ static int dps310_ready_status(struct dps310_data *data, int ready_bit, int time } static int dps310_ready(struct dps310_data *data, int ready_bit, int timeout) + __must_hold(&data->lock) { int rc; @@ -464,40 +466,36 @@ static int dps310_ready(struct dps310_data *data, int ready_bit, int timeout) return 0; } -static int dps310_read_pres_raw(struct dps310_data *data) +static int dps310_read_pres_raw_locked(struct dps310_data *data) + __must_hold(&data->lock) { int rc; int rate; int timeout; u8 val[3]; - if (mutex_lock_interruptible(&data->lock)) - return -EINTR; - rc = dps310_get_pres_samp_freq(data, &rate); if (rc) - goto done; + return rc; timeout = DPS310_POLL_TIMEOUT_US(rate); /* Poll for sensor readiness; base the timeout upon the sample rate. */ rc = dps310_ready(data, DPS310_PRS_RDY, timeout); if (rc) - goto done; + return rc; rc = regmap_bulk_read(data->regmap, DPS310_PRS_BASE, val, sizeof(val)); if (rc < 0) - goto done; + return rc; data->pressure_raw = sign_extend32(get_unaligned_be24(val), 23); -done: - mutex_unlock(&data->lock); - return rc; + return 0; } -/* Called with lock held */ static int dps310_read_temp_ready(struct dps310_data *data) + __must_hold(&data->lock) { int rc; u8 val[3]; @@ -511,31 +509,40 @@ static int dps310_read_temp_ready(struct dps310_data *data) return 0; } -static int dps310_read_temp_raw(struct dps310_data *data) +static int dps310_read_temp_raw_locked(struct dps310_data *data) + __must_hold(&data->lock) { int rc; int rate; int timeout; - if (mutex_lock_interruptible(&data->lock)) - return -EINTR; - rc = dps310_get_temp_samp_freq(data, &rate); if (rc) - goto done; + return rc; timeout = DPS310_POLL_TIMEOUT_US(rate); /* Poll for sensor readiness; base the timeout upon the sample rate. */ rc = dps310_ready(data, DPS310_TMP_RDY, timeout); if (rc) - goto done; + return rc; + + return dps310_read_temp_ready(data); +} + +/* Best effort: on error the previous temperature stands */ +static void dps310_refresh_temp_locked(struct dps310_data *data) + __must_hold(&data->lock) +{ + int rc; + int t_ready; - rc = dps310_read_temp_ready(data); + rc = regmap_read(data->regmap, DPS310_MEAS_CFG, &t_ready); + if (rc) + return; -done: - mutex_unlock(&data->lock); - return rc; + if (t_ready & DPS310_TMP_RDY) + dps310_read_temp_ready(data); } static bool dps310_is_writeable_reg(struct device *dev, unsigned int reg) @@ -577,59 +584,47 @@ static int dps310_write_raw(struct iio_dev *iio, struct iio_chan_spec const *chan, int val, int val2, long mask) { - int rc; struct dps310_data *data = iio_priv(iio); - if (mutex_lock_interruptible(&data->lock)) + ACQUIRE(mutex_intr, lock)(&data->lock); + if (ACQUIRE_ERR(mutex_intr, &lock)) return -EINTR; switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: switch (chan->type) { case IIO_PRESSURE: - rc = dps310_set_pres_samp_freq(data, val); - break; + return dps310_set_pres_samp_freq(data, val); case IIO_TEMP: - rc = dps310_set_temp_samp_freq(data, val); - break; + return dps310_set_temp_samp_freq(data, val); default: - rc = -EINVAL; - break; + return -EINVAL; } - break; case IIO_CHAN_INFO_OVERSAMPLING_RATIO: switch (chan->type) { case IIO_PRESSURE: - rc = dps310_set_pres_precision(data, val); - break; + return dps310_set_pres_precision(data, val); case IIO_TEMP: - rc = dps310_set_temp_precision(data, val); - break; + return dps310_set_temp_precision(data, val); default: - rc = -EINVAL; - break; + return -EINVAL; } - break; default: - rc = -EINVAL; - break; + return -EINVAL; } - - mutex_unlock(&data->lock); - return rc; } static int dps310_calculate_pressure(struct dps310_data *data, int *val) + __must_hold(&data->lock) { int i; int rc; - int t_ready; int kpi; int kti; s64 rem = 0ULL; @@ -653,15 +648,6 @@ static int dps310_calculate_pressure(struct dps310_data *data, int *val) kp = (s64)kpi; kt = (s64)kti; - /* Refresh temp if it's ready, otherwise just use the latest value */ - if (mutex_trylock(&data->lock)) { - rc = regmap_read(data->regmap, DPS310_MEAS_CFG, &t_ready); - if (rc >= 0 && t_ready & DPS310_TMP_RDY) - dps310_read_temp_ready(data); - - mutex_unlock(&data->lock); - } - p = (s64)data->pressure_raw; t = (s64)data->temp_raw; @@ -707,6 +693,23 @@ static int dps310_calculate_pressure(struct dps310_data *data, int *val) return 0; } +static int dps310_read_pressure_value(struct dps310_data *data, int *val) +{ + int rc; + + ACQUIRE(mutex_intr, lock)(&data->lock); + if (ACQUIRE_ERR(mutex_intr, &lock)) + return -EINTR; + + rc = dps310_read_pres_raw_locked(data); + if (rc) + return rc; + + dps310_refresh_temp_locked(data); + + return dps310_calculate_pressure(data, val); +} + static int dps310_read_pressure(struct dps310_data *data, int *val, int *val2, long mask) { @@ -721,11 +724,7 @@ static int dps310_read_pressure(struct dps310_data *data, int *val, int *val2, return IIO_VAL_INT; case IIO_CHAN_INFO_PROCESSED: - rc = dps310_read_pres_raw(data); - if (rc) - return rc; - - rc = dps310_calculate_pressure(data, val); + rc = dps310_read_pressure_value(data, val); if (rc) return rc; @@ -744,6 +743,7 @@ static int dps310_read_pressure(struct dps310_data *data, int *val, int *val2, } static int dps310_calculate_temp(struct dps310_data *data, int *val) + __must_hold(&data->lock) { s64 c0; s64 t; @@ -765,6 +765,21 @@ static int dps310_calculate_temp(struct dps310_data *data, int *val) return 0; } +static int dps310_read_temp_value(struct dps310_data *data, int *val) +{ + int rc; + + ACQUIRE(mutex_intr, lock)(&data->lock); + if (ACQUIRE_ERR(mutex_intr, &lock)) + return -EINTR; + + rc = dps310_read_temp_raw_locked(data); + if (rc) + return rc; + + return dps310_calculate_temp(data, val); +} + static int dps310_read_temp(struct dps310_data *data, int *val, int *val2, long mask) { @@ -779,11 +794,7 @@ static int dps310_read_temp(struct dps310_data *data, int *val, int *val2, return IIO_VAL_INT; case IIO_CHAN_INFO_PROCESSED: - rc = dps310_read_temp_raw(data); - if (rc) - return rc; - - rc = dps310_calculate_temp(data, val); + rc = dps310_read_temp_value(data, val); if (rc) return rc; -- 2.43.0