From: Kenji Kaneshige <[email protected]>
Subject: x86: enable the intr-remap fault handling after local apic setup
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 <[email protected]>
Signed-off-by: Suresh Siddha <[email protected]>
Cc: [email protected] [v2.6.32+]
---
arch/x86/kernel/apic/apic.c | 8 ++++++++
arch/x86/kernel/apic/probe_64.c | 7 -------
2 files changed, 8 insertions(+), 7 deletions(-)
Index: tip/arch/x86/kernel/apic/apic.c
===================================================================
--- tip.orig/arch/x86/kernel/apic/apic.c
+++ tip/arch/x86/kernel/apic/apic.c
@@ -1384,6 +1384,14 @@ void __cpuinit end_local_APIC_setup(void
#endif
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: tip/arch/x86/kernel/apic/probe_64.c
===================================================================
--- tip.orig/arch/x86/kernel/apic/probe_64.c
+++ tip/arch/x86/kernel/apic/probe_64.c
@@ -79,13 +79,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. */
* Suresh Siddha ([email protected]) wrote:
> From: Kenji Kaneshige <[email protected]>
> Subject: x86: enable the intr-remap fault handling after local apic setup
>
> 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 <[email protected]>
> Signed-off-by: Suresh Siddha <[email protected]>
Acked-by: Chris Wright <[email protected]>
Commit-ID: 7f7fbf45c6b748074546f7f16b9488ca71de99c1
Gitweb: http://git.kernel.org/tip/7f7fbf45c6b748074546f7f16b9488ca71de99c1
Author: Kenji Kaneshige <[email protected]>
AuthorDate: Tue, 30 Nov 2010 22:22:28 -0800
Committer: H. Peter Anvin <[email protected]>
CommitDate: Mon, 13 Dec 2010 16:53:32 -0800
x86: Enable the intr-remap fault handling after local APIC setup
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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Suresh Siddha <[email protected]>
Cc: [email protected] [v2.6.32+]
Acked-by: Chris Wright <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/apic/apic.c | 8 ++++++++
arch/x86/kernel/apic/probe_64.c | 7 -------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 3f838d5..7821813 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -1389,6 +1389,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
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index f9e4e6a..d8c4a6f 100644
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -79,13 +79,6 @@ void __init default_setup_apic_routing(void)
/* 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. */