7f7fbf45c6
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 <kaneshige.kenji@jp.fujitsu.com> LKML-Reference: <20101201062244.541996375@intel.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Cc: stable@kernel.org [v2.6.32+] Acked-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
105 lines
2.2 KiB
C
105 lines
2.2 KiB
C
/*
|
|
* Copyright 2004 James Cleverdon, IBM.
|
|
* Subject to the GNU Public License, v.2
|
|
*
|
|
* Generic APIC sub-arch probe layer.
|
|
*
|
|
* Hacked for x86-64 by James Cleverdon from i386 architecture code by
|
|
* Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and
|
|
* James Cleverdon.
|
|
*/
|
|
#include <linux/threads.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/string.h>
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/init.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/dmar.h>
|
|
|
|
#include <asm/smp.h>
|
|
#include <asm/apic.h>
|
|
#include <asm/ipi.h>
|
|
#include <asm/setup.h>
|
|
|
|
extern struct apic apic_flat;
|
|
extern struct apic apic_physflat;
|
|
extern struct apic apic_x2xpic_uv_x;
|
|
extern struct apic apic_x2apic_phys;
|
|
extern struct apic apic_x2apic_cluster;
|
|
|
|
struct apic __read_mostly *apic = &apic_flat;
|
|
EXPORT_SYMBOL_GPL(apic);
|
|
|
|
static struct apic *apic_probe[] __initdata = {
|
|
#ifdef CONFIG_X86_UV
|
|
&apic_x2apic_uv_x,
|
|
#endif
|
|
#ifdef CONFIG_X86_X2APIC
|
|
&apic_x2apic_phys,
|
|
&apic_x2apic_cluster,
|
|
#endif
|
|
&apic_physflat,
|
|
NULL,
|
|
};
|
|
|
|
static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
|
|
{
|
|
return hard_smp_processor_id() >> index_msb;
|
|
}
|
|
|
|
/*
|
|
* Check the APIC IDs in bios_cpu_apicid and choose the APIC mode.
|
|
*/
|
|
void __init default_setup_apic_routing(void)
|
|
{
|
|
|
|
enable_IR_x2apic();
|
|
|
|
#ifdef CONFIG_X86_X2APIC
|
|
if (x2apic_mode
|
|
#ifdef CONFIG_X86_UV
|
|
&& apic != &apic_x2apic_uv_x
|
|
#endif
|
|
) {
|
|
if (x2apic_phys)
|
|
apic = &apic_x2apic_phys;
|
|
else
|
|
apic = &apic_x2apic_cluster;
|
|
}
|
|
#endif
|
|
|
|
if (apic == &apic_flat && num_possible_cpus() > 8)
|
|
apic = &apic_physflat;
|
|
|
|
printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
|
|
|
|
if (is_vsmp_box()) {
|
|
/* need to update phys_pkg_id */
|
|
apic->phys_pkg_id = apicid_phys_pkg_id;
|
|
}
|
|
}
|
|
|
|
/* Same for both flat and physical. */
|
|
|
|
void apic_send_IPI_self(int vector)
|
|
{
|
|
__default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
|
|
}
|
|
|
|
int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; apic_probe[i]; ++i) {
|
|
if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
|
|
apic = apic_probe[i];
|
|
printk(KERN_INFO "Setting APIC routing to %s.\n",
|
|
apic->name);
|
|
return 1;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|