From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Lv Zheng <lv.zheng@intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Len Brown <len.brown@intel.com>, Lv Zheng <zetalog@gmail.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@gmail.com>,
"Bastien Nocera:" <hadess@hadess.net>,
linux-input@vger.kernel.org
Subject: Re: [PATCH v4 1/2] ACPI / button: Add KEY_LID_OPEN/KEY_LID_CLOSE for new usage model
Date: Thu, 21 Jul 2016 15:35:36 +0200 [thread overview]
Message-ID: <6943722.0LO9QHJXWg@vostro.rjw.lan> (raw)
In-Reply-To: <1b96ee1e5b5ebbed0096adde410a9fd0b7930848.1468915808.git.lv.zheng@intel.com>
On Tuesday, July 19, 2016 04:11:02 PM Lv Zheng wrote:
> There are many AML tables reporting wrong initial lid state, and some of
> them never report lid open state. As a proxy layer acting between, ACPI
> button driver is not able to handle all such cases, but need to re-define
> the usage model of the ACPI lid. That is:
> 1. It's initial state is not reliable;
> 2. There may not be an open event;
> 3. Userspace should only take action against the close event which is
> reliable, always sent after a real lid close.
>
> OTOH, using an input switch event for the lid device on such platforms can
> cause the loss of the close event, but the platforms purposely want to use
> these close events to trigger power saving actions.
>
> So we need to introduce a new ABI, which is input key events based, not
> input switch events based.
>
> This patch adds a set of new input key events so that the new userspace
> programs can use them to handle this usage model correctly. And in the
> meanwhile, the old input switch event is kept so that no old programs will
> be broken by the ABI change.
>
> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
> Cc: Bastien Nocera: <hadess@hadess.net>
> Cc: linux-input@vger.kernel.org
Dmitry, any objections here?
> ---
> drivers/acpi/button.c | 34 +++++++++++++++++++++++++++++++-
> include/uapi/linux/input-event-codes.h | 7 +++++++
> 2 files changed, 40 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
> index 148f4e5..dd16879 100644
> --- a/drivers/acpi/button.c
> +++ b/drivers/acpi/button.c
> @@ -104,6 +104,8 @@ struct acpi_button {
> struct input_dev *input;
> char phys[32]; /* for input device */
> unsigned long pushed;
> + int last_state;
> + unsigned long timestamp;
> bool suspended;
> };
>
> @@ -111,6 +113,10 @@ static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier);
> static struct acpi_device *lid_device;
> static u8 lid_init_state = ACPI_BUTTON_LID_INIT_METHOD;
>
> +static unsigned long lid_report_interval __read_mostly = 500;
> +module_param(lid_report_interval, ulong, 0644);
> +MODULE_PARM_DESC(lid_report_interval, "Interval (ms) between lid key events");
> +
> /* --------------------------------------------------------------------------
> FS Interface (/proc)
> -------------------------------------------------------------------------- */
> @@ -133,12 +139,34 @@ static int acpi_lid_evaluate_state(struct acpi_device *device)
> static int acpi_lid_notify_state(struct acpi_device *device, int state)
> {
> struct acpi_button *button = acpi_driver_data(device);
> + int keycode;
> + unsigned long timeout;
> int ret;
>
> - /* input layer checks if event is redundant */
> + /*
> + * Send the switch event.
> + * The input layer checks if the event is redundant.
> + */
> input_report_switch(button->input, SW_LID, !state);
> input_sync(button->input);
>
> + /*
> + * Send the key event.
> + * The input layer doesn't check if the event is redundant.
> + */
> + timeout = button->timestamp +
> + msecs_to_jiffies(lid_report_interval);
> + if (button->last_state != !!state ||
> + time_after(jiffies, timeout)) {
> + keycode = state ? KEY_LID_OPEN : KEY_LID_CLOSE;
> + input_report_key(button->input, keycode, 1);
> + input_sync(button->input);
> + input_report_key(button->input, keycode, 0);
> + input_sync(button->input);
> + button->last_state = !!state;
> + button->timestamp = jiffies;
> + }
> +
> if (state)
> pm_wakeup_event(&device->dev, 0);
>
> @@ -407,6 +435,8 @@ static int acpi_button_add(struct acpi_device *device)
> strcpy(name, ACPI_BUTTON_DEVICE_NAME_LID);
> sprintf(class, "%s/%s",
> ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);
> + button->last_state = !!acpi_lid_evaluate_state(device);
> + button->timestamp = jiffies;
> } else {
> printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid);
> error = -ENODEV;
> @@ -436,6 +466,8 @@ static int acpi_button_add(struct acpi_device *device)
>
> case ACPI_BUTTON_TYPE_LID:
> input_set_capability(input, EV_SW, SW_LID);
> + input_set_capability(input, EV_KEY, KEY_LID_OPEN);
> + input_set_capability(input, EV_KEY, KEY_LID_CLOSE);
> break;
> }
>
> diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
> index 737fa32..b062fe1 100644
> --- a/include/uapi/linux/input-event-codes.h
> +++ b/include/uapi/linux/input-event-codes.h
> @@ -641,6 +641,13 @@
> * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.)
> */
> #define KEY_DATA 0x275
> +/*
> + * Key events sent by the lid drivers.
> + * The drivers may not be able to send paired "open"/"close" events, in
> + * which case, they send KEY_LID_OPEN/KEY_LID_CLOSE instead of SW_LID.
> + */
> +#define KEY_LID_OPEN 0x278
> +#define KEY_LID_CLOSE 0x279
>
> #define BTN_TRIGGER_HAPPY 0x2c0
> #define BTN_TRIGGER_HAPPY1 0x2c0
To this part in particular?
Thanks,
Rafael
next prev parent reply other threads:[~2016-07-21 13:30 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 8:27 [RFC PATCH 1/2] ACPI / button: Send "open" state after boot/resume Lv Zheng
2016-05-17 23:36 ` Rafael J. Wysocki
2016-05-18 1:25 ` Zheng, Lv
2016-05-18 22:56 ` Rafael J. Wysocki
2016-05-19 1:50 ` Zheng, Lv
2016-05-19 13:21 ` Rafael J. Wysocki
2016-05-26 13:31 ` Benjamin Tissoires
2016-05-30 1:39 ` Zheng, Lv
2016-05-18 12:57 ` Bastien Nocera
2016-05-18 21:41 ` Rafael J. Wysocki
2016-05-19 1:59 ` Zheng, Lv
2016-05-27 7:15 ` [PATCH v2 0/3] ACPI / button: Clarify initial lid state Lv Zheng
2016-05-27 7:15 ` [PATCH v2 1/3] ACPI / button: Remove initial lid state notification Lv Zheng
2016-05-27 7:15 ` [PATCH v2 2/3] ACPI / button: Refactor functions to eliminate redundant code Lv Zheng
2016-05-27 7:16 ` [PATCH v2 3/3] ACPI / button: Send "open" state after boot/resume Lv Zheng
2016-05-30 8:10 ` Benjamin Tissoires
2016-05-31 2:55 ` Zheng, Lv
2016-05-31 14:47 ` Benjamin Tissoires
2016-06-01 1:17 ` Zheng, Lv
2016-06-01 7:51 ` Zheng, Lv
2016-06-01 8:07 ` Benjamin Tissoires
2016-05-27 22:10 ` [PATCH v2 0/3] ACPI / button: Clarify initial lid state Valdis.Kletnieks
2016-06-01 10:10 ` [PATCH v3 1/3] ACPI / button: Remove initial lid state notification Lv Zheng
2016-06-23 0:36 ` Rafael J. Wysocki
2016-06-23 0:57 ` Zheng, Lv
2016-06-01 10:10 ` [PATCH v3 2/3] ACPI / button: Refactor functions to eliminate redundant code Lv Zheng
2016-06-01 10:10 ` [PATCH v3 3/3] ACPI / button: Add quirks for initial lid state notification Lv Zheng
2016-06-01 11:01 ` Bastien Nocera
2016-06-02 1:08 ` Zheng, Lv
2016-06-02 14:01 ` Bastien Nocera
2016-06-02 15:25 ` Benjamin Tissoires
2016-06-03 0:41 ` Zheng, Lv
2016-07-19 8:11 ` [PATCH v4 1/2] ACPI / button: Add KEY_LID_OPEN/KEY_LID_CLOSE for new usage model Lv Zheng
2016-07-19 8:46 ` Benjamin Tissoires
2016-07-21 13:35 ` Rafael J. Wysocki [this message]
2016-07-21 20:33 ` Dmitry Torokhov
2016-07-19 8:11 ` [PATCH v4 2/2] ACPI / button: Add document for ACPI control method lid device restrictions Lv Zheng
2016-07-19 8:44 ` Benjamin Tissoires
2016-07-21 20:32 ` Dmitry Torokhov
2016-07-22 0:24 ` Zheng, Lv
2016-07-22 4:37 ` Dmitry Torokhov
2016-07-22 6:55 ` Benjamin Tissoires
2016-07-22 8:47 ` Zheng, Lv
2016-07-22 9:08 ` Benjamin Tissoires
2016-07-22 9:38 ` Zheng, Lv
2016-07-24 11:28 ` Bastien Nocera
2016-07-25 0:38 ` Zheng, Lv
2016-07-22 17:02 ` Dmitry Torokhov
2016-07-23 12:17 ` Zheng, Lv
2016-07-22 8:37 ` Zheng, Lv
2016-07-22 17:22 ` Dmitry Torokhov
2016-07-23 11:57 ` Zheng, Lv
2016-07-22 6:24 ` [PATCH v5 1/3] ACPI / button: Add missing event to keep SW_LID running without additional event loss Lv Zheng
2016-07-22 10:26 ` Zheng, Lv
2016-07-23 12:37 ` Rafael J. Wysocki
2016-07-25 0:24 ` Zheng, Lv
2016-07-22 6:24 ` [PATCH v5 2/3] ACPI / button: Add KEY_LID_OPEN/KEY_LID_CLOSE for new usage model Lv Zheng
2016-07-22 6:24 ` [PATCH v5 3/3] ACPI / button: Add document for ACPI control method lid device restrictions Lv Zheng
2016-07-25 1:14 ` [PATCH v6] ACPI / button: Fix an issue that the platform triggered "close" event may not be delivered to the userspace Lv Zheng
2016-07-26 9:52 ` [PATCH v7 1/2] ACPI / button: Fix an issue that the platform triggered reliable events " Lv Zheng
2016-08-17 0:19 ` Rafael J. Wysocki
2016-08-17 4:45 ` Zheng, Lv
2016-07-26 9:52 ` [PATCH v7 2/2] ACPI / button: Add document for ACPI control method lid device restrictions Lv Zheng
2016-08-17 8:22 ` [PATCH v8 1/2] ACPI / button: Fix an issue in button.lid_init_state=ignore mode Lv Zheng
2016-09-12 22:10 ` Rafael J. Wysocki
2016-08-17 8:23 ` [PATCH v8 2/2] ACPI / button: Add document for ACPI control method lid device restrictions Lv Zheng
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=6943722.0LO9QHJXWg@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=benjamin.tissoires@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hadess@hadess.net \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=zetalog@gmail.com \
/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).