From: Syed Nayyar Waris <syednwaris@gmail.com>
To: vilhelm.gray@gmail.com
Cc: jic23@kernel.org, linux-iio@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/3] counter: 104-quad-8: Add lock guards - differential encoder cable
Date: Thu, 12 Mar 2020 16:55:17 +0530 [thread overview]
Message-ID: <20200312112517.GA32485@syed> (raw)
Add lock protection from race conditions in the 104-quad-8 counter
driver for differential encoder cable status changes. There is no IRQ
handling so spin_lock calls are used for protection.
Fixes: bbef69e088c3 ("counter: 104-quad-8: Support Differential Encoder
Cable Status")
Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>
Split the patch from generic driver interface and clock prescaler
related code changes. Also, include more code statements for protection
using spin_lock calls and remove protection from few code statements as
they are unnecessary.
---
drivers/counter/104-quad-8.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
index 9dab190..1ce9660 100644
--- a/drivers/counter/104-quad-8.c
+++ b/drivers/counter/104-quad-8.c
@@ -1153,16 +1153,22 @@ static ssize_t quad8_signal_cable_fault_read(struct counter_device *counter,
{
const struct quad8_iio *const priv = counter->priv;
const size_t channel_id = signal->id / 2;
- const bool disabled = !(priv->cable_fault_enable & BIT(channel_id));
+ bool disabled;
unsigned int status;
unsigned int fault;
+ spin_lock(&((struct quad8_iio *)priv)->lock);
+
+ disabled = !(priv->cable_fault_enable & BIT(channel_id));
+
if (disabled)
return -EINVAL;
/* Logic 0 = cable fault */
status = inb(priv->base + QUAD8_DIFF_ENCODER_CABLE_STATUS);
+ spin_unlock(&((struct quad8_iio *)priv)->lock);
+
/* Mask respective channel and invert logic */
fault = !(status & BIT(channel_id));
@@ -1194,6 +1200,8 @@ static ssize_t quad8_signal_cable_fault_enable_write(
if (ret)
return ret;
+ spin_lock(&priv->lock);
+
if (enable)
priv->cable_fault_enable |= BIT(channel_id);
else
@@ -1204,6 +1212,8 @@ static ssize_t quad8_signal_cable_fault_enable_write(
outb(cable_fault_enable, priv->base + QUAD8_DIFF_ENCODER_CABLE_STATUS);
+ spin_unlock(&priv->lock);
+
return len;
}
--
2.7.4
next reply other threads:[~2020-03-12 11:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-12 11:25 Syed Nayyar Waris [this message]
2020-03-12 15:34 ` [PATCH v3 2/3] counter: 104-quad-8: Add lock guards - differential encoder cable William Breathitt Gray
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=20200312112517.GA32485@syed \
--to=syednwaris@gmail.com \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vilhelm.gray@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.