From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCBA1C432C3 for ; Mon, 2 Dec 2019 07:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 932B3214AF for ; Mon, 2 Dec 2019 07:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726350AbfLBHDy (ORCPT ); Mon, 2 Dec 2019 02:03:54 -0500 Received: from mga03.intel.com ([134.134.136.65]:4373 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725965AbfLBHDy (ORCPT ); Mon, 2 Dec 2019 02:03:54 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 23:03:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="207980148" Received: from tao-optiplex-7060.sh.intel.com ([10.239.159.36]) by fmsmga008.fm.intel.com with ESMTP; 01 Dec 2019 23:03:51 -0800 From: Tao Xu To: rafael.j.wysocki@intel.com, lenb@kernel.org, keith.busch@intel.com, gregkh@linuxfoundation.org, dan.j.williams@intel.com, dave.hansen@linux.intel.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Tao Xu Subject: [PATCH] ACPI/HMAT: Fix the parsing of Cache Associativity and Write Policy Date: Mon, 2 Dec 2019 15:03:48 +0800 Message-Id: <20191202070348.32148-1-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In chapter 5.2.27.5, Table 5-147: Field "Cache Attributes" of ACPI 6.3 spec: 0 is "None", 1 is "Direct Mapped", 2 is "Complex Cache Indexing" for Cache Associativity; 0 is "None", 1 is "Write Back", 2 is "Write Through" for Write Policy. Signed-off-by: Tao Xu --- drivers/acpi/numa/hmat.c | 4 ++-- include/linux/node.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/numa/hmat.c b/drivers/acpi/numa/hmat.c index 2c32cfb72370..719d0279563d 100644 --- a/drivers/acpi/numa/hmat.c +++ b/drivers/acpi/numa/hmat.c @@ -383,7 +383,7 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header, break; case ACPI_HMAT_CA_NONE: default: - tcache->cache_attrs.indexing = NODE_CACHE_OTHER; + tcache->cache_attrs.indexing = NODE_CACHE_NONE; break; } @@ -396,7 +396,7 @@ static __init int hmat_parse_cache(union acpi_subtable_headers *header, break; case ACPI_HMAT_CP_NONE: default: - tcache->cache_attrs.write_policy = NODE_CACHE_WRITE_OTHER; + tcache->cache_attrs.write_policy = NODE_CACHE_WRITE_NONE; break; } list_add_tail(&tcache->node, &target->caches); diff --git a/include/linux/node.h b/include/linux/node.h index 4866f32a02d8..6dbd764d09ce 100644 --- a/include/linux/node.h +++ b/include/linux/node.h @@ -36,15 +36,15 @@ struct node_hmem_attrs { }; enum cache_indexing { + NODE_CACHE_NONE, NODE_CACHE_DIRECT_MAP, NODE_CACHE_INDEXED, - NODE_CACHE_OTHER, }; enum cache_write_policy { + NODE_CACHE_WRITE_NONE, NODE_CACHE_WRITE_BACK, NODE_CACHE_WRITE_THROUGH, - NODE_CACHE_WRITE_OTHER, }; /** -- 2.20.1