Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dba77370 authored by Yunfeng Ye's avatar Yunfeng Ye Committed by Greg Kroah-Hartman
Browse files

ACPI: sysfs: Change ACPI_MASKABLE_GPE_MAX to 0x100 



commit a7583e72a5f22470d3e6fd3b6ba912892242339f upstream.

The commit 0f27cff8 ("ACPI: sysfs: Make ACPI GPE mask kernel
parameter cover all GPEs") says:
  "Use a bitmap of size 0xFF instead of a u64 for the GPE mask so 256
   GPEs can be masked"

But the masking of GPE 0xFF it not supported and the check condition
"gpe > ACPI_MASKABLE_GPE_MAX" is not valid because the type of gpe is
u8.

So modify the macro ACPI_MASKABLE_GPE_MAX to 0x100, and drop the "gpe >
ACPI_MASKABLE_GPE_MAX" check. In addition, update the docs "Format" for
acpi_mask_gpe parameter.

Fixes: 0f27cff8 ("ACPI: sysfs: Make ACPI GPE mask kernel parameter cover all GPEs")
Signed-off-by: default avatarYunfeng Ye <yeyunfeng@huawei.com>
[ rjw: Use u16 as gpe data type in acpi_gpe_apply_masked_gpes() ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d833862

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
			the GPE dispatcher.

			This facility can be used to prevent such uncontrolled

			GPE floodings.

			Format: <int>

			Format: <byte>



	acpi_no_auto_serialize	[HW,ACPI]

			Disable auto-serialization of AML methods

drivers/acpi/sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -816,14 +816,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;



	if (kstrtou8(val, 0, &gpe) || gpe > ACPI_MASKABLE_GPE_MAX)

	if (kstrtou8(val, 0, &gpe))

		return -EINVAL;

	set_bit(gpe, acpi_masked_gpes_map);
@@ -835,7 +835,7 @@ void __init acpi_gpe_apply_masked_gpes(void) 
{

	acpi_handle handle;

	acpi_status status;

	u8 gpe;

	u16 gpe;



	for_each_set_bit(gpe, acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) {

		status = acpi_get_gpe_device(gpe, &handle);