Skip to contentSkip to conversation

input: keyboard: imx: no need to control interrupt status in event check

PATCH In review Anson Huang 2 participants 4 messages Mar 29, 2019 – Apr 4, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 input: keyboard: imx: no need to control interrupt status in event check

There is no need to enable release interrupt and disable depress interrupt in event check, as a timer is setup for checking these events rather than interrupts.

---
 drivers/input/keyboard/imx_keypad.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/input/keyboard/imx_keypad.c +0 -5
index 539cb67..7e32c36 100644
@@ -276,11 +276,6 @@ static void imx_keypad_check_for_events(struct timer_list *t)
 		reg_val = readw(keypad->mmio_base + KPSR);
 		reg_val |= KBD_STAT_KPKR | KBD_STAT_KRSS;
 		writew(reg_val, keypad->mmio_base + KPSR);
-
-		reg_val = readw(keypad->mmio_base + KPSR);
-		reg_val |= KBD_STAT_KRIE;
-		reg_val &= ~KBD_STAT_KDIE;
-		writew(reg_val, keypad->mmio_base + KPSR);
 	}
 }
 
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 input: keyboard: imx: make sure keyboard can always wake up system

There are several scenarios that keyboard can NOT wake up system from suspend, e.g., if a keyboard is depressed between system device suspend phase and device noirq suspend phase, the keyboard ISR will be called and both keyboard depress and release interrupts will be disabled, then keyboard will no longer be able to wake up system. Another scenario would be, if a keyboard is kept depressed, and then system goes into suspend, the expected behavior would be when keyboard is released, system will be waked up, but current implementation can NOT achieve that, because both depress and release interrupts are disabled in ISR, and the event check is still in progress.

To fix these issues, need to make sure keyboard's depress or release interrupt is enabled after noirq device suspend phase, this patch moves the suspend/resume callback to noirq suspend/resume phase, and enable the corresponding interrupt according to current keyboard status.

---
 drivers/input/keyboard/imx_keypad.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
drivers/input/keyboard/imx_keypad.c +14 -4
index 7e32c36..9ae2090 100644
@@ -521,11 +521,12 @@ static int imx_keypad_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __maybe_unused imx_kbd_suspend(struct device *dev)
+static int __maybe_unused imx_kbd_noirq_suspend(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct imx_keypad *kbd = platform_get_drvdata(pdev);
 	struct input_dev *input_dev = kbd->input_dev;
+	unsigned short reg_val = readw(kbd->mmio_base + KPSR);
 
 	/* imx kbd can wake up system even clock is disabled */
 	mutex_lock(&input_dev->mutex);
@@ -535,13 +536,20 @@ static int __maybe_unused imx_kbd_suspend(struct device *dev)
 
 	mutex_unlock(&input_dev->mutex);
 
-	if (device_may_wakeup(&pdev->dev))
+	if (device_may_wakeup(&pdev->dev)) {
+		if (reg_val & KBD_STAT_KPKD)
+			reg_val |= KBD_STAT_KRIE;
+		if (reg_val & KBD_STAT_KPKR)
+			reg_val |= KBD_STAT_KDIE;
+		writew(reg_val, kbd->mmio_base + KPSR);
+
 		enable_irq_wake(kbd->irq);
+	}
 
 	return 0;
 }
 
-static int __maybe_unused imx_kbd_resume(struct device *dev)
+static int __maybe_unused imx_kbd_noirq_resume(struct device *dev)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct imx_keypad *kbd = platform_get_drvdata(pdev);
@@ -565,7 +573,9 @@ static int __maybe_unused imx_kbd_resume(struct device *dev)
 	return ret;
 }
 
-static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume);
+static const struct dev_pm_ops imx_kbd_pm_ops = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(imx_kbd_noirq_suspend, imx_kbd_noirq_resume)
+};
 
 static struct platform_driver imx_keypad_driver = {
 	.driver		= {
Signature · 1 line
2.7.4
#2 lore raw
In reply to Anson Huang

Hi Anson,

Quoted 3 lines · Anson Huang

There is no need to enable release interrupt and disable depress interrupt in event check, as a timer is setup for checking these events rather than interrupts.

But won't using release interrupt allow signalling key release earlier?

Quoted 25 lines
---
 drivers/input/keyboard/imx_keypad.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/input/keyboard/imx_keypad.c +0 -5
index 539cb67..7e32c36 100644
@@ -276,11 +276,6 @@ static void imx_keypad_check_for_events(struct timer_list *t)
 		reg_val = readw(keypad->mmio_base + KPSR);
 		reg_val |= KBD_STAT_KPKR | KBD_STAT_KRSS;
 		writew(reg_val, keypad->mmio_base + KPSR);
-
-		reg_val = readw(keypad->mmio_base + KPSR);
-		reg_val |= KBD_STAT_KRIE;
-		reg_val &= ~KBD_STAT_KDIE;
-		writew(reg_val, keypad->mmio_base + KPSR);
 	}
 }
 
Signature · 1 line
2.7.4

Thanks.

Signature · 1 line
Dmitry
#3 lore raw

Hi, Dmitry

Best Regards!
Anson Huang

Quoted 11 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]]
Sent: 2019年4月4日 5:49
To: Anson Huang <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux- imx <[email protected]>
Subject: Re: [PATCH 1/2] input: keyboard: imx: no need to control interrupt status in event check

Quoted 8 lines

Hi Anson,

Quoted 3 lines · Anson Huang

There is no need to enable release interrupt and disable depress interrupt in event check, as a timer is setup for checking these events rather than interrupts.

But won't using release interrupt allow signalling key release earlier?

It makes sense, patch #1 can be dropped, I will resend the patch #2 for review.

Thanks,
Anson.

Quoted 33 lines

drivers/input/keyboard/imx_keypad.c static void imx_keypad_check_for_events(struct

Quoted 13 lines
---
 drivers/input/keyboard/imx_keypad.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/input/keyboard/imx_keypad.c +0 -0
index 539cb67..7e32c36 100644
@@ -276,11 +276,6 @@ static void imx_keypad_check_for_events(struct

timer_list *t)

Quoted 12 lines
drivers/input/keyboard/imx_keypad.c +0 -6
 		reg_val = readw(keypad->mmio_base + KPSR);
 		reg_val |= KBD_STAT_KPKR | KBD_STAT_KRSS;
 		writew(reg_val, keypad->mmio_base + KPSR);
-
-		reg_val = readw(keypad->mmio_base + KPSR);
-		reg_val |= KBD_STAT_KRIE;
-		reg_val &= ~KBD_STAT_KDIE;
-		writew(reg_val, keypad->mmio_base + KPSR);
 	}
 }
 
--
Quoted 2 lines

2.7.4

Thanks.

--
Dmitry