From: Ken Xue <Ken.Xue@amd.com>
To: <linux-acpi@vger.kernel.org>
Cc: <Ken.Xue@amd.com>, <andriy.shevchenko@linux.intel.com>,
<oe-kbuild-all@lists.linux.dev>, <rafael@kernel.org>,
kernel test robot <lkp@intel.com>
Subject: [PATCH] acpi: trigger wakeup key event from power button
Date: Fri, 8 Sep 2023 17:57:49 +0800 [thread overview]
Message-ID: <20230908095747.446389-1-Ken.Xue@amd.com> (raw)
Andorid can wakeup from various wakeup sources,
but only several wakeup sources can wake up screen
with right events(POWER, WAKEUP) from input device.
Regarding pressing acpi power button, it can resume system and
ACPI_BITMASK_WAKE_STATUS and ACPI_BITMASK_POWER_BUTTON_STATUS
are set in pm1a_sts, but kernel does not report any key
event to user space during resume by default.
So, trigger wakeup key event to user space during resume
from power button.
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202309080315.txQUEyHQ-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202309080239.IiC7uLpW-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202309080351.xHt2qhP2-lkp@intel.com/
Signed-off-by: Ken Xue <Ken.Xue@amd.com>
---
drivers/acpi/button.c | 16 ++++++++++++++++
drivers/acpi/sleep.c | 2 ++
include/acpi/button.h | 6 ++++++
3 files changed, 24 insertions(+)
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 1e76a64cce0a..0e0f30286c22 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -363,6 +363,21 @@ static int acpi_button_remove_fs(struct acpi_device *device)
return 0;
}
+void acpi_power_button_wakeup(struct acpi_device *device)
+{
+ struct acpi_button *button = acpi_driver_data(device);
+ struct input_dev *input;
+
+ if (button->type == ACPI_BUTTON_TYPE_POWER) {
+ input = button->input;
+ input_report_key(input, KEY_WAKEUP, 1);
+ input_sync(input);
+ input_report_key(input, KEY_WAKEUP, 0);
+ input_sync(input);
+ }
+}
+EXPORT_SYMBOL(acpi_power_button_wakeup);
+
/* Driver Interface */
int acpi_lid_open(void)
{
@@ -579,6 +594,7 @@ static int acpi_button_add(struct acpi_device *device)
switch (button->type) {
case ACPI_BUTTON_TYPE_POWER:
input_set_capability(input, EV_KEY, KEY_POWER);
+ input_set_capability(input, EV_KEY, KEY_WAKEUP);
break;
case ACPI_BUTTON_TYPE_SLEEP:
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 808484d11209..dcd5d0237eeb 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -22,6 +22,7 @@
#include <linux/syscore_ops.h>
#include <asm/io.h>
#include <trace/events/power.h>
+#include <acpi/button.h>
#include "internal.h"
#include "sleep.h"
@@ -507,6 +508,7 @@ static void acpi_pm_finish(void)
pwr_btn_adev = acpi_dev_get_first_match_dev(ACPI_BUTTON_HID_POWERF,
NULL, -1);
if (pwr_btn_adev) {
+ acpi_power_button_wakeup(pwr_btn_adev);
pm_wakeup_event(&pwr_btn_adev->dev, 0);
acpi_dev_put(pwr_btn_adev);
}
diff --git a/include/acpi/button.h b/include/acpi/button.h
index af2fce5d2ee3..fa0fb170cfb5 100644
--- a/include/acpi/button.h
+++ b/include/acpi/button.h
@@ -2,17 +2,23 @@
#ifndef ACPI_BUTTON_H
#define ACPI_BUTTON_H
+#include <linux/acpi.h>
+
#define ACPI_BUTTON_HID_POWER "PNP0C0C"
#define ACPI_BUTTON_HID_LID "PNP0C0D"
#define ACPI_BUTTON_HID_SLEEP "PNP0C0E"
#if IS_ENABLED(CONFIG_ACPI_BUTTON)
extern int acpi_lid_open(void);
+extern void acpi_power_button_wakeup(struct acpi_device *device);
#else
static inline int acpi_lid_open(void)
{
return 1;
}
+static inline void acpi_power_button_wakeup(struct acpi_device *device)
+{
+}
#endif /* IS_ENABLED(CONFIG_ACPI_BUTTON) */
#endif /* ACPI_BUTTON_H */
base-commit: b483d3b8a54a544ab8854ca6dbb8d99c423b3ba4
--
2.35.1
next reply other threads:[~2023-09-08 10:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 9:57 Ken Xue [this message]
2023-09-11 9:42 ` [PATCH] acpi: trigger wakeup key event from power button Andy Shevchenko
2023-09-12 5:32 ` Ken Xue
2023-09-12 9:30 ` Andy Shevchenko
2023-09-12 12:53 ` Ken Xue
-- strict thread matches above, loose matches on Subject: below --
2023-09-07 7:43 Ken Xue
2023-09-07 18:51 ` kernel test robot
2023-09-07 19:34 ` kernel test robot
2023-09-07 20:06 ` kernel test robot
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=20230908095747.446389-1-Ken.Xue@amd.com \
--to=ken.xue@amd.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=lkp@intel.com \
--cc=oe-kbuild-all@lists.linux.dev \
--cc=rafael@kernel.org \
/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