Attachment 311832 Details for Bug 455428 – Upstream fix for this issue

[patch] Upstream fix for this issue

387 (text/plain), 7.33 KB, created by Prarit Bhargava on 2008-07-15 14:11:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-07-15 14:11:22 UTC

Size: 7.33 KB

patch

obsolete

>Return-path: <git-commits-head-owner@vger.kernel.org>
>Envelope-to: arjan@infradead.org
>Delivery-date: Fri, 18 Apr 2008 17:38:46 +0000
>Received: from vger.kernel.org ([209.132.176.167])
>	by pentafluge.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux))
>	id 1JmuXt-0000Rw-TO
>	for arjan@infradead.org; Fri, 18 Apr 2008 17:38:46 +0000
>Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
>	id S1754274AbYDRRip (ORCPT <rfc822;arjan@infradead.org>);
>	Fri, 18 Apr 2008 13:38:45 -0400
>Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754607AbYDRRip
>	(ORCPT <rfc822;git-commits-head-outgoing>);
>	Fri, 18 Apr 2008 13:38:45 -0400
>Received: from hera.kernel.org ([140.211.167.34]:50044 "EHLO hera.kernel.org"
>	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
>	id S1754274AbYDRRio (ORCPT
>	<rfc822;git-commits-head@vger.kernel.org>);
>	Fri, 18 Apr 2008 13:38:44 -0400
>Received: from hera.kernel.org (IDENT:U2FsdGVkX1+5D0ES1x/6b3pNmud6wXXoF3SjN6myHvQ@localhost [127.0.0.1])
>	by hera.kernel.org (8.13.8/8.13.8) with ESMTP id m3IHcdjJ010551
>	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
>	for <git-commits-head@vger.kernel.org>; Fri, 18 Apr 2008 17:38:39 GMT
>Received: (from dwmw2@localhost)
>	by hera.kernel.org (8.13.8/8.13.1/Submit) id m3IHccPV010535
>	for git-commits-head@vger.kernel.org; Fri, 18 Apr 2008 17:38:38 GMT
>Date:	Fri, 18 Apr 2008 17:38:38 GMT
>Message-Id: <200804181738.m3IHccPV010535@hera.kernel.org>
>From:	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
>To:	git-commits-head@vger.kernel.org
>Subject: x86: don't set IO APIC features if IO APIC is not enabled
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>X-Git-Commit: 61048c6328819b0973ef662f6d46f2e2bc753ceb
>X-Git-Parent: 16ecf7a47cf4f1c97189a551b001195aed550cc2
>X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00
>	autolearn=ham version=3.2.3
>X-Spam-Checker-Version:	SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org
>Sender:	git-commits-head-owner@vger.kernel.org
>Precedence: bulk
>List-ID: <git-commits-head.vger.kernel.org>
>X-Mailing-List:	git-commits-head@vger.kernel.org
>
>Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=61048c6328819b0973ef662f6d46f2e2bc753ceb
>Commit:     61048c6328819b0973ef662f6d46f2e2bc753ceb
>Parent:     16ecf7a47cf4f1c97189a551b001195aed550cc2
>Author:     Alexey Starikovskiy <astarikovskiy@suse.de>
>AuthorDate: Fri Apr 4 23:41:07 2008 +0400
>Committer:  Ingo Molnar <mingo@elte.hu>
>CommitDate: Thu Apr 17 17:41:34 2008 +0200
>
>    x86: don't set IO APIC features if IO APIC is not enabled
>    
>    Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>---
> arch/x86/kernel/mpparse_32.c             |   24 +++++++++++++++++++++---
> include/asm-x86/mach-default/mach_apic.h |    2 ++
> include/asm-x86/mpspec.h                 |    3 ---
> 3 files changed, 23 insertions(+), 6 deletions(-)
>
>diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
>index 4f4cfad..09cb778 100644
>--- a/arch/x86/kernel/mpparse_32.c
>+++ b/arch/x86/kernel/mpparse_32.c
>@@ -221,6 +221,8 @@ static void __init MP_bus_info (struct mpc_config_bus *m)
> 	}
> }
> 
>+#ifdef CONFIG_X86_IO_APIC
>+
> static int bad_ioapic(unsigned long address)
> {
> 	if (nr_ioapics >= MAX_IO_APICS) {
>@@ -263,6 +265,8 @@ static void __init MP_intsrc_info (struct mpc_config_intsrc *m)
> 		panic("Max # of irq sources exceeded!!\n");
> }
> 
>+#endif
>+
> static void __init MP_lintsrc_info (struct mpc_config_lintsrc *m)
> {
> 	Dprintk("Lint: type %d, pol %d, trig %d, bus %d,"
>@@ -421,21 +425,25 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
> 			}
> 			case MP_IOAPIC:
> 			{
>+#ifdef CONFIG_X86_IO_APIC
> 				struct mpc_config_ioapic *m=
> 					(struct mpc_config_ioapic *)mpt;
> 				MP_ioapic_info(m);
> 				mpt+=sizeof(*m);
> 				count+=sizeof(*m);
>+#endif
> 				break;
> 			}
> 			case MP_INTSRC:
> 			{
>+#ifdef CONFIG_X86_IO_APIC
> 				struct mpc_config_intsrc *m=
> 					(struct mpc_config_intsrc *)mpt;
> 
> 				MP_intsrc_info(m);
> 				mpt+=sizeof(*m);
> 				count+=sizeof(*m);
>+#endif
> 				break;
> 			}
> 			case MP_LINTSRC:
>@@ -463,6 +471,8 @@ static int __init smp_read_mpc(struct mp_config_table *mpc)
> 	return num_processors;
> }
> 
>+#ifdef CONFIG_X86_IO_APIC
>+
> static int __init ELCR_trigger(unsigned int irq)
> {
> 	unsigned int port;
>@@ -537,11 +547,15 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
> 	MP_intsrc_info(&intsrc);
> }
> 
>+#endif
>+
> static inline void __init construct_default_ISA_mptable(int mpc_default_type)
> {
> 	struct mpc_config_processor processor;
> 	struct mpc_config_bus bus;
>+#ifdef CONFIG_X86_IO_APIC
> 	struct mpc_config_ioapic ioapic;
>+#endif
> 	struct mpc_config_lintsrc lintsrc;
> 	int linttypes[2] = { mp_ExtINT, mp_NMI };
> 	int i;
>@@ -597,6 +611,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
> 		MP_bus_info(&bus);
> 	}
> 
>+#ifdef CONFIG_X86_IO_APIC
> 	ioapic.mpc_type = MP_IOAPIC;
> 	ioapic.mpc_apicid = 2;
> 	ioapic.mpc_apicver = mpc_default_type > 4 ? 0x10 : 0x01;
>@@ -608,7 +623,7 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
> 	 * We set up most of the low 16 IO-APIC pins according to MPS rules.
> 	 */
> 	construct_default_ioirq_mptable(mpc_default_type);
>-
>+#endif
> 	lintsrc.mpc_type = MP_LINTSRC;
> 	lintsrc.mpc_irqflag = 0;		/* conforming */
> 	lintsrc.mpc_srcbusid = 0;
>@@ -670,6 +685,8 @@ void __init get_smp_config (void)
> 			printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n");
> 			return;
> 		}
>+
>+#ifdef CONFIG_X86_IO_APIC
> 		/*
> 		 * If there are no explicit MP IRQ entries, then we are
> 		 * broken.  We set up most of the low 16 IO-APIC pins to
>@@ -687,7 +704,7 @@ void __init get_smp_config (void)
> 
> 			construct_default_ioirq_mptable(0);
> 		}
>-
>+#endif
> 	} else
> 		BUG();
> 
>@@ -967,8 +984,9 @@ void __init mp_config_acpi_legacy_irqs (void)
> 	intsrc.mpc_type = MP_INTSRC;
> 	intsrc.mpc_irqflag = 0;					/* Conforming */
> 	intsrc.mpc_srcbus = MP_ISA_BUS;
>+#ifdef CONFIG_X86_IO_APIC
> 	intsrc.mpc_dstapic = mp_ioapics[ioapic].mpc_apicid;
>-
>+#endif
> 	/* 
> 	 * Use the default configuration for the IRQs 0-15.  Unless
> 	 * overridden by (MADT) interrupt source override entries.
>diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h
>index 14217a9..0a6634f 100644
>--- a/include/asm-x86/mach-default/mach_apic.h
>+++ b/include/asm-x86/mach-default/mach_apic.h
>@@ -69,8 +69,10 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
> 
> static inline void setup_apic_routing(void)
> {
>+#ifdef CONFIG_X86_IO_APIC
> 	printk("Enabling APIC mode:  %s.  Using %d I/O APICs\n",
> 					"Flat", nr_ioapics);
>+#endif
> }
> 
> static inline int apicid_to_node(int logical_apicid)
>diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
>index 1f6445b..08cc5e0 100644
>--- a/include/asm-x86/mpspec.h
>+++ b/include/asm-x86/mpspec.h
>@@ -36,9 +36,6 @@ extern int mp_bus_id_to_pci_bus[MAX_MP_BUSSES];
> 
> extern unsigned int boot_cpu_physical_apicid;
> extern int smp_found_config;
>-extern int nr_ioapics;
>-extern int mp_irq_entries;
>-extern struct mpc_config_intsrc mp_irqs[MAX_IRQ_SOURCES];
> extern int mpc_default_type;
> extern unsigned long mp_lapic_addr;
> 
>--
>To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Actions: View | Diff

Attachments on bug 455428: 311832