From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7824344DAA; Sun, 26 Apr 2026 08:38:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777192699; cv=none; b=JXPCer5VliElPsXUkJoKHY+suORB4xAQwDMY18pUaCDDGVu0PmjUg/E+6r2ecHBOAi8AQoyXeiRvU3aUA8qwNuh7gQ15F+eRQsyxQ1bwY+pptpopNOiy92+d7CDkWw0z6ROOL81+pTdnaM8yiT/YzkPQWNe+lJCloS7oI9hjqE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777192699; c=relaxed/simple; bh=I2c3TyrIl5LtLuANO5k33UekJxZJPWps6rrDC331JCs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ru5XLu+hK0ELOOkEo/frdOGkSe9K5i02Q2nTVzKo1A3ePHncypMxrZAmtGvfd6jTTA/CzfhpYssrishmkc7QMf1v8UGxYG88nZHbGmCC96Jk8RVX/SZJYOPlf4Q3fYPyi2oE0vjxO/+yK+S9BGp1HGh8BbJ9NB2XwD3NcCcOFsk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mIz8sxgv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mIz8sxgv" Received: by smtp.kernel.org (Postfix) with ESMTPS id BADAFC2BCF6; Sun, 26 Apr 2026 08:38:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777192699; bh=I2c3TyrIl5LtLuANO5k33UekJxZJPWps6rrDC331JCs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=mIz8sxgvFdsD5omZi73FcOuGpy4C8/+3E49p4bpDJVT/OlizW7fPLT3JuS2bht/CR YUpPIPak+bB1lJpme+drK5BepfkXGjSH9uZlw34E1km1lq0nh4KDKuiipn79Lt8eF2 A32HeAba/FfL4hv/jSXLbS6IQNJbJU4Tuu5K0VHoKZo4ITKZsc2TCDNZKhOuRnWl6t H30OixUabp1068YBNFLg1fbt6Lf31xIdj+fZWIUurwJnGMEUjpW/b9dAZ8Rnm+r2MU K2bJAryFDQZWj8wF62e03k6st+EFvf9eBpmkkysHI3aVCsSjpZ6+qC74ZVIPyyCCIr PLLGXqXSsmHng== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0FC3FF885D; Sun, 26 Apr 2026 08:38:19 +0000 (UTC) From: Rodrigo Alencar via B4 Relay Date: Sun, 26 Apr 2026 09:38:07 +0100 Subject: [PATCH 06/10] iio: dac: ad5686: acquire lock when doing powerdown control Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260426-ad5686-fixes-v1-6-7c946a77794e@analog.com> References: <20260426-ad5686-fixes-v1-0-7c946a77794e@analog.com> In-Reply-To: <20260426-ad5686-fixes-v1-0-7c946a77794e@analog.com> To: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Popa , Jonathan Cameron , Greg Kroah-Hartman , Michael Auchter , Jonathan Cameron Cc: Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , David Lechner , Andy Shevchenko , Rodrigo Alencar X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1777192698; l=2949; i=rodrigo.alencar@analog.com; s=default; h=from:subject:message-id; bh=zkyMJeMfxk74OfFs+GS146KNXFlUAIQgn0Fr+aKUZsY=; b=8WchA4kzK/7Jq3ZSKrqZTJ7mS6QkRD38FBenREA9Pn86YGL4ePKkg8gvErmEo+/UJs7oWeo9/ ibQDk3mDDA0BcqJDLHR7wjA+XLKHPxR9phTjPsqm6bB7h2G8dwgvPya X-Developer-Key: i=rodrigo.alencar@analog.com; a=ed25519; pk=ULeHbgU/OYh/PG/4anHDfLgldFItQHAhOktYRVLMFRo= X-Endpoint-Received: by B4 Relay for rodrigo.alencar@analog.com/default with auth_id=561 X-Original-From: Rodrigo Alencar Reply-To: rodrigo.alencar@analog.com From: Rodrigo Alencar Protect access of pwr_down_mode and pwr_down_mask fields with existing mutex lock. This issue exists since the ad5686 driver was first introduced. Acquire mutex with guard(mutex)() throughout for consistency, which allows for early returns, facilitating the review of further changes. Fixes: c2f37c8dcadc ("iio: dac: New driver for AD5686R, AD5685R, AD5684R Digital to analog converters") Signed-off-by: Rodrigo Alencar --- drivers/iio/dac/ad5686.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index 843e425f656f..c7d5ee344a6f 100644 --- a/drivers/iio/dac/ad5686.c +++ b/drivers/iio/dac/ad5686.c @@ -45,6 +45,8 @@ static int ad5686_get_powerdown_mode(struct iio_dev *indio_dev, { struct ad5686_state *st = iio_priv(indio_dev); + guard(mutex)(&st->lock); + return ((st->pwr_down_mode >> (chan->channel * 2)) & 0x3) - 1; } @@ -54,6 +56,7 @@ static int ad5686_set_powerdown_mode(struct iio_dev *indio_dev, { struct ad5686_state *st = iio_priv(indio_dev); + guard(mutex)(&st->lock); st->pwr_down_mode &= ~(0x3 << (chan->channel * 2)); st->pwr_down_mode |= ((mode + 1) << (chan->channel * 2)); @@ -72,6 +75,8 @@ static ssize_t ad5686_read_dac_powerdown(struct iio_dev *indio_dev, { struct ad5686_state *st = iio_priv(indio_dev); + guard(mutex)(&st->lock); + return sysfs_emit(buf, "%d\n", !!(st->pwr_down_mask & (0x3 << (chan->channel * 2)))); } @@ -92,6 +97,8 @@ static ssize_t ad5686_write_dac_powerdown(struct iio_dev *indio_dev, if (ret) return ret; + guard(mutex)(&st->lock); + if (readin) st->pwr_down_mask |= (0x3 << (chan->channel * 2)); else @@ -138,11 +145,11 @@ static int ad5686_read_raw(struct iio_dev *indio_dev, struct ad5686_state *st = iio_priv(indio_dev); int ret; + guard(mutex)(&st->lock); + switch (m) { case IIO_CHAN_INFO_RAW: - mutex_lock(&st->lock); ret = st->read(st, chan->address); - mutex_unlock(&st->lock); if (ret < 0) return ret; *val = (ret >> chan->scan_type.shift) & @@ -163,25 +170,19 @@ static int ad5686_write_raw(struct iio_dev *indio_dev, long mask) { struct ad5686_state *st = iio_priv(indio_dev); - int ret; + + guard(mutex)(&st->lock); switch (mask) { case IIO_CHAN_INFO_RAW: if (val > (1 << chan->scan_type.realbits) || val < 0) return -EINVAL; - mutex_lock(&st->lock); - ret = st->write(st, - AD5686_CMD_WRITE_INPUT_N_UPDATE_N, - chan->address, - val << chan->scan_type.shift); - mutex_unlock(&st->lock); - break; + return st->write(st, AD5686_CMD_WRITE_INPUT_N_UPDATE_N, + chan->address, val << chan->scan_type.shift); default: - ret = -EINVAL; + return -EINVAL; } - - return ret; } static const struct iio_info ad5686_info = { -- 2.43.0