From: Bjorn Helgaas <bjorn.helgaas@hp.com>
To: acpi-devel@lists.sourceforge.net, linux-ia64@vger.kernel.org
Cc: Andi Kleen <ak@suse.de>, "Nakajima, Jun" <jun.nakajima@intel.com>,
"Brown, Len" <len.brown@intel.com>
Subject: Re: [ACPI] [PATCH] 2 of 6 add acpi_irq_to_vector for x86_64
Date: Tue, 09 Mar 2004 23:25:37 +0000 [thread overview]
Message-ID: <200403091625.37344.bjorn.helgaas@hp.com> (raw)
In-Reply-To: <200403091619.04333.bjorn.helgaas@hp.com>
x86_64: Add acpi_irq_to_vector() to follow i386
diff -Nru a/arch/x86_64/kernel/acpi/boot.c b/arch/x86_64/kernel/acpi/boot.c
--- a/arch/x86_64/kernel/acpi/boot.c Tue Mar 9 13:21:53 2004
+++ b/arch/x86_64/kernel/acpi/boot.c Tue Mar 9 13:21:53 2004
@@ -323,6 +323,15 @@
#endif /* CONFIG_ACPI_BUS */
+#ifdef CONFIG_X86_IO_APIC
+int acpi_irq_to_vector(u32 irq)
+{
+ if (use_pci_vector() && !platform_legacy_irq(irq))
+ irq = IO_APIC_VECTOR(irq);
+ return irq;
+}
+#endif
+
static unsigned long __init
acpi_scan_rsdp (
unsigned long start,
diff -Nru a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
--- a/arch/x86_64/kernel/mpparse.c Tue Mar 9 13:21:53 2004
+++ b/arch/x86_64/kernel/mpparse.c Tue Mar 9 13:21:53 2004
@@ -998,17 +998,13 @@
if ((1<<bit) & mp_ioapic_routing[ioapic].pin_programmed[idx]) {
Dprintk(KERN_DEBUG "Pin %d-%d already programmed\n",
mp_ioapic_routing[ioapic].apic_id, ioapic_pin);
- if (use_pci_vector() && !platform_legacy_irq(irq))
- irq = IO_APIC_VECTOR(irq);
- entry->irq = irq;
+ entry->irq = acpi_irq_to_vector(irq);
continue;
}
mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
if (!io_apic_set_pci_routing(ioapic, ioapic_pin, irq, edge_level, active_high_low)) {
- if (use_pci_vector() && !platform_legacy_irq(irq))
- irq = IO_APIC_VECTOR(irq);
- entry->irq = irq;
+ entry->irq = acpi_irq_to_vector(irq);
}
printk(KERN_DEBUG "%02x:%02x:%02x[%c] -> %d-%d -> IRQ %d\n",
entry->id.segment, entry->id.bus,
next prev parent reply other threads:[~2004-03-09 23:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-03-09 23:19 [PATCH] clean up some ACPI IRQ conversions Bjorn Helgaas
2004-03-09 23:24 ` [ACPI] [PATCH] 1 of 6 sync mpparse Bjorn Helgaas
2004-03-09 23:25 ` Bjorn Helgaas [this message]
[not found] ` <200403091619.04333.bjorn.helgaas-VXdhtT5mjnY@public.gmane.org>
2004-03-09 23:26 ` [ACPI] [PATCH] 3 of 6 use global_irq to refer to ACPI global IRQs Bjorn Helgaas
2004-03-09 23:26 ` [ACPI] [PATCH] 4 of 6 introduce acpi_global_irq_to_irq() Bjorn Helgaas
2004-03-09 23:44 ` David Mosberger
2004-03-10 0:00 ` Nakajima, Jun
2004-03-10 0:09 ` Bjorn Helgaas
2004-03-09 23:26 ` [ACPI] [PATCH] 5 of 6 avoid double conversion of ACPI OS interrupt Bjorn Helgaas
2004-03-09 23:27 ` [ACPI] [PATCH] 6 of 6 rename some ACPI IRQ variables Bjorn Helgaas
2004-03-09 23:54 ` [PATCH] clean up some ACPI IRQ conversions Andi Kleen
2004-03-10 16:41 ` Bjorn Helgaas
2004-03-10 17:10 ` Andi Kleen
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=200403091625.37344.bjorn.helgaas@hp.com \
--to=bjorn.helgaas@hp.com \
--cc=acpi-devel@lists.sourceforge.net \
--cc=ak@suse.de \
--cc=jun.nakajima@intel.com \
--cc=len.brown@intel.com \
--cc=linux-ia64@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox