From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754400Ab1LCBhv (ORCPT ); Fri, 2 Dec 2011 20:37:51 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:54938 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754087Ab1LCBhj (ORCPT ); Fri, 2 Dec 2011 20:37:39 -0500 X-Authority-Analysis: v=2.0 cv=dOUkaZlb c=1 sm=0 a=ZycB6UtQUfgMyuk2+PxD7w==:17 a=vhdKIqpQuCYA:10 a=yTRiKB6edxQA:10 a=5SG0PmZfjMsA:10 a=bbbx4UPp9XUA:10 a=Scopg583AAAA:8 a=VwQbUJbxAAAA:8 a=Z4Rwk6OoAAAA:8 a=n3Yv3MhLhy3a0x0I4RwA:9 a=PgOFUIcPIoEFqauMDYIA:7 a=QEXdDO2ut3YA:10 a=YudZRJjv1OwA:10 a=Zh68SRI7RUMA:10 a=LI9Vle30uBYA:10 a=jbrJJM5MRmoA:10 a=0IjwTiz75VSvUxvlLU8A:9 a=ZycB6UtQUfgMyuk2+PxD7w==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.80.29 Message-Id: <20111203013736.706815535@goodmis.org> User-Agent: quilt/0.48-1 Date: Fri, 02 Dec 2011 20:36:55 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Edward Donovan , Thomas Gleixner , stable@kernel.org ("2.6.39+"), Linus Torvalds Subject: [PATCH 02/10] genirq: fix regression in irqfixup, irqpoll References: <20111203013653.090501690@goodmis.org> Content-Disposition: inline; filename=0002-genirq-fix-regression-in-irqfixup-irqpoll.patch Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="00GvhwF7k39YY" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --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) iQIcBAABAgAGBQJO2X1gAAoJEIy3vGnGbaoARiEQANSw5M8iw2fqAFQ2XP+VcAGw 0jdRRHa7CBBP1oXEdTPkeH6rfOgAfW/wFNTWKjNzLJ896ThTNaqTx82IXhIKIOu5 UZerWKKRAFG5WUi76BmXiBoNSi0upqR2Ezp5rD4Mce4RA2iyCxzIiUSKUMoO+19j a0W2KRReDekVZgI2kLpCEyIZoMoJLaqxqJoXZdUMTbA2tYTtNQCxpDrOxYvM+rrW Q2itflIMwhfdMgblygNoQxxVodU59Sde1Sefnxxe9ng3j7cO56twk0XKWSUqTwsZ IPluTdtRuUY5COgQlBEvR/Uprwkvm7zoV/b7yUJZbo8uhNi0daCHCUTmy8x3dIrN lapDHXrd/YMwA9QtH+5GxokO/ct0rBY+pR5IY6WC3Cq2U25XIXFwlgUuXzlhOa4a 2w1N4pEpYDnFBAmecGjBWKOFW7+XX3uTtVKssGNhXO+iRLYcE7czB2g4GpUKtrLr k+Ul+WHx8xitAyvJI0f4hTr7emBvZxk6r6J7rKfyo1YI5a6DPWeko0wJ0am/5AoG BiSU4s20tU6DCZRNB/ey8diEdeDAwKMA0Pl6cyga+XjiMtONTohdE38q56HC+HnM lTdZMWyW8n60GY3iGD50aGEYo/ILWESzxdo5LGdCTgxmY7R3NIdlKqw6FwBv4oIg 4f35+KF3//MXOnHuUYuc =6dsF -----END PGP SIGNATURE----- --00GvhwF7k39YY--