| Message ID | 20180111141211.16888-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 2018-01-11 at 15:12 +0100, Hans de Goede wrote: > We should not try to do any i2c transfers before the controller is > resumed (which happens before our resume method gets called). > > So we need to disable our IRQ while suspended to enforce this. The > code paths for devices with GPIOs for the int and reset pins already > disable the IRQ the through goodix_free_irq(). > > This commit also disables the IRQ while suspended for devices without > GPIOs for the int and reset pins. > > This fixes the i2c bus sometimes getting stuck after a suspend/resume > causing the touchscreen to sometimes not work after a suspend/resume. > This has been tested on a GPD pocked device. pocket? Reviewed-by: Bastien Nocera <hadess@hadess.net> > BugLink: https://github.com/nexus511/gpd-ubuntu-packages/issues/10 > BugLink: https://www.reddit.com/r/GPDPocket/comments/7niut2/fix_for_b > roken_touch_after_resume_all_linux/ > Tested-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > Changes in v2: > -Mention the problems this fix + devices tested on in commit msg > -Add BugLinks and Tested-by to commit msg > --- > drivers/input/touchscreen/goodix.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/touchscreen/goodix.c > b/drivers/input/touchscreen/goodix.c > index 69d0b8cbc71f..ecec8eb17f28 100644 > --- a/drivers/input/touchscreen/goodix.c > +++ b/drivers/input/touchscreen/goodix.c > @@ -878,8 +878,10 @@ static int __maybe_unused goodix_suspend(struct > device *dev) > int error; > > /* We need gpio pins to suspend/resume */ > - if (!ts->gpiod_int || !ts->gpiod_rst) > + if (!ts->gpiod_int || !ts->gpiod_rst) { > + disable_irq(client->irq); > return 0; > + } > > wait_for_completion(&ts->firmware_loading_complete); > > @@ -919,8 +921,10 @@ static int __maybe_unused goodix_resume(struct > device *dev) > struct goodix_ts_data *ts = i2c_get_clientdata(client); > int error; > > - if (!ts->gpiod_int || !ts->gpiod_rst) > + if (!ts->gpiod_int || !ts->gpiod_rst) { > + enable_irq(client->irq); > return 0; > + } > > /* > * Exit sleep mode by outputting HIGH level to INT pin -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On 11-01-18 16:52, Bastien Nocera wrote: > On Thu, 2018-01-11 at 15:12 +0100, Hans de Goede wrote: >> We should not try to do any i2c transfers before the controller is >> resumed (which happens before our resume method gets called). >> >> So we need to disable our IRQ while suspended to enforce this. The >> code paths for devices with GPIOs for the int and reset pins already >> disable the IRQ the through goodix_free_irq(). >> >> This commit also disables the IRQ while suspended for devices without >> GPIOs for the int and reset pins. >> >> This fixes the i2c bus sometimes getting stuck after a suspend/resume >> causing the touchscreen to sometimes not work after a suspend/resume. >> This has been tested on a GPD pocked device. > > pocket? Erm, yes. Regards, Hans > > Reviewed-by: Bastien Nocera <hadess@hadess.net> > >> BugLink: https://github.com/nexus511/gpd-ubuntu-packages/issues/10 >> BugLink: https://www.reddit.com/r/GPDPocket/comments/7niut2/fix_for_b >> roken_touch_after_resume_all_linux/ >> Tested-by: Hans de Goede <hdegoede@redhat.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> Changes in v2: >> -Mention the problems this fix + devices tested on in commit msg >> -Add BugLinks and Tested-by to commit msg >> --- >> drivers/input/touchscreen/goodix.c | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/input/touchscreen/goodix.c >> b/drivers/input/touchscreen/goodix.c >> index 69d0b8cbc71f..ecec8eb17f28 100644 >> --- a/drivers/input/touchscreen/goodix.c >> +++ b/drivers/input/touchscreen/goodix.c >> @@ -878,8 +878,10 @@ static int __maybe_unused goodix_suspend(struct >> device *dev) >> int error; >> >> /* We need gpio pins to suspend/resume */ >> - if (!ts->gpiod_int || !ts->gpiod_rst) >> + if (!ts->gpiod_int || !ts->gpiod_rst) { >> + disable_irq(client->irq); >> return 0; >> + } >> >> wait_for_completion(&ts->firmware_loading_complete); >> >> @@ -919,8 +921,10 @@ static int __maybe_unused goodix_resume(struct >> device *dev) >> struct goodix_ts_data *ts = i2c_get_clientdata(client); >> int error; >> >> - if (!ts->gpiod_int || !ts->gpiod_rst) >> + if (!ts->gpiod_int || !ts->gpiod_rst) { >> + enable_irq(client->irq); >> return 0; >> + } >> >> /* >> * Exit sleep mode by outputting HIGH level to INT pin -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index 69d0b8cbc71f..ecec8eb17f28 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -878,8 +878,10 @@ static int __maybe_unused goodix_suspend(struct device *dev) int error; /* We need gpio pins to suspend/resume */ - if (!ts->gpiod_int || !ts->gpiod_rst) + if (!ts->gpiod_int || !ts->gpiod_rst) { + disable_irq(client->irq); return 0; + } wait_for_completion(&ts->firmware_loading_complete); @@ -919,8 +921,10 @@ static int __maybe_unused goodix_resume(struct device *dev) struct goodix_ts_data *ts = i2c_get_clientdata(client); int error; - if (!ts->gpiod_int || !ts->gpiod_rst) + if (!ts->gpiod_int || !ts->gpiod_rst) { + enable_irq(client->irq); return 0; + } /* * Exit sleep mode by outputting HIGH level to INT pin