From patchwork Wed Aug 19 14:51:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 247965 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp535325ils; Wed, 19 Aug 2020 07:54:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3k7LMMG2IT5jXO2K6CY8E/arRTrXBGv0uo05zfOcTzccP84V8qnE9ayAmX1Vo6jmA5Br2 X-Received: by 2002:a05:6402:12c4:: with SMTP id k4mr24470417edx.358.1597848887364; Wed, 19 Aug 2020 07:54:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597848887; cv=none; d=google.com; s=arc-20160816; b=HgNqsH0NgKJyfPC2DGEZBHhA5U0/Q8nUhpLml878X2ugDS6MGoTea5UVXSretsATjT 11Lx84Ck1v1X6vcddzr3nWUgiXA1AQJsOEDow9xX57AeNWLBFZ1aavagVgP4zvZJ4/5L yBW/8qUMkTFdQv1B9/pkpCzMGlUDUi3M3qnss+mYCs5jNuhYKI0CDrnW1CEd5GI4Jc94 2aY3XIGihA5/JFTsLQQLjUjaDCtJHVienLyn/QKxKkYTUnsKNoCJmMMjnFI/sbBYF42h jijfyPo6ACCt5oVtlRgJHvP2jTzQs2/Vd3UzHdgEYPyAUOCQoOhvVoz085PRm+QKnNvm As2A== 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=Tgn3g1Z+bzDMJjcWQGUtOY0mH9m8T6Ht/wepem+3Eiga3D89pwoxgL5AIqSihFdi4x 4Iwza02NR0Qg2tbcB1eOX/eqRORaHn2JXrytDXAbA8XH3nTOjKvh3kliLRvMHFXNliuc qyIn+urOLgJQGhJqIpJkGN/LEr8l8z2ztrCrxRTPKWSHOTxWMRN6P4MZXfcgCIobRKIC yPj8jcL1voP+e4K6FBu8O4sXN4duFWP65ddKvRRh9eDv6w0d2qeSe+TgGTWt1CJ+0Nj+ 1vz2kqQdCCPg/BfarPfeH5041P/eRWdyk4wLX15ZH2UmsrQgr82MzGIVNwQ1CT9k4VMA jDyw== 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 m13si15447933edv.45.2020.08.19.07.54.47; Wed, 19 Aug 2020 07:54:47 -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 S1728060AbgHSOyn (ORCPT + 7 others); Wed, 19 Aug 2020 10:54:43 -0400 Received: from lhrrgout.huawei.com ([185.176.76.210]:2671 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727827AbgHSOym (ORCPT ); Wed, 19 Aug 2020 10:54:42 -0400 Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.108]) by Forcepoint Email with ESMTP id 032C127994B91CF0FFE4; Wed, 19 Aug 2020 15:54:41 +0100 (IST) Received: from lhrphicprd00229.huawei.com (10.123.41.22) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Wed, 19 Aug 2020 15:54:40 +0100 From: Jonathan Cameron To: , , , CC: Lorenzo Pieralisi , Bjorn Helgaas , , , Ingo Molnar , Thomas Gleixner , , Dan Williams , Brice Goglin , Sean V Kelley , , Jonathan Cameron Subject: [PATCH v9 4/6] ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3 Date: Wed, 19 Aug 2020 22:51:09 +0800 Message-ID: <20200819145111.1715026-5-Jonathan.Cameron@huawei.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20200819145111.1715026-1-Jonathan.Cameron@huawei.com> References: <20200819145111.1715026-1-Jonathan.Cameron@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.123.41.22] X-ClientProxiedBy: lhreml741-chm.china.huawei.com (10.201.108.191) To lhreml710-chm.china.huawei.com (10.201.108.61) 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");