| Message ID | 20210816093856.12313-1-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | cef0d022f55364d69017daeb9443bd31510ad6a2 |
| Headers | show |
| Series | [regression,fix] gpiolib: acpi: Make set-debounce-timeout failures non fatal | expand |
On Mon, Aug 16, 2021 at 11:39 AM Hans de Goede <hdegoede@redhat.com> wrote: > Commit 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") > made the gpiolib-acpi code call gpio_set_debounce_timeout() when requesting > GPIOs. > > This in itself is fine, but it also made gpio_set_debounce_timeout() > errors fatal, causing the requesting of the GPIO to fail. This is causing > regressions. E.g. on a HP ElitePad 1000 G2 various _AEI specified GPIO > ACPI event sources specify a debouncy timeout of 20 ms, but the > pinctrl-baytrail.c only supports certain fixed values, the closest > ones being 12 or 14 ms and pinctrl-baytrail.c responds with -EINVAL > when specified a value which is not one of the fixed values. > > This is causing the acpi_request_own_gpiod() call to fail for 3 > ACPI event sources on the HP ElitePad 1000 G2, which in turn is causing > e.g. the battery charging vs discharging status to never get updated, > even though a charger has been plugged-in or unplugged. > > Make gpio_set_debounce_timeout() errors non fatal, warning about the > failure instead, to fix this regression. > > Note we should probably also fix various pinctrl drivers to just > pick the first bigger discrete value rather then returning -EINVAL but > this will need to be done on a per driver basis, where as this fix > at least gets us back to where things were before and thus restores > functionality on devices where this was lost due to > gpio_set_debounce_timeout() errors. > > Fixes: 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Bartosz will pick this up I think, I'm a bit off duty with GPIO right now. Yours, Linus Walleij
Hi, On 9/21/21 8:28 PM, Linus Walleij wrote: > On Mon, Aug 16, 2021 at 11:39 AM Hans de Goede <hdegoede@redhat.com> wrote: > >> Commit 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") >> made the gpiolib-acpi code call gpio_set_debounce_timeout() when requesting >> GPIOs. >> >> This in itself is fine, but it also made gpio_set_debounce_timeout() >> errors fatal, causing the requesting of the GPIO to fail. This is causing >> regressions. E.g. on a HP ElitePad 1000 G2 various _AEI specified GPIO >> ACPI event sources specify a debouncy timeout of 20 ms, but the >> pinctrl-baytrail.c only supports certain fixed values, the closest >> ones being 12 or 14 ms and pinctrl-baytrail.c responds with -EINVAL >> when specified a value which is not one of the fixed values. >> >> This is causing the acpi_request_own_gpiod() call to fail for 3 >> ACPI event sources on the HP ElitePad 1000 G2, which in turn is causing >> e.g. the battery charging vs discharging status to never get updated, >> even though a charger has been plugged-in or unplugged. >> >> Make gpio_set_debounce_timeout() errors non fatal, warning about the >> failure instead, to fix this regression. >> >> Note we should probably also fix various pinctrl drivers to just >> pick the first bigger discrete value rather then returning -EINVAL but >> this will need to be done on a per driver basis, where as this fix >> at least gets us back to where things were before and thus restores >> functionality on devices where this was lost due to >> gpio_set_debounce_timeout() errors. >> >> Fixes: 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > Bartosz will pick this up I think, I'm a bit off duty with GPIO right now. Added Bartosz to the To: list, to make sure that he actually sees this. I somehow did not add him in the To/Cc when sending out the patch, sorry about that. Regards, Hans
On Tue, Sep 21, 2021 at 8:42 PM Hans de Goede <hdegoede@redhat.com> wrote: > > Hi, > > On 9/21/21 8:28 PM, Linus Walleij wrote: > > On Mon, Aug 16, 2021 at 11:39 AM Hans de Goede <hdegoede@redhat.com> wrote: > > > >> Commit 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") > >> made the gpiolib-acpi code call gpio_set_debounce_timeout() when requesting > >> GPIOs. > >> > >> This in itself is fine, but it also made gpio_set_debounce_timeout() > >> errors fatal, causing the requesting of the GPIO to fail. This is causing > >> regressions. E.g. on a HP ElitePad 1000 G2 various _AEI specified GPIO > >> ACPI event sources specify a debouncy timeout of 20 ms, but the > >> pinctrl-baytrail.c only supports certain fixed values, the closest > >> ones being 12 or 14 ms and pinctrl-baytrail.c responds with -EINVAL > >> when specified a value which is not one of the fixed values. > >> > >> This is causing the acpi_request_own_gpiod() call to fail for 3 > >> ACPI event sources on the HP ElitePad 1000 G2, which in turn is causing > >> e.g. the battery charging vs discharging status to never get updated, > >> even though a charger has been plugged-in or unplugged. > >> > >> Make gpio_set_debounce_timeout() errors non fatal, warning about the > >> failure instead, to fix this regression. > >> > >> Note we should probably also fix various pinctrl drivers to just > >> pick the first bigger discrete value rather then returning -EINVAL but > >> this will need to be done on a per driver basis, where as this fix > >> at least gets us back to where things were before and thus restores > >> functionality on devices where this was lost due to > >> gpio_set_debounce_timeout() errors. > >> > >> Fixes: 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > > > Bartosz will pick this up I think, I'm a bit off duty with GPIO right now. > > Added Bartosz to the To: list, to make sure that he actually > sees this. I somehow did not add him in the To/Cc when sending out > the patch, sorry about that. > Yep, I only process patches that are directed to me personally (TO or CC). Now applied but I'll only be able to send it out for v5.15-rc3. Bart
On Wed, Sep 22, 2021 at 12:17 PM Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote: > On Tue, Sep 21, 2021 at 8:42 PM Hans de Goede <hdegoede@redhat.com> wrote: > > On 9/21/21 8:28 PM, Linus Walleij wrote: > > > On Mon, Aug 16, 2021 at 11:39 AM Hans de Goede <hdegoede@redhat.com> wrote: ... > > >> Fixes: 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") > > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > > > > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > > > > > Bartosz will pick this up I think, I'm a bit off duty with GPIO right now. > > > > Added Bartosz to the To: list, to make sure that he actually > > sees this. I somehow did not add him in the To/Cc when sending out > > the patch, sorry about that. > > Yep, I only process patches that are directed to me personally (TO or CC). Hmm... It's then strange that GPIO lib ACPI is not listed for you in MAINTAINERS. Perhaps we need to update MAINTAINERS as well. > Now applied but I'll only be able to send it out for v5.15-rc3. Thanks! -- With Best Regards, Andy Shevchenko
On Wed, Sep 22, 2021 at 12:56 PM Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > On Wed, Sep 22, 2021 at 12:17 PM Bartosz Golaszewski > <bgolaszewski@baylibre.com> wrote: > > On Tue, Sep 21, 2021 at 8:42 PM Hans de Goede <hdegoede@redhat.com> wrote: > > > On 9/21/21 8:28 PM, Linus Walleij wrote: > > > > On Mon, Aug 16, 2021 at 11:39 AM Hans de Goede <hdegoede@redhat.com> wrote: > > ... > > > > >> Fixes: 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") > > > >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > > > > > > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > > > > > > > Bartosz will pick this up I think, I'm a bit off duty with GPIO right now. > > > > > > Added Bartosz to the To: list, to make sure that he actually > > > sees this. I somehow did not add him in the To/Cc when sending out > > > the patch, sorry about that. > > > > Yep, I only process patches that are directed to me personally (TO or CC). > > Hmm... It's then strange that GPIO lib ACPI is not listed for you in > MAINTAINERS. > Perhaps we need to update MAINTAINERS as well. > With the following line in MAINTAINERS: 7998 F: drivers/gpio/ My name should pop up for all patches aimed at the GPIO subsystem if one uses scripts/get_maintainer.pl. Bart
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 411525ac4cc4..47712b6903b5 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -313,9 +313,11 @@ static struct gpio_desc *acpi_request_own_gpiod(struct gpio_chip *chip, ret = gpio_set_debounce_timeout(desc, agpio->debounce_timeout); if (ret) - gpiochip_free_own_desc(desc); + dev_warn(chip->parent, + "Failed to set debounce-timeout for pin 0x%04X, err %d\n", + pin, ret); - return ret ? ERR_PTR(ret) : desc; + return desc; } static bool acpi_gpio_in_ignore_list(const char *controller_in, int pin_in)
Commit 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") made the gpiolib-acpi code call gpio_set_debounce_timeout() when requesting GPIOs. This in itself is fine, but it also made gpio_set_debounce_timeout() errors fatal, causing the requesting of the GPIO to fail. This is causing regressions. E.g. on a HP ElitePad 1000 G2 various _AEI specified GPIO ACPI event sources specify a debouncy timeout of 20 ms, but the pinctrl-baytrail.c only supports certain fixed values, the closest ones being 12 or 14 ms and pinctrl-baytrail.c responds with -EINVAL when specified a value which is not one of the fixed values. This is causing the acpi_request_own_gpiod() call to fail for 3 ACPI event sources on the HP ElitePad 1000 G2, which in turn is causing e.g. the battery charging vs discharging status to never get updated, even though a charger has been plugged-in or unplugged. Make gpio_set_debounce_timeout() errors non fatal, warning about the failure instead, to fix this regression. Note we should probably also fix various pinctrl drivers to just pick the first bigger discrete value rather then returning -EINVAL but this will need to be done on a per driver basis, where as this fix at least gets us back to where things were before and thus restores functionality on devices where this was lost due to gpio_set_debounce_timeout() errors. Fixes: 8dcb7a15a585 ("gpiolib: acpi: Take into account debounce settings") Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/gpio/gpiolib-acpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)