Skip to contentSkip to conversation

input: sirfsoc-onkey - report onkey untouch event by detecting pin status

PATCH New Barry Song 2 participants 5 messages Feb 10, 2014 – Feb 13, 2014

Subsystems (2)
lore
Share & tools
lore

Barry Song

author
#0 lore raw

PATCH 1/1 input: sirfsoc-onkey - report onkey untouch event by detecting pin status

From: Xianglong Du <[email protected]>

this patch adds a delayed_work to detect the untouch of onkey since HW will not generate interrupt for it.

at the same time, we move the KEY event to POWER instead of SUSPEND, which will be suitable for both Android and Linux. Userspace PowerManager Daemon will decide to suspend or shutdown based on how long we have touched onkey

---
 drivers/input/misc/sirfsoc-onkey.c |   48 ++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 10 deletions(-)
drivers/input/misc/sirfsoc-onkey.c +38 -10
index e8897c3..9cd810b 100644
@@ -13,16 +13,44 @@
 #include <linux/input.h>
 #include <linux/rtc/sirfsoc_rtciobrg.h>
 #include <linux/of.h>
+#include <linux/workqueue.h>
 
 struct sirfsoc_pwrc_drvdata {
 	u32			pwrc_base;
 	struct input_dev	*input;
+	struct delayed_work	work;
 };
 
 #define PWRC_ON_KEY_BIT			(1 << 0)
 
 #define PWRC_INT_STATUS			0xc
 #define PWRC_INT_MASK			0x10
+#define PWRC_PIN_STATUS			0x14
+#define PWRC_KEY_DETECT_UP_TIME		20	/* ms*/
+
+static inline int sirfsoc_pwrc_is_on_key_down(
+		struct sirfsoc_pwrc_drvdata *pwrcdrv)
+{
+	int state = sirfsoc_rtc_iobrg_readl(
+				pwrcdrv->pwrc_base + PWRC_PIN_STATUS)
+				& PWRC_ON_KEY_BIT;
+	return !state; /* ON_KEY is active low */
+}
+
+static void sirfsoc_pwrc_report_event(struct work_struct *work)
+{
+	struct sirfsoc_pwrc_drvdata *pwrcdrv =
+				container_of((struct delayed_work *)work,
+				struct sirfsoc_pwrc_drvdata, work);
+
+	if (!sirfsoc_pwrc_is_on_key_down(pwrcdrv)) {
+		input_event(pwrcdrv->input, EV_PWR, KEY_POWER, 0);
+		input_sync(pwrcdrv->input);
+	} else {
+		schedule_delayed_work(&pwrcdrv->work,
+			msecs_to_jiffies(PWRC_KEY_DETECT_UP_TIME));
+	}
+}
 
 static irqreturn_t sirfsoc_pwrc_isr(int irq, void *dev_id)
 {
@@ -34,17 +62,11 @@ static irqreturn_t sirfsoc_pwrc_isr(int irq, void *dev_id)
 	sirfsoc_rtc_iobrg_writel(int_status & ~PWRC_ON_KEY_BIT,
 				 pwrcdrv->pwrc_base + PWRC_INT_STATUS);
 
-	/*
-	 * For a typical Linux system, we report KEY_SUSPEND to trigger apm-power.c
-	 * to queue a SUSPEND APM event
-	 */
-	input_event(pwrcdrv->input, EV_PWR, KEY_SUSPEND, 1);
-	input_sync(pwrcdrv->input);
 
-	/*
-	 * Todo: report KEY_POWER event for Android platforms, Android PowerManager
-	 * will handle the suspend and powerdown/hibernation
-	 */
+	input_event(pwrcdrv->input, EV_PWR, KEY_POWER, 1);
+	input_sync(pwrcdrv->input);
+	schedule_delayed_work(&pwrcdrv->work,
+		msecs_to_jiffies(PWRC_KEY_DETECT_UP_TIME));
 
 	return IRQ_HANDLED;
 }
@@ -88,6 +110,8 @@ static int sirfsoc_pwrc_probe(struct platform_device *pdev)
 	pwrcdrv->input->phys = "pwrc/input0";
 	pwrcdrv->input->evbit[0] = BIT_MASK(EV_PWR);
 
+	INIT_DELAYED_WORK(&pwrcdrv->work, sirfsoc_pwrc_report_event);
+
 	irq = platform_get_irq(pdev, 0);
 	error = devm_request_irq(&pdev->dev, irq,
 				 sirfsoc_pwrc_isr, IRQF_SHARED,
@@ -119,8 +143,12 @@ static int sirfsoc_pwrc_probe(struct platform_device *pdev)
 
 static int sirfsoc_pwrc_remove(struct platform_device *pdev)
 {
+	struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(&pdev->dev);
+
 	device_init_wakeup(&pdev->dev, 0);
 
+	cancel_delayed_work_sync(&pwrcdrv->work);
+
 	return 0;
 }
 
Signature · 1 line
1.7.5.4
maintainer
#1 lore raw

PATCH 1/1 input: sirfsoc-onkey - report onkey untouch event by detecting pin status

Hi Barry,

drivers/input/misc/sirfsoc-onkey.c static int sirfsoc_pwrc_probe(struct platform_device *pdev) · line 151

Quoted 9 lines · Barry Song

static int sirfsoc_pwrc_remove(struct platform_device *pdev) {

drivers/input/misc/sirfsoc-onkey.c +4 -0
+	struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(&pdev->dev);
+
 	device_init_wakeup(&pdev->dev, 0);
 
+	cancel_delayed_work_sync(&pwrcdrv->work);
+

This is racy: interrupt is freed later and can schedule work again.

Thanks.

Signature · 1 line
Dmitry
author
#2 lore raw

PATCH 1/1 input: sirfsoc-onkey - report onkey untouch event by detecting pin status

2014-02-13 7:11 GMT+08:00 Dmitry Torokhov <[email protected]>:

Quoted 10 lines

Hi Barry,

Quoted 7 lines · Barry Song

static int sirfsoc_pwrc_remove(struct platform_device *pdev) {

drivers/input/misc/sirfsoc-onkey.c +2 -0
+     struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(&pdev->dev);
+
      device_init_wakeup(&pdev->dev, 0);
Quoted 4 lines

drivers/input/misc/sirfsoc-onkey.c static int sirfsoc_pwrc_probe(struct platform_device *pdev) · line 151

Quoted 2 lines
drivers/input/misc/sirfsoc-onkey.c +2 -0
+     cancel_delayed_work_sync(&pwrcdrv->work);
+

This is racy: interrupt is freed later and can schedule work again.

thanks, Dmitry. i will do a manual devm_free_irq() before cancelling the work and before devres removes the resources.

Quoted 5 lines

Thanks.

--
Dmitry

-barry

maintainer
#3 lore raw

PATCH 1/1 input: sirfsoc-onkey - report onkey untouch event by detecting pin status

Quoted 12 lines · Barry Song

2014-02-13 7:11 GMT+08:00 Dmitry Torokhov <[email protected]>:

Quoted 7 lines

Hi Barry,

Quoted 4 lines · Barry Song

static int sirfsoc_pwrc_remove(struct platform_device *pdev) {
+ struct sirfsoc_pwrc_drvdata *pwrcdrv =

dev_get_drvdata(&pdev->dev);

Quoted 3 lines
Quoted 3 lines

+

      device_init_wakeup(&pdev->dev, 0);
Quoted 7 lines
Quoted 4 lines

drivers/input/misc/sirfsoc-onkey.c static int sirfsoc_pwrc_probe(struct platform_device *pdev) · line 151

Quoted 2 lines
drivers/input/misc/sirfsoc-onkey.c +2 -0
+     cancel_delayed_work_sync(&pwrcdrv->work);
+

This is racy: interrupt is freed later and can schedule work again.

thanks, Dmitry. i will do a manual devm_free_irq() before cancelling the work and before devres removes the resources.

Another option would be to use devm custom action to ensure that work is canceled after freeing IRQ.

Signature · 1 line
Dmitry
author
#4 lore raw

PATCH 1/1 input: sirfsoc-onkey - report onkey untouch event by detecting pin status

2014-02-13 11:41 GMT+08:00 Dmitry Torokhov <[email protected]>:

Quoted 18 lines · Barry Song
Quoted 17 lines

2014-02-13 7:11 GMT+08:00 Dmitry Torokhov <[email protected]>:

Quoted 7 lines

Hi Barry,

Quoted 4 lines · Barry Song

static int sirfsoc_pwrc_remove(struct platform_device *pdev) {
+ struct sirfsoc_pwrc_drvdata *pwrcdrv =

dev_get_drvdata(&pdev->dev);

Quoted 7 lines

drivers/input/misc/sirfsoc-onkey.c static int sirfsoc_pwrc_probe(struct platform_device *pdev) · line 151

Quoted 5 lines
drivers/input/misc/sirfsoc-onkey.c +3 -0
+
      device_init_wakeup(&pdev->dev, 0);
 
+     cancel_delayed_work_sync(&pwrcdrv->work);
+

This is racy: interrupt is freed later and can schedule work again.

Quoted 4 lines
Quoted 2 lines

thanks, Dmitry. i will do a manual devm_free_irq() before cancelling the work and before devres removes the resources.

Another option would be to use devm custom action to ensure that work is canceled after freeing IRQ.

yes. you did a great job to have a devm_add_action() API.

Quoted 4 lines

--
Dmitry

-barry