Commit cf5a6124 authored Sep 30, 2020 by Jonathan Cameron Committed by Greg Kroah-Hartman Nov 05, 2020

ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3



[ Upstream commit 2c5b9bde95c96942f2873cea6ef383c02800e4a8 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 37464a8a

drivers/acpi/hmat/hmat.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,8 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
		pr_info("HMAT: Memory Flags:%04x Processor Domain:%d Memory Domain:%d\n",
		p->flags, p->processor_PD, p->memory_PD);

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