]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
ACPI / SRAT: fix SRAT parsing order with both LAPIC and X2APIC present
authorLukasz Anaczkowski <lukasz.anaczkowski@intel.com>
Thu, 21 Apr 2016 09:29:00 +0000 (11:29 +0200)
committerKamal Mostafa <kamal@canonical.com>
Thu, 15 Sep 2016 16:34:48 +0000 (09:34 -0700)
commitee67b864bce95cbfaf6034d46233db6fed374365
tree5b4b004418f65ecbcbe613933c0fe5eed31d5f67
parent5632139edeb1e93f3497537d18da149fec827a5d
ACPI / SRAT: fix SRAT parsing order with both LAPIC and X2APIC present

BugLink: http://bugs.launchpad.net/bugs/1621113
commit 702b07fcc9b264c9afd372676bbdd50a762dcde0 upstream.

SRAT maps APIC ID to proximity domains ids (PXM). Mapping from PXM to
NUMA node ids is based on order of entries in SRAT table.
SRAT table has just LAPIC entires or mix of LAPIC and X2APIC entries.
As long as there are only LAPIC entires, mapping from proximity domain
id to NUMA node id is as assumed by BIOS. However, once APIC entries are
mixed, X2APIC entries would be first mapped which causes unexpected NUMA
node mapping.

To fix that, change parsing to check each entry against both LAPIC and
X2APIC so mapping is in the SRAT/PXM order.

This is supplemental change to the fix made by commit d81056b5278
(Handle apic/x2apic entries in MADT in correct order) and using the
mechanism introduced by 9b3fedd (ACPI / tables: Add acpi_subtable_proc
to ACPI table parsers).

Fixes: d81056b5278 (Handle apic/x2apic entries in MADT in correct order)
Signed-off-by: Lukasz Anaczkowski <lukasz.anaczkowski@intel.com>
[ rjw : Subject & changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
drivers/acpi/numa.c