Commit 74a9e7db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fixes from Rafael Wysocki:
 "These revert a 4.11 change that turned out to be problematic and add a
  .gitignore file.

  Specifics:

   - Revert a 4.11 commit related to the ACPI-based handling of laptop
     lids that made changes incompatible with existing user space stacks
     and broke things there (Lv Zheng).

   - Add .gitignore to the ACPI tools directory (Prarit Bhargava)"

* tag 'acpi-4.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI / button: Remove lid_init_state=method mode"
  tools/power/acpi: Add .gitignore file
parents 801099be e3170cc0

Documentation/acpi/acpi-lid.txt

+12 −4
Original line number Diff line number Diff line
@@ -59,20 +59,28 @@ button driver uses the following 3 modes in order not to trigger issues. 
If the userspace hasn't been prepared to ignore the unreliable "opened"

events and the unreliable initial state notification, Linux users can use

the following kernel parameters to handle the possible issues:

A. button.lid_init_state=open:

A. button.lid_init_state=method:

   When this option is specified, the ACPI button driver reports the

   initial lid state using the returning value of the _LID control method

   and whether the "opened"/"closed" events are paired fully relies on the

   firmware implementation.

   This option can be used to fix some platforms where the returning value

   of the _LID control method is reliable but the initial lid state

   notification is missing.

   This option is the default behavior during the period the userspace

   isn't ready to handle the buggy AML tables.

B. button.lid_init_state=open:

   When this option is specified, the ACPI button driver always reports the

   initial lid state as "opened" and whether the "opened"/"closed" events

   are paired fully relies on the firmware implementation.

   This may fix some platforms where the returning value of the _LID

   control method is not reliable and the initial lid state notification is

   missing.

   This option is the default behavior during the period the userspace

   isn't ready to handle the buggy AML tables.



If the userspace has been prepared to ignore the unreliable "opened" events

and the unreliable initial state notification, Linux users should always

use the following kernel parameter:

B. button.lid_init_state=ignore:

C. button.lid_init_state=ignore:

   When this option is specified, the ACPI button driver never reports the

   initial lid state and there is a compensation mechanism implemented to

   ensure that the reliable "closed" notifications can always be delievered

drivers/acpi/button.c

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 


#define ACPI_BUTTON_LID_INIT_IGNORE	0x00

#define ACPI_BUTTON_LID_INIT_OPEN	0x01

#define ACPI_BUTTON_LID_INIT_METHOD	0x02



#define _COMPONENT		ACPI_BUTTON_COMPONENT

ACPI_MODULE_NAME("button");
@@ -376,6 +377,9 @@ static void acpi_lid_initialize_state(struct acpi_device *device) 
	case ACPI_BUTTON_LID_INIT_OPEN:

		(void)acpi_lid_notify_state(device, 1);

		break;

	case ACPI_BUTTON_LID_INIT_METHOD:

		(void)acpi_lid_update_state(device);

		break;

	case ACPI_BUTTON_LID_INIT_IGNORE:

	default:

		break;
@@ -560,6 +564,9 @@ static int param_set_lid_init_state(const char *val, struct kernel_param *kp) 
	if (!strncmp(val, "open", sizeof("open") - 1)) {

		lid_init_state = ACPI_BUTTON_LID_INIT_OPEN;

		pr_info("Notify initial lid state as open\n");

	} else if (!strncmp(val, "method", sizeof("method") - 1)) {

		lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;

		pr_info("Notify initial lid state with _LID return value\n");

	} else if (!strncmp(val, "ignore", sizeof("ignore") - 1)) {

		lid_init_state = ACPI_BUTTON_LID_INIT_IGNORE;

		pr_info("Do not notify initial lid state\n");
@@ -573,6 +580,8 @@ static int param_get_lid_init_state(char *buffer, struct kernel_param *kp) 
	switch (lid_init_state) {

	case ACPI_BUTTON_LID_INIT_OPEN:

		return sprintf(buffer, "open");

	case ACPI_BUTTON_LID_INIT_METHOD:

		return sprintf(buffer, "method");

	case ACPI_BUTTON_LID_INIT_IGNORE:

		return sprintf(buffer, "ignore");

	default:

tools/power/acpi/.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
acpidbg

acpidump

ec

include

CRA Git | Maintained and supported by SUSTech CRA and CCSE