| Message ID | 20190730154848.5164-1-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [5.3,regression,fix] pwm: Fallback to the static lookup-list when acpi_pwm_get fails | expand |
On Tue, Jul 30, 2019 at 05:48:48PM +0200, Hans de Goede wrote: > Commit 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") > made pwm_get unconditionally return the acpi_pwm_get return value if > the device passed to pwm_get has an ACPI fwnode. > > But even if the passed in device has an ACPI fwnode, it does not > necessarily have the necessary ACPI package defining its pwm bindings, > especially since the binding / API of this ACPI package has only been > introduced very recently. > > Up until now X86/ACPI devices which use a separate pwm controller for > controlling their LCD screen's backlight brightness have been relying > on the static lookup-list to get their pwm. > > pwm_get unconditionally returning the acpi_pwm_get return value breaks > this, breaking backlight control on these devices. > > This commit fixes this by making pwm_get fall back to the static > lookup-list if acpi_pwm_get returns -ENOENT. > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Perhaps, we may switch to swnode API instead of lookup tables in the future? > BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96571 > Reported-by: youling257@gmail.com > Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") > Cc: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/pwm/core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > index c3ab07ab31a9..8edfac17364e 100644 > --- a/drivers/pwm/core.c > +++ b/drivers/pwm/core.c > @@ -882,8 +882,11 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) > return of_pwm_get(dev, dev->of_node, con_id); > > /* then lookup via ACPI */ > - if (dev && is_acpi_node(dev->fwnode)) > - return acpi_pwm_get(dev->fwnode); > + if (dev && is_acpi_node(dev->fwnode)) { > + pwm = acpi_pwm_get(dev->fwnode); > + if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) > + return pwm; > + } > > /* > * We look up the provider in the static table typically provided by > -- > 2.21.0 >
Hi Hans, On Tue, 30 Jul 2019, Hans de Goede wrote: > Commit 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") > made pwm_get unconditionally return the acpi_pwm_get return value if > the device passed to pwm_get has an ACPI fwnode. > > But even if the passed in device has an ACPI fwnode, it does not > necessarily have the necessary ACPI package defining its pwm bindings, > especially since the binding / API of this ACPI package has only been > introduced very recently. > > Up until now X86/ACPI devices which use a separate pwm controller for > controlling their LCD screen's backlight brightness have been relying > on the static lookup-list to get their pwm. > > pwm_get unconditionally returning the acpi_pwm_get return value breaks > this, breaking backlight control on these devices. > > This commit fixes this by making pwm_get fall back to the static > lookup-list if acpi_pwm_get returns -ENOENT. Ok, I didn't find any pwm_add_table() calls in the x86 directory, so I thought the fallback matching is only for non-DT/non-ACPI systems. If it is used for ACPI nodes without PWM controller binding, it maybe should apply to DT nodes without PWM controller binding, too? It would be structurally cleaner as DT and ACPI handling was symmetrical. Niko > > BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96571 > Reported-by: youling257@gmail.com > Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") > Cc: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/pwm/core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > index c3ab07ab31a9..8edfac17364e 100644 > --- a/drivers/pwm/core.c > +++ b/drivers/pwm/core.c > @@ -882,8 +882,11 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) > return of_pwm_get(dev, dev->of_node, con_id); > > /* then lookup via ACPI */ > - if (dev && is_acpi_node(dev->fwnode)) > - return acpi_pwm_get(dev->fwnode); > + if (dev && is_acpi_node(dev->fwnode)) { > + pwm = acpi_pwm_get(dev->fwnode); > + if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) > + return pwm; > + } > > /* > * We look up the provider in the static table typically provided by > -- > 2.21.0 > >
Hi, On 05-08-19 11:31, Nikolaus Voss wrote: > Hi Hans, > > On Tue, 30 Jul 2019, Hans de Goede wrote: >> Commit 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") >> made pwm_get unconditionally return the acpi_pwm_get return value if >> the device passed to pwm_get has an ACPI fwnode. >> >> But even if the passed in device has an ACPI fwnode, it does not >> necessarily have the necessary ACPI package defining its pwm bindings, >> especially since the binding / API of this ACPI package has only been >> introduced very recently. >> >> Up until now X86/ACPI devices which use a separate pwm controller for >> controlling their LCD screen's backlight brightness have been relying >> on the static lookup-list to get their pwm. >> >> pwm_get unconditionally returning the acpi_pwm_get return value breaks >> this, breaking backlight control on these devices. >> >> This commit fixes this by making pwm_get fall back to the static >> lookup-list if acpi_pwm_get returns -ENOENT. > > Ok, I didn't find any pwm_add_table() calls in the x86 directory, so I thought the fallback matching is only for non-DT/non-ACPI systems. AFAIK only Bay Trail and Cherry Trail X86 systems use a separate (not integrated into the GPU) PWM controller, but there are a lot of these systems out there. I got a bug report for this pretty much the day rc1 was out :) The pwm_add_table calls are done in drivers/acpi/acpi_lpss.c. > If it is used for ACPI nodes without PWM controller binding, it maybe should apply to DT nodes without PWM controller binding, too? > > It would be structurally cleaner as DT and ACPI handling was symmetrical. I'm fine with someone doing a follow up patch along this lines, but given that this is a serious regression in 5.3 I would like to move forward with my tested patch as is to fix the regression in 5.3. Regards, Hans >> BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96571 >> Reported-by: youling257@gmail.com >> Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") >> Cc: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/pwm/core.c | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c >> index c3ab07ab31a9..8edfac17364e 100644 >> --- a/drivers/pwm/core.c >> +++ b/drivers/pwm/core.c >> @@ -882,8 +882,11 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) >> return of_pwm_get(dev, dev->of_node, con_id); >> >> /* then lookup via ACPI */ >> - if (dev && is_acpi_node(dev->fwnode)) >> - return acpi_pwm_get(dev->fwnode); >> + if (dev && is_acpi_node(dev->fwnode)) { >> + pwm = acpi_pwm_get(dev->fwnode); >> + if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) >> + return pwm; >> + } >> >> /* >> * We look up the provider in the static table typically provided by >> -- >> 2.21.0 >> >>
On Mon, 5 Aug 2019, Hans de Goede wrote: > Hi, > > On 05-08-19 11:31, Nikolaus Voss wrote: >> Hi Hans, >> >> On Tue, 30 Jul 2019, Hans de Goede wrote: >>> Commit 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") >>> made pwm_get unconditionally return the acpi_pwm_get return value if >>> the device passed to pwm_get has an ACPI fwnode. >>> >>> But even if the passed in device has an ACPI fwnode, it does not >>> necessarily have the necessary ACPI package defining its pwm bindings, >>> especially since the binding / API of this ACPI package has only been >>> introduced very recently. >>> >>> Up until now X86/ACPI devices which use a separate pwm controller for >>> controlling their LCD screen's backlight brightness have been relying >>> on the static lookup-list to get their pwm. >>> >>> pwm_get unconditionally returning the acpi_pwm_get return value breaks >>> this, breaking backlight control on these devices. >>> >>> This commit fixes this by making pwm_get fall back to the static >>> lookup-list if acpi_pwm_get returns -ENOENT. >> >> Ok, I didn't find any pwm_add_table() calls in the x86 directory, so I >> thought the fallback matching is only for non-DT/non-ACPI systems. > > AFAIK only Bay Trail and Cherry Trail X86 systems use a separate > (not integrated into the GPU) PWM controller, but there are a lot of > these systems out there. I got a bug report for this pretty much the > day rc1 was out :) > > The pwm_add_table calls are done in drivers/acpi/acpi_lpss.c. > >> If it is used for ACPI nodes without PWM controller binding, it maybe >> should apply to DT nodes without PWM controller binding, too? >> >> It would be structurally cleaner as DT and ACPI handling was symmetrical. > > I'm fine with someone doing a follow up patch along this lines, but > given that this is a serious regression in 5.3 I would like to move > forward with my tested patch as is to fix the regression in 5.3. Makes sense, thank you for the explanation. Acked-by: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > > Regards, > > Hans > > > >>> BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96571 >>> Reported-by: youling257@gmail.com >>> Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") >>> Cc: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> drivers/pwm/core.c | 7 +++++-- >>> 1 file changed, 5 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c >>> index c3ab07ab31a9..8edfac17364e 100644 >>> --- a/drivers/pwm/core.c >>> +++ b/drivers/pwm/core.c >>> @@ -882,8 +882,11 @@ struct pwm_device *pwm_get(struct device *dev, const >>> char *con_id) >>> return of_pwm_get(dev, dev->of_node, con_id); >>> >>> /* then lookup via ACPI */ >>> - if (dev && is_acpi_node(dev->fwnode)) >>> - return acpi_pwm_get(dev->fwnode); >>> + if (dev && is_acpi_node(dev->fwnode)) { >>> + pwm = acpi_pwm_get(dev->fwnode); >>> + if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) >>> + return pwm; >>> + } >>> >>> /* >>> * We look up the provider in the static table typically provided >>> by >>> -- >>> 2.21.0 >>> >>> >
Thierry, Ping? This fixes a somewhat serious regression in 5.3, can we please get this queued up for merging into 5.3 ? Regards, Hans On 30-07-19 17:48, Hans de Goede wrote: > Commit 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") > made pwm_get unconditionally return the acpi_pwm_get return value if > the device passed to pwm_get has an ACPI fwnode.Thieer > > But even if the passed in device has an ACPI fwnode, it does not > necessarily have the necessary ACPI package defining its pwm bindings, > especially since the binding / API of this ACPI package has only been > introduced very recently. > > Up until now X86/ACPI devices which use a separate pwm controller for > controlling their LCD screen's backlight brightness have been relying > on the static lookup-list to get their pwm. > > pwm_get unconditionally returning the acpi_pwm_get return value breaks > this, breaking backlight control on these devices. > > This commit fixes this by making pwm_get fall back to the static > lookup-list if acpi_pwm_get returns -ENOENT. > > BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96571 > Reported-by: youling257@gmail.com > Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") > Cc: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/pwm/core.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c > index c3ab07ab31a9..8edfac17364e 100644 > --- a/drivers/pwm/core.c > +++ b/drivers/pwm/core.c > @@ -882,8 +882,11 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) > return of_pwm_get(dev, dev->of_node, con_id); > > /* then lookup via ACPI */ > - if (dev && is_acpi_node(dev->fwnode)) > - return acpi_pwm_get(dev->fwnode); > + if (dev && is_acpi_node(dev->fwnode)) { > + pwm = acpi_pwm_get(dev->fwnode); > + if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) > + return pwm; > + } > > /* > * We look up the provider in the static table typically provided by >
On Thu, Aug 08, 2019 at 12:19:53PM +0200, Hans de Goede wrote: > Thierry, > > Ping? This fixes a somewhat serious regression in 5.3, can we please get > this queued up for merging into 5.3 ? I've pushed this out. Let's give it a day in linux-next and then I'll send out a PR for v5.3-rc4. Thierry
Hi, On 08-08-19 13:21, Thierry Reding wrote: > On Thu, Aug 08, 2019 at 12:19:53PM +0200, Hans de Goede wrote: >> Thierry, >> >> Ping? This fixes a somewhat serious regression in 5.3, can we please get >> this queued up for merging into 5.3 ? > > I've pushed this out. Let's give it a day in linux-next and then I'll > send out a PR for v5.3-rc4. Great, thank you. Regards, Hans
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index c3ab07ab31a9..8edfac17364e 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -882,8 +882,11 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id) return of_pwm_get(dev, dev->of_node, con_id); /* then lookup via ACPI */ - if (dev && is_acpi_node(dev->fwnode)) - return acpi_pwm_get(dev->fwnode); + if (dev && is_acpi_node(dev->fwnode)) { + pwm = acpi_pwm_get(dev->fwnode); + if (!IS_ERR(pwm) || PTR_ERR(pwm) != -ENOENT) + return pwm; + } /* * We look up the provider in the static table typically provided by
Commit 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") made pwm_get unconditionally return the acpi_pwm_get return value if the device passed to pwm_get has an ACPI fwnode. But even if the passed in device has an ACPI fwnode, it does not necessarily have the necessary ACPI package defining its pwm bindings, especially since the binding / API of this ACPI package has only been introduced very recently. Up until now X86/ACPI devices which use a separate pwm controller for controlling their LCD screen's backlight brightness have been relying on the static lookup-list to get their pwm. pwm_get unconditionally returning the acpi_pwm_get return value breaks this, breaking backlight control on these devices. This commit fixes this by making pwm_get fall back to the static lookup-list if acpi_pwm_get returns -ENOENT. BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96571 Reported-by: youling257@gmail.com Fixes: 4a6ef8e37c4d ("pwm: Add support referencing PWMs from ACPI") Cc: Nikolaus Voss <nikolaus.voss@loewensteinmedical.de> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/pwm/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)