From: Jiang Liu <jiang.liu@linux.intel.com>
To: jim876@xs4all.nl, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jiang Liu <jiang.liu@linux.intel.com>,
linux-pm@vger.kernel.org
Subject: [PATCH] x86/ACPI: Fix regression caused by 16ee7b3dcc56
Date: Tue, 7 Apr 2015 22:34:03 +0800 [thread overview]
Message-ID: <1428417244-32416-1-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <55214A0D.9000404@xs4all.nl>
Hi Jim,
Could you please help to test this patch against v4.0-rc6?
Thanks!
Gerry
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
---
arch/x86/kernel/acpi/boot.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 803b684676ff..f7f1fe7cd1b0 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -403,10 +403,14 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
static int mp_register_gsi(struct device *dev, u32 gsi, int trigger,
int polarity)
{
- int irq, node;
+ int i, irq, node;
- if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
- return gsi;
+ if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC) {
+ for (i = 0; i < nr_legacy_irqs(); i++)
+ if (isa_irq_to_gsi[i] == gsi)
+ return i;
+ return -1;
+ }
trigger = trigger == ACPI_EDGE_SENSITIVE ? 0 : 1;
polarity = polarity == ACPI_ACTIVE_HIGH ? 0 : 1;
--
1.7.10.4
next prev parent reply other threads:[~2015-04-07 14:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-05 14:43 ACPI events broken on non-SMP since 3.16 Jim Bos
2015-04-07 14:34 ` Jiang Liu [this message]
2015-04-07 16:49 ` [PATCH] x86/ACPI: Fix regression caused by 16ee7b3dcc56 Jim Bos
2015-04-08 5:26 ` Jiang Liu
2015-04-08 15:51 ` Jim Bos
2015-04-09 10:15 ` Jiang Liu
2015-04-09 16:41 ` Jim Bos
2015-04-10 1:56 ` Jiang Liu
2015-04-10 6:19 ` Jim Bos
2015-04-11 15:08 ` [PATCH] x86/ACPI: Fix regression caused by 16ee7b3dcc56 & c50f13c672df7 Jim Bos
2015-04-11 16:57 ` Jiang Liu
2015-04-12 1:29 ` Rafael J. Wysocki
2015-04-12 9:03 ` Jim Bos
2015-04-12 23:30 ` Rafael J. Wysocki
2015-04-13 13:36 ` Rafael J. Wysocki
2015-04-13 14:54 ` Jim Bos
2015-04-13 19:46 ` Rafael J. Wysocki
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=1428417244-32416-1-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jim876@xs4all.nl \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=x86@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).