Skip to content

Commit 0f27cff

Browse files
praritrafaeljw
authored andcommitted
ACPI: sysfs: Make ACPI GPE mask kernel parameter cover all GPEs
The acpi_mask_gpe= kernel parameter documentation states that the range of mask is 128 GPEs (0x00 to 0x7F). The acpi_masked_gpes mask is a u64 so only 64 GPEs (0x00 to 0x3F) can really be masked. Use a bitmap of size 0xFF instead of a u64 for the GPE mask so 256 GPEs can be masked. Fixes: 9c4aa1e (ACPI / sysfs: Provide quirk mechanism to prevent GPE flooding) Signed-off-by: Prarit Bharava <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 50c4c4e commit 0f27cff

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
This facility can be used to prevent such uncontrolled
115115
GPE floodings.
116116
Format: <int>
117-
Support masking of GPEs numbered from 0x00 to 0x7f.
118117

119118
acpi_no_auto_serialize [HW,ACPI]
120119
Disable auto-serialization of AML methods

drivers/acpi/sysfs.c

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -816,22 +816,16 @@ static ssize_t counter_set(struct kobject *kobj,
816816
* interface:
817817
* echo unmask > /sys/firmware/acpi/interrupts/gpe00
818818
*/
819-
820-
/*
821-
* Currently, the GPE flooding prevention only supports to mask the GPEs
822-
* numbered from 00 to 7f.
823-
*/
824-
#define ACPI_MASKABLE_GPE_MAX 0x80
825-
826-
static u64 __initdata acpi_masked_gpes;
819+
#define ACPI_MASKABLE_GPE_MAX 0xFF
820+
static DECLARE_BITMAP(acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) __initdata;
827821

828822
static int __init acpi_gpe_set_masked_gpes(char *val)
829823
{
830824
u8 gpe;
831825

832826
if (kstrtou8(val, 0, &gpe) || gpe > ACPI_MASKABLE_GPE_MAX)
833827
return -EINVAL;
834-
acpi_masked_gpes |= ((u64)1<<gpe);
828+
set_bit(gpe, acpi_masked_gpes_map);
835829

836830
return 1;
837831
}
@@ -843,15 +837,11 @@ void __init acpi_gpe_apply_masked_gpes(void)
843837
acpi_status status;
844838
u8 gpe;
845839

846-
for (gpe = 0;
847-
gpe < min_t(u8, ACPI_MASKABLE_GPE_MAX, acpi_current_gpe_count);
848-
gpe++) {
849-
if (acpi_masked_gpes & ((u64)1<<gpe)) {
850-
status = acpi_get_gpe_device(gpe, &handle);
851-
if (ACPI_SUCCESS(status)) {
852-
pr_info("Masking GPE 0x%x.\n", gpe);
853-
(void)acpi_mask_gpe(handle, gpe, TRUE);
854-
}
840+
for_each_set_bit(gpe, acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) {
841+
status = acpi_get_gpe_device(gpe, &handle);
842+
if (ACPI_SUCCESS(status)) {
843+
pr_info("Masking GPE 0x%x.\n", gpe);
844+
(void)acpi_mask_gpe(handle, gpe, TRUE);
855845
}
856846
}
857847
}

0 commit comments

Comments
 (0)