From patchwork Mon Dec 16 15:38:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 181735 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp4457145och; Mon, 16 Dec 2019 07:39:25 -0800 (PST) X-Google-Smtp-Source: APXvYqz10WVURHABEHLM/rPWJ4PyPd5E7sO3Id0InV+26oHzjAu1ULR9nx5CkCrKs7AHHCz7HJ0l X-Received: by 2002:a9d:7:: with SMTP id 7mr30571300ota.26.1576510765205; Mon, 16 Dec 2019 07:39:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576510765; cv=none; d=google.com; s=arc-20160816; b=DM2ZDCd5Id0/ueZ8s2q14g5ikzVLfiquKDKrBhfvPH6P1a2ToClnkz5BC0oLFadw8i oRlN8TPdCA/a00y1OMKZsC4Ebl5geVbS1yQYeQcwbgWUPjfschpNtDzwc84CMr+bGMhM UMTwFz3USduxw16j0wP8crEqbt9MhdZflPMQx5hOzHknS2eT3FlOM/S/t9J3c3FfPuPT p9a7TxGRFs6oB6I0R6QDjGVJSyz4uyVBHR696ANh8By/SZ4LUqzhmsmZ8JWC/CfTE5Zd +haX2J6NX9e4k0lXyAiFsxaWFtouZKy5DOH6rRawtvHPdc16c9QJJAmVSxRssM/TPk7B 4XIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=mbxLlEWIUQzEcWeGGGAuTvzr4aHzAeYjxzFInWevZGM=; b=fpXL/f19MP9JNV6/plPT+tZDr7eE9nunVaumT5cUiS23CwpnD9xzmmuojiOzpqPEDX TsYF56871B6gTua//n1le62Bh6Md/kDSqzR44cY8Utajw86WBKRuMmW9b9Akjy5zd6hN KBcdiBhYjM9xQUiCZJfZojGD3Upi2C/ZPj7LRJdGpiRrkq2P6igpWNnU8PukeohuOK4B +48Z3NwFa5Hgd/AbKWbT4RS8vkihhLYVl98rojFNRfW17JXckJs3gtAdMO9K3zZevunS 4NRhfOu/N5d798+36wAHTERRJ3bK46rPlgbzQTyggdTJIQk2N9SSaLWwqLfRr9eo6oGP sKiQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r83si596009oie.64.2019.12.16.07.39.25; Mon, 16 Dec 2019 07:39:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728528AbfLPPjY (ORCPT + 7 others); Mon, 16 Dec 2019 10:39:24 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:46242 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728337AbfLPPjY (ORCPT ); Mon, 16 Dec 2019 10:39:24 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 8A993EC629902585DC1E; Mon, 16 Dec 2019 23:39:18 +0800 (CST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.439.0; Mon, 16 Dec 2019 23:39:09 +0800 From: Jonathan Cameron To: , , , , CC: Keith Busch , , "Rafael J . Wysocki" , , Andrew Morton , Dan Williams , Tao Xu , Brice Goglin , Lorenzo Pieralisi , Hanjun Guo , Sudeep Holla , Jonathan Cameron Subject: [PATCH V6 5/7] ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3 Date: Mon, 16 Dec 2019 23:38:07 +0800 Message-ID: <20191216153809.105463-6-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20191216153809.105463-1-Jonathan.Cameron@huawei.com> References: <20191216153809.105463-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- drivers/acpi/numa/hmat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.1 diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 2c32cfb72370..07cfe50136e0 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -424,7 +424,7 @@ 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 ((p->flags & ACPI_HMAT_MEMORY_PD_VALID && hmat_revision == 1) || hmat_revision == 2) { target = find_mem_target(p->memory_PD); if (!target) { pr_debug("HMAT: Memory Domain missing from SRAT\n");