From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759587AbYG2VQH (ORCPT ); Tue, 29 Jul 2008 17:16:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752771AbYG2VPz (ORCPT ); Tue, 29 Jul 2008 17:15:55 -0400 Received: from qb-out-0506.google.com ([72.14.204.238]:38060 "EHLO qb-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752679AbYG2VPz (ORCPT ); Tue, 29 Jul 2008 17:15:55 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=iYgmTjtYyovTOUzCoUqYprFDMbLh05Pj2M8yAhv+8GOfNbpWgEM73kVkgeykEz0nQv wNYulp9wgsWM9wn82kbH5x9j5zUnyZ/oskeFmCrr0VO2n1cZpa2UgHhxbGAN8X11wv3L YHabQftdUYUYWqtJv5rhNVZcIcEHFcCY5QTM0= From: Yinghai Lu To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , "Eric W. Biederman" , Dhaval Giani Subject: [PATCH] x86: 64bit support more than 256 irq v2 Date: Tue, 29 Jul 2008 14:14:54 -0700 User-Agent: KMail/1.9.9 Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200807291414.55479.yhlu.kernel@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dhaval Giani got: kernel BUG at arch/x86/kernel/io_apic_64.c:357! invalid opcode: 0000 [1] SMP CPU 24 Modules linked in: Pid: 1, comm: swapper Not tainted 2.6.27-rc1-autokern1 #1 RIP: 0010:[] [] add_pin_to_irq+0x8e/0xa0 RSP: 0018:ffff88032e4b9b30 EFLAGS: 00010216 RAX: 00000000000000f0 RBX: 00000000000000f0 RCX: 0000000000000000 RDX: 000000000000afaf RSI: 0000000000000046 RDI: ffffffff80738234 RBP: 0000000000000006 R08: 0000000000000000 R09: ffff8800280992c0 R10: 0000000000000000 R11: ffffffff80372060 R12: 0000000000000018 R13: 0000000000000001 R14: 0000000000000018 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff880bfe733540(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000000 CR3: 0000000000201000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper (pid: 1, threadinfo ffff88032e4b8000, task ffff880bfe4ca050) Stack: 00000000000000f0 0000000000000006 0000000000000001 ffffffff8021bbbe 00000000000000f0 0000000000000001 0000000000000000 ffff88032e4b9c0c 00000000000000f0 ffffffff80218d81 00000000000000f0 0000000000000000 Call Trace: [] ? io_apic_set_pci_routing+0x7e/0xa0 [] ? mp_register_gsi+0xb1/0xd0 [] ? acpi_register_gsi+0x6c/0x70 [] ? acpi_pci_irq_enable+0x178/0x260 [] ? acpi_pci_allocate_irq+0x0/0x4c [] ? pci_enable_resources+0x27/0x160 [] ? do_pci_enable_device+0x4a/0x70 [] ? __pci_enable_device_flags+0x51/0x60 [] ? tg3_init_one+0x58/0x1640 [] ? default_wake_function+0x0/0x10 [] ? set_cpus_allowed_ptr+0xe8/0x110 [] ? pci_device_probe+0xdf/0x130 [] ? driver_probe_device+0x96/0x1a0 [] ? __driver_attach+0x89/0x90 [] ? __driver_attach+0x0/0x90 [] ? bus_for_each_dev+0x4d/0x80 [] ? kmem_cache_alloc+0xc8/0xf0 [] ? bus_add_driver+0xae/0x220 [] ? driver_register+0x56/0x130 [] ? __pci_register_driver+0x68/0xb0 [] ? tg3_init+0x0/0x20 [] ? do_one_initcall+0x41/0x180 [] ? create_proc_entry+0x58/0xa0 [] ? register_irq_proc+0xd4/0xf0 [] ? kernel_init+0x133/0x190 [] ? child_rip+0xa/0x11 [] ? kernel_init+0x0/0x190 [] ? child_rip+0x0/0x11 Code: 89 05 2b 54 42 00 7f 27 48 0f bf c1 48 8d 14 00 48 c1 e0 03 48 29 d0 48 8d 90 c0 5e 73 80 66 89 2a 66 44 89 62 02 5b 5d 41 5c c3 <0f> 0b eb fe 48 c7 c7 c8 db 5c 80 31 c0 e8 60 7e 01 00 48 83 ec RIP [] add_pin_to_irq+0x8e/0xa0 RSP his system (x3950) has 8 ioapic, irq > 256 caused by commit 9b7dc567d03d74a1fbae84e88949b6a60d922d82 Author: Thomas Gleixner Date: Fri May 2 20:10:09 2008 +0200 x86: unify interrupt vector defines The interrupt vector defines are copied 4 times around with minimal differences. Move them all into asm-x86/irq_vectors.h 64bit allow same vector for different cpu to serve different irq also change next in irq_pin_list from short to int. because for 4096 NR_IRQS is 2^(8+12). v2: accoding to Eric W. Biederman, change to NR_IRQ_VECTORS to NR_IRQS use NR_VECTORS*NR_CPUS directly need to create that array dynamically later Signed-off-by: Yinghai Lu Tested-by: Dhaval Giani --- arch/x86/kernel/io_apic_64.c | 3 ++- include/asm-x86/irq_vectors.h | 14 ++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) Index: linux-2.6/include/asm-x86/irq_vectors.h =================================================================== --- linux-2.6.orig/include/asm-x86/irq_vectors.h +++ linux-2.6/include/asm-x86/irq_vectors.h @@ -113,28 +113,26 @@ # if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS) +#ifdef CONFIG_X86_64 +# define NR_IRQS (NR_VECTORS * NR_CPUS) +#else # define NR_IRQS 224 - -# if (224 >= 32 * NR_CPUS) -# define NR_IRQ_VECTORS NR_IRQS -# else -# define NR_IRQ_VECTORS (32 * NR_CPUS) -# endif +#endif # else /* IO_APIC || PARAVIRT */ # define NR_IRQS 16 -# define NR_IRQ_VECTORS NR_IRQS # endif #else /* !VISWS && !VOYAGER */ # define NR_IRQS 224 -# define NR_IRQ_VECTORS NR_IRQS #endif /* VISWS */ +#define NR_IRQ_VECTORS NR_IRQS + /* Voyager specific defines */ /* These define the CPIs we use in linux */ #define VIC_CPI_LEVEL0 0 Index: linux-2.6/arch/x86/kernel/io_apic_64.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/io_apic_64.c +++ linux-2.6/arch/x86/kernel/io_apic_64.c @@ -140,7 +140,8 @@ DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BU */ static struct irq_pin_list { - short apic, pin, next; + short apic, pin; + int next; } irq_2_pin[PIN_MAP_SIZE]; struct io_apic {