Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758879Ab0APDI4 (ORCPT ); Fri, 15 Jan 2010 22:08:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758865Ab0APDIy (ORCPT ); Fri, 15 Jan 2010 22:08:54 -0500 Received: from sca-es-mail-2.Sun.COM ([192.18.43.133]:33984 "EHLO sca-es-mail-2.sun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758863Ab0APDIZ (ORCPT ); Fri, 15 Jan 2010 22:08:25 -0500 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Date: Fri, 15 Jan 2010 19:07:05 -0800 From: Yinghai Lu Subject: [PATCH 34/37] x86: using logical flat for amd cpu too. In-reply-to: <1263611228-6751-1-git-send-email-yinghai@kernel.org> To: Ingo Molnar , Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , Jesse Barnes , Christoph Lameter Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Yinghai Lu Message-id: <1263611228-6751-35-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.6.4.2 References: <1263611228-6751-1-git-send-email-yinghai@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org not sure it works again, could be bios fix the irq routing dest ? tested that amd support logical flat too when cpus num <= 8 and even bsp apic id > 8 so could remove vendor check... Signed-off-by: Yinghai Lu --- arch/x86/kernel/apic/apic.c | 11 ++--------- arch/x86/kernel/apic/probe_64.c | 13 ++----------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index aa57c07..c5f4906 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1898,15 +1898,8 @@ void __cpuinit generic_processor_info(int apicid, int version) max_physical_apicid = apicid; #ifdef CONFIG_X86_32 - switch (boot_cpu_data.x86_vendor) { - case X86_VENDOR_INTEL: - if (num_processors > 8) - def_to_bigsmp = 1; - break; - case X86_VENDOR_AMD: - if (max_physical_apicid >= 8) - def_to_bigsmp = 1; - } + if (num_processors > 8) + def_to_bigsmp = 1; #endif #if defined(CONFIG_SMP) || defined(CONFIG_X86_64) diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c index c4cbd30..0a428dd 100644 --- a/arch/x86/kernel/apic/probe_64.c +++ b/arch/x86/kernel/apic/probe_64.c @@ -67,17 +67,8 @@ void __init default_setup_apic_routing(void) } #endif - if (apic == &apic_flat) { - switch (boot_cpu_data.x86_vendor) { - case X86_VENDOR_INTEL: - if (num_processors > 8) - apic = &apic_physflat; - break; - case X86_VENDOR_AMD: - if (max_physical_apicid >= 8) - apic = &apic_physflat; - } - } + if (apic == &apic_flat && num_processors > 8) + apic = &apic_physflat; printk(KERN_INFO "Setting APIC routing to %s\n", apic->name); -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/