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>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>,
Joerg Roedel <joro@8bytes.org>
Subject: [PATCH v2 02/26] x86, irq: Modify irq chip once for irq remapping
Date: Fri, 8 Feb 2013 11:27:59 -0800 [thread overview]
Message-ID: <1360351703-20571-3-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1360351703-20571-1-git-send-email-yinghai@kernel.org>
Now after irq remapping is enabled, irq_chip fields are modified during
every irq setup.
Only need to change them one during we enable irq mapping.
Also change irq_remap_modify_chip_defaults() to __init.
We don't need to use #ifdef in irq_remap_modify_chips(), as
IRQ_REMAP only support x86_64 AND X86_IO_APIC AND PCI_MSI,
also HPET_TIMER is set when x86_64 is set.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: Joerg Roedel <joro@8bytes.org>
---
arch/x86/include/asm/io_apic.h | 5 +++++
arch/x86/kernel/apic/apic.c | 9 ++++++++-
arch/x86/kernel/apic/io_apic.c | 8 +++-----
drivers/iommu/irq_remapping.c | 11 +++++++++--
4 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 459e50a..eaff3ad 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -215,6 +215,11 @@ static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned
extern void io_apic_eoi(unsigned int apic, unsigned int vector);
+extern struct irq_chip ioapic_chip;
+extern struct irq_chip msi_chip;
+extern struct irq_chip hpet_msi_type;
+void irq_remap_modify_chips(void);
+
#else /* !CONFIG_X86_IO_APIC */
#define io_apic_assign_pci_irqs 0
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index a5b4dce..84815b1 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1552,6 +1552,8 @@ void enable_x2apic(void)
int __init enable_IR(void)
{
#ifdef CONFIG_IRQ_REMAP
+ int ret;
+
if (!irq_remapping_supported()) {
pr_debug("intr-remapping not supported\n");
return -1;
@@ -1563,7 +1565,12 @@ int __init enable_IR(void)
return -1;
}
- return irq_remapping_enable();
+ ret = irq_remapping_enable();
+
+ if (ret >= 0)
+ irq_remap_modify_chips();
+
+ return ret;
#endif
return -1;
}
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 9ed796c..f78f7f6 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1238,8 +1238,6 @@ void __setup_vector_irq(int cpu)
raw_spin_unlock(&vector_lock);
}
-static struct irq_chip ioapic_chip;
-
#ifdef CONFIG_X86_32
static inline int IO_APIC_irq_trigger(int irq)
{
@@ -2511,7 +2509,7 @@ static void ack_apic_level(struct irq_data *data)
ioapic_irqd_unmask(data, cfg, masked);
}
-static struct irq_chip ioapic_chip __read_mostly = {
+struct irq_chip ioapic_chip __read_mostly = {
.name = "IO-APIC",
.irq_startup = startup_ioapic_irq,
.irq_mask = mask_ioapic_irq,
@@ -3093,7 +3091,7 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
* IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,
* which implement the MSI or MSI-X Capability Structure.
*/
-static struct irq_chip msi_chip = {
+struct irq_chip msi_chip = {
.name = "PCI-MSI",
.irq_unmask = unmask_msi_irq,
.irq_mask = mask_msi_irq,
@@ -3240,7 +3238,7 @@ static int hpet_msi_set_affinity(struct irq_data *data,
return IRQ_SET_MASK_OK_NOCOPY;
}
-static struct irq_chip hpet_msi_type = {
+struct irq_chip hpet_msi_type = {
.name = "HPET_MSI",
.irq_unmask = hpet_msi_unmask,
.irq_mask = hpet_msi_mask,
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 01ed477..33918c3 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -368,19 +368,26 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
seq_printf(p, " IR-%s", data->chip->name);
}
-static void irq_remap_modify_chip_defaults(struct irq_chip *chip)
+static void __init irq_remap_modify_chip_defaults(struct irq_chip *chip)
{
+ printk(KERN_DEBUG "irq_chip: %s ==> IR-%s", chip->name, chip->name);
chip->irq_print_chip = ir_print_prefix;
chip->irq_ack = ir_ack_apic_edge;
chip->irq_eoi = ir_ack_apic_level;
chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
}
+void __init irq_remap_modify_chips(void)
+{
+ irq_remap_modify_chip_defaults(&ioapic_chip);
+ irq_remap_modify_chip_defaults(&msi_chip);
+ irq_remap_modify_chip_defaults(&hpet_msi_type);
+}
+
bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
{
if (!irq_remapped(cfg))
return false;
irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
- irq_remap_modify_chip_defaults(chip);
return true;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-02-08 19:34 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 ` Yinghai Lu [this message]
2013-03-08 20:07 ` [PATCH v2 02/26] x86, irq: Modify irq chip once for irq remapping 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 ` [PATCH v2 17/26] x86, irq: Add ioapic_gsi_to_irq Yinghai Lu
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-3-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=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).