From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:46151 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751953AbbGXPQC (ORCPT ); Fri, 24 Jul 2015 11:16:02 -0400 Date: Fri, 24 Jul 2015 08:15:59 -0700 From: Greg Kroah-Hartman To: Dave Martin Cc: Russell King , Jakub =?utf-8?B?S2ljacWEc2tp?= , Andre Przywara , Andrew Jackson , "stable@vger.kernel.org" , Graeme Gregory , "linux-serial@vger.kernel.org" , popcorn mix , Jorge Ramirez-Ortiz , Robin Murphy , "linux-arm-kernel@lists.infradead.org" Subject: Re: [PATCH] serial/amba-pl011: Disable interrupts around TX softirq Message-ID: <20150724151559.GA12324@kroah.com> References: <1436439433-10258-1-git-send-email-Dave.Martin@arm.com> <20150723220550.GA15032@kroah.com> <20150724095605.GI10670@e103592.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150724095605.GI10670@e103592.cambridge.arm.com> Sender: stable-owner@vger.kernel.org List-ID: On Fri, Jul 24, 2015 at 10:56:06AM +0100, Dave Martin wrote: > On Thu, Jul 23, 2015 at 03:05:50PM -0700, Greg Kroah-Hartman wrote: > > On Thu, Jul 09, 2015 at 11:57:12AM +0100, Dave Martin wrote: > > > 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 > > > Tested-by: Robin Murphy > > > Tested-by: Stefan Wahren > > > Cc: stable # 4.1 > > > --- > > > drivers/tty/serial/amba-pl011.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > This doesn't apply at all to 4.2-rc3, so I can't apply it :( > > This is applicable to 4.1 stable only, since the code this patch fixes > was replaced in 4.2-rc1. > > Apologies, I didn't make that clear in the text. I can't do anything with a 4.1-only patch, please read Documentation/stable_kernel_rules.txt for how to get a patch into the stable kernel releases. thanks, greg k-h From mboxrd@z Thu Jan 1 00:00:00 1970 From: gregkh@linuxfoundation.org (Greg Kroah-Hartman) Date: Fri, 24 Jul 2015 08:15:59 -0700 Subject: [PATCH] serial/amba-pl011: Disable interrupts around TX softirq In-Reply-To: <20150724095605.GI10670@e103592.cambridge.arm.com> References: <1436439433-10258-1-git-send-email-Dave.Martin@arm.com> <20150723220550.GA15032@kroah.com> <20150724095605.GI10670@e103592.cambridge.arm.com> Message-ID: <20150724151559.GA12324@kroah.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Jul 24, 2015 at 10:56:06AM +0100, Dave Martin wrote: > On Thu, Jul 23, 2015 at 03:05:50PM -0700, Greg Kroah-Hartman wrote: > > On Thu, Jul 09, 2015 at 11:57:12AM +0100, Dave Martin wrote: > > > 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 > > > Tested-by: Robin Murphy > > > Tested-by: Stefan Wahren > > > Cc: stable # 4.1 > > > --- > > > drivers/tty/serial/amba-pl011.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > This doesn't apply at all to 4.2-rc3, so I can't apply it :( > > This is applicable to 4.1 stable only, since the code this patch fixes > was replaced in 4.2-rc1. > > Apologies, I didn't make that clear in the text. I can't do anything with a 4.1-only patch, please read Documentation/stable_kernel_rules.txt for how to get a patch into the stable kernel releases. thanks, greg k-h