From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>, Pavel Machek <pavel@ucw.cz>,
Joerg Roedel <joro@8bytes.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Subject: [PATCH v2 17/26] x86, irq: Add ioapic_gsi_to_irq
Date: Fri, 8 Feb 2013 11:28:14 -0800 [thread overview]
Message-ID: <1360351703-20571-18-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1360351703-20571-1-git-send-email-yinghai@kernel.org>
For hot add ioapic, irq_base is not equal to gsi_base.
So we need a way to do mapping between gsi and irq.
Also remove irq_to_gsi that is causing confusing, just use that array
directly as only caller already check input irq before.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
---
arch/x86/include/asm/io_apic.h | 1 +
arch/x86/kernel/acpi/boot.c | 22 +++++-----------------
arch/x86/kernel/apic/io_apic.c | 29 ++++++++++++++++++++++++++++-
3 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 8181fd8..02ac411 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -180,6 +180,7 @@ struct mp_ioapic_gsi{
};
extern struct mp_ioapic_gsi mp_gsi_routing[];
extern u32 gsi_top;
+int ioapic_gsi_to_irq(u32 gsi);
int mp_find_ioapic(u32 gsi);
int mp_find_ioapic_pin(int ioapic, u32 gsi);
void __init mp_register_ioapic(int id, u32 address, u32 gsi_base);
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index bacf4b0..350879f 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -112,6 +112,10 @@ static unsigned int gsi_to_irq(unsigned int gsi)
}
}
+#ifdef CONFIG_X86_IO_APIC
+ if (acpi_irq_model == ACPI_IRQ_MODEL_IOAPIC)
+ return ioapic_gsi_to_irq(gsi);
+#endif
/* Provide an identity mapping of gsi == irq
* except on truly weird platforms that have
* non isa irqs in the first 16 gsis.
@@ -124,22 +128,6 @@ static unsigned int gsi_to_irq(unsigned int gsi)
return irq;
}
-static u32 irq_to_gsi(int irq)
-{
- unsigned int gsi;
-
- if (irq < NR_IRQS_LEGACY)
- gsi = isa_irq_to_gsi[irq];
- else if (irq < gsi_top)
- gsi = irq;
- else if (irq < (gsi_top + NR_IRQS_LEGACY))
- gsi = irq - gsi_top;
- else
- gsi = 0xffffffff;
-
- return gsi;
-}
-
/*
* Temporarily use the virtual area starting from FIX_IO_APIC_BASE_END,
* to map the target physical address. The problem is that set_fixmap()
@@ -529,7 +517,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
{
if (isa_irq >= 16)
return -1;
- *gsi = irq_to_gsi(isa_irq);
+ *gsi = isa_irq_to_gsi[isa_irq];
return 0;
}
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index c499c88..9514728 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1044,13 +1044,16 @@ static int pin_2_irq(int idx, int apic, int pin)
if (test_bit(bus, mp_bus_not_pci)) {
irq = mp_irqs[idx].srcbusirq;
- } else {
+ } else if (gsi_cfg->gsi_base == gsi_cfg->irq_base) {
u32 gsi = gsi_cfg->gsi_base + pin;
if (gsi >= NR_IRQS_LEGACY)
irq = gsi;
else
irq = gsi_top + gsi;
+ } else {
+ /* hotadd ioapic */
+ irq = gsi_cfg->irq_base + pin;
}
#ifdef CONFIG_X86_32
@@ -1476,6 +1479,30 @@ static void __init setup_IO_APIC_irqs(void)
__io_apic_setup_irqs(ioapic_idx);
}
+int ioapic_gsi_to_irq(u32 gsi)
+{
+ int ioapic_idx = 0, irq = gsi;
+ struct mp_ioapic_gsi *gsi_cfg;
+
+ ioapic_idx = mp_find_ioapic(gsi);
+ if (ioapic_idx < 0)
+ return -1;
+
+ gsi_cfg = mp_ioapic_gsi_routing(ioapic_idx);
+ if (gsi_cfg->gsi_base == gsi_cfg->irq_base) {
+ if (gsi < NR_IRQS_LEGACY)
+ irq = gsi_top + gsi;
+ } else {
+ int pin = mp_find_ioapic_pin(ioapic_idx, gsi);
+
+ if (pin < 0)
+ return -1;
+ /* hotadd ioapic */
+ irq = gsi_cfg->irq_base + pin;
+ }
+
+ return irq;
+}
/*
* for the gsit that is not in first ioapic
* but could not use acpi_register_gsi()
--
1.7.10.4
next prev parent reply other threads:[~2013-02-08 19:32 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 19:27 [PATCH v2 00/26] x86, irq: support ioapic device hotplug Yinghai Lu
2013-02-08 19:27 ` [PATCH v2 01/26] x86, irq: Change irq_remap_modify_chip_defaults to static Yinghai Lu
2013-02-08 19:27 ` [PATCH v2 02/26] x86, irq: Modify irq chip once for irq remapping Yinghai Lu
2013-03-08 20:07 ` Thomas Gleixner
2013-03-08 20:10 ` Thomas Gleixner
2013-03-09 7:25 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 03/26] x86, irq: Print out MSI/MSI-X clearly Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 04/26] x86, irq: Show MSI-X in /proc/interrupt Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 05/26] x86, irq: Show pci device name for msi " Yinghai Lu
2013-03-08 19:46 ` Konrad Rzeszutek Wilk
2013-03-08 19:58 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 06/26] x86, irq: Make dmar_msi/hpet_msi irq_chip name consistent Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 07/26] ia64, irq: Add dummy create_irq_nr() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 08/26] iommu, irq: Allocate irq_desc for dmar_msi with local node Yinghai Lu
2013-02-08 20:45 ` Don Dutile
2013-02-08 20:58 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 09/26] x86, irq: kill create_irq() Yinghai Lu
2013-03-08 19:48 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 10/26] x86, irq: Convert irq_2_pin list to generic list Yinghai Lu
2013-03-08 19:50 ` Konrad Rzeszutek Wilk
2013-03-08 20:00 ` Yinghai Lu
2013-03-08 20:13 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 11/26] genirq: Split __irq_reserve_irqs from irq_alloc_descs Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 12/26] x86, irq: Add realloc_irq_and_cfg_at() Yinghai Lu
2013-03-08 19:53 ` Konrad Rzeszutek Wilk
2013-03-09 7:22 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 13/26] x86, irq: Move down arch_early_irq_init() Yinghai Lu
2013-03-08 19:53 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 14/26] x86, irq: Split out alloc_ioapic_save_registers() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 15/26] xen, irq: call irq_realloc_desc_at() at first Yinghai Lu
2013-03-08 19:43 ` Konrad Rzeszutek Wilk
2013-03-08 19:46 ` Yinghai Lu
2013-03-08 20:01 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 16/26] x86, irq: pre-reserve irq range/realloc for booting path Yinghai Lu
2013-02-08 19:28 ` Yinghai Lu [this message]
2013-02-08 19:28 ` [PATCH v2 18/26] genirq: Bail out early in free_desc() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 19/26] x86, irq: More strict checking about registering ioapic Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 20/26] x86, irq: Make mp_register_ioapic handle hotadd ioapic Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 21/26] x86, irq: Add mp_unregister_ioapic to handle hot-remove ioapic Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 22/26] x86, irq: Make ioapics loop skip blank slots Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 23/26] x86, ioapic: Find usable ioapic id for 64bit Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 24/26] x86: Move declaration for mp_register_ioapic() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 25/26] PCI: Disable mem in the ioapic removing path Yinghai Lu
2013-02-08 21:14 ` Bjorn Helgaas
2013-02-08 22:33 ` Yinghai Lu
2013-02-08 23:18 ` Bjorn Helgaas
2013-02-08 19:28 ` [PATCH v2 26/26] PCI, x86, ACPI: Add ioapic hotplug support with acpi host bridge Yinghai Lu
2013-02-08 21:24 ` Bjorn Helgaas
2013-02-08 22:35 ` Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-1/26] PCI, x86: Make ioapic hotplug support built-in Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-2/26] PCI, x86, ACPI: Link acpi ioapic register to ioapic Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-3/26] PCI, x86, ACPI: Enable ioapic hotplug support with acpi host bridge Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-4/26] PCI, x86, ACPI: get ioapic address from acpi device Yinghai Lu
2013-02-11 9:34 ` [PATCH v2 00/26] x86, irq: support ioapic device hotplug Ingo Molnar
2013-02-12 6:10 ` H. Peter Anvin
2013-02-13 2:36 ` Yinghai Lu
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=1360351703-20571-18-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pavel@ucw.cz \
--cc=rjw@sisk.pl \
--cc=sebastian@breakpoint.cc \
--cc=tglx@linutronix.de \
/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).