linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 2/3] counter: 104-quad-8: Add lock guards - differential encoder cable
@ 2020-03-13 12:01 Syed Nayyar Waris
  2020-03-13 16:51 ` William Breathitt Gray
  0 siblings, 1 reply; 2+ messages in thread
From: Syed Nayyar Waris @ 2020-03-13 12:01 UTC (permalink / raw)
  To: vilhelm.gray; +Cc: jic23, linux-iio, linux-kernel

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 use spin_lock calls for protection.

Fixes: bbef69e088c3 ("counter: 104-quad-8: Support Differential Encoder Cable Status")

Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>
---
Changes in v4:
 - Shift review-comments section so that it is not saved in commit message.
 - Add spin_unlock calls for deadlock avoidance.
 - Few changes related to casting.

 drivers/counter/104-quad-8.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
index 9dab190..c9e227f 100644
--- a/drivers/counter/104-quad-8.c
+++ b/drivers/counter/104-quad-8.c
@@ -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)
+	spin_lock(&priv->lock);
+
+	disabled = !(priv->cable_fault_enable & BIT(channel_id));
+
+	if (disabled) {
+		spin_unlock(&priv->lock);
 		return -EINVAL;
+	}
 
 	/* Logic 0 = cable fault */
 	status = inb(priv->base + QUAD8_DIFF_ENCODER_CABLE_STATUS);
 
+	spin_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;
 
+	spin_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);
 
+	spin_unlock(&priv->lock);
+
 	return len;
 }
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH v4 2/3] counter: 104-quad-8: Add lock guards - differential encoder cable
  2020-03-13 12:01 [PATCH v4 2/3] counter: 104-quad-8: Add lock guards - differential encoder cable Syed Nayyar Waris
@ 2020-03-13 16:51 ` William Breathitt Gray
  0 siblings, 0 replies; 2+ messages in thread
From: William Breathitt Gray @ 2020-03-13 16:51 UTC (permalink / raw)
  To: Syed Nayyar Waris; +Cc: jic23, linux-iio, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 2408 bytes --]

On Fri, Mar 13, 2020 at 05:31:33PM +0530, Syed Nayyar Waris wrote:
> 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 use spin_lock calls for protection.
> 
> Fixes: bbef69e088c3 ("counter: 104-quad-8: Support Differential Encoder Cable Status")
> 
> Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com>

Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>

> ---
> Changes in v4:
>  - Shift review-comments section so that it is not saved in commit message.
>  - Add spin_unlock calls for deadlock avoidance.
>  - Few changes related to casting.
> 
>  drivers/counter/104-quad-8.c | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/counter/104-quad-8.c b/drivers/counter/104-quad-8.c
> index 9dab190..c9e227f 100644
> --- a/drivers/counter/104-quad-8.c
> +++ b/drivers/counter/104-quad-8.c
> @@ -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)
> +	spin_lock(&priv->lock);
> +
> +	disabled = !(priv->cable_fault_enable & BIT(channel_id));
> +
> +	if (disabled) {
> +		spin_unlock(&priv->lock);
>  		return -EINVAL;
> +	}
>  
>  	/* Logic 0 = cable fault */
>  	status = inb(priv->base + QUAD8_DIFF_ENCODER_CABLE_STATUS);
>  
> +	spin_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;
>  
> +	spin_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);
>  
> +	spin_unlock(&priv->lock);
> +
>  	return len;
>  }
>  
> -- 
> 2.7.4
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-13 16:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-13 12:01 [PATCH v4 2/3] counter: 104-quad-8: Add lock guards - differential encoder cable Syed Nayyar Waris
2020-03-13 16:51 ` William Breathitt Gray

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).