From: Dave Martin <Dave.Martin@arm.com>
To: linux-serial@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Russell King" <linux@arm.linux.org.uk>,
"Robin Murphy" <Robin.Murphy@arm.com>,
linux-arm-kernel@lists.infradead.org,
"Jakub Kiciński" <moorray3@wp.pl>,
"Andrew Jackson" <Andrew.Jackson@arm.com>,
"Graeme Gregory" <gg@slimlogic.co.uk>,
"Andre Przywara" <Andre.Przywara@arm.com>,
"Jorge Ramirez-Ortiz" <jorge.ramirez-ortiz@linaro.org>,
"popcorn mix" <popcornmix@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] serial/amba-pl011: Disable interrupts around TX softirq
Date: Thu, 9 Jul 2015 11:57:12 +0100 [thread overview]
Message-ID: <1436439433-10258-1-git-send-email-Dave.Martin@arm.com> (raw)
pl011_tx_softirq() currently uses spin_{,un}lock(), which are not
sufficient to inhibit pl011_int() from being triggered by a local
IRQ and trying to re-take the same lock. This can lead to
deadlocks.
This patch uses the _irq() locking variants instead to ensure that
pl011_int() handling for a given port is deferred until any
pl011_tx_softirq() work for that port is complete.
Fixes: 734745caeb9f serial/amba-pl011: Activate TX IRQ passively
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Tested-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Cc: stable <stable@vger.kernel.org> # 4.1
---
drivers/tty/serial/amba-pl011.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 763eb20..0cc622a 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1360,9 +1360,9 @@ static void pl011_tx_softirq(struct work_struct *work)
struct uart_amba_port *uap =
container_of(dwork, struct uart_amba_port, tx_softirq_work);
- spin_lock(&uap->port.lock);
+ spin_lock_irq(&uap->port.lock);
while (pl011_tx_chars(uap)) ;
- spin_unlock(&uap->port.lock);
+ spin_unlock_irq(&uap->port.lock);
}
static void pl011_tx_irq_seen(struct uart_amba_port *uap)
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] serial/amba-pl011: Disable interrupts around TX softirq
Date: Thu, 9 Jul 2015 11:57:12 +0100 [thread overview]
Message-ID: <1436439433-10258-1-git-send-email-Dave.Martin@arm.com> (raw)
pl011_tx_softirq() currently uses spin_{,un}lock(), which are not
sufficient to inhibit pl011_int() from being triggered by a local
IRQ and trying to re-take the same lock. This can lead to
deadlocks.
This patch uses the _irq() locking variants instead to ensure that
pl011_int() handling for a given port is deferred until any
pl011_tx_softirq() work for that port is complete.
Fixes: 734745caeb9f serial/amba-pl011: Activate TX IRQ passively
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Tested-by: Robin Murphy <robin.murphy@arm.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Cc: stable <stable@vger.kernel.org> # 4.1
---
drivers/tty/serial/amba-pl011.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 763eb20..0cc622a 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1360,9 +1360,9 @@ static void pl011_tx_softirq(struct work_struct *work)
struct uart_amba_port *uap =
container_of(dwork, struct uart_amba_port, tx_softirq_work);
- spin_lock(&uap->port.lock);
+ spin_lock_irq(&uap->port.lock);
while (pl011_tx_chars(uap)) ;
- spin_unlock(&uap->port.lock);
+ spin_unlock_irq(&uap->port.lock);
}
static void pl011_tx_irq_seen(struct uart_amba_port *uap)
--
1.7.10.4
next reply other threads:[~2015-07-09 10:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 10:57 Dave Martin [this message]
2015-07-09 10:57 ` [PATCH] serial/amba-pl011: Disable interrupts around TX softirq Dave Martin
2015-07-23 22:05 ` Greg Kroah-Hartman
2015-07-23 22:05 ` Greg Kroah-Hartman
2015-07-24 9:56 ` Dave Martin
2015-07-24 9:56 ` Dave Martin
2015-07-24 15:15 ` Greg Kroah-Hartman
2015-07-24 15:15 ` Greg Kroah-Hartman
2015-07-24 16:46 ` Dave Martin
2015-07-24 16:46 ` Dave Martin
-- strict thread matches above, loose matches on Subject: below --
2015-06-18 13:54 Dave Martin
2015-06-18 13:54 ` Dave Martin
2015-06-20 9:09 ` Stefan Wahren
2015-06-20 9:09 ` Stefan Wahren
2015-06-20 9:09 ` Stefan Wahren
2015-06-23 11:13 ` Dave P Martin
2015-06-23 11:13 ` Dave P Martin
2015-06-05 14:07 Dave Martin
2015-06-05 14:07 ` Dave Martin
2015-06-05 18:03 ` Robin Murphy
2015-06-05 18:03 ` Robin Murphy
2015-06-08 10:34 ` Robin Murphy
2015-06-08 10:34 ` Robin Murphy
2015-06-08 11:34 ` Dave P Martin
2015-06-08 11:34 ` Dave P Martin
2015-06-13 0:39 ` Greg Kroah-Hartman
2015-06-13 0:39 ` Greg Kroah-Hartman
2015-06-15 10:53 ` Dave P Martin
2015-06-15 10:53 ` Dave P Martin
2015-06-15 11:09 ` Andre Przywara
2015-06-15 11:09 ` Andre Przywara
2015-06-15 14:03 ` Dave Martin
2015-06-15 14:03 ` Dave Martin
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=1436439433-10258-1-git-send-email-Dave.Martin@arm.com \
--to=dave.martin@arm.com \
--cc=Andre.Przywara@arm.com \
--cc=Andrew.Jackson@arm.com \
--cc=Robin.Murphy@arm.com \
--cc=gg@slimlogic.co.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jorge.ramirez-ortiz@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=moorray3@wp.pl \
--cc=popcornmix@gmail.com \
--cc=stable@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.