| From cd298f60a2451a16e0f077404bf69b62ec868733 Mon Sep 17 00:00:00 2001 |
| From: Kurt Garloff <kurt@garloff.de> |
| Date: Tue, 17 Jan 2012 04:20:31 -0500 |
| Subject: ACPI, x86: Use SRAT table rev to use 8bit or 32bit PXM fields (x86/x86-64) |
| |
| From: Kurt Garloff <kurt@garloff.de> |
| |
| commit cd298f60a2451a16e0f077404bf69b62ec868733 upstream. |
| |
| In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides |
| 32bits for these. The new fields were reserved before. |
| According to the ACPI spec, the OS must disregrard reserved fields. |
| |
| x86/x86-64 was rather inconsistent prior to this patch; it used 8 bits |
| for the pxm field in cpu_affinity, but 32 bits in mem_affinity. |
| This patch makes it consistent: Either use 8 bits consistently (SRAT |
| rev 1 or lower) or 32 bits (SRAT rev 2 or higher). |
| |
| cc: x86@kernel.org |
| Signed-off-by: Kurt Garloff <kurt@garloff.de> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/mm/srat.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/arch/x86/mm/srat.c |
| +++ b/arch/x86/mm/srat.c |
| @@ -104,6 +104,8 @@ acpi_numa_processor_affinity_init(struct |
| if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0) |
| return; |
| pxm = pa->proximity_domain_lo; |
| + if (acpi_srat_revision >= 2) |
| + pxm |= *((unsigned int*)pa->proximity_domain_hi) << 8; |
| node = setup_node(pxm); |
| if (node < 0) { |
| printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); |
| @@ -155,6 +157,8 @@ acpi_numa_memory_affinity_init(struct ac |
| start = ma->base_address; |
| end = start + ma->length; |
| pxm = ma->proximity_domain; |
| + if (acpi_srat_revision <= 1) |
| + pxm &= 0xff; |
| node = setup_node(pxm); |
| if (node < 0) { |
| printk(KERN_ERR "SRAT: Too many proximity domains.\n"); |
