Skip to content

Commit 2c5b9bd

Browse files
jic23rafaeljw
authored andcommitted
ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3
In ACPI 6.3, the Memory Proximity Domain Attributes Structure changed substantially. One of those changes was that the flag for "Memory Proximity Domain field is valid" was deprecated. This was because the field "Proximity Domain for the Memory" became a required field and hence having a validity flag makes no sense. So the correct logic is to always assume the field is there. Current code assumes it never is. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 01aabca commit 2c5b9bd

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/acpi/numa/hmat.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
424424
pr_info("HMAT: Memory Flags:%04x Processor Domain:%u Memory Domain:%u\n",
425425
p->flags, p->processor_PD, p->memory_PD);
426426

427-
if (p->flags & ACPI_HMAT_MEMORY_PD_VALID && hmat_revision == 1) {
427+
if ((hmat_revision == 1 && p->flags & ACPI_HMAT_MEMORY_PD_VALID) ||
428+
hmat_revision > 1) {
428429
target = find_mem_target(p->memory_PD);
429430
if (!target) {
430431
pr_debug("HMAT: Memory Domain missing from SRAT\n");

0 commit comments

Comments
 (0)