| Message ID | 1571220826-7740-7-git-send-email-kgunda@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
On Wed, Oct 16, 2019 at 03:43:46PM +0530, Kiran Gunda wrote: > The auto string detection algorithm checks if the current WLED > sink configuration is valid. It tries enabling every sink and > checks if the OVP fault is observed. Based on this information > it detects and enables the valid sink configuration. > Auto calibration will be triggered when the OVP fault interrupts > are seen frequently thereby it tries to fix the sink configuration. > > The auto-detection also kicks in when the connected LED string > of the display-backlight malfunctions (because of damage) and > requires the damaged string to be turned off to prevent the > complete panel and/or board from being damaged. > > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> It's a complex bit of code but I'm OK with it in principle. Everything below is about small details and/or nitpicking. > +static void wled_ovp_work(struct work_struct *work) > +{ > + struct wled *wled = container_of(work, > + struct wled, ovp_work.work); > + enable_irq(wled->ovp_irq); > +} > + A bit of commenting about why we have to wait 10ms before enabling the OVP interrupt would be appreciated. > +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) > +{ > + struct wled *wled = _wled; > + int rc; > + u32 int_sts, fault_sts; > + > + rc = regmap_read(wled->regmap, > + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); > + if (rc < 0) { > + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", > + rc); > + return IRQ_HANDLED; > + } > + > + rc = regmap_read(wled->regmap, wled->ctrl_addr + > + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); > + if (rc < 0) { > + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", > + rc); > + return IRQ_HANDLED; > + } > + > + if (fault_sts & > + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) > + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= %x\n", > + int_sts, fault_sts); > + > + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { > + mutex_lock(&wled->lock); > + disable_irq_nosync(wled->ovp_irq); We're currently running the threaded ISR for this irq. Do we really need to disable it? > + > + if (wled_auto_detection_required(wled)) > + wled_auto_string_detection(wled); > + > + enable_irq(wled->ovp_irq); > + > + mutex_unlock(&wled->lock); > + } > + > + return IRQ_HANDLED; > +} > + Snip. > +static int wled_remove(struct platform_device *pdev) > +{ > + struct wled *wled = dev_get_drvdata(&pdev->dev); > + > + cancel_delayed_work_sync(&wled->ovp_work); > + mutex_destroy(&wled->lock); Have the irq handlers been disabled at this point? Also, if you want to destroy the mutex shouldn't that code be introduced in the same patch that introduces the mutex? > + > + return 0; > +} Daniel.
On 2019-10-17 16:59, Daniel Thompson wrote: > On Wed, Oct 16, 2019 at 03:43:46PM +0530, Kiran Gunda wrote: >> The auto string detection algorithm checks if the current WLED >> sink configuration is valid. It tries enabling every sink and >> checks if the OVP fault is observed. Based on this information >> it detects and enables the valid sink configuration. >> Auto calibration will be triggered when the OVP fault interrupts >> are seen frequently thereby it tries to fix the sink configuration. >> >> The auto-detection also kicks in when the connected LED string >> of the display-backlight malfunctions (because of damage) and >> requires the damaged string to be turned off to prevent the >> complete panel and/or board from being damaged. >> >> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> > > It's a complex bit of code but I'm OK with it in principle. Everything > below is about small details and/or nitpicking. > > >> +static void wled_ovp_work(struct work_struct *work) >> +{ >> + struct wled *wled = container_of(work, >> + struct wled, ovp_work.work); >> + enable_irq(wled->ovp_irq); >> +} >> + > > A bit of commenting about why we have to wait 10ms before enabling the > OVP interrupt would be appreciated. > > Sure. Will add the comment in the next series. >> +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) >> +{ >> + struct wled *wled = _wled; >> + int rc; >> + u32 int_sts, fault_sts; >> + >> + rc = regmap_read(wled->regmap, >> + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); >> + if (rc < 0) { >> + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", >> + rc); >> + return IRQ_HANDLED; >> + } >> + >> + rc = regmap_read(wled->regmap, wled->ctrl_addr + >> + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); >> + if (rc < 0) { >> + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", >> + rc); >> + return IRQ_HANDLED; >> + } >> + >> + if (fault_sts & >> + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) >> + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= >> %x\n", >> + int_sts, fault_sts); >> + >> + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { >> + mutex_lock(&wled->lock); >> + disable_irq_nosync(wled->ovp_irq); > > We're currently running the threaded ISR for this irq. Do we really > need > to disable it? > We need to disable this IRQ, during the auto string detection logic. Because in the auto string detection we configure the current sinks one by one and check the status register for the OVPs and set the right string configuration. We enable it later after the auto string detection is completed. >> + >> + if (wled_auto_detection_required(wled)) >> + wled_auto_string_detection(wled); >> + >> + enable_irq(wled->ovp_irq); >> + >> + mutex_unlock(&wled->lock); >> + } >> + >> + return IRQ_HANDLED; >> +} >> + > > Snip. > > >> +static int wled_remove(struct platform_device *pdev) >> +{ >> + struct wled *wled = dev_get_drvdata(&pdev->dev); >> + >> + cancel_delayed_work_sync(&wled->ovp_work); >> + mutex_destroy(&wled->lock); > > Have the irq handlers been disabled at this point? > Ok.. may not be. I will disable the irq's here in next series. > Also, if you want to destroy the mutex shouldn't that code be > introduced in the same patch that introduces the mutex? Ok.. I will move it to the same patch where the mutex introduced in next series. >> + >> + return 0; >> +} > > > Daniel.
On Wed, 16 Oct 2019, Kiran Gunda wrote: > The auto string detection algorithm checks if the current WLED > sink configuration is valid. It tries enabling every sink and > checks if the OVP fault is observed. Based on this information > it detects and enables the valid sink configuration. > Auto calibration will be triggered when the OVP fault interrupts > are seen frequently thereby it tries to fix the sink configuration. > > The auto-detection also kicks in when the connected LED string > of the display-backlight malfunctions (because of damage) and > requires the damaged string to be turned off to prevent the > complete panel and/or board from being damaged. > > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> > --- > drivers/video/backlight/qcom-wled.c | 410 +++++++++++++++++++++++++++++++++++- > 1 file changed, 404 insertions(+), 6 deletions(-) > > diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c > index b5b125c..ff7c409 100644 > --- a/drivers/video/backlight/qcom-wled.c > +++ b/drivers/video/backlight/qcom-wled.c [...] > + /* iterate through the strings one by one */ Please use proper English in comments (less a full stop). In this case, just s/iterate/Iterate/. > + for (i = 0; i < wled->cfg.num_strings; i++) { > + sink_test = BIT((WLED4_SINK_REG_CURR_SINK_SHFT + i)); > + > + /* Enable feedback control */ > + rc = regmap_write(wled->regmap, wled->ctrl_addr + > + WLED3_CTRL_REG_FEEDBACK_CONTROL, i + 1); > + if (rc < 0) { > + dev_err(wled->dev, "Failed to enable feedback for SINK %d rc = %d\n", > + i + 1, rc); > + goto failed_detect; > + } > + > + /* enable the sink */ Here too. And everywhere else. > + rc = regmap_write(wled->regmap, wled->sink_addr + > + WLED4_SINK_REG_CURR_SINK, sink_test); > + if (rc < 0) { > + dev_err(wled->dev, "Failed to configure SINK %d rc=%d\n", > + i + 1, rc); > + goto failed_detect; > + } > + > + /* Enable the module */ > + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + > + WLED3_CTRL_REG_MOD_EN, > + WLED3_CTRL_REG_MOD_EN_MASK, > + WLED3_CTRL_REG_MOD_EN_MASK); > + if (rc < 0) { > + dev_err(wled->dev, "Failed to enable WLED module rc=%d\n", > + rc); > + goto failed_detect; > + } > + > + usleep_range(WLED_SOFT_START_DLY_US, > + WLED_SOFT_START_DLY_US + 1000); > + > + rc = regmap_read(wled->regmap, wled->ctrl_addr + > + WLED3_CTRL_REG_INT_RT_STS, &int_sts); > + if (rc < 0) { > + dev_err(wled->dev, "Error in reading WLED3_CTRL_INT_RT_STS rc=%d\n", > + rc); > + goto failed_detect; > + } > + > + if (int_sts & WLED3_CTRL_REG_OVP_FAULT_STATUS) > + dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n", > + i + 1); I haven't reviewed the whole patch, but this caught my eye. I think this should be upgraded to dev_warn(). > + else > + sink_valid |= sink_test; > + > + /* Disable the module */ > + rc = regmap_update_bits(wled->regmap, > + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, > + WLED3_CTRL_REG_MOD_EN_MASK, 0); > + if (rc < 0) { > + dev_err(wled->dev, "Failed to disable WLED module rc=%d\n", > + rc); > + goto failed_detect; > + } > + } > + > + if (!sink_valid) { > + dev_err(wled->dev, "No valid WLED sinks found\n"); > + wled->disabled_by_short = true; > + goto failed_detect; > + } > + > + if (sink_valid == sink_config) { > + dev_dbg(wled->dev, "WLED auto-detection complete, sink-config=%x OK!\n", > + sink_config); Does this really need to be placed in the kernel log? > + } else { > + dev_warn(wled->dev, "New WLED string configuration found %x\n", > + sink_valid); Why would the user care about this? Is it not normal? > + sink_config = sink_valid; > + } [...] > +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) > +{ > + struct wled *wled = _wled; > + int rc; > + u32 int_sts, fault_sts; > + > + rc = regmap_read(wled->regmap, > + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); > + if (rc < 0) { > + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", > + rc); > + return IRQ_HANDLED; > + } > + > + rc = regmap_read(wled->regmap, wled->ctrl_addr + > + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); > + if (rc < 0) { > + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", > + rc); > + return IRQ_HANDLED; > + } > + > + if (fault_sts & > + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) Break the line at the '|'. > + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= %x\n", > + int_sts, fault_sts); dev_warn(). > + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { > + mutex_lock(&wled->lock); > + disable_irq_nosync(wled->ovp_irq); > + > + if (wled_auto_detection_required(wled)) > + wled_auto_string_detection(wled); > + > + enable_irq(wled->ovp_irq); > + > + mutex_unlock(&wled->lock); > + } > + > + return IRQ_HANDLED; > +} > + > static int wled3_setup(struct wled *wled) > { > u16 addr; > @@ -435,8 +775,10 @@ static int wled4_setup(struct wled *wled) > sink_en |= 1 << temp; > } > > - if (sink_cfg == sink_en) > - return 0; > + if (sink_cfg == sink_en) { > + rc = wled_auto_detection_at_init(wled); > + return rc; > + } > > rc = regmap_update_bits(wled->regmap, > wled->sink_addr + WLED4_SINK_REG_CURR_SINK, > @@ -499,7 +841,9 @@ static int wled4_setup(struct wled *wled) > return rc; > } > > - return 0; > + rc = wled_auto_detection_at_init(wled); > + > + return rc; > } > > static const struct wled_config wled4_config_defaults = { > @@ -510,6 +854,7 @@ static int wled4_setup(struct wled *wled) > .switch_freq = 11, > .cabc = false, > .external_pfet = false, > + .auto_detection_enabled = false, > }; > > static const u32 wled3_boost_i_limit_values[] = { > @@ -676,6 +1021,7 @@ static int wled_configure(struct wled *wled, int version) > { "qcom,ext-gen", &cfg->ext_gen, }, > { "qcom,cabc", &cfg->cabc, }, > { "qcom,external-pfet", &cfg->external_pfet, }, > + { "qcom,auto-string-detection", &cfg->auto_detection_enabled, }, > }; > > prop_addr = of_get_address(dev->of_node, 0, NULL, NULL); > @@ -796,6 +1142,40 @@ static int wled_configure_short_irq(struct wled *wled, > return rc; > } > > +static int wled_configure_ovp_irq(struct wled *wled, > + struct platform_device *pdev) > +{ > + int rc; > + u32 val; > + > + wled->ovp_irq = platform_get_irq_byname(pdev, "ovp"); > + if (wled->ovp_irq < 0) { > + dev_dbg(&pdev->dev, "ovp irq is not used\n"); I assume this is optional. What happens if no IRQ is provided? If, for instance, polling mode is enabled, maybe something like this would be better? dev_warn(&pdev->dev, "No IRQ found, falling back to polling mode\n");
On 2019-10-17 17:56, Lee Jones wrote: > On Wed, 16 Oct 2019, Kiran Gunda wrote: > >> The auto string detection algorithm checks if the current WLED >> sink configuration is valid. It tries enabling every sink and >> checks if the OVP fault is observed. Based on this information >> it detects and enables the valid sink configuration. >> Auto calibration will be triggered when the OVP fault interrupts >> are seen frequently thereby it tries to fix the sink configuration. >> >> The auto-detection also kicks in when the connected LED string >> of the display-backlight malfunctions (because of damage) and >> requires the damaged string to be turned off to prevent the >> complete panel and/or board from being damaged. >> >> Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> >> --- >> drivers/video/backlight/qcom-wled.c | 410 >> +++++++++++++++++++++++++++++++++++- >> 1 file changed, 404 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/video/backlight/qcom-wled.c >> b/drivers/video/backlight/qcom-wled.c >> index b5b125c..ff7c409 100644 >> --- a/drivers/video/backlight/qcom-wled.c >> +++ b/drivers/video/backlight/qcom-wled.c > > > [...] > >> + /* iterate through the strings one by one */ > > Please use proper English in comments (less a full stop). > > In this case, just s/iterate/Iterate/. > Sorry for that ! will fix it in next series. >> + for (i = 0; i < wled->cfg.num_strings; i++) { >> + sink_test = BIT((WLED4_SINK_REG_CURR_SINK_SHFT + i)); >> + >> + /* Enable feedback control */ >> + rc = regmap_write(wled->regmap, wled->ctrl_addr + >> + WLED3_CTRL_REG_FEEDBACK_CONTROL, i + 1); >> + if (rc < 0) { >> + dev_err(wled->dev, "Failed to enable feedback for SINK %d rc = >> %d\n", >> + i + 1, rc); >> + goto failed_detect; >> + } >> + >> + /* enable the sink */ > > Here too. And everywhere else. > Will fix it in next series. >> + rc = regmap_write(wled->regmap, wled->sink_addr + >> + WLED4_SINK_REG_CURR_SINK, sink_test); >> + if (rc < 0) { >> + dev_err(wled->dev, "Failed to configure SINK %d rc=%d\n", >> + i + 1, rc); >> + goto failed_detect; >> + } >> + >> + /* Enable the module */ >> + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + >> + WLED3_CTRL_REG_MOD_EN, >> + WLED3_CTRL_REG_MOD_EN_MASK, >> + WLED3_CTRL_REG_MOD_EN_MASK); >> + if (rc < 0) { >> + dev_err(wled->dev, "Failed to enable WLED module rc=%d\n", >> + rc); >> + goto failed_detect; >> + } >> + >> + usleep_range(WLED_SOFT_START_DLY_US, >> + WLED_SOFT_START_DLY_US + 1000); >> + >> + rc = regmap_read(wled->regmap, wled->ctrl_addr + >> + WLED3_CTRL_REG_INT_RT_STS, &int_sts); >> + if (rc < 0) { >> + dev_err(wled->dev, "Error in reading WLED3_CTRL_INT_RT_STS >> rc=%d\n", >> + rc); >> + goto failed_detect; >> + } >> + >> + if (int_sts & WLED3_CTRL_REG_OVP_FAULT_STATUS) >> + dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n", >> + i + 1); > > I haven't reviewed the whole patch, but this caught my eye. > > I think this should be upgraded to dev_warn(). > Thought of keeping these messages silent, Because the string configuration will be corrected in this and informing it at end of the auto string detection. >> + else >> + sink_valid |= sink_test; >> + >> + /* Disable the module */ >> + rc = regmap_update_bits(wled->regmap, >> + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, >> + WLED3_CTRL_REG_MOD_EN_MASK, 0); >> + if (rc < 0) { >> + dev_err(wled->dev, "Failed to disable WLED module rc=%d\n", >> + rc); >> + goto failed_detect; >> + } >> + } >> + >> + if (!sink_valid) { >> + dev_err(wled->dev, "No valid WLED sinks found\n"); >> + wled->disabled_by_short = true; >> + goto failed_detect; >> + } >> + >> + if (sink_valid == sink_config) { >> + dev_dbg(wled->dev, "WLED auto-detection complete, sink-config=%x >> OK!\n", >> + sink_config); > > Does this really need to be placed in the kernel log? > Ok. This can be removed. I will remove it in next series. >> + } else { >> + dev_warn(wled->dev, "New WLED string configuration found %x\n", >> + sink_valid); > > Why would the user care about this? Is it not normal? > Actually, it comes here if the user provided string configuration in the device tree is in-correct. That's why just informing the user about the right string configuration, after the auto string detection. >> + sink_config = sink_valid; >> + } > > [...] > >> +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) >> +{ >> + struct wled *wled = _wled; >> + int rc; >> + u32 int_sts, fault_sts; >> + >> + rc = regmap_read(wled->regmap, >> + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); >> + if (rc < 0) { >> + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", >> + rc); >> + return IRQ_HANDLED; >> + } >> + >> + rc = regmap_read(wled->regmap, wled->ctrl_addr + >> + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); >> + if (rc < 0) { >> + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", >> + rc); >> + return IRQ_HANDLED; >> + } >> + >> + if (fault_sts & >> + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) > > Break the line at the '|'. > Will do it next series. >> + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= >> %x\n", >> + int_sts, fault_sts); > > dev_warn(). > As said above, wanted to keep these messages silent and inform the right string configuration at the end of string detection. >> + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { >> + mutex_lock(&wled->lock); >> + disable_irq_nosync(wled->ovp_irq); >> + >> + if (wled_auto_detection_required(wled)) >> + wled_auto_string_detection(wled); >> + >> + enable_irq(wled->ovp_irq); >> + >> + mutex_unlock(&wled->lock); >> + } >> + >> + return IRQ_HANDLED; >> +} >> + >> static int wled3_setup(struct wled *wled) >> { >> u16 addr; >> @@ -435,8 +775,10 @@ static int wled4_setup(struct wled *wled) >> sink_en |= 1 << temp; >> } >> >> - if (sink_cfg == sink_en) >> - return 0; >> + if (sink_cfg == sink_en) { >> + rc = wled_auto_detection_at_init(wled); >> + return rc; >> + } >> >> rc = regmap_update_bits(wled->regmap, >> wled->sink_addr + WLED4_SINK_REG_CURR_SINK, >> @@ -499,7 +841,9 @@ static int wled4_setup(struct wled *wled) >> return rc; >> } >> >> - return 0; >> + rc = wled_auto_detection_at_init(wled); >> + >> + return rc; >> } >> >> static const struct wled_config wled4_config_defaults = { >> @@ -510,6 +854,7 @@ static int wled4_setup(struct wled *wled) >> .switch_freq = 11, >> .cabc = false, >> .external_pfet = false, >> + .auto_detection_enabled = false, >> }; >> >> static const u32 wled3_boost_i_limit_values[] = { >> @@ -676,6 +1021,7 @@ static int wled_configure(struct wled *wled, int >> version) >> { "qcom,ext-gen", &cfg->ext_gen, }, >> { "qcom,cabc", &cfg->cabc, }, >> { "qcom,external-pfet", &cfg->external_pfet, }, >> + { "qcom,auto-string-detection", &cfg->auto_detection_enabled, }, >> }; >> >> prop_addr = of_get_address(dev->of_node, 0, NULL, NULL); >> @@ -796,6 +1142,40 @@ static int wled_configure_short_irq(struct wled >> *wled, >> return rc; >> } >> >> +static int wled_configure_ovp_irq(struct wled *wled, >> + struct platform_device *pdev) >> +{ >> + int rc; >> + u32 val; >> + >> + wled->ovp_irq = platform_get_irq_byname(pdev, "ovp"); >> + if (wled->ovp_irq < 0) { >> + dev_dbg(&pdev->dev, "ovp irq is not used\n"); > > I assume this is optional. What happens if no IRQ is provided? > Here OVP IRQ is used to detect the wrong string detection. If it is not provided the auto string detection logic won't work. > If, for instance, polling mode is enabled, maybe something like this > would be better? > > dev_warn(&pdev->dev, "No IRQ found, falling back to polling > mode\n");
On Thu, 17 Oct 2019, kgunda@codeaurora.org wrote: > On 2019-10-17 17:56, Lee Jones wrote: > > On Wed, 16 Oct 2019, Kiran Gunda wrote: > > > > > The auto string detection algorithm checks if the current WLED > > > sink configuration is valid. It tries enabling every sink and > > > checks if the OVP fault is observed. Based on this information > > > it detects and enables the valid sink configuration. > > > Auto calibration will be triggered when the OVP fault interrupts > > > are seen frequently thereby it tries to fix the sink configuration. > > > > > > The auto-detection also kicks in when the connected LED string > > > of the display-backlight malfunctions (because of damage) and > > > requires the damaged string to be turned off to prevent the > > > complete panel and/or board from being damaged. > > > > > > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> > > > --- > > > drivers/video/backlight/qcom-wled.c | 410 > > > +++++++++++++++++++++++++++++++++++- > > > 1 file changed, 404 insertions(+), 6 deletions(-) > > > > > > diff --git a/drivers/video/backlight/qcom-wled.c > > > b/drivers/video/backlight/qcom-wled.c > > > index b5b125c..ff7c409 100644 > > > --- a/drivers/video/backlight/qcom-wled.c > > > +++ b/drivers/video/backlight/qcom-wled.c [...] > > > + if (int_sts & WLED3_CTRL_REG_OVP_FAULT_STATUS) > > > + dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n", > > > + i + 1); > > > > I haven't reviewed the whole patch, but this caught my eye. > > > > I think this should be upgraded to dev_warn(). > > > Thought of keeping these messages silent, Because the string configuration > will be corrected in this > and informing it at end of the auto string detection. [...] > > > + } else { > > > + dev_warn(wled->dev, "New WLED string configuration found %x\n", > > > + sink_valid); > > > > Why would the user care about this? Is it not normal? > > > Actually, it comes here if the user provided string configuration in the > device tree is in-correct. > That's why just informing the user about the right string configuration, > after the auto string detection. Then I think we need to be more forthcoming. Tell the user the configuration is incorrect and what you've done to rectify it. "XXX is not a valid configuration - using YYY instead" [...] > > > +static int wled_configure_ovp_irq(struct wled *wled, > > > + struct platform_device *pdev) > > > +{ > > > + int rc; > > > + u32 val; > > > + > > > + wled->ovp_irq = platform_get_irq_byname(pdev, "ovp"); > > > + if (wled->ovp_irq < 0) { > > > + dev_dbg(&pdev->dev, "ovp irq is not used\n"); > > > > I assume this is optional. What happens if no IRQ is provided? > > > Here OVP IRQ is used to detect the wrong string detection. If it is not > provided the auto string detection logic won't work. "OVP IRQ not found - disabling automatic string detection" > > If, for instance, polling mode is enabled, maybe something like this > > would be better? > > > > dev_warn(&pdev->dev, "No IRQ found, falling back to polling > > mode\n");
On Thu, Oct 17, 2019 at 05:47:47PM +0530, kgunda@codeaurora.org wrote: > On 2019-10-17 16:59, Daniel Thompson wrote: > > On Wed, Oct 16, 2019 at 03:43:46PM +0530, Kiran Gunda wrote: > > > The auto string detection algorithm checks if the current WLED > > > sink configuration is valid. It tries enabling every sink and > > > checks if the OVP fault is observed. Based on this information > > > it detects and enables the valid sink configuration. > > > Auto calibration will be triggered when the OVP fault interrupts > > > are seen frequently thereby it tries to fix the sink configuration. > > > > > > The auto-detection also kicks in when the connected LED string > > > of the display-backlight malfunctions (because of damage) and > > > requires the damaged string to be turned off to prevent the > > > complete panel and/or board from being damaged. > > > > > > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> > > > > It's a complex bit of code but I'm OK with it in principle. Everything > > below is about small details and/or nitpicking. > > > > > > > +static void wled_ovp_work(struct work_struct *work) > > > +{ > > > + struct wled *wled = container_of(work, > > > + struct wled, ovp_work.work); > > > + enable_irq(wled->ovp_irq); > > > +} > > > + > > > > A bit of commenting about why we have to wait 10ms before enabling the > > OVP interrupt would be appreciated. > > > > > Sure. Will add the comment in the next series. > > > +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) > > > +{ > > > + struct wled *wled = _wled; > > > + int rc; > > > + u32 int_sts, fault_sts; > > > + > > > + rc = regmap_read(wled->regmap, > > > + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); > > > + if (rc < 0) { > > > + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", > > > + rc); > > > + return IRQ_HANDLED; > > > + } > > > + > > > + rc = regmap_read(wled->regmap, wled->ctrl_addr + > > > + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); > > > + if (rc < 0) { > > > + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", > > > + rc); > > > + return IRQ_HANDLED; > > > + } > > > + > > > + if (fault_sts & > > > + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) > > > + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x > > > fault_sts= %x\n", > > > + int_sts, fault_sts); > > > + > > > + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { > > > + mutex_lock(&wled->lock); > > > + disable_irq_nosync(wled->ovp_irq); > > > > We're currently running the threaded ISR for this irq. Do we really need > > to disable it? > > > We need to disable this IRQ, during the auto string detection logic. Because > in the auto string detection we configure the current sinks one by one and > check the > status register for the OVPs and set the right string configuration. We > enable it later after > the auto string detection is completed. This is a threaded oneshot interrupt handler. Why isn't the framework masking sufficient for you here? Daniel.
On 2019-10-17 19:00, Lee Jones wrote: > On Thu, 17 Oct 2019, kgunda@codeaurora.org wrote: > >> On 2019-10-17 17:56, Lee Jones wrote: >> > On Wed, 16 Oct 2019, Kiran Gunda wrote: >> > >> > > The auto string detection algorithm checks if the current WLED >> > > sink configuration is valid. It tries enabling every sink and >> > > checks if the OVP fault is observed. Based on this information >> > > it detects and enables the valid sink configuration. >> > > Auto calibration will be triggered when the OVP fault interrupts >> > > are seen frequently thereby it tries to fix the sink configuration. >> > > >> > > The auto-detection also kicks in when the connected LED string >> > > of the display-backlight malfunctions (because of damage) and >> > > requires the damaged string to be turned off to prevent the >> > > complete panel and/or board from being damaged. >> > > >> > > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> >> > > --- >> > > drivers/video/backlight/qcom-wled.c | 410 >> > > +++++++++++++++++++++++++++++++++++- >> > > 1 file changed, 404 insertions(+), 6 deletions(-) >> > > >> > > diff --git a/drivers/video/backlight/qcom-wled.c >> > > b/drivers/video/backlight/qcom-wled.c >> > > index b5b125c..ff7c409 100644 >> > > --- a/drivers/video/backlight/qcom-wled.c >> > > +++ b/drivers/video/backlight/qcom-wled.c > > [...] > >> > > + if (int_sts & WLED3_CTRL_REG_OVP_FAULT_STATUS) >> > > + dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n", >> > > + i + 1); >> > >> > I haven't reviewed the whole patch, but this caught my eye. >> > >> > I think this should be upgraded to dev_warn(). >> > >> Thought of keeping these messages silent, Because the string >> configuration >> will be corrected in this >> and informing it at end of the auto string detection. > > [...] > >> > > + } else { >> > > + dev_warn(wled->dev, "New WLED string configuration found %x\n", >> > > + sink_valid); >> > >> > Why would the user care about this? Is it not normal? >> > >> Actually, it comes here if the user provided string configuration in >> the >> device tree is in-correct. >> That's why just informing the user about the right string >> configuration, >> after the auto string detection. > > Then I think we need to be more forthcoming. Tell the user the > configuration is incorrect and what you've done to rectify it. > > "XXX is not a valid configuration - using YYY instead" > Sure. Will update it in the next series. > [...] > >> > > +static int wled_configure_ovp_irq(struct wled *wled, >> > > + struct platform_device *pdev) >> > > +{ >> > > + int rc; >> > > + u32 val; >> > > + >> > > + wled->ovp_irq = platform_get_irq_byname(pdev, "ovp"); >> > > + if (wled->ovp_irq < 0) { >> > > + dev_dbg(&pdev->dev, "ovp irq is not used\n"); >> > >> > I assume this is optional. What happens if no IRQ is provided? >> > >> Here OVP IRQ is used to detect the wrong string detection. If it is >> not >> provided the auto string detection logic won't work. > > "OVP IRQ not found - disabling automatic string detection" > Sure. Will update it in the next series. >> > If, for instance, polling mode is enabled, maybe something like this >> > would be better? >> > >> > dev_warn(&pdev->dev, "No IRQ found, falling back to polling >> > mode\n");
On 2019-10-17 19:09, Daniel Thompson wrote: > On Thu, Oct 17, 2019 at 05:47:47PM +0530, kgunda@codeaurora.org wrote: >> On 2019-10-17 16:59, Daniel Thompson wrote: >> > On Wed, Oct 16, 2019 at 03:43:46PM +0530, Kiran Gunda wrote: >> > > The auto string detection algorithm checks if the current WLED >> > > sink configuration is valid. It tries enabling every sink and >> > > checks if the OVP fault is observed. Based on this information >> > > it detects and enables the valid sink configuration. >> > > Auto calibration will be triggered when the OVP fault interrupts >> > > are seen frequently thereby it tries to fix the sink configuration. >> > > >> > > The auto-detection also kicks in when the connected LED string >> > > of the display-backlight malfunctions (because of damage) and >> > > requires the damaged string to be turned off to prevent the >> > > complete panel and/or board from being damaged. >> > > >> > > Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> >> > >> > It's a complex bit of code but I'm OK with it in principle. Everything >> > below is about small details and/or nitpicking. >> > >> > >> > > +static void wled_ovp_work(struct work_struct *work) >> > > +{ >> > > + struct wled *wled = container_of(work, >> > > + struct wled, ovp_work.work); >> > > + enable_irq(wled->ovp_irq); >> > > +} >> > > + >> > >> > A bit of commenting about why we have to wait 10ms before enabling the >> > OVP interrupt would be appreciated. >> > >> > >> Sure. Will add the comment in the next series. >> > > +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) >> > > +{ >> > > + struct wled *wled = _wled; >> > > + int rc; >> > > + u32 int_sts, fault_sts; >> > > + >> > > + rc = regmap_read(wled->regmap, >> > > + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); >> > > + if (rc < 0) { >> > > + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", >> > > + rc); >> > > + return IRQ_HANDLED; >> > > + } >> > > + >> > > + rc = regmap_read(wled->regmap, wled->ctrl_addr + >> > > + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); >> > > + if (rc < 0) { >> > > + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", >> > > + rc); >> > > + return IRQ_HANDLED; >> > > + } >> > > + >> > > + if (fault_sts & >> > > + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) >> > > + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x >> > > fault_sts= %x\n", >> > > + int_sts, fault_sts); >> > > + >> > > + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { >> > > + mutex_lock(&wled->lock); >> > > + disable_irq_nosync(wled->ovp_irq); >> > >> > We're currently running the threaded ISR for this irq. Do we really need >> > to disable it? >> > >> We need to disable this IRQ, during the auto string detection logic. >> Because >> in the auto string detection we configure the current sinks one by one >> and >> check the >> status register for the OVPs and set the right string configuration. >> We >> enable it later after >> the auto string detection is completed. > > This is a threaded oneshot interrupt handler. Why isn't the framework > masking sufficient for you here? > > > Daniel. Right .. I overlooked that it is a oneshot interrupt earlier. I will address it in the next series.
diff --git a/drivers/video/backlight/qcom-wled.c b/drivers/video/backlight/qcom-wled.c index b5b125c..ff7c409 100644 --- a/drivers/video/backlight/qcom-wled.c +++ b/drivers/video/backlight/qcom-wled.c @@ -17,19 +17,29 @@ #define WLED_MAX_STRINGS 4 #define WLED_DEFAULT_BRIGHTNESS 2048 - +#define WLED_SOFT_START_DLY_US 10000 #define WLED3_SINK_REG_BRIGHT_MAX 0xFFF /* WLED3/WLED4 control registers */ +#define WLED3_CTRL_REG_FAULT_STATUS 0x08 +#define WLED3_CTRL_REG_ILIM_FAULT_BIT BIT(0) +#define WLED3_CTRL_REG_OVP_FAULT_BIT BIT(1) +#define WLED4_CTRL_REG_SC_FAULT_BIT BIT(2) + +#define WLED3_CTRL_REG_INT_RT_STS 0x10 +#define WLED3_CTRL_REG_OVP_FAULT_STATUS BIT(1) + #define WLED3_CTRL_REG_MOD_EN 0x46 #define WLED3_CTRL_REG_MOD_EN_MASK BIT(7) #define WLED3_CTRL_REG_MOD_EN_SHIFT 7 +#define WLED3_CTRL_REG_FEEDBACK_CONTROL 0x48 + #define WLED3_CTRL_REG_FREQ 0x4c #define WLED3_CTRL_REG_FREQ_MASK GENMASK(3, 0) #define WLED3_CTRL_REG_OVP 0x4d -#define WLED3_CTRL_REG_OVP_MASK GENMASK(1, 0) +#define WLED3_CTRL_REG_OVP_MASK GENMASK(1, 0) #define WLED3_CTRL_REG_ILIMIT 0x4e #define WLED3_CTRL_REG_ILIMIT_MASK GENMASK(2, 0) @@ -119,6 +129,7 @@ struct wled_config { bool ext_gen; bool cabc; bool external_pfet; + bool auto_detection_enabled; }; struct wled { @@ -127,16 +138,21 @@ struct wled { struct regmap *regmap; struct mutex lock; /* Lock to avoid race from thread irq handler */ ktime_t last_short_event; + ktime_t start_ovp_fault_time; u16 ctrl_addr; u16 sink_addr; u16 max_string_count; + u16 auto_detection_ovp_count; u32 brightness; u32 max_brightness; u32 short_count; + u32 auto_detect_count; bool disabled_by_short; bool has_short_detect; + int ovp_irq; struct wled_config cfg; + struct delayed_work ovp_work; int (*wled_set_brightness)(struct wled *wled, u16 brightness); }; @@ -181,6 +197,13 @@ static int wled4_set_brightness(struct wled *wled, u16 brightness) return 0; } +static void wled_ovp_work(struct work_struct *work) +{ + struct wled *wled = container_of(work, + struct wled, ovp_work.work); + enable_irq(wled->ovp_irq); +} + static int wled_module_enable(struct wled *wled, int val) { int rc; @@ -192,7 +215,19 @@ static int wled_module_enable(struct wled *wled, int val) WLED3_CTRL_REG_MOD_EN, WLED3_CTRL_REG_MOD_EN_MASK, val << WLED3_CTRL_REG_MOD_EN_SHIFT); - return rc; + if (rc < 0) + return rc; + + if (wled->ovp_irq > 0) { + if (val) { + schedule_delayed_work(&wled->ovp_work, HZ / 100); + } else { + if (!cancel_delayed_work_sync(&wled->ovp_work)) + disable_irq(wled->ovp_irq); + } + } + + return 0; } static int wled_sync_toggle(struct wled *wled) @@ -299,6 +334,311 @@ static irqreturn_t wled_short_irq_handler(int irq, void *_wled) return IRQ_HANDLED; } +#define AUTO_DETECT_BRIGHTNESS 200 + +static void wled_auto_string_detection(struct wled *wled) +{ + int rc = 0, i; + u32 sink_config = 0, int_sts; + u8 sink_test = 0, sink_valid = 0, val; + + /* read configured sink configuration */ + rc = regmap_read(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_CURR_SINK, &sink_config); + if (rc < 0) { + dev_err(wled->dev, "Failed to read SINK configuration rc=%d\n", + rc); + goto failed_detect; + } + + /* disable the module before starting detection */ + rc = regmap_update_bits(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, 0); + if (rc < 0) { + dev_err(wled->dev, "Failed to disable WLED module rc=%d\n", rc); + goto failed_detect; + } + + /* set low brightness across all sinks */ + rc = wled4_set_brightness(wled, AUTO_DETECT_BRIGHTNESS); + if (rc < 0) { + dev_err(wled->dev, "Failed to set brightness for auto detection rc=%d\n", + rc); + goto failed_detect; + } + + if (wled->cfg.cabc) { + for (i = 0; i < wled->cfg.num_strings; i++) { + rc = regmap_update_bits(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_STR_CABC(i), + WLED4_SINK_REG_STR_CABC_MASK, + 0); + if (rc < 0) + goto failed_detect; + } + } + + /* disable all sinks */ + rc = regmap_write(wled->regmap, + wled->sink_addr + WLED4_SINK_REG_CURR_SINK, 0); + if (rc < 0) { + dev_err(wled->dev, "Failed to disable all sinks rc=%d\n", rc); + goto failed_detect; + } + + /* iterate through the strings one by one */ + for (i = 0; i < wled->cfg.num_strings; i++) { + sink_test = BIT((WLED4_SINK_REG_CURR_SINK_SHFT + i)); + + /* Enable feedback control */ + rc = regmap_write(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_FEEDBACK_CONTROL, i + 1); + if (rc < 0) { + dev_err(wled->dev, "Failed to enable feedback for SINK %d rc = %d\n", + i + 1, rc); + goto failed_detect; + } + + /* enable the sink */ + rc = regmap_write(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_CURR_SINK, sink_test); + if (rc < 0) { + dev_err(wled->dev, "Failed to configure SINK %d rc=%d\n", + i + 1, rc); + goto failed_detect; + } + + /* Enable the module */ + rc = regmap_update_bits(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, + WLED3_CTRL_REG_MOD_EN_MASK); + if (rc < 0) { + dev_err(wled->dev, "Failed to enable WLED module rc=%d\n", + rc); + goto failed_detect; + } + + usleep_range(WLED_SOFT_START_DLY_US, + WLED_SOFT_START_DLY_US + 1000); + + rc = regmap_read(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_INT_RT_STS, &int_sts); + if (rc < 0) { + dev_err(wled->dev, "Error in reading WLED3_CTRL_INT_RT_STS rc=%d\n", + rc); + goto failed_detect; + } + + if (int_sts & WLED3_CTRL_REG_OVP_FAULT_STATUS) + dev_dbg(wled->dev, "WLED OVP fault detected with SINK %d\n", + i + 1); + else + sink_valid |= sink_test; + + /* Disable the module */ + rc = regmap_update_bits(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, 0); + if (rc < 0) { + dev_err(wled->dev, "Failed to disable WLED module rc=%d\n", + rc); + goto failed_detect; + } + } + + if (!sink_valid) { + dev_err(wled->dev, "No valid WLED sinks found\n"); + wled->disabled_by_short = true; + goto failed_detect; + } + + if (sink_valid == sink_config) { + dev_dbg(wled->dev, "WLED auto-detection complete, sink-config=%x OK!\n", + sink_config); + } else { + dev_warn(wled->dev, "New WLED string configuration found %x\n", + sink_valid); + sink_config = sink_valid; + } + + /* write the new sink configuration */ + rc = regmap_write(wled->regmap, + wled->sink_addr + WLED4_SINK_REG_CURR_SINK, + sink_config); + if (rc < 0) { + dev_err(wled->dev, "Failed to reconfigure the default sink rc=%d\n", + rc); + goto failed_detect; + } + + /* Enable valid sinks */ + for (i = 0; i < wled->cfg.num_strings; i++) { + if (wled->cfg.cabc) { + rc = regmap_update_bits(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_STR_CABC(i), + WLED4_SINK_REG_STR_CABC_MASK, + WLED4_SINK_REG_STR_CABC_MASK); + if (rc < 0) + goto failed_detect; + } + + if (sink_config & BIT(WLED4_SINK_REG_CURR_SINK_SHFT + i)) + val = WLED4_SINK_REG_STR_MOD_MASK; + else + val = 0x0; /* disable modulator_en for unused sink */ + + rc = regmap_write(wled->regmap, wled->sink_addr + + WLED4_SINK_REG_STR_MOD_EN(i), val); + if (rc < 0) { + dev_err(wled->dev, "Failed to configure MODULATOR_EN rc=%d\n", + rc); + goto failed_detect; + } + } + + /* restore the feedback setting */ + rc = regmap_write(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_FEEDBACK_CONTROL, 0); + if (rc < 0) { + dev_err(wled->dev, "Failed to restore feedback setting rc=%d\n", + rc); + goto failed_detect; + } + + /* restore brightness */ + rc = wled4_set_brightness(wled, wled->brightness); + if (rc < 0) { + dev_err(wled->dev, "Failed to set brightness after auto detection rc=%d\n", + rc); + goto failed_detect; + } + + rc = regmap_update_bits(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_MOD_EN, + WLED3_CTRL_REG_MOD_EN_MASK, + WLED3_CTRL_REG_MOD_EN_MASK); + if (rc < 0) { + dev_err(wled->dev, "Failed to enable WLED module rc=%d\n", rc); + goto failed_detect; + } + +failed_detect: + return; +} + +#define WLED_AUTO_DETECT_OVP_COUNT 5 +#define WLED_AUTO_DETECT_CNT_DLY_US USEC_PER_SEC +static bool wled_auto_detection_required(struct wled *wled) +{ + s64 elapsed_time_us; + + if (!wled->cfg.auto_detection_enabled) + return false; + + /* + * Check if the OVP fault was an occasional one + * or if it's firing continuously, the latter qualifies + * for an auto-detection check. + */ + if (!wled->auto_detection_ovp_count) { + wled->start_ovp_fault_time = ktime_get(); + wled->auto_detection_ovp_count++; + } else { + elapsed_time_us = ktime_us_delta(ktime_get(), + wled->start_ovp_fault_time); + if (elapsed_time_us > WLED_AUTO_DETECT_CNT_DLY_US) + wled->auto_detection_ovp_count = 0; + else + wled->auto_detection_ovp_count++; + + if (wled->auto_detection_ovp_count >= + WLED_AUTO_DETECT_OVP_COUNT) { + wled->auto_detection_ovp_count = 0; + return true; + } + } + + return false; +} + +static int wled_auto_detection_at_init(struct wled *wled) +{ + int rc; + u32 fault_status, rt_status; + + if (!wled->cfg.auto_detection_enabled) + return 0; + + rc = regmap_read(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, + &rt_status); + if (rc < 0) { + dev_err(wled->dev, "Failed to read RT status rc=%d\n", rc); + return rc; + } + + rc = regmap_read(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_FAULT_STATUS, + &fault_status); + if (rc < 0) { + dev_err(wled->dev, "Failed to read fault status rc=%d\n", rc); + return rc; + } + + if ((rt_status & WLED3_CTRL_REG_OVP_FAULT_STATUS) || + (fault_status & WLED3_CTRL_REG_OVP_FAULT_BIT)) { + mutex_lock(&wled->lock); + wled_auto_string_detection(wled); + mutex_unlock(&wled->lock); + } + + return rc; +} + +static irqreturn_t wled_ovp_irq_handler(int irq, void *_wled) +{ + struct wled *wled = _wled; + int rc; + u32 int_sts, fault_sts; + + rc = regmap_read(wled->regmap, + wled->ctrl_addr + WLED3_CTRL_REG_INT_RT_STS, &int_sts); + if (rc < 0) { + dev_err(wled->dev, "Error in reading WLED3_INT_RT_STS rc=%d\n", + rc); + return IRQ_HANDLED; + } + + rc = regmap_read(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_FAULT_STATUS, &fault_sts); + if (rc < 0) { + dev_err(wled->dev, "Error in reading WLED_FAULT_STATUS rc=%d\n", + rc); + return IRQ_HANDLED; + } + + if (fault_sts & + (WLED3_CTRL_REG_OVP_FAULT_BIT | WLED3_CTRL_REG_ILIM_FAULT_BIT)) + dev_dbg(wled->dev, "WLED OVP fault detected, int_sts=%x fault_sts= %x\n", + int_sts, fault_sts); + + if (fault_sts & WLED3_CTRL_REG_OVP_FAULT_BIT) { + mutex_lock(&wled->lock); + disable_irq_nosync(wled->ovp_irq); + + if (wled_auto_detection_required(wled)) + wled_auto_string_detection(wled); + + enable_irq(wled->ovp_irq); + + mutex_unlock(&wled->lock); + } + + return IRQ_HANDLED; +} + static int wled3_setup(struct wled *wled) { u16 addr; @@ -435,8 +775,10 @@ static int wled4_setup(struct wled *wled) sink_en |= 1 << temp; } - if (sink_cfg == sink_en) - return 0; + if (sink_cfg == sink_en) { + rc = wled_auto_detection_at_init(wled); + return rc; + } rc = regmap_update_bits(wled->regmap, wled->sink_addr + WLED4_SINK_REG_CURR_SINK, @@ -499,7 +841,9 @@ static int wled4_setup(struct wled *wled) return rc; } - return 0; + rc = wled_auto_detection_at_init(wled); + + return rc; } static const struct wled_config wled4_config_defaults = { @@ -510,6 +854,7 @@ static int wled4_setup(struct wled *wled) .switch_freq = 11, .cabc = false, .external_pfet = false, + .auto_detection_enabled = false, }; static const u32 wled3_boost_i_limit_values[] = { @@ -676,6 +1021,7 @@ static int wled_configure(struct wled *wled, int version) { "qcom,ext-gen", &cfg->ext_gen, }, { "qcom,cabc", &cfg->cabc, }, { "qcom,external-pfet", &cfg->external_pfet, }, + { "qcom,auto-string-detection", &cfg->auto_detection_enabled, }, }; prop_addr = of_get_address(dev->of_node, 0, NULL, NULL); @@ -796,6 +1142,40 @@ static int wled_configure_short_irq(struct wled *wled, return rc; } +static int wled_configure_ovp_irq(struct wled *wled, + struct platform_device *pdev) +{ + int rc; + u32 val; + + wled->ovp_irq = platform_get_irq_byname(pdev, "ovp"); + if (wled->ovp_irq < 0) { + dev_dbg(&pdev->dev, "ovp irq is not used\n"); + return 0; + } + + rc = devm_request_threaded_irq(wled->dev, wled->ovp_irq, NULL, + wled_ovp_irq_handler, IRQF_ONESHOT, + "wled_ovp_irq", wled); + if (rc < 0) { + dev_err(wled->dev, "Unable to request ovp_irq (err:%d)\n", + rc); + wled->ovp_irq = 0; + return 0; + } + + rc = regmap_read(wled->regmap, wled->ctrl_addr + + WLED3_CTRL_REG_MOD_EN, &val); + if (rc < 0) + return rc; + + /* Keep OVP irq disabled until module is enabled */ + if (!(val & WLED3_CTRL_REG_MOD_EN_MASK)) + disable_irq(wled->ovp_irq); + + return 0; +} + static const struct backlight_ops wled_ops = { .update_status = wled_update_status, }; @@ -836,6 +1216,7 @@ static int wled_probe(struct platform_device *pdev) switch (version) { case 3: + wled->cfg.auto_detection_enabled = false; rc = wled3_setup(wled); if (rc) { dev_err(&pdev->dev, "wled3_setup failed\n"); @@ -857,10 +1238,16 @@ static int wled_probe(struct platform_device *pdev) break; } + INIT_DELAYED_WORK(&wled->ovp_work, wled_ovp_work); + rc = wled_configure_short_irq(wled, pdev); if (rc < 0) return rc; + rc = wled_configure_ovp_irq(wled, pdev); + if (rc < 0) + return rc; + val = WLED_DEFAULT_BRIGHTNESS; of_property_read_u32(pdev->dev.of_node, "default-brightness", &val); @@ -874,6 +1261,16 @@ static int wled_probe(struct platform_device *pdev) return PTR_ERR_OR_ZERO(bl); }; +static int wled_remove(struct platform_device *pdev) +{ + struct wled *wled = dev_get_drvdata(&pdev->dev); + + cancel_delayed_work_sync(&wled->ovp_work); + mutex_destroy(&wled->lock); + + return 0; +} + static const struct of_device_id wled_match_table[] = { { .compatible = "qcom,pm8941-wled", .data = (void *)3 }, { .compatible = "qcom,pmi8998-wled", .data = (void *)4 }, @@ -884,6 +1281,7 @@ static int wled_probe(struct platform_device *pdev) static struct platform_driver wled_driver = { .probe = wled_probe, + .remove = wled_remove, .driver = { .name = "qcom,wled", .of_match_table = wled_match_table,
The auto string detection algorithm checks if the current WLED sink configuration is valid. It tries enabling every sink and checks if the OVP fault is observed. Based on this information it detects and enables the valid sink configuration. Auto calibration will be triggered when the OVP fault interrupts are seen frequently thereby it tries to fix the sink configuration. The auto-detection also kicks in when the connected LED string of the display-backlight malfunctions (because of damage) and requires the damaged string to be turned off to prevent the complete panel and/or board from being damaged. Signed-off-by: Kiran Gunda <kgunda@codeaurora.org> --- drivers/video/backlight/qcom-wled.c | 410 +++++++++++++++++++++++++++++++++++- 1 file changed, 404 insertions(+), 6 deletions(-)