summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorJonathan Cameron <Jonathan.Cameron@huawei.com>2020-09-30 22:05:45 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-02 18:51:57 +0200
commit2c5b9bde95c96942f2873cea6ef383c02800e4a8 (patch)
tree390c8d1ba5ef9a6b14a6bdb845ec5acf00c687c9 /drivers/acpi
parent01aabca2fd545554905321029e6c4c5b2fedb345 (diff)
downloadlinux-stable-2c5b9bde95c96942f2873cea6ef383c02800e4a8.tar.gz
linux-stable-2c5b9bde95c96942f2873cea6ef383c02800e4a8.tar.bz2
linux-stable-2c5b9bde95c96942f2873cea6ef383c02800e4a8.zip
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/numa/hmat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c
index e7add2609c03..5264aee93642 100644
--- a/drivers/acpi/numa/hmat.c
+++ b/drivers/acpi/numa/hmat.c
@@ -424,7 +424,8 @@ static int __init hmat_parse_proximity_domain(union acpi_subtable_headers *heade
pr_info("HMAT: Memory Flags:%04x Processor Domain:%u Memory Domain:%u\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");