Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754220Ab1BBA5F (ORCPT ); Tue, 1 Feb 2011 19:57:05 -0500 Received: from mga09.intel.com ([134.134.136.24]:10285 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753544Ab1BBAoh (ORCPT ); Tue, 1 Feb 2011 19:44:37 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.60,412,1291622400"; d="scan'208";a="598622533" From: Andi Kleen References: <20110201443.618138584@firstfloor.org> In-Reply-To: <20110201443.618138584@firstfloor.org> To: kaneshige.kenji@jp.fujitsu.com, ak@linux.intel.com, suresh.b.siddha@intel.com, chrisw@sous-sol.org, hpa@linux.intel.com, gregkh@suse.de, linux-kernel@vger.kernel.org, stable@kernel.org Subject: [PATCH] [90/139] x86: Enable the intr-remap fault handling after local APIC setup Message-Id: <20110202004447.EEFC13E09BD@tassilo.jf.intel.com> Date: Tue, 1 Feb 2011 16:44:47 -0800 (PST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2824 Lines: 75 2.6.35-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Kenji Kaneshige commit 7f7fbf45c6b748074546f7f16b9488ca71de99c1 upstream. Interrupt-remapping gets enabled very early in the boot, as it determines the apic mode that the processor can use. And the current code enables the vt-d fault handling before the setup_local_APIC(). And hence the APIC LDR registers and data structure in the memory may not be initialized. So the vt-d fault handling in logical xapic/x2apic modes were broken. Fix this by enabling the vt-d fault handling in the end_local_APIC_setup() A cleaner fix of enabling fault handling while enabling intr-remapping will be addressed for v2.6.38. [ Enabling intr-remapping determines the usage of x2apic mode and the apic mode determines the fault-handling configuration. ] Signed-off-by: Kenji Kaneshige Signed-off-by: Andi Kleen LKML-Reference: <20101201062244.541996375@intel.com> Signed-off-by: Suresh Siddha Acked-by: Chris Wright Signed-off-by: H. Peter Anvin Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/apic/apic.c | 8 ++++++++ arch/x86/kernel/apic/probe_64.c | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) Index: linux-2.6.35.y/arch/x86/kernel/apic/apic.c =================================================================== --- linux-2.6.35.y.orig/arch/x86/kernel/apic/apic.c +++ linux-2.6.35.y/arch/x86/kernel/apic/apic.c @@ -1340,6 +1340,14 @@ void __cpuinit end_local_APIC_setup(void setup_apic_nmi_watchdog(NULL); apic_pm_activate(); + + /* + * Now that local APIC setup is completed for BP, configure the fault + * handling for interrupt remapping. + */ + if (!smp_processor_id() && intr_remapping_enabled) + enable_drhd_fault_handling(); + } #ifdef CONFIG_X86_X2APIC Index: linux-2.6.35.y/arch/x86/kernel/apic/probe_64.c =================================================================== --- linux-2.6.35.y.orig/arch/x86/kernel/apic/probe_64.c +++ linux-2.6.35.y/arch/x86/kernel/apic/probe_64.c @@ -76,13 +76,6 @@ void __init default_setup_apic_routing(v /* need to update phys_pkg_id */ apic->phys_pkg_id = apicid_phys_pkg_id; } - - /* - * Now that apic routing model is selected, configure the - * fault handling for intr remapping. - */ - if (intr_remapping_enabled) - enable_drhd_fault_handling(); } /* Same for both flat and physical. */ -- 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/