From: Lv Zheng <lv.zheng@intel.com> To: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, "Rafael J . Wysocki" <rjw@rjwysocki.net>, Len Brown <len.brown@intel.com> Cc: systemd-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Lv Zheng <zetalog@gmail.com>, linux-acpi@vger.kernel.org, Benjamin Tissoires <benjamin.tissoires@redhat.com>, Lv Zheng <lv.zheng@intel.com> Subject: [RFC PATCH v6 1/5] ACPI: button: Add a workaround to fix an order issue for old userspace Date: Wed, 21 Jun 2017 16:55:03 +0800 [thread overview] Message-ID: <45932b46ea84bfbab2120092f23aff2c522a3945.1498034513.git.lv.zheng@intel.com> (raw) In-Reply-To: <cover.1498034513.git.lv.zheng@intel.com> There are platform variations implementing ACPI lid device in different ways: 1. Some platforms send "open" events to OS and the events arrive before button driver is resumed; 2. Some platforms send "open" events to OS, but the events arrive after button driver is resumed, ex., Samsung N210+; 3. Some platforms never send "open" events to OS, but send "open" events to update the cached _LID return value, and the update events arrive before button driver is resumed; 4. Some platforms never send "open" events to OS, but send "open" events to update the cached _LID return value, but the update events arrive after button driver is resumed, ex., Surface Pro 3; 5. Some platforms never send "open" events, _LID returns value sticks to "close", ex., Surface Pro 1. Currently, all cases work find with systemd 233, but only case 1 works fine with systemd 229. Case 2,4 can be treated as an order issue: If the button driver always evaluates _LID after seeing a LID notification, there shouldn't be such a problem. Note that this order issue cannot be fixed by sorting OS drivers' resume code: 1. When acpi.ec_freeze_events=Y, the order depends on whether PNP0C0D(LID) or PNP0C09(EC) appears first in the namespace (probe order). 2. Even when acpi.ec_freeze_events=N, which forces OS to handle EC events as early as possible, the order issue can still be reproduced due to platform delays (reproduce ratio is lower than case 1). 3. Some platform simply has a very big delay for LID open events. This patch tries to fix this issue for systemd 229 by defer sending initial lid state 10 seconds later after resume, which ensures EC events can always arrive before button driver evaluates _LID. It finally only fixes case 2 platforms as fixing case 4 platforms needs additional efforts (see known issue below). The users can configure wait timeout via button.lid_notify_timeout. Known issu: 1. systemd/logind 229 still mis-bahaves with case 3,4 platforms After seeing a LID "close" event, systemd 229 will wait several seconds (HoldoffTimeoutSec) before suspending the platform. Thus on case 4 platforms, if users close lid, and re-open it during the HoldoffTimeoutSec period, there is still no "open" events seen by the userspace. Thus systemd still considers the last state as "close" and suspends the platform after the HoldoffTimeoutSec times out. Cc: <systemd-devel@lists.freedesktop.org> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Lv Zheng <lv.zheng@intel.com> --- drivers/acpi/button.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index e19f530..67a0d78 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -28,6 +28,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/input.h> +#include <linux/timer.h> #include <linux/slab.h> #include <linux/acpi.h> #include <acpi/button.h> @@ -79,6 +80,7 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids); static int acpi_button_add(struct acpi_device *device); static int acpi_button_remove(struct acpi_device *device); static void acpi_button_notify(struct acpi_device *device, u32 event); +static void acpi_lid_timeout(ulong arg); #ifdef CONFIG_PM_SLEEP static int acpi_button_suspend(struct device *dev); @@ -104,6 +106,7 @@ static struct acpi_driver acpi_button_driver = { struct acpi_button { unsigned int type; struct input_dev *input; + struct timer_list lid_timer; char phys[32]; /* for input device */ unsigned long pushed; int last_state; @@ -119,6 +122,10 @@ 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"); +static unsigned long lid_notify_timeout __read_mostly = 10; +module_param(lid_notify_timeout, ulong, 0644); +MODULE_PARM_DESC(lid_notify_timeout, "Timeout (s) before receiving lid notification"); + /* -------------------------------------------------------------------------- FS Interface (/proc) -------------------------------------------------------------------------- */ @@ -371,6 +378,15 @@ static int acpi_lid_update_state(struct acpi_device *device) return acpi_lid_notify_state(device, state); } +static void acpi_lid_start_timer(struct acpi_device *device, + unsigned long msecs) +{ + struct acpi_button *button = acpi_driver_data(device); + + mod_timer(&button->lid_timer, + jiffies + msecs_to_jiffies(msecs)); +} + static void acpi_lid_initialize_state(struct acpi_device *device) { switch (lid_init_state) { @@ -386,6 +402,13 @@ static void acpi_lid_initialize_state(struct acpi_device *device) } } +static void acpi_lid_timeout(ulong arg) +{ + struct acpi_device *device = (struct acpi_device *)arg; + + acpi_lid_initialize_state(device); +} + static void acpi_button_notify(struct acpi_device *device, u32 event) { struct acpi_button *button = acpi_driver_data(device); @@ -432,6 +455,8 @@ static int acpi_button_suspend(struct device *dev) struct acpi_device *device = to_acpi_device(dev); struct acpi_button *button = acpi_driver_data(device); + if (button->type == ACPI_BUTTON_TYPE_LID) + del_timer(&button->lid_timer); button->suspended = true; return 0; } @@ -443,7 +468,8 @@ static int acpi_button_resume(struct device *dev) button->suspended = false; if (button->type == ACPI_BUTTON_TYPE_LID) - acpi_lid_initialize_state(device); + acpi_lid_start_timer(device, + lid_notify_timeout * MSEC_PER_SEC); return 0; } #endif @@ -490,6 +516,9 @@ static int acpi_button_add(struct acpi_device *device) ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); button->last_state = !!acpi_lid_evaluate_state(device); button->last_time = ktime_get(); + init_timer(&button->lid_timer); + setup_timer(&button->lid_timer, + acpi_lid_timeout, (ulong)device); } else { printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid); error = -ENODEV; @@ -526,12 +555,13 @@ static int acpi_button_add(struct acpi_device *device) if (error) goto err_remove_fs; if (button->type == ACPI_BUTTON_TYPE_LID) { - acpi_lid_initialize_state(device); /* * This assumes there's only one lid device, or if there are * more we only care about the last one... */ lid_device = device; + acpi_lid_start_timer(device, + lid_notify_timeout * MSEC_PER_SEC); } printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device)); @@ -551,6 +581,8 @@ static int acpi_button_remove(struct acpi_device *device) struct acpi_button *button = acpi_driver_data(device); acpi_button_remove_fs(device); + if (button->type == ACPI_BUTTON_TYPE_LID) + del_timer_sync(&button->lid_timer); input_unregister_device(button->input); kfree(button); return 0; -- 2.7.4 _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/systemd-devel
WARNING: multiple messages have this Message-ID (diff)
From: Lv Zheng <lv.zheng@intel.com> To: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, "Rafael J . Wysocki" <rjw@rjwysocki.net>, Len Brown <len.brown@intel.com> Cc: Lv Zheng <lv.zheng@intel.com>, Lv Zheng <zetalog@gmail.com>, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, systemd-devel@lists.freedesktop.org, Benjamin Tissoires <benjamin.tissoires@redhat.com>, Peter Hutterer <peter.hutterer@who-t.net> Subject: [RFC PATCH v6 1/5] ACPI: button: Add a workaround to fix an order issue for old userspace Date: Wed, 21 Jun 2017 16:55:03 +0800 [thread overview] Message-ID: <45932b46ea84bfbab2120092f23aff2c522a3945.1498034513.git.lv.zheng@intel.com> (raw) In-Reply-To: <cover.1498034513.git.lv.zheng@intel.com> There are platform variations implementing ACPI lid device in different ways: 1. Some platforms send "open" events to OS and the events arrive before button driver is resumed; 2. Some platforms send "open" events to OS, but the events arrive after button driver is resumed, ex., Samsung N210+; 3. Some platforms never send "open" events to OS, but send "open" events to update the cached _LID return value, and the update events arrive before button driver is resumed; 4. Some platforms never send "open" events to OS, but send "open" events to update the cached _LID return value, but the update events arrive after button driver is resumed, ex., Surface Pro 3; 5. Some platforms never send "open" events, _LID returns value sticks to "close", ex., Surface Pro 1. Currently, all cases work find with systemd 233, but only case 1 works fine with systemd 229. Case 2,4 can be treated as an order issue: If the button driver always evaluates _LID after seeing a LID notification, there shouldn't be such a problem. Note that this order issue cannot be fixed by sorting OS drivers' resume code: 1. When acpi.ec_freeze_events=Y, the order depends on whether PNP0C0D(LID) or PNP0C09(EC) appears first in the namespace (probe order). 2. Even when acpi.ec_freeze_events=N, which forces OS to handle EC events as early as possible, the order issue can still be reproduced due to platform delays (reproduce ratio is lower than case 1). 3. Some platform simply has a very big delay for LID open events. This patch tries to fix this issue for systemd 229 by defer sending initial lid state 10 seconds later after resume, which ensures EC events can always arrive before button driver evaluates _LID. It finally only fixes case 2 platforms as fixing case 4 platforms needs additional efforts (see known issue below). The users can configure wait timeout via button.lid_notify_timeout. Known issu: 1. systemd/logind 229 still mis-bahaves with case 3,4 platforms After seeing a LID "close" event, systemd 229 will wait several seconds (HoldoffTimeoutSec) before suspending the platform. Thus on case 4 platforms, if users close lid, and re-open it during the HoldoffTimeoutSec period, there is still no "open" events seen by the userspace. Thus systemd still considers the last state as "close" and suspends the platform after the HoldoffTimeoutSec times out. Cc: <systemd-devel@lists.freedesktop.org> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com> Cc: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Lv Zheng <lv.zheng@intel.com> --- drivers/acpi/button.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index e19f530..67a0d78 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -28,6 +28,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/input.h> +#include <linux/timer.h> #include <linux/slab.h> #include <linux/acpi.h> #include <acpi/button.h> @@ -79,6 +80,7 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids); static int acpi_button_add(struct acpi_device *device); static int acpi_button_remove(struct acpi_device *device); static void acpi_button_notify(struct acpi_device *device, u32 event); +static void acpi_lid_timeout(ulong arg); #ifdef CONFIG_PM_SLEEP static int acpi_button_suspend(struct device *dev); @@ -104,6 +106,7 @@ static struct acpi_driver acpi_button_driver = { struct acpi_button { unsigned int type; struct input_dev *input; + struct timer_list lid_timer; char phys[32]; /* for input device */ unsigned long pushed; int last_state; @@ -119,6 +122,10 @@ 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"); +static unsigned long lid_notify_timeout __read_mostly = 10; +module_param(lid_notify_timeout, ulong, 0644); +MODULE_PARM_DESC(lid_notify_timeout, "Timeout (s) before receiving lid notification"); + /* -------------------------------------------------------------------------- FS Interface (/proc) -------------------------------------------------------------------------- */ @@ -371,6 +378,15 @@ static int acpi_lid_update_state(struct acpi_device *device) return acpi_lid_notify_state(device, state); } +static void acpi_lid_start_timer(struct acpi_device *device, + unsigned long msecs) +{ + struct acpi_button *button = acpi_driver_data(device); + + mod_timer(&button->lid_timer, + jiffies + msecs_to_jiffies(msecs)); +} + static void acpi_lid_initialize_state(struct acpi_device *device) { switch (lid_init_state) { @@ -386,6 +402,13 @@ static void acpi_lid_initialize_state(struct acpi_device *device) } } +static void acpi_lid_timeout(ulong arg) +{ + struct acpi_device *device = (struct acpi_device *)arg; + + acpi_lid_initialize_state(device); +} + static void acpi_button_notify(struct acpi_device *device, u32 event) { struct acpi_button *button = acpi_driver_data(device); @@ -432,6 +455,8 @@ static int acpi_button_suspend(struct device *dev) struct acpi_device *device = to_acpi_device(dev); struct acpi_button *button = acpi_driver_data(device); + if (button->type == ACPI_BUTTON_TYPE_LID) + del_timer(&button->lid_timer); button->suspended = true; return 0; } @@ -443,7 +468,8 @@ static int acpi_button_resume(struct device *dev) button->suspended = false; if (button->type == ACPI_BUTTON_TYPE_LID) - acpi_lid_initialize_state(device); + acpi_lid_start_timer(device, + lid_notify_timeout * MSEC_PER_SEC); return 0; } #endif @@ -490,6 +516,9 @@ static int acpi_button_add(struct acpi_device *device) ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); button->last_state = !!acpi_lid_evaluate_state(device); button->last_time = ktime_get(); + init_timer(&button->lid_timer); + setup_timer(&button->lid_timer, + acpi_lid_timeout, (ulong)device); } else { printk(KERN_ERR PREFIX "Unsupported hid [%s]\n", hid); error = -ENODEV; @@ -526,12 +555,13 @@ static int acpi_button_add(struct acpi_device *device) if (error) goto err_remove_fs; if (button->type == ACPI_BUTTON_TYPE_LID) { - acpi_lid_initialize_state(device); /* * This assumes there's only one lid device, or if there are * more we only care about the last one... */ lid_device = device; + acpi_lid_start_timer(device, + lid_notify_timeout * MSEC_PER_SEC); } printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device)); @@ -551,6 +581,8 @@ static int acpi_button_remove(struct acpi_device *device) struct acpi_button *button = acpi_driver_data(device); acpi_button_remove_fs(device); + if (button->type == ACPI_BUTTON_TYPE_LID) + del_timer_sync(&button->lid_timer); input_unregister_device(button->input); kfree(button); return 0; -- 2.7.4
next prev parent reply other threads:[~2017-06-21 8:55 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-05 2:39 [PATCH 1/5] Revert "ACPI / button: Remove lid_init_state=method mode" Lv Zheng 2017-05-05 2:39 ` [PATCH 2/5] ACPI: button: Add button.lid_init_state=close Lv Zheng 2017-05-05 2:39 ` [PATCH 3/5] ACPI: button: Fix lid notification Lv Zheng 2017-05-05 2:39 ` [PATCH 4/5] ACPI: button: Always notify kernel space using _LID returning value Lv Zheng 2017-05-05 2:40 ` [PATCH 5/5] ACPI: button: Obselete acpi_lid_open() invocations Lv Zheng 2017-05-09 1:21 ` Julian Wiedmann 2017-05-09 6:19 ` Zheng, Lv 2017-05-09 1:22 ` [PATCH 1/5] Revert "ACPI / button: Remove lid_init_state=method mode" Julian Wiedmann 2017-05-09 6:17 ` Zheng, Lv 2017-05-09 7:02 ` [PATCH v2 " Lv Zheng 2017-05-09 7:02 ` [PATCH v2 2/5] ACPI: button: Add button.lid_init_state=close Lv Zheng 2017-05-11 10:20 ` Benjamin Tissoires 2017-05-12 1:31 ` Zheng, Lv 2017-05-12 9:55 ` Benjamin Tissoires 2017-05-15 1:44 ` Zheng, Lv 2017-05-09 7:02 ` [PATCH v2 3/5] ACPI: button: Fix lid notification Lv Zheng 2017-05-11 10:21 ` Benjamin Tissoires 2017-05-09 7:02 ` [PATCH v2 4/5] ACPI: button: Always notify kernel space using _LID returning value Lv Zheng 2017-05-11 10:28 ` Benjamin Tissoires 2017-05-12 1:22 ` Zheng, Lv 2017-05-12 10:06 ` Benjamin Tissoires 2017-05-15 2:11 ` Zheng, Lv 2017-05-09 7:02 ` [PATCH v2 5/5] ACPI: button: Obselete acpi_lid_open() invocations Lv Zheng 2017-05-10 10:30 ` [Intel-gfx] " Jani Nikula 2017-05-11 10:33 ` Benjamin Tissoires 2017-05-12 1:25 ` Zheng, Lv 2017-05-12 6:08 ` Zheng, Lv 2017-05-12 10:20 ` Benjamin Tissoires 2017-05-15 3:55 ` Zheng, Lv 2017-05-15 7:12 ` Benjamin Tissoires 2017-05-15 8:42 ` Jani Nikula 2017-05-15 9:21 ` [Intel-gfx] " Benjamin Tissoires 2017-05-15 9:41 ` Jani Nikula 2017-05-26 23:42 ` [RFC PATCH v3 1/5] ACPI: button: Add indication of BIOS notification and faked events Lv Zheng 2017-05-26 23:42 ` Lv Zheng 2017-05-29 16:04 ` Benjamin Tissoires 2017-05-31 8:57 ` Zheng, Lv 2017-05-31 8:57 ` Zheng, Lv 2017-05-26 23:42 ` [RFC PATCH v3 2/5] ACPI: button: Extends complement switch event support for all modes Lv Zheng 2017-05-26 23:42 ` Lv Zheng 2017-05-26 23:42 ` [RFC PATCH v3 3/5] ACPI: button: Add lid event type debugging messages Lv Zheng 2017-05-26 23:42 ` Lv Zheng 2017-05-26 23:42 ` [RFC PATCH v3 4/5] ACPI: button: Fix lid notification Lv Zheng 2017-05-26 23:42 ` Lv Zheng [not found] ` <2a779ae8c280c968b3237ac4a3d9580df7262a46.1493951798.git.lv.zheng-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> 2017-05-26 23:42 ` [RFC PATCH v3 5/5] ACPI: button: Always notify kernel space using _LID returning value Lv Zheng 2017-05-26 23:42 ` Lv Zheng 2017-05-29 16:08 ` Benjamin Tissoires 2017-05-31 8:59 ` Zheng, Lv 2017-05-31 9:41 ` [RFC PATCH v4 1/5] ACPI: button: Add indication of BIOS notification and faked events Lv Zheng 2017-05-31 9:41 ` [RFC PATCH v4 2/5] ACPI: button: Extends complement switch event support for all modes Lv Zheng 2017-05-31 9:41 ` Lv Zheng 2017-05-31 9:42 ` [RFC PATCH v4 3/5] ACPI: button: Add lid event type debugging messages Lv Zheng 2017-05-31 9:42 ` [RFC PATCH v4 4/5] ACPI: button: Fix lid notification locks Lv Zheng 2017-05-31 9:42 ` [RFC PATCH v4 5/5] ACPI: button: Cleanup lid notification logics Lv Zheng 2017-06-07 9:43 ` [RFC PATCH 0/2] ACPI: button: Fix button.lid_init_state=method mode Lv Zheng 2017-06-07 9:43 ` [RFC PATCH v5 1/2] ACPI: button: Fix issue that button notify cannot report stateful SW_LID state Lv Zheng 2017-06-07 9:43 ` Lv Zheng 2017-06-13 6:17 ` [lkp-robot] [ACPI] 4d0c35c1af: BUG:scheduling_while_atomic kernel test robot 2017-06-13 6:17 ` kernel test robot 2017-06-13 6:17 ` kernel test robot 2017-06-07 9:43 ` [RFC PATCH v5 2/2] ACPI: button: Add a quirk mode for Surface Pro 1 like laptop Lv Zheng 2017-06-07 9:43 ` Lv Zheng 2017-06-21 8:54 ` [RFC PATCH v6 0/5] ACPI: button: Fix button.lid_init_state=method mode Lv Zheng 2017-06-21 8:55 ` Lv Zheng [this message] 2017-06-21 8:55 ` [RFC PATCH v6 1/5] ACPI: button: Add a workaround to fix an order issue for old userspace Lv Zheng 2017-06-23 14:02 ` Benjamin Tissoires 2017-06-23 14:02 ` Benjamin Tissoires 2017-06-30 1:34 ` [lkp-robot] [ACPI] c4a9ff748c: BUG:scheduling_while_atomic kernel test robot 2017-06-30 1:34 ` kernel test robot 2017-06-30 1:34 ` kernel test robot 2017-06-21 8:55 ` [RFC PATCH v6 2/5] ACPI: button: Add an optional workaround to fix an event missing issue for old userspace Lv Zheng 2017-06-21 8:55 ` Lv Zheng 2017-06-23 14:03 ` Benjamin Tissoires 2017-06-23 14:03 ` Benjamin Tissoires 2017-06-21 8:55 ` [RFC PATCH v6 3/5] ACPI: button: Rework lid_init_state=ignore mode Lv Zheng 2017-06-21 8:55 ` Lv Zheng 2017-06-23 14:03 ` Benjamin Tissoires 2017-06-23 14:03 ` Benjamin Tissoires 2017-06-21 8:55 ` [RFC PATCH v6 4/5] ACPI: button: extract input creation/destruction helpers Lv Zheng 2017-06-21 8:55 ` [RFC PATCH v6 5/5] ACPI: button: Add an optional workaround to fix a persistent close issue for old userspace Lv Zheng 2017-06-23 14:03 ` Benjamin Tissoires
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=45932b46ea84bfbab2120092f23aff2c522a3945.1498034513.git.lv.zheng@intel.com \ --to=lv.zheng@intel.com \ --cc=benjamin.tissoires@redhat.com \ --cc=len.brown@intel.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=rafael.j.wysocki@intel.com \ --cc=rjw@rjwysocki.net \ --cc=systemd-devel@lists.freedesktop.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.