diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2010-07-16 13:52:18 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2010-07-16 13:52:18 +0100 |
commit | b3625d1e2c5815e6d65a47197bebeae2061153ce (patch) | |
tree | 0b81045610df333d54d1e17b5d081ca08560b362 /xen/arch/x86/srat.c | |
parent | 1652d36bbe2108109159bf62ec11be2736351c02 (diff) | |
download | xen-b3625d1e2c5815e6d65a47197bebeae2061153ce.tar.gz xen-b3625d1e2c5815e6d65a47197bebeae2061153ce.tar.bz2 xen-b3625d1e2c5815e6d65a47197bebeae2061153ce.zip |
ACPI: add support for x2APIC ACPI extensions
All logical processors with APIC ID values of 255 and greater will
have their APIC reported through Processor X2APIC structure (type-9
entry type) and all logical processors with APIC ID less than 255 will
have their APIC reported through legacy Processor Local APIC (type-0
entry type) only. This is the same case even for NMI structure
reporting.
The Processor X2APIC Affinity structure provides the association
between the X2APIC ID of a logical processor and the proximity domain
to which the logical processor belongs.
This patch adds 2 new subtables to MADT and one new subtable to SRAT.
This patch also changes x86_acpiid_to_apicid from u8 to u32 for x2APIC
ID, and changes mp_register_lapic to accept 32-bit id. But there are
still some 8-bit apic id hardcode and assumptions in Xen code, it
needs to be fixed in future.
Signed-off-by: Weidong Han <weidong.han@intel.com>
Diffstat (limited to 'xen/arch/x86/srat.c')
-rw-r--r-- | xen/arch/x86/srat.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 5caeb6a683..63b8c2137d 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -164,6 +164,36 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) } #endif +/* Callback for Proximity Domain -> x2APIC mapping */ +void __init +acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) +{ + int pxm, node; + int apic_id; + + if (srat_disabled()) + return; + if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) { + bad_srat(); + return; + } + if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0) + return; + pxm = pa->proximity_domain; + node = setup_node(pxm); + if (node < 0) { + printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); + bad_srat(); + return; + } + + apic_id = pa->apic_id; + apicid_to_node[apic_id] = node; + acpi_numa = 1; + printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", + pxm, apic_id, node); +} + /* Callback for Proximity Domain -> LAPIC mapping */ void __init acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) |