Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
On 02/05/2013 12:40 AM, NeilBrown wrote:
On Thu, 31 Jan 2013 15:25:43 +0200 "ivan.khoronzhuk"
wrote:
On 01/28/2013 08:51 PM, NeilBrown wrote:
On Mon, 28 Jan 2013 18:13:14 +0200 "ivan.khoronzhuk"
wrote:
On 01/22/2013 07:24 AM, NeilBrown wrote:
On Mon, 21 Jan 2013 15:57:18 -0800 Dmitry Torokhov
wrote:
Hi Ivan,
On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote:
Rebased on linux_omap/master.
During suspend/resume the key press can be lost if time of resume
sequence is significant.
If press event cannot be remembered then the driver can read the
current button state only in time of interrupt handling. But in some
cases when time between IRQ and IRQ handler is significant we can
read incorrect state. As a particular case, when device is in suspend
we press wakupable key and up it back in a jiffy, the interrupt
handler read the state of up but the interrupt source is press indeed.
As a result, in a OS like android, we resume then suspend right away
because the key state is not changed.
This patch add to gpio_keys framework opportunity to recover lost of
press key event at resuming. The variable "key_pressed" from
gpio_button_data structure is not used for gpio keys, it is only used
for gpio irq keys, so it is logically used to remember press lost
while resuming.
The same could happen if you delay processing of interrupt long enough
during normal operation. If key is released by the time you get around
to reading it you will not see a key press.
To me this sounds like you need to speed up your resume process so that
you can start serving interrupts quicker.
Agreed. When I was looking at this I found that any genuine button press
would have at least 70msec between press and release, while the device could
wake up to the point of being able to handle interrupts in about 14msec.
That is enough of a gap to make it pointless to try to 'fix' the code.
With enough verbose debugging enabled that 14msec can easily grow to
hundreds, but then if you have debugging enabled to can discipline yourself
to hold the button for longer.
Ivan: What sort of delay are you seeing between the button press and the
interrupt routine running? And can you measure how long the button is
typically down for?
NeilBrown
In my case I have the delay between the button press and the ISR
about 145ms. If the button down for 120ms the IRQ press event is
lost and if 160ms event is captured. I cannot speed up resume
process enough to guarantee correct work, so I wrote this fix.
145ms does sound like a long time.
You should be able to get precise timings by putting a printk in various
parts of the code and ensuring the kernel logs are getting precise timestamps.
Then you could see if the delay is between resume starting and the ISR
running, or between the ISR and the gpio_work_func getting scheduled.
I assume that you don't have ->debounce_interval set
If the ISR is running soon enough, it might be possible to read the GPIO from
the ISR - I think that would be a cleaner solution.
If not, then you will need something that interpolates an extra key press.
In that case I would suggest my original patch - it seems simpler than yours
and doesn't make a special case out of suspend. As Dmitry said, any delay
could cause a problem.
My patch simply ensures that there is at least one button event for each
interrupt by generating an extra event for the inverse of the current button
position. If that state had already been noticed, the input subsystem will
filter the extra event out so it won't be visible elsewhere.
For reference, my original patch is below.
NeilBrown
[PATCH] Input: gpio_keys - ensure we don't miss key-presses during resume.
If the latency of resume means we don't poll the key status until
after it has been released, we can lose the keypress which woke the
device.
So on each interrupt, record that a press is pending, and in that
case, report both the up and down event, ordered such that the second
event is that one that reflects the current state.
One event will normally be swallowed by the input layer if there was
no change, but the result will be that every interrupt will produce at
least one event.
Signed-off-by: NeilBrown
diff --git a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c index 62bfce4..961e5e1 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -40,6 +40,7 @@ struct gpio_button_data {
spinlock_t lock;
bool disabled;
bool key_pressed;
+ bool pending;
};
struct gpio_keys_drvdata {
@@ -335,6 +336,14 @@ static void gpio_keys_gpio_report_event(struct
gpio_button_data *bdata) if (state)
input_event(input, type, button->code, button->value);
} else {
+ if (type == EV_KEY && bdata->pending) {
+ /* Before reporting the observed state, report the
+* alternate to be sure that a change is seen.
+
Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
On Thu, 31 Jan 2013 15:25:43 +0200 "ivan.khoronzhuk"
wrote:
> On 01/28/2013 08:51 PM, NeilBrown wrote:
> > On Mon, 28 Jan 2013 18:13:14 +0200 "ivan.khoronzhuk"
> >
> > wrote:
> >
> >> On 01/22/2013 07:24 AM, NeilBrown wrote:
> >>> On Mon, 21 Jan 2013 15:57:18 -0800 Dmitry Torokhov
> >>> wrote:
> >>>
> Hi Ivan,
>
> On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote:
> > Rebased on linux_omap/master.
> >
> > During suspend/resume the key press can be lost if time of resume
> > sequence is significant.
> >
> > If press event cannot be remembered then the driver can read the
> > current button state only in time of interrupt handling. But in some
> > cases when time between IRQ and IRQ handler is significant we can
> > read incorrect state. As a particular case, when device is in suspend
> > we press wakupable key and up it back in a jiffy, the interrupt
> > handler read the state of up but the interrupt source is press indeed.
> > As a result, in a OS like android, we resume then suspend right away
> > because the key state is not changed.
> >
> > This patch add to gpio_keys framework opportunity to recover lost of
> > press key event at resuming. The variable "key_pressed" from
> > gpio_button_data structure is not used for gpio keys, it is only used
> > for gpio irq keys, so it is logically used to remember press lost
> > while resuming.
> The same could happen if you delay processing of interrupt long enough
> during normal operation. If key is released by the time you get around
> to reading it you will not see a key press.
>
> To me this sounds like you need to speed up your resume process so that
> you can start serving interrupts quicker.
>
> >>> Agreed. When I was looking at this I found that any genuine button press
> >>> would have at least 70msec between press and release, while the device
> >>> could
> >>> wake up to the point of being able to handle interrupts in about 14msec.
> >>> That is enough of a gap to make it pointless to try to 'fix' the code.
> >>>
> >>> With enough verbose debugging enabled that 14msec can easily grow to
> >>> hundreds, but then if you have debugging enabled to can discipline
> >>> yourself
> >>> to hold the button for longer.
> >>>
> >>> Ivan: What sort of delay are you seeing between the button press and the
> >>> interrupt routine running? And can you measure how long the button is
> >>> typically down for?
> >>>
> >>> NeilBrown
> >> In my case I have the delay between the button press and the ISR
> >> about 145ms. If the button down for 120ms the IRQ press event is
> >> lost and if 160ms event is captured. I cannot speed up resume
> >> process enough to guarantee correct work, so I wrote this fix.
> >>
> >
> > 145ms does sound like a long time.
> > You should be able to get precise timings by putting a printk in various
> > parts of the code and ensuring the kernel logs are getting precise
> > timestamps.
> >
> > Then you could see if the delay is between resume starting and the ISR
> > running, or between the ISR and the gpio_work_func getting scheduled.
> >
> > I assume that you don't have ->debounce_interval set
> >
> > If the ISR is running soon enough, it might be possible to read the GPIO
> > from
> > the ISR - I think that would be a cleaner solution.
> >
> > If not, then you will need something that interpolates an extra key press.
> > In that case I would suggest my original patch - it seems simpler than yours
> > and doesn't make a special case out of suspend. As Dmitry said, any delay
> > could cause a problem.
> > My patch simply ensures that there is at least one button event for each
> > interrupt by generating an extra event for the inverse of the current button
> > position. If that state had already been noticed, the input subsystem will
> > filter the extra event out so it won't be visible elsewhere.
> >
> > For reference, my original patch is below.
> >
> > NeilBrown
> >
> > [PATCH] Input: gpio_keys - ensure we don't miss key-presses during resume.
> >
> > If the latency of resume means we don't poll the key status until
> > after it has been released, we can lose the keypress which woke the
> > device.
> >
> > So on each interrupt, record that a press is pending, and in that
> > case, report both the up and down event, ordered such that the second
> > event is that one that reflects the current state.
> >
> > One event will normally be swallowed by the input layer if there was
> > no change, but the result will be that every interrupt will produce at
> > least one event.
> >
> > Signed-off-by: NeilBrown
> >
> > diff --git a/drivers/input/keyboard/gpio_keys.c
> > b/drivers/input/keyboard/gpio_keys.c index 62bfce4..961e5e1 100644
> > --- a/drivers/input/keyboard/gpio_keys.c
> > +++ b/drivers/input/keyboard/gpio_keys.c
> > @@ -40,6 +40,7 @@ struct gpio_button_data {
> > spinlock_t lock;
>
Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
On 01/28/2013 08:51 PM, NeilBrown wrote:
On Mon, 28 Jan 2013 18:13:14 +0200 "ivan.khoronzhuk"
wrote:
On 01/22/2013 07:24 AM, NeilBrown wrote:
On Mon, 21 Jan 2013 15:57:18 -0800 Dmitry Torokhov
wrote:
Hi Ivan,
On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote:
Rebased on linux_omap/master.
During suspend/resume the key press can be lost if time of resume
sequence is significant.
If press event cannot be remembered then the driver can read the
current button state only in time of interrupt handling. But in some
cases when time between IRQ and IRQ handler is significant we can
read incorrect state. As a particular case, when device is in suspend
we press wakupable key and up it back in a jiffy, the interrupt
handler read the state of up but the interrupt source is press indeed.
As a result, in a OS like android, we resume then suspend right away
because the key state is not changed.
This patch add to gpio_keys framework opportunity to recover lost of
press key event at resuming. The variable "key_pressed" from
gpio_button_data structure is not used for gpio keys, it is only used
for gpio irq keys, so it is logically used to remember press lost
while resuming.
The same could happen if you delay processing of interrupt long enough
during normal operation. If key is released by the time you get around
to reading it you will not see a key press.
To me this sounds like you need to speed up your resume process so that
you can start serving interrupts quicker.
Agreed. When I was looking at this I found that any genuine button press
would have at least 70msec between press and release, while the device could
wake up to the point of being able to handle interrupts in about 14msec.
That is enough of a gap to make it pointless to try to 'fix' the code.
With enough verbose debugging enabled that 14msec can easily grow to
hundreds, but then if you have debugging enabled to can discipline yourself
to hold the button for longer.
Ivan: What sort of delay are you seeing between the button press and the
interrupt routine running? And can you measure how long the button is
typically down for?
NeilBrown
In my case I have the delay between the button press and the ISR
about 145ms. If the button down for 120ms the IRQ press event is
lost and if 160ms event is captured. I cannot speed up resume
process enough to guarantee correct work, so I wrote this fix.
145ms does sound like a long time.
You should be able to get precise timings by putting a printk in various
parts of the code and ensuring the kernel logs are getting precise timestamps.
Then you could see if the delay is between resume starting and the ISR
running, or between the ISR and the gpio_work_func getting scheduled.
I assume that you don't have ->debounce_interval set
If the ISR is running soon enough, it might be possible to read the GPIO from
the ISR - I think that would be a cleaner solution.
If not, then you will need something that interpolates an extra key press.
In that case I would suggest my original patch - it seems simpler than yours
and doesn't make a special case out of suspend. As Dmitry said, any delay
could cause a problem.
My patch simply ensures that there is at least one button event for each
interrupt by generating an extra event for the inverse of the current button
position. If that state had already been noticed, the input subsystem will
filter the extra event out so it won't be visible elsewhere.
For reference, my original patch is below.
NeilBrown
[PATCH] Input: gpio_keys - ensure we don't miss key-presses during resume.
If the latency of resume means we don't poll the key status until
after it has been released, we can lose the keypress which woke the
device.
So on each interrupt, record that a press is pending, and in that
case, report both the up and down event, ordered such that the second
event is that one that reflects the current state.
One event will normally be swallowed by the input layer if there was
no change, but the result will be that every interrupt will produce at
least one event.
Signed-off-by: NeilBrown
diff --git a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c index 62bfce4..961e5e1 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -40,6 +40,7 @@ struct gpio_button_data {
spinlock_t lock;
bool disabled;
bool key_pressed;
+ bool pending;
};
struct gpio_keys_drvdata {
@@ -335,6 +336,14 @@ static void gpio_keys_gpio_report_event(struct
gpio_button_data *bdata) if (state)
input_event(input, type, button->code, button->value);
} else {
+ if (type == EV_KEY && bdata->pending) {
+ /* Before reporting the observed state, report the
+* alternate to be sure that a change is seen.
+*/
+ bdata->pending = 0;
+ input_event(i
Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
On Mon, 28 Jan 2013 18:13:14 +0200 "ivan.khoronzhuk"
wrote:
> On 01/22/2013 07:24 AM, NeilBrown wrote:
> > On Mon, 21 Jan 2013 15:57:18 -0800 Dmitry Torokhov
> > wrote:
> >
> >> Hi Ivan,
> >>
> >> On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote:
> >>> Rebased on linux_omap/master.
> >>>
> >>> During suspend/resume the key press can be lost if time of resume
> >>> sequence is significant.
> >>>
> >>> If press event cannot be remembered then the driver can read the
> >>> current button state only in time of interrupt handling. But in some
> >>> cases when time between IRQ and IRQ handler is significant we can
> >>> read incorrect state. As a particular case, when device is in suspend
> >>> we press wakupable key and up it back in a jiffy, the interrupt
> >>> handler read the state of up but the interrupt source is press indeed.
> >>> As a result, in a OS like android, we resume then suspend right away
> >>> because the key state is not changed.
> >>>
> >>> This patch add to gpio_keys framework opportunity to recover lost of
> >>> press key event at resuming. The variable "key_pressed" from
> >>> gpio_button_data structure is not used for gpio keys, it is only used
> >>> for gpio irq keys, so it is logically used to remember press lost
> >>> while resuming.
> >> The same could happen if you delay processing of interrupt long enough
> >> during normal operation. If key is released by the time you get around
> >> to reading it you will not see a key press.
> >>
> >> To me this sounds like you need to speed up your resume process so that
> >> you can start serving interrupts quicker.
> >>
> > Agreed. When I was looking at this I found that any genuine button press
> > would have at least 70msec between press and release, while the device could
> > wake up to the point of being able to handle interrupts in about 14msec.
> > That is enough of a gap to make it pointless to try to 'fix' the code.
> >
> > With enough verbose debugging enabled that 14msec can easily grow to
> > hundreds, but then if you have debugging enabled to can discipline yourself
> > to hold the button for longer.
> >
> > Ivan: What sort of delay are you seeing between the button press and the
> > interrupt routine running? And can you measure how long the button is
> > typically down for?
> >
> > NeilBrown
>
> In my case I have the delay between the button press and the ISR
> about 145ms. If the button down for 120ms the IRQ press event is
> lost and if 160ms event is captured. I cannot speed up resume
> process enough to guarantee correct work, so I wrote this fix.
>
145ms does sound like a long time.
You should be able to get precise timings by putting a printk in various
parts of the code and ensuring the kernel logs are getting precise timestamps.
Then you could see if the delay is between resume starting and the ISR
running, or between the ISR and the gpio_work_func getting scheduled.
I assume that you don't have ->debounce_interval set
If the ISR is running soon enough, it might be possible to read the GPIO from
the ISR - I think that would be a cleaner solution.
If not, then you will need something that interpolates an extra key press.
In that case I would suggest my original patch - it seems simpler than yours
and doesn't make a special case out of suspend. As Dmitry said, any delay
could cause a problem.
My patch simply ensures that there is at least one button event for each
interrupt by generating an extra event for the inverse of the current button
position. If that state had already been noticed, the input subsystem will
filter the extra event out so it won't be visible elsewhere.
For reference, my original patch is below.
NeilBrown
[PATCH] Input: gpio_keys - ensure we don't miss key-presses during resume.
If the latency of resume means we don't poll the key status until
after it has been released, we can lose the keypress which woke the
device.
So on each interrupt, record that a press is pending, and in that
case, report both the up and down event, ordered such that the second
event is that one that reflects the current state.
One event will normally be swallowed by the input layer if there was
no change, but the result will be that every interrupt will produce at
least one event.
Signed-off-by: NeilBrown
diff --git a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c index 62bfce4..961e5e1 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -40,6 +40,7 @@ struct gpio_button_data {
spinlock_t lock;
bool disabled;
bool key_pressed;
+ bool pending;
};
struct gpio_keys_drvdata {
@@ -335,6 +336,14 @@ static void gpio_keys_gpio_report_event(struct
gpio_button_data *bdata) if (state)
input_event(input, type, button->code, button->value);
} else {
+ if (type == EV_KEY && bdata->pending) {
+ /* Before reporting the observed state, report
Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
On 01/22/2013 07:24 AM, NeilBrown wrote: On Mon, 21 Jan 2013 15:57:18 -0800 Dmitry Torokhov wrote: Hi Ivan, On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote: Rebased on linux_omap/master. During suspend/resume the key press can be lost if time of resume sequence is significant. If press event cannot be remembered then the driver can read the current button state only in time of interrupt handling. But in some cases when time between IRQ and IRQ handler is significant we can read incorrect state. As a particular case, when device is in suspend we press wakupable key and up it back in a jiffy, the interrupt handler read the state of up but the interrupt source is press indeed. As a result, in a OS like android, we resume then suspend right away because the key state is not changed. This patch add to gpio_keys framework opportunity to recover lost of press key event at resuming. The variable "key_pressed" from gpio_button_data structure is not used for gpio keys, it is only used for gpio irq keys, so it is logically used to remember press lost while resuming. The same could happen if you delay processing of interrupt long enough during normal operation. If key is released by the time you get around to reading it you will not see a key press. To me this sounds like you need to speed up your resume process so that you can start serving interrupts quicker. Agreed. When I was looking at this I found that any genuine button press would have at least 70msec between press and release, while the device could wake up to the point of being able to handle interrupts in about 14msec. That is enough of a gap to make it pointless to try to 'fix' the code. With enough verbose debugging enabled that 14msec can easily grow to hundreds, but then if you have debugging enabled to can discipline yourself to hold the button for longer. Ivan: What sort of delay are you seeing between the button press and the interrupt routine running? And can you measure how long the button is typically down for? NeilBrown In my case I have the delay between the button press and the ISR about 145ms. If the button down for 120ms the IRQ press event is lost and if 160ms event is captured. I cannot speed up resume process enough to guarantee correct work, so I wrote this fix. -- Regards, Ivan Khoronzhuk -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
On Mon, 21 Jan 2013 15:57:18 -0800 Dmitry Torokhov wrote: > Hi Ivan, > > On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote: > > Rebased on linux_omap/master. > > > > During suspend/resume the key press can be lost if time of resume > > sequence is significant. > > > > If press event cannot be remembered then the driver can read the > > current button state only in time of interrupt handling. But in some > > cases when time between IRQ and IRQ handler is significant we can > > read incorrect state. As a particular case, when device is in suspend > > we press wakupable key and up it back in a jiffy, the interrupt > > handler read the state of up but the interrupt source is press indeed. > > As a result, in a OS like android, we resume then suspend right away > > because the key state is not changed. > > > > This patch add to gpio_keys framework opportunity to recover lost of > > press key event at resuming. The variable "key_pressed" from > > gpio_button_data structure is not used for gpio keys, it is only used > > for gpio irq keys, so it is logically used to remember press lost > > while resuming. > > The same could happen if you delay processing of interrupt long enough > during normal operation. If key is released by the time you get around > to reading it you will not see a key press. > > To me this sounds like you need to speed up your resume process so that > you can start serving interrupts quicker. > Agreed. When I was looking at this I found that any genuine button press would have at least 70msec between press and release, while the device could wake up to the point of being able to handle interrupts in about 14msec. That is enough of a gap to make it pointless to try to 'fix' the code. With enough verbose debugging enabled that 14msec can easily grow to hundreds, but then if you have debugging enabled to can discipline yourself to hold the button for longer. Ivan: What sort of delay are you seeing between the button press and the interrupt routine running? And can you measure how long the button is typically down for? NeilBrown signature.asc Description: PGP signature
Re: [RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
Hi Ivan, On Mon, Jan 21, 2013 at 03:15:14PM +0200, Ivan Khoronzhuk wrote: > Rebased on linux_omap/master. > > During suspend/resume the key press can be lost if time of resume > sequence is significant. > > If press event cannot be remembered then the driver can read the > current button state only in time of interrupt handling. But in some > cases when time between IRQ and IRQ handler is significant we can > read incorrect state. As a particular case, when device is in suspend > we press wakupable key and up it back in a jiffy, the interrupt > handler read the state of up but the interrupt source is press indeed. > As a result, in a OS like android, we resume then suspend right away > because the key state is not changed. > > This patch add to gpio_keys framework opportunity to recover lost of > press key event at resuming. The variable "key_pressed" from > gpio_button_data structure is not used for gpio keys, it is only used > for gpio irq keys, so it is logically used to remember press lost > while resuming. The same could happen if you delay processing of interrupt long enough during normal operation. If key is released by the time you get around to reading it you will not see a key press. To me this sounds like you need to speed up your resume process so that you can start serving interrupts quicker. Thanks. -- Dmitry -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
Rebased on linux_omap/master.
During suspend/resume the key press can be lost if time of resume
sequence is significant.
If press event cannot be remembered then the driver can read the
current button state only in time of interrupt handling. But in some
cases when time between IRQ and IRQ handler is significant we can
read incorrect state. As a particular case, when device is in suspend
we press wakupable key and up it back in a jiffy, the interrupt
handler read the state of up but the interrupt source is press indeed.
As a result, in a OS like android, we resume then suspend right away
because the key state is not changed.
This patch add to gpio_keys framework opportunity to recover lost of
press key event at resuming. The variable "key_pressed" from
gpio_button_data structure is not used for gpio keys, it is only used
for gpio irq keys, so it is logically used to remember press lost
while resuming.
Signed-off-by: Ivan Khoronzhuk
---
drivers/input/keyboard/gpio_keys.c | 31 ++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c
index b29ca65..33ac8c5 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -45,6 +45,7 @@ struct gpio_button_data {
struct gpio_keys_drvdata {
const struct gpio_keys_platform_data *pdata;
struct input_dev *input;
+ int suspended;
struct mutex disable_lock;
struct gpio_button_data data[0];
};
@@ -326,14 +327,40 @@ static void gpio_keys_gpio_report_event(struct
gpio_button_data *bdata)
{
const struct gpio_keys_button *button = bdata->button;
struct input_dev *input = bdata->input;
+ struct gpio_keys_drvdata *ddata = input_get_drvdata(input);
unsigned int type = button->type ?: EV_KEY;
int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^
button->active_low;
+ /*
+* Don't generate input event while resuming,
+* it will be generated at gpio_keys_resume function
+ */
+ if (ddata->suspended) {
+ /*
+* missed press event while resuming so set
+* key_pressed flag to generate press and up events
+* while gpio_keys_resume function.
+*/
+ if (button->wakeup && state == 0)
+ bdata->key_pressed = 1;
+ return;
+ }
+
if (type == EV_ABS) {
if (state)
input_event(input, type, button->code, button->value);
} else {
- input_event(input, type, button->code, !!state);
+ /*
+* missed press key, so generate press event then up event
+*/
+ if (bdata->key_pressed) {
+ input_event(bdata->input, EV_KEY, button->code, 1);
+ input_sync(bdata->input);
+ input_event(bdata->input, EV_KEY, button->code, 0);
+ bdata->key_pressed = 0;
+ } else {
+ input_event(input, type, button->code, !!state);
+ }
}
input_sync(input);
}
@@ -822,6 +849,7 @@ static int gpio_keys_suspend(struct device *dev)
mutex_unlock(&input->mutex);
}
+ ddata->suspended = 1;
return 0;
}
@@ -832,6 +860,7 @@ static int gpio_keys_resume(struct device *dev)
int error = 0;
int i;
+ ddata->suspended = 0;
if (device_may_wakeup(dev)) {
for (i = 0; i < ddata->pdata->nbuttons; i++) {
struct gpio_button_data *bdata = &ddata->data[i];
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[RFC PATCH] Input: gpio_keys: Fix suspend/resume press event lost
During suspend/resume the key press can be lost if time of resume
sequence is significant.
If press event cannot be remembered then the driver can read the
current button state only in time of interrupt handling. But in some
cases when time between IRQ and IRQ handler is significant we can
read incorrect state. As a particular case, when device is in suspend
we press wakupable key and up it back in a jiffy, the interrupt
handler read the state of up but the interrupt source is press indeed.
As a result, in a OS like android, we resume then suspend right away
because the key state is not changed.
This patch add to gpio_keys framework opportunity to recover lost of
press key event at resuming. The variable "key_pressed" from
gpio_button_data structure is not used for gpio keys, it is only used
for gpio irq keys, so it is logically used to remember press lost
while resuming.
Signed-off-by: Ivan Khoronzhuk
---
drivers/input/keyboard/gpio_keys.c | 31 ++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/drivers/input/keyboard/gpio_keys.c
b/drivers/input/keyboard/gpio_keys.c
index 62bfce4..aa49aef 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -46,6 +46,7 @@ struct gpio_keys_drvdata {
struct input_dev *input;
struct mutex disable_lock;
unsigned int n_buttons;
+ int suspended;
int (*enable)(struct device *dev);
void (*disable)(struct device *dev);
struct gpio_button_data data[0];
@@ -328,14 +329,40 @@ static void gpio_keys_gpio_report_event(struct
gpio_button_data *bdata)
{
const struct gpio_keys_button *button = bdata->button;
struct input_dev *input = bdata->input;
+ struct gpio_keys_drvdata *ddata = input_get_drvdata(input);
unsigned int type = button->type ?: EV_KEY;
int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^
button->active_low;
+ /*
+* Don't generate input event while resuming,
+* it will be generated at gpio_keys_resume function
+ */
+ if (ddata->suspended) {
+ /*
+* missed press event while resuming so set
+* key_pressed flag to generate press and up events
+* while gpio_keys_resume function.
+*/
+ if (button->wakeup && state == 0)
+ bdata->key_pressed = 1;
+ return;
+ }
+
if (type == EV_ABS) {
if (state)
input_event(input, type, button->code, button->value);
} else {
- input_event(input, type, button->code, !!state);
+ /*
+* missed press key, so generate press event then up event
+*/
+ if (bdata->key_pressed) {
+ input_event(bdata->input, EV_KEY, button->code, 1);
+ input_sync(bdata->input);
+ input_event(bdata->input, EV_KEY, button->code, 0);
+ bdata->key_pressed = 0;
+ } else {
+ input_event(input, type, button->code, !!state);
+ }
}
input_sync(input);
}
@@ -792,6 +819,7 @@ static int gpio_keys_suspend(struct device *dev)
}
}
+ ddata->suspended = 1;
return 0;
}
@@ -800,6 +828,7 @@ static int gpio_keys_resume(struct device *dev)
struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);
int i;
+ ddata->suspended = 0;
for (i = 0; i < ddata->n_buttons; i++) {
struct gpio_button_data *bdata = &ddata->data[i];
if (bdata->button->wakeup && device_may_wakeup(dev))
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
