From: Bin Liu <b-liu@ti.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>, Bin Liu <b-liu@ti.com>
Subject: [PATCH 5/6] usb: musb: jz4740: Prevent lockup when CONFIG_SMP is set
Date: Sun, 24 May 2020 21:50:48 -0500 [thread overview]
Message-ID: <20200525025049.3400-6-b-liu@ti.com> (raw)
In-Reply-To: <20200525025049.3400-1-b-liu@ti.com>
From: Paul Cercueil <paul@crapouillou.net>
The function dma_controller_irq() locks up the exact same spinlock we
locked before calling it, which obviously resulted in a deadlock when
CONFIG_SMP was enabled. This flew under the radar as none of the boards
supported by this driver needs SMP.
Fixes: 57aadb46bd63 ("usb: musb: jz4740: Add support for DMA")
Cc: stable@vger.kernel.org
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Bin Liu <b-liu@ti.com>
---
drivers/usb/musb/jz4740.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c
index e64dd30e80e7..c4fe1f4cd17a 100644
--- a/drivers/usb/musb/jz4740.c
+++ b/drivers/usb/musb/jz4740.c
@@ -30,11 +30,11 @@ static irqreturn_t jz4740_musb_interrupt(int irq, void *__hci)
irqreturn_t retval = IRQ_NONE, retval_dma = IRQ_NONE;
struct musb *musb = __hci;
- spin_lock_irqsave(&musb->lock, flags);
-
if (IS_ENABLED(CONFIG_USB_INVENTRA_DMA) && musb->dma_controller)
retval_dma = dma_controller_irq(irq, musb->dma_controller);
+ spin_lock_irqsave(&musb->lock, flags);
+
musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX);
--
2.17.1
next prev parent reply other threads:[~2020-05-25 2:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 2:50 [PATCH 0/6] musb patches for v5.8-rc1 Bin Liu
2020-05-25 2:50 ` [PATCH 1/6] usb: musb: return -ESHUTDOWN in urb when three-strikes error happened Bin Liu
2020-05-25 2:50 ` [PATCH 2/6] usb: musb: start session in resume for host port Bin Liu
2020-05-25 2:50 ` [PATCH 3/6] usb: musb: use true for 'use_dma' Bin Liu
2020-05-25 2:50 ` [PATCH 4/6] usb: musb: mediatek: add reset FADDR to zero in reset interrupt handle Bin Liu
2020-06-17 8:17 ` Macpaul Lin
2020-06-17 8:58 ` Greg Kroah-Hartman
2020-06-17 9:31 ` Macpaul Lin
2020-06-19 8:51 ` Greg Kroah-Hartman
2020-05-25 2:50 ` Bin Liu [this message]
2020-05-25 2:50 ` [PATCH 6/6] usb: musb: Fix runtime PM imbalance on error Bin Liu
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=20200525025049.3400-6-b-liu@ti.com \
--to=b-liu@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
/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.