From: Yunfeng Ye <yeyunfeng@huawei.com>
To: <rjw@rjwysocki.net>, <lenb@kernel.org>
Cc: <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-doc@vger.kernel.org>,
"hushiyuan@huawei.com" <hushiyuan@huawei.com>,
"linfeilong@huawei.com" <linfeilong@huawei.com>
Subject: [PATCH] ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100
Date: Tue, 5 Nov 2019 22:35:25 +0800 [thread overview]
Message-ID: <8bdc7a86-e464-9c46-3d40-4f3c75111ce6@huawei.com> (raw)
There are two problems after commit 0f27cff8597d ("ACPI: sysfs: Make
ACPI GPE mask kernel parameter cover all GPEs"):
1. ACPI_MASKABLE_GPE_MAX is changed from 0x80 to 0xff, so the check
condition "gpe > ACPI_MASKABLE_GPE_MAX" is not valid because the type of
gpe is u8.
2. The size of bitmap is ACPI_MASKABLE_GPE_MAX, so it is not support the
num 255 for gpe.
Update the macro ACPI_MASKABLE_GPE_MAX to 0x100, and change the type of
gpe to u32, also modify the checking condition for gpe.
Bye the way, update the docs for kernel parameter acpi_mask_gpe.
Fixes: 0f27cff8597d ("ACPI: sysfs: Make ACPI GPE mask kernel parameter cover all GPEs")
Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
---
Documentation/admin-guide/kernel-parameters.txt | 1 +
drivers/acpi/sysfs.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a84a83f8881e..dd878e2491e1 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -114,6 +114,7 @@
This facility can be used to prevent such uncontrolled
GPE floodings.
Format: <int>
+ Support masking of GPEs numbered from 0x00 to 0xff
acpi_no_auto_serialize [HW,ACPI]
Disable auto-serialization of AML methods
diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 75948a3f1a20..3c3302583d78 100644
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -819,14 +819,14 @@ static ssize_t counter_set(struct kobject *kobj,
* interface:
* echo unmask > /sys/firmware/acpi/interrupts/gpe00
*/
-#define ACPI_MASKABLE_GPE_MAX 0xFF
+#define ACPI_MASKABLE_GPE_MAX 0x100
static DECLARE_BITMAP(acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) __initdata;
static int __init acpi_gpe_set_masked_gpes(char *val)
{
- u8 gpe;
+ u32 gpe;
- if (kstrtou8(val, 0, &gpe) || gpe > ACPI_MASKABLE_GPE_MAX)
+ if (kstrtouint(val, 0, &gpe) || gpe >= ACPI_MASKABLE_GPE_MAX)
return -EINVAL;
set_bit(gpe, acpi_masked_gpes_map);
@@ -838,7 +838,7 @@ void __init acpi_gpe_apply_masked_gpes(void)
{
acpi_handle handle;
acpi_status status;
- u8 gpe;
+ u32 gpe;
for_each_set_bit(gpe, acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) {
status = acpi_get_gpe_device(gpe, &handle);
--
2.7.4
next reply other threads:[~2019-11-05 14:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-05 14:35 Yunfeng Ye [this message]
2019-11-13 23:21 ` [PATCH] ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100 Rafael J. Wysocki
2019-11-14 6:45 ` Yunfeng Ye
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=8bdc7a86-e464-9c46-3d40-4f3c75111ce6@huawei.com \
--to=yeyunfeng@huawei.com \
--cc=hushiyuan@huawei.com \
--cc=lenb@kernel.org \
--cc=linfeilong@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/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).