[tip:x86/irq] x86, ioapic: Optimize pin_2_irq
in [Kernel]
|
Prev: [tip:x86/irq] x86, ioapic: Move nr_ioapic_registers calculation to mp_register_ioapic.
Next: [PATCH] sysfs-namespaces: add a high-level Documentation file
From: tip-bot for Eric W. Biederman on 4 May 2010 22:20 Commit-ID: d464207c4fdd70c2a0febd4f9c58206fa915bb36 Gitweb: http://git.kernel.org/tip/d464207c4fdd70c2a0febd4f9c58206fa915bb36 Author: Eric W. Biederman <ebiederm(a)xmission.com> AuthorDate: Tue, 30 Mar 2010 01:07:13 -0700 Committer: H. Peter Anvin <hpa(a)zytor.com> CommitDate: Tue, 4 May 2010 13:35:08 -0700 x86, ioapic: Optimize pin_2_irq Now that all ioapics have valid gsi_base values use this to accellerate pin_2_irq. In the case of acpi this also ensures that pin_2_irq will compute the same irq value for an ioapic pin as acpi will. Signed-off-by: Eric W. Biederman <ebiederm(a)xmission.com> LKML-Reference: <1269936436-7039-12-git-send-email-ebiederm(a)xmission.com> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> --- arch/x86/kernel/apic/io_apic.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index dae9240..0d35f46 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c @@ -1019,7 +1019,7 @@ static inline int irq_trigger(int idx) int (*ioapic_renumber_irq)(int ioapic, int irq); static int pin_2_irq(int idx, int apic, int pin) { - int irq, i; + int irq; int bus = mp_irqs[idx].srcbus; /* @@ -1031,18 +1031,13 @@ 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 { - /* - * PCI IRQs are mapped in order - */ - i = irq = 0; - while (i < apic) - irq += nr_ioapic_registers[i++]; - irq += pin; + u32 gsi = mp_gsi_routing[apic].gsi_base + pin; /* * For MPS mode, so far only needed by ES7000 platform */ if (ioapic_renumber_irq) - irq = ioapic_renumber_irq(apic, irq); + gsi = ioapic_renumber_irq(apic, gsi); + irq = gsi; } #ifdef CONFIG_X86_32 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |