Commit 4399b14f authored Apr 14, 2015 by Jiang Liu Committed by Thomas Gleixner Apr 24, 2015

x86/irq: Refine the way to calculate NR_IRQS

Now we have made MSI independent of IOAPIC, so we need to refine the
way to calculate NR_IRQS to support configuration with MSI enabled but
IOAPIC disabled.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Tested-by: Joerg Roedel <jroedel@suse.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Jan Beulich <JBeulich@suse.com>
Link: http://lkml.kernel.org/r/1428978610-28986-28-git-send-email-jiang.liu@linux.intel.com

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 7f3262ed

arch/x86/include/asm/irq_vectors.h

+11 −7

Original line number	Diff line number	Diff line
		@@ -157,15 +157,19 @@ static inline int invalid_vm86_irq(int irq)

		#define NR_IRQS_LEGACY 16

		#define CPU_VECTOR_LIMIT (64 * NR_CPUS)
		#define IO_APIC_VECTOR_LIMIT (32 * MAX_IO_APICS)

		#ifdef CONFIG_X86_IO_APIC
		# define CPU_VECTOR_LIMIT (64 * NR_CPUS)
		#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_PCI_MSI)
		#define NR_IRQS \
		(CPU_VECTOR_LIMIT > IO_APIC_VECTOR_LIMIT ? \
		(NR_VECTORS + CPU_VECTOR_LIMIT) : \
		(NR_VECTORS + IO_APIC_VECTOR_LIMIT))
		#else /* !CONFIG_X86_IO_APIC: */
		#elif defined(CONFIG_X86_IO_APIC)
		#define NR_IRQS (NR_VECTORS + IO_APIC_VECTOR_LIMIT)
		#elif defined(CONFIG_PCI_MSI)
		#define NR_IRQS (NR_VECTORS + CPU_VECTOR_LIMIT)
		#else
		#define NR_IRQS NR_IRQS_LEGACY
		#endif