ACPI: HMAT: don't mix pxm and nid when setting memory target processor_pxm

On systems where PXMs and nids are in different order, memory initiators
exposed in sysfs could be wrong: On dual-socket CLX with SNC enabled
(4 nodes, 1 and 2 swapped between PXMs and nids), node1 would only
get node2 as initiator, and node2 would only get node1.

With this patch, we get node1 as the only initiator of itself,
and node2 as the only initiator of itself, as expected.

This should likely go to stable up to 5.2.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c
index 1ce366a7bc558970fef9eb8f3f0fe2cf3e5b8c34..42cafeaac336bcac73a4f6ead4113496d0f495b3 100644 (file)
--- a/drivers/acpi/numa/hmat.c
+++ b/drivers/acpi/numa/hmat.c
@@ -438,7 +438,7 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
                        pr_debug("HMAT: Invalid Processor Domain\n");
                        return -EINVAL;
                }
-               target->processor_pxm = p_node;
+               target->processor_pxm = p->processor_PD;
        }
 
        return 0;