All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
To: <linux-mm@kvack.org>, <linux-acpi@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>, <x86@kernel.org>
Cc: Keith Busch <keith.busch@intel.com>, <jglisse@redhat.com>,
	"Rafael J . Wysocki" <rjw@rjwysocki.net>, <linuxarm@huawei.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Dan Williams <dan.j.williams@intel.com>,
	Tao Xu <tao3.xu@intel.com>, Brice Goglin <brice.goglin@gmail.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Hanjun Guo <guohanjun@huawei.com>,
	Sudeep Holla <sudeep.holla@arm.com>,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>
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	[thread overview]
Message-ID: <20191216153809.105463-6-Jonathan.Cameron@huawei.com> (raw)
In-Reply-To: <20191216153809.105463-1-Jonathan.Cameron@huawei.com>

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>
---
 drivers/acpi/numa/hmat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
-- 
2.19.1


WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
To: <linux-mm@kvack.org>, <linux-acpi@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>, <x86@kernel.org>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Brice Goglin <brice.goglin@gmail.com>, Tao Xu <tao3.xu@intel.com>,
	Sudeep Holla <sudeep.holla@arm.com>,
	"Rafael J . Wysocki" <rjw@rjwysocki.net>,
	linuxarm@huawei.com, Keith Busch <keith.busch@intel.com>,
	jglisse@redhat.com,
	Jonathan Cameron <Jonathan.Cameron@huawei.com>,
	Hanjun Guo <guohanjun@huawei.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Andrew Morton <akpm@linux-foundation.org>
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	[thread overview]
Message-ID: <20191216153809.105463-6-Jonathan.Cameron@huawei.com> (raw)
In-Reply-To: <20191216153809.105463-1-Jonathan.Cameron@huawei.com>

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>
---
 drivers/acpi/numa/hmat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
-- 
2.19.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-12-16 15:39 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-16 15:38 [PATCH V6 0/7] ACPI: Support Generic Initiator proximity domains Jonathan Cameron
2019-12-16 15:38 ` Jonathan Cameron
2019-12-16 15:38 ` [PATCH V6 1/7] ACPI: Support Generic Initiator only domains Jonathan Cameron
2019-12-16 15:38   ` Jonathan Cameron
2019-12-16 15:38 ` [PATCH V6 2/7] arm64: " Jonathan Cameron
2019-12-16 15:38   ` Jonathan Cameron
2019-12-16 15:38 ` [PATCH V6 3/7] x86: Support Generic Initiator only proximity domains Jonathan Cameron
2019-12-16 15:38   ` Jonathan Cameron
2019-12-16 15:38 ` [PATCH V6 4/7] ACPI: Let ACPI know we support Generic Initiator Affinity Structures Jonathan Cameron
2019-12-16 15:38   ` Jonathan Cameron
2019-12-16 15:38 ` Jonathan Cameron [this message]
2019-12-16 15:38   ` [PATCH V6 5/7] ACPI: HMAT: Fix handling of changes from ACPI 6.2 to ACPI 6.3 Jonathan Cameron
2019-12-16 15:38 ` [PATCH V6 6/7] node: Add access1 class to represent CPU to memory characteristics Jonathan Cameron
2019-12-16 15:38   ` Jonathan Cameron
2019-12-16 15:38 ` [PATCH V6 7/7] docs: mm: numaperf.rst Add brief description for access class 1 Jonathan Cameron
2019-12-16 15:38   ` Jonathan Cameron
2019-12-18 11:34   ` Brice Goglin
2019-12-18 11:34     ` Brice Goglin
2019-12-18 14:37     ` Jonathan Cameron
2019-12-18 14:37       ` Jonathan Cameron
2019-12-18 11:32 ` [PATCH V6 0/7] ACPI: Support Generic Initiator proximity domains Brice Goglin
2019-12-18 11:32   ` Brice Goglin
2019-12-18 14:50   ` Jonathan Cameron
2019-12-18 14:50     ` Jonathan Cameron
2019-12-20 21:40     ` Brice Goglin
2019-12-20 21:40       ` Brice Goglin
2020-01-02 15:27       ` Jonathan Cameron
2020-01-02 15:27         ` Jonathan Cameron
2020-01-02 21:37         ` Brice Goglin
2020-01-02 21:37           ` Brice Goglin
2020-01-03 10:09           ` Jonathan Cameron
2020-01-03 10:09             ` Jonathan Cameron
2020-01-03 12:18             ` Brice Goglin
2020-01-03 12:18               ` Brice Goglin
2020-01-03 13:08               ` Jonathan Cameron
2020-01-03 13:08                 ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191216153809.105463-6-Jonathan.Cameron@huawei.com \
    --to=jonathan.cameron@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=brice.goglin@gmail.com \
    --cc=dan.j.williams@intel.com \
    --cc=guohanjun@huawei.com \
    --cc=jglisse@redhat.com \
    --cc=keith.busch@intel.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxarm@huawei.com \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=rjw@rjwysocki.net \
    --cc=sudeep.holla@arm.com \
    --cc=tao3.xu@intel.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.