Skip to contentSkip to conversation

counter: 104-quad-8: Add lock guards - differential encoder

PATCH Applied Syed Nayyar Waris 3 participants 4 messages Mar 16, 2020 – Jun 14, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v5 2/3 counter: 104-quad-8: Add lock guards - differential encoder

Add lock protection from race conditions to 104-quad-8 counter driver for differential encoder status code changes. Mutex lock calls used for protection.

---
Changes in v5:
- Change spin lock calls to mutex lock calls.
- Modify the title description.

 drivers/counter/104-quad-8.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/counter/104-quad-8.c +15 -3
index 9dab190..21b2e3e 100644
@@ -1151,18 +1151,26 @@ static ssize_t quad8_signal_cable_fault_read(struct counter_device *counter,
 					     struct counter_signal *signal,
 					     void *private, char *buf)
 {
-	const struct quad8_iio *const priv = counter->priv;
+	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;
 
-	if (disabled)
+	mutex_lock(&priv->lock);
+
+	disabled = !(priv->cable_fault_enable & BIT(channel_id));
+
+	if (disabled) {
+		mutex_unlock(&priv->lock);
 		return -EINVAL;
+	}
 
 	/* Logic 0 = cable fault */
 	status = inb(priv->base + QUAD8_DIFF_ENCODER_CABLE_STATUS);
 
+	mutex_unlock(&priv->lock);
+
 	/* Mask respective channel and invert logic */
 	fault = !(status & BIT(channel_id));
 
@@ -1194,6 +1202,8 @@ static ssize_t quad8_signal_cable_fault_enable_write(
 	if (ret)
 		return ret;
 
+	mutex_lock(&priv->lock);
+
 	if (enable)
 		priv->cable_fault_enable |= BIT(channel_id);
 	else
@@ -1204,6 +1214,8 @@ static ssize_t quad8_signal_cable_fault_enable_write(
 
 	outb(cable_fault_enable, priv->base + QUAD8_DIFF_ENCODER_CABLE_STATUS);
 
+	mutex_unlock(&priv->lock);
+
 	return len;
 }
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 9 lines · Syed Nayyar Waris

Add lock protection from race conditions to 104-quad-8 counter driver for differential encoder status code changes. Mutex lock calls used for protection.

---
Changes in v5:
- Change spin lock calls to mutex lock calls.
- Modify the title description.

Looks like the Fixes tags were dropped in these last two patches. I suppose they aren't really necessary though since these features haven't yet made it out of the IIO tree, so no need to backport these fixes.

#2 lore raw
Quoted 12 lines · William Breathitt Gray
Quoted 9 lines · Syed Nayyar Waris

Add lock protection from race conditions to 104-quad-8 counter driver for differential encoder status code changes. Mutex lock calls used for protection.

---
Changes in v5:
- Change spin lock calls to mutex lock calls.
- Modify the title description.

Quoted 5 lines

Looks like the Fixes tags were dropped in these last two patches. I suppose they aren't really necessary though since these features haven't yet made it out of the IIO tree, so no need to backport these fixes.

Adding the 'Fixes' tag:

Fixes bbef69e088c3 ("counter: 104-quad-8: Support Differential

Encoder Cable Status")

Regards
Syed Nayyar Waris

maintainer Applied
#3 lore raw
Quoted 18 lines · On Sun, 7 Jun 2020 10:52:57 +0530 Syed Nayyar Waris <[email protected]>…
Quoted 16 lines · William Breathitt Gray
Quoted 9 lines · Syed Nayyar Waris

Add lock protection from race conditions to 104-quad-8 counter driver for differential encoder status code changes. Mutex lock calls used for protection.

---
Changes in v5:
- Change spin lock calls to mutex lock calls.
- Modify the title description.

Looks like the Fixes tags were dropped in these last two patches. I suppose they aren't really necessary though since these features haven't yet made it out of the IIO tree, so no need to backport these fixes.

Quoted 6 lines
Quoted 1 line

Adding the 'Fixes' tag:

Fixes bbef69e088c3 ("counter: 104-quad-8: Support Differential

Encoder Cable Status")

That doesn't seem to be the correct hash upstream though it exists in my local tree. I'm not sure quite what happened here (and don't care enough to try and figure it out), so I've fixed to match the upstream hash.

Applied to the fixes-togreg branch of iio.git.

Thanks,

Jonathan

Quoted 3 lines

Regards
Syed Nayyar Waris