From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: alsa-devel@alsa-project.org
Cc: John Ogness <john.ogness@linutronix.de>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
linux-usb@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
Daniel Mack <zonque@gmail.com>,
tglx@linutronix.de
Subject: [PATCH 5/9] ALSA: usb: caiaq: audio: use irqsave() in USB's complete callback
Date: Tue, 19 Jun 2018 23:55:17 +0200 [thread overview]
Message-ID: <20180619215521.13688-6-bigeasy@linutronix.de> (raw)
In-Reply-To: <20180619215521.13688-1-bigeasy@linutronix.de>
From: John Ogness <john.ogness@linutronix.de>
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: Daniel Mack <zonque@gmail.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Signed-off-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
sound/usb/caiaq/audio.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c
index f35d29f49ffe..15344d39a6cd 100644
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
@@ -636,6 +636,7 @@ static void read_completed(struct urb *urb)
struct device *dev;
struct urb *out = NULL;
int i, frame, len, send_it = 0, outframe = 0;
+ unsigned long flags;
size_t offset = 0;
if (urb->status || !info)
@@ -672,10 +673,10 @@ static void read_completed(struct urb *urb)
offset += len;
if (len > 0) {
- spin_lock(&cdev->spinlock);
+ spin_lock_irqsave(&cdev->spinlock, flags);
fill_out_urb(cdev, out, &out->iso_frame_desc[outframe]);
read_in_urb(cdev, urb, &urb->iso_frame_desc[frame]);
- spin_unlock(&cdev->spinlock);
+ spin_unlock_irqrestore(&cdev->spinlock, flags);
check_for_elapsed_periods(cdev, cdev->sub_playback);
check_for_elapsed_periods(cdev, cdev->sub_capture);
send_it = 1;
--
2.17.1
next prev parent reply other threads:[~2018-06-19 21:55 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-19 21:55 ALSA: use irqsave() in URB completion + usb_fill_int_urb Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 1/9] ALSA: 6fire: use usb_fill_int_urb() Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 2/9] ALSA: line6: " Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 3/9] ALSA: ua101: " Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 4/9] ALSA: usb-audio: " Sebastian Andrzej Siewior
2018-06-20 8:23 ` Sergei Shtylyov
2018-06-20 9:38 ` [PATCH 4/9 v2] " Sebastian Andrzej Siewior
2018-06-20 13:21 ` Takashi Iwai
2018-06-20 13:52 ` Sebastian Andrzej Siewior
2018-06-20 13:56 ` Takashi Iwai
2018-06-20 14:00 ` Takashi Iwai
2018-06-19 21:55 ` Sebastian Andrzej Siewior [this message]
2018-06-21 20:18 ` [PATCH 5/9] ALSA: usb: caiaq: audio: use irqsave() in USB's complete callback Daniel Mack
2018-06-19 21:55 ` [PATCH 6/9] ALSA: usb: caiaq: use usb_fill_int_urb() Sebastian Andrzej Siewior
2018-06-21 20:19 ` Daniel Mack
2018-06-21 21:16 ` Sebastian Andrzej Siewior
2018-06-22 8:49 ` Takashi Iwai
2018-06-22 10:01 ` Daniel Mack
2018-06-22 10:14 ` Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 7/9] ALSA: usb-midi: use irqsave() in USB's complete callback Sebastian Andrzej Siewior
2018-06-19 21:55 ` [PATCH 8/9] ALSA: usx2y: usbusx2yaudio: use usb_fill_int_urb() Sebastian Andrzej Siewior
2018-06-20 12:51 ` Takashi Iwai
2018-06-20 14:39 ` Sebastian Andrzej Siewior
2018-06-20 14:52 ` Takashi Iwai
2018-06-20 15:38 ` Sebastian Andrzej Siewior
2018-06-20 15:47 ` Sebastian Andrzej Siewior
2018-06-20 16:20 ` Takashi Iwai
2018-06-19 21:55 ` [PATCH 9/9] ALSA: usx2y: usx2yhwdeppcm: " Sebastian Andrzej Siewior
2018-06-20 12:55 ` ALSA: use irqsave() in URB completion + usb_fill_int_urb Takashi Iwai
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=20180619215521.13688-6-bigeasy@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=alsa-devel@alsa-project.org \
--cc=john.ogness@linutronix.de \
--cc=linux-usb@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=zonque@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 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).