From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: [PATCH 02/10] genirq: fix regression in irqfixup, irqpoll Date: Fri, 02 Dec 2011 20:46:43 -0500 Message-ID: <20111203014741.569973127@goodmis.org> References: <20111203014641.165123482@goodmis.org> Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="00GvhwF7k39YY" Cc: Thomas Gleixner , Carsten Emde , John Kacur , Edward Donovan , stable@kernel.org ("2.6.39+"), Linus Torvalds To: linux-kernel@vger.kernel.org, linux-rt-users Return-path: Received: from hrndva-omtalb.mail.rr.com ([71.74.56.125]:60741 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754486Ab1LCBrp (ORCPT ); Fri, 2 Dec 2011 20:47:45 -0500 Content-Disposition: inline; filename=0002-genirq-fix-regression-in-irqfixup-irqpoll.patch Sender: linux-rt-users-owner@vger.kernel.org List-ID: --00GvhwF7k39YY Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable From: Edward Donovan Commit fa27271bc8d2("genirq: Fixup poll handling") introduced a regression that broke irqfixup/irqpoll for some hardware configurations. Amidst reorganizing 'try_one_irq', that patch removed a test that checked for 'action->handler' returning IRQ_HANDLED, before acting on the interrupt. Restoring this test back returns the functionality lost since 2.6.39. In the current set of tests, after 'action' is set, it must precede '!action->next' to take effect. With this and my previous patch to irq/spurious.c, c75d720fca8a, all IRQ regressions that I have encountered are fixed. Signed-off-by: Edward Donovan Reported-and-tested-by: Rog=C3=A9rio Brito Cc: Thomas Gleixner Cc: stable@kernel.org (2.6.39+) Signed-off-by: Linus Torvalds --- kernel/irq/spurious.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index bfe1004..d09e0f5 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c @@ -84,7 +84,9 @@ static int try_one_irq(int irq, struct irq_desc *desc, bo= ol force) */ action =3D desc->action; if (!action || !(action->flags & IRQF_SHARED) || - (action->flags & __IRQF_TIMER) || !action->next) + (action->flags & __IRQF_TIMER) || + (action->handler(irq, action->dev_id) =3D=3D IRQ_HANDLED) || + !action->next) goto out; =20 /* Already running on another processor */ --=20 1.7.7.1 --00GvhwF7k39YY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJO2X+9AAoJEIy3vGnGbaoAnVEQAK5rVOASxIRNo2irtX3dHzQv d4Ljq/CvR0q2EmB1KWjeDpd5LMg7bEKuq3t0Ke8THSGOY6u1WrJLT28uQTwQ9i+b Tqphww5iaMyCxWaVndiJsNkACLEyLBZJy6WQhPXhY1aeOwpD1qaoALRCq2f0QIKv UfuMnYC9SXpAO6d7hN+oAXYGp/lAfqHiQw7NAAt+Maze839oYmCphQvLdOAtk9Aq qcmOPI+nDMaYbtvjBrkLoa2Jr8YFOdKRdrVyV0h/nm03o+TJqaVCz8C9/jhwlHk9 adRK9XNz0v0od/qhNulDqpBNvcsYlYzxs76mhALjzNCCj9wuut0CpapNZ2JtIT1N paxsHflpGY2RM76LdYiaCFR109QU6SC9nWy8NskQqLdAFWObTZ3cXnQiymESb1ik u3LCL1/ox+RekKD23TRq59qXnHMxaM/foPiMWnmPXcMqdu9rr+596EJRD171FL1A mWXXTKqKdoGiXDf/yx2Z3e8XTUdW776sbKY4tZcPrjs/fC3cXple6+UtYITX/NHS RVcgRXPPsbsO2rKiiq1mEexRCtrSkXXv1l4hqUXwrF4yE+YYWvXUWMoATmlCjb45 3gytd5eN5jDdX7cHLNrFcRPi+xzv8CnNB8SMOSVr0Fw3qL5B1+cJ6N3krT2sNU9a i7Cp/W/Ure3G9aDwTWUC =7o9s -----END PGP SIGNATURE----- --00GvhwF7k39YY--