summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Goglin <Brice.Goglin@inria.fr>2019-10-28 10:11:18 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-11-07 15:46:52 +0100
commit4caa525b783b0abe7bc06e41220b337ba311bbf7 (patch)
treee070414ae0cb7c1af48d01c16755c227443afa06
parentcf8741ac57ed48613e49559d3e5ae43f56291e4c (diff)
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>
-rw-r--r--drivers/acpi/numa/hmat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c
index 1ce366a7bc55..42cafeaac336 100644
--- 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;