From: Erik Kaneda <erik.kaneda@intel.com>
To: "Rafael J . Wysocki" <rafael@kernel.org>,
ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: Maximilian Luz <luzmaximilian@gmail.com>,
Bob Moore <robert.moore@intel.com>,
Erik Kaneda <erik.kaneda@intel.com>
Subject: [PATCH v2 1/9] ACPICA: Fix exception code class checks
Date: Thu, 21 Jan 2021 16:23:49 -0800 [thread overview]
Message-ID: <20210122002357.370836-2-erik.kaneda@intel.com> (raw)
In-Reply-To: <20210122002357.370836-1-erik.kaneda@intel.com>
From: Maximilian Luz <luzmaximilian@gmail.com>
ACPICA commit 1a3a549286ea9db07d7ec700e7a70dd8bcc4354e
The macros to classify different AML exception codes are broken. For
instance,
ACPI_ENV_EXCEPTION(Status)
will always evaluate to zero due to
#define AE_CODE_ENVIRONMENTAL 0x0000
#define ACPI_ENV_EXCEPTION(Status) (Status & AE_CODE_ENVIRONMENTAL)
Similarly, ACPI_AML_EXCEPTION(Status) will evaluate to a non-zero value
for error codes of type AE_CODE_PROGRAMMER, AE_CODE_ACPI_TABLES, as well
as AE_CODE_AML, and not just AE_CODE_AML as the name suggests.
This commit fixes those checks.
Fixes: e884d78aab26 ("AML Parser: ignore all exceptions that result from incorrect AML during table load")
Link: https://github.com/acpica/acpica/commit/1a3a5492
Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Erik Kaneda <erik.kaneda@intel.com>
---
include/acpi/acexcep.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/acpi/acexcep.h b/include/acpi/acexcep.h
index 2fc624a61769..f8a4afb0279a 100644
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
@@ -59,11 +59,11 @@ struct acpi_exception_info {
#define AE_OK (acpi_status) 0x0000
-#define ACPI_ENV_EXCEPTION(status) (status & AE_CODE_ENVIRONMENTAL)
-#define ACPI_AML_EXCEPTION(status) (status & AE_CODE_AML)
-#define ACPI_PROG_EXCEPTION(status) (status & AE_CODE_PROGRAMMER)
-#define ACPI_TABLE_EXCEPTION(status) (status & AE_CODE_ACPI_TABLES)
-#define ACPI_CNTL_EXCEPTION(status) (status & AE_CODE_CONTROL)
+#define ACPI_ENV_EXCEPTION(status) (((status) & AE_CODE_MASK) == AE_CODE_ENVIRONMENTAL)
+#define ACPI_AML_EXCEPTION(status) (((status) & AE_CODE_MASK) == AE_CODE_AML)
+#define ACPI_PROG_EXCEPTION(status) (((status) & AE_CODE_MASK) == AE_CODE_PROGRAMMER)
+#define ACPI_TABLE_EXCEPTION(status) (((status) & AE_CODE_MASK) == AE_CODE_ACPI_TABLES)
+#define ACPI_CNTL_EXCEPTION(status) (((status) & AE_CODE_MASK) == AE_CODE_CONTROL)
/*
* Environmental exceptions
--
2.29.2
next prev parent reply other threads:[~2021-01-22 0:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 0:23 [PATCH v2 0/9] ACPICA release 20201217 and 20210105 Erik Kaneda
2021-01-22 0:23 ` Erik Kaneda [this message]
2021-01-22 0:23 ` [PATCH v2 2/9] ACPICA: Clean up exception code class checks Erik Kaneda
2021-01-22 0:23 ` [PATCH v2 3/9] ACPICA: ACPICA: fix -Wfallthrough Erik Kaneda
2021-01-23 15:21 ` [v2,3/9] " Guenter Roeck
2021-01-23 15:25 ` Guenter Roeck
2021-01-23 20:11 ` Rafael J. Wysocki
2021-01-22 0:23 ` [PATCH v2 4/9] ACPICA: add type casts for string functions Erik Kaneda
2021-01-22 0:23 ` [PATCH v2 5/9] ACPICA: Update version to 20201217 Version 20201217 Erik Kaneda
2021-01-22 0:23 ` [PATCH v2 6/9] ACPICA: Remove the MTMR (Mid-Timer) table Erik Kaneda
2021-01-22 0:23 ` [PATCH v2 7/9] ACPICA: Remove the VRTC table Erik Kaneda
2021-01-22 0:23 ` [PATCH v2 8/9] ACPICA: Updated all copyrights to 2021 Erik Kaneda
2021-01-22 0:23 ` [PATCH v2 9/9] ACPICA: Update version to 20210105 Erik Kaneda
2021-01-22 15:07 ` [PATCH v2 0/9] ACPICA release 20201217 and 20210105 Rafael J. Wysocki
2021-01-22 17:57 ` Kaneda, Erik
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=20210122002357.370836-2-erik.kaneda@intel.com \
--to=erik.kaneda@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=luzmaximilian@gmail.com \
--cc=rafael@kernel.org \
--cc=robert.moore@intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).