[v2] mfd: dln2: use irqsave() in USB's complete callback

Commit Message

Sebastian Andrzej Siewior July 2, 2018, 7:31 a.m. UTC

The USB completion callback does not disable interrupts while acquiring
the lock. We want to remove the local_irq_disable() invocation from
__usb_hcd_giveback_urb() and therefore it is required for the callback
handler to disable the interrupts while acquiring the lock.
The callback may be invoked either in IRQ or BH context depending on the
USB host controller.
Use the _irqsave() variant of the locking primitives.

Cc: Lee Jones <[e-mail]>
Cc: Octavian Purdila <[e-mail]>
Reviewed-by: Johan Hovold <[e-mail]>
Signed-off-by: Sebastian Andrzej Siewior <[e-mail]>
---
v1…v2: Remove also the comment that says that there is no need to
       disable interrupts.

 drivers/mfd/dln2.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Lee Jones July 4, 2018, 7:40 a.m. UTC | #1

On Mon, 02 Jul 2018, Sebastian Andrzej Siewior wrote:

> The USB completion callback does not disable interrupts while acquiring
> the lock. We want to remove the local_irq_disable() invocation from
> __usb_hcd_giveback_urb() and therefore it is required for the callback
> handler to disable the interrupts while acquiring the lock.
> The callback may be invoked either in IRQ or BH context depending on the
> USB host controller.
> Use the _irqsave() variant of the locking primitives.
> 
> Cc: Lee Jones <[e-mail]>
> Cc: Octavian Purdila <[e-mail]>
> Reviewed-by: Johan Hovold <[e-mail]>
> Signed-off-by: Sebastian Andrzej Siewior <[e-mail]>
> ---
> v1…v2: Remove also the comment that says that there is no need to
>        disable interrupts.
> 
>  drivers/mfd/dln2.c | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)

Applied, thanks.

Patch

diff --git a/drivers/mfd/dln2.c b/drivers/mfd/dln2.c
index 704e189ca162..90e789943466 100644
--- a/drivers/mfd/dln2.c
+++ b/drivers/mfd/dln2.c
@@ -194,6 +194,7 @@  static bool dln2_transfer_complete(struct dln2_dev *dln2, struct urb *urb,
 	struct device *dev = &dln2->interface->dev;
 	struct dln2_mod_rx_slots *rxs = &dln2->mod_rx_slots[handle];
 	struct dln2_rx_context *rxc;
+	unsigned long flags;
 	bool valid_slot = false;
 
 	if (rx_slot >= DLN2_MAX_RX_SLOTS)
@@ -201,18 +202,13 @@  static bool dln2_transfer_complete(struct dln2_dev *dln2, struct urb *urb,
 
 	rxc = &rxs->slots[rx_slot];
 
-	/*
-	 * No need to disable interrupts as this lock is not taken in interrupt
-	 * context elsewhere in this driver. This function (or its callers) are
-	 * also not exported to other modules.
-	 */
-	spin_lock(&rxs->lock);
+	spin_lock_irqsave(&rxs->lock, flags);
 	if (rxc->in_use && !rxc->urb) {
 		rxc->urb = urb;
 		complete(&rxc->done);
 		valid_slot = true;
 	}
-	spin_unlock(&rxs->lock);
+	spin_unlock_irqrestore(&rxs->lock, flags);
 
 out:
 	if (!valid_slot)