This patch adds button.lid_init_state=close so that it can explicitly explain the contradictory requirements and help the kernel community to raise such bugs to the correct responsibles. Link: https://bugzilla.kernel.org/show_bug.cgi?id=195455 Link: https://bugzilla.redhat.com/show_bug.cgi?id=1430259 Tested-by: Steffen Weber <steffen.weber@xxxxxxxxx> Reported-by: Julian Wiedmann <julian.weidmann@xxxxxxxx> Reported-by: Joachim Frieben <jfrieben@xxxxxxxxxxx> Signed-off-by: Lv Zheng <lv.zheng@xxxxxxxxx> --- Documentation/acpi/acpi-lid.txt | 12 +++++++----- drivers/acpi/button.c | 11 ++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Documentation/acpi/acpi-lid.txt b/Documentation/acpi/acpi-lid.txt index effe7af..e846a59 100644 --- a/Documentation/acpi/acpi-lid.txt +++ b/Documentation/acpi/acpi-lid.txt @@ -69,13 +69,15 @@ A. button.lid_init_state=method: 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. +B. button.lid_init_state=open/close: + When one of these options are specified, the ACPI button driver always + reports the initial lid state as fixed "opened"/"closed" 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. + missing. Especially useful for platforms where different usage models + require contractory initial lid state. If the userspace has been prepared to ignore the unreliable "opened" events and the unreliable initial state notification, Linux users should always diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index 6d5a8c1..8b4666f 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -57,7 +57,8 @@ #define ACPI_BUTTON_LID_INIT_IGNORE 0x00 #define ACPI_BUTTON_LID_INIT_OPEN 0x01 -#define ACPI_BUTTON_LID_INIT_METHOD 0x02 +#define ACPI_BUTTON_LID_INIT_CLOSE 0x02 +#define ACPI_BUTTON_LID_INIT_METHOD 0x03 #define _COMPONENT ACPI_BUTTON_COMPONENT ACPI_MODULE_NAME("button"); @@ -377,6 +378,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_CLOSE: + (void)acpi_lid_notify_state(device, 0); + break; case ACPI_BUTTON_LID_INIT_METHOD: (void)acpi_lid_update_state(device); break; @@ -563,6 +567,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, "close", sizeof("close") - 1)) { + lid_init_state = ACPI_BUTTON_LID_INIT_CLOSE; + pr_info("Notify initial lid state as close\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"); @@ -579,6 +586,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_CLOSE: + return sprintf(buffer, "close"); case ACPI_BUTTON_LID_INIT_METHOD: return sprintf(buffer, "method"); case ACPI_BUTTON_LID_INIT_IGNORE: -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
