Re: [PATCH] Input: pm8941-pwrkey - respect reboot_mode for warm reset
From: Luca Weiss <hidden>
Date: 2021-07-11 10:03:09
Also in:
linux-arm-msm
Hi Shawn, On Dienstag, 29. Juni 2021 05:05:09 CEST Shawn Guo wrote:
quoted hunk ↗ jump to hunk
On some devices, e.g. Sony Xperia M4 Aqua, warm reset is used to reboot device into bootloader and recovery mode. Instead of always doing hard reset, add a check on reboot_mode for possible warm reset. Signed-off-by: Shawn Guo <redacted> --- drivers/input/misc/pm8941-pwrkey.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)diff --git a/drivers/input/misc/pm8941-pwrkey.cb/drivers/input/misc/pm8941-pwrkey.c index cf8104454e74..9b14d6eb1918 100644--- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c@@ -27,6 +27,7 @@ #define PON_PS_HOLD_RST_CTL2 0x5b #define PON_PS_HOLD_ENABLE BIT(7) #define PON_PS_HOLD_TYPE_MASK 0x0f +#define PON_PS_HOLD_TYPE_WARM_RESET 1 #define PON_PS_HOLD_TYPE_SHUTDOWN 4 #define PON_PS_HOLD_TYPE_HARD_RESET 7@@ -93,7 +94,10 @@ static int pm8941_reboot_notify(struct notifier_block*nb, break; case SYS_RESTART: default: - reset_type = PON_PS_HOLD_TYPE_HARD_RESET; + if (reboot_mode == REBOOT_WARM)
This doesn't compile with CONFIG_INPUT_PM8941_PWRKEY=m ERROR: modpost: "reboot_mode" [drivers/input/misc/pm8941-pwrkey.ko] undefined! Also just to clarify, this is supposed to trigger when rebooting with LINUX_REBOOT_CMD_RESTART2 and adding an argument that way, right? Regards Luca
+ reset_type = PON_PS_HOLD_TYPE_WARM_RESET; + else + reset_type = PON_PS_HOLD_TYPE_HARD_RESET; break; }