From patchwork Mon Sep 7 14:03:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 249213 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp3730941ilg; Mon, 7 Sep 2020 07:08:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/ANt7c+YM2NEYn7myFA9gepA3jrNhZCGn4iqz5m5LFnxsaHb5ZB2ozXruKpAIAGwMWrCQ X-Received: by 2002:a17:906:474f:: with SMTP id j15mr22667700ejs.468.1599487705082; Mon, 07 Sep 2020 07:08:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599487705; cv=none; d=google.com; s=arc-20160816; b=BfKpnk37GeT0CWYnAG0cijb3h+WOKj90kbdL34UQHWGuwcBvPUvW2LUVBIQYzI/lm4 RPr3Fw6P75htE98klcwtlIqK2nIBdpNGr0jtHxVwy8AA+csO8PIwivejKCkCG7z3SgHZ AXoVSaoYsPk15lV9PXx0F0s5E6oOhxZUUZM6+bYq7OSAaPxlz2emmXr1ZU6fpaUC/HgZ RjnnvOFRhNgR0fztzq/BqzMK96WDsq+VlZAuY4TLismGWxJlyHSnRREp2tfH+Cm+rvha 5kjxSVj34sy3hNNxJp+vXTI1KW7CKGNlr+iqN5KE5TB7KGqeIggbBQWT1cdP4E/Trb0t L+vQ== 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=WfZpnrYpTOiUwSeE2Uh0jALpRWqeZW3IcniMAlJFu5g=; b=igTdoIQ2Bl+Rt+mKbpJG7qr2WIu/UTkf5F4yJLCDPm8zWS1nWHBo1vMGXNd5fLuwrb N60SDIHVHKZaNiiumnTx7H34h9rgYW8eSr9c0uQPE0L+JvwUOLTPzpGNQXPz/oMmeYHP ah7JhbIPKKV4uu3nYdEJOmSvYbl10n81ASa5jhuw0wIaCqoxQlBwe7zjF19TOltJC4sA HOhptTon8CAFfHoCm0cvYxmygM/BAaCENiJt61g0NZlncz7F7SVSzBQM+HCjf64ytLLV aAwdJaPp5bhTglCStRG1t2AUQswDhLwYGC2PnSBfTBw4pHDarxo86QyxQm34p7rqDmza JWjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j4si9343629eds.475.2020.09.07.07.08.24; Mon, 07 Sep 2020 07:08:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729786AbgIGOHw (ORCPT + 7 others); Mon, 7 Sep 2020 10:07:52 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:60372 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729778AbgIGOGt (ORCPT ); Mon, 7 Sep 2020 10:06:49 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id EA383C92ADD5C0558545; Mon, 7 Sep 2020 22:06:46 +0800 (CST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.487.0; Mon, 7 Sep 2020 22:06:39 +0800 From: Jonathan Cameron To: , , , , Lorenzo Pieralisi , , Ingo Molnar CC: Bjorn Helgaas , , Thomas Gleixner , , Dan Williams , Brice Goglin , "Sean V Kelley" , , "Hanjun Guo" , Jonathan Cameron Subject: [PATCH v10 4/6] ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3 Date: Mon, 7 Sep 2020 22:03:05 +0800 Message-ID: <20200907140307.571932-5-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200907140307.571932-1-Jonathan.Cameron@huawei.com> References: <20200907140307.571932-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 --- Changes for v10: * Reorder the checks so we confirm the version first before taking the ACPI_HMAT_MEMORY_PD_VALID into account. (Bjorn Helgaas) drivers/acpi/numa/hmat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.19.1 diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 2c32cfb72370..6a91a55229ae 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");