[RESEND] mfd: rk8xx-core: Fix interrupt processing order for power key button

Message ID 20240217195615.1767907-1-megi@xff.cz
State New
Headers
Series [RESEND] mfd: rk8xx-core: Fix interrupt processing order for power key button |

Commit Message

Ondřej Jirman Feb. 17, 2024, 7:56 p.m. UTC
  From: Ondrej Jirman <megi@xff.cz>

Process rise event last, to avoid stuck keys when multiple interrupts
are coalesced. This can happen typically when resuming from suspend
via power key press and holding the power button for a bit too short,
so that RISE an FALL IRQ flags are set before any interrupt routine
has a chance to run.

Input subsystem will interpret it as holding down a power key for
a long time, which leads to unintended initiation of shutdown UI
on some OSes.

Signed-off-by: Ondrej Jirman <megi@xff.cz>
---
Sorry, resent without the bogous patch series numbering.

 drivers/mfd/rk8xx-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Lee Jones Feb. 23, 2024, 4:14 p.m. UTC | #1
On Sat, 17 Feb 2024 20:56:13 +0100, Ondřej Jirman wrote:
> Process rise event last, to avoid stuck keys when multiple interrupts
> are coalesced. This can happen typically when resuming from suspend
> via power key press and holding the power button for a bit too short,
> so that RISE an FALL IRQ flags are set before any interrupt routine
> has a chance to run.
> 
> Input subsystem will interpret it as holding down a power key for
> a long time, which leads to unintended initiation of shutdown UI
> on some OSes.
> 
> [...]

Applied, thanks!

[1/1] mfd: rk8xx-core: Fix interrupt processing order for power key button
      commit: bda40bf667d8d26b157a69d821872b2ade59bfa4

--
Lee Jones [李琼斯]
  
Lee Jones Feb. 23, 2024, 4:15 p.m. UTC | #2
On Sat, 17 Feb 2024, Ondřej Jirman wrote:

> From: Ondrej Jirman <megi@xff.cz>
> 
> Process rise event last, to avoid stuck keys when multiple interrupts
> are coalesced. This can happen typically when resuming from suspend
> via power key press and holding the power button for a bit too short,
> so that RISE an FALL IRQ flags are set before any interrupt routine
> has a chance to run.
> 
> Input subsystem will interpret it as holding down a power key for
> a long time, which leads to unintended initiation of shutdown UI
> on some OSes.
> 
> Signed-off-by: Ondrej Jirman <megi@xff.cz>
> ---
> Sorry, resent without the bogous patch series numbering.
> 
>  drivers/mfd/rk8xx-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
> index b1ffc3b9e2be..e2261b68b844 100644
> --- a/drivers/mfd/rk8xx-core.c
> +++ b/drivers/mfd/rk8xx-core.c
> @@ -43,8 +43,8 @@ static struct resource rk806_pwrkey_resources[] = {
>  };
>  
>  static const struct resource rk817_pwrkey_resources[] = {
> -	DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),
>  	DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL),
> +	DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),

FWIW, basing solutions on ordering like this is often fragile!

>  };
>  
>  static const struct resource rk817_charger_resources[] = {
> -- 
> 2.43.0
>
  

Patch

diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c
index b1ffc3b9e2be..e2261b68b844 100644
--- a/drivers/mfd/rk8xx-core.c
+++ b/drivers/mfd/rk8xx-core.c
@@ -43,8 +43,8 @@  static struct resource rk806_pwrkey_resources[] = {
 };
 
 static const struct resource rk817_pwrkey_resources[] = {
-	DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),
 	DEFINE_RES_IRQ(RK817_IRQ_PWRON_FALL),
+	DEFINE_RES_IRQ(RK817_IRQ_PWRON_RISE),
 };
 
 static const struct resource rk817_charger_resources[] = {