| Message ID | 2b919bea97f23c952e0141ed63d04dbbcea5c695.1497861705.git.hns@goldelico.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi, On Mon, Jun 19, 2017 at 10:41:45AM +0200, H. Nikolaus Schaller wrote: > And initialize workers and notifiers as soon as possible. > > This avoids a potential race if irqs are enabled and triggered too early > before the worker is properly set up. > > Suggested-by: Grygorii Strashko <grygorii.strashko@ti.com> > Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> > --- > drivers/power/supply/twl4030_charger.c | 29 +++++++++++++++-------------- > 1 file changed, 15 insertions(+), 14 deletions(-) > > diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c > index 1fbbe0cc216a..9d974f1e3957 100644 > --- a/drivers/power/supply/twl4030_charger.c > +++ b/drivers/power/supply/twl4030_charger.c > @@ -984,12 +984,27 @@ static int twl4030_bci_probe(struct platform_device *pdev) > > platform_set_drvdata(pdev, bci); > > + INIT_WORK(&bci->work, twl4030_bci_usb_work); > + INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker); > + > bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac"); > if (IS_ERR(bci->channel_vac)) { > bci->channel_vac = NULL; > dev_warn(&pdev->dev, "could not request vac iio channel"); > } > > + if (bci->dev->of_node) { > + struct device_node *phynode; > + > + phynode = of_find_compatible_node(bci->dev->of_node->parent, > + NULL, "ti,twl4030-usb"); > + if (phynode) { > + bci->transceiver = devm_usb_get_phy_by_node( > + bci->dev, phynode, &bci->usb_nb); > + bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; those two should be the other way around. -- Sebastian
Hi, > Am 03.07.2017 um 14:55 schrieb Sebastian Reichel <sebastian.reichel@collabora.co.uk>: > > Hi, > > On Mon, Jun 19, 2017 at 10:41:45AM +0200, H. Nikolaus Schaller wrote: >> And initialize workers and notifiers as soon as possible. >> >> This avoids a potential race if irqs are enabled and triggered too early >> before the worker is properly set up. >> >> Suggested-by: Grygorii Strashko <grygorii.strashko@ti.com> >> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> >> --- >> drivers/power/supply/twl4030_charger.c | 29 +++++++++++++++-------------- >> 1 file changed, 15 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c >> index 1fbbe0cc216a..9d974f1e3957 100644 >> --- a/drivers/power/supply/twl4030_charger.c >> +++ b/drivers/power/supply/twl4030_charger.c >> @@ -984,12 +984,27 @@ static int twl4030_bci_probe(struct platform_device *pdev) >> >> platform_set_drvdata(pdev, bci); >> >> + INIT_WORK(&bci->work, twl4030_bci_usb_work); >> + INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker); >> + >> bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac"); >> if (IS_ERR(bci->channel_vac)) { >> bci->channel_vac = NULL; >> dev_warn(&pdev->dev, "could not request vac iio channel"); >> } >> >> + if (bci->dev->of_node) { >> + struct device_node *phynode; >> + >> + phynode = of_find_compatible_node(bci->dev->of_node->parent, >> + NULL, "ti,twl4030-usb"); >> + if (phynode) { >> + bci->transceiver = devm_usb_get_phy_by_node( >> + bci->dev, phynode, &bci->usb_nb); >> + bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; > > those two should be the other way around. Seems to work as well (and avoids another potential race condition). v8 coming instantly. BR and thanks, Nikolaus
diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index 1fbbe0cc216a..9d974f1e3957 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -984,12 +984,27 @@ static int twl4030_bci_probe(struct platform_device *pdev) platform_set_drvdata(pdev, bci); + INIT_WORK(&bci->work, twl4030_bci_usb_work); + INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker); + bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac"); if (IS_ERR(bci->channel_vac)) { bci->channel_vac = NULL; dev_warn(&pdev->dev, "could not request vac iio channel"); } + if (bci->dev->of_node) { + struct device_node *phynode; + + phynode = of_find_compatible_node(bci->dev->of_node->parent, + NULL, "ti,twl4030-usb"); + if (phynode) { + bci->transceiver = devm_usb_get_phy_by_node( + bci->dev, phynode, &bci->usb_nb); + bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; + } + } + bci->ac = devm_power_supply_register(&pdev->dev, &twl4030_bci_ac_desc, NULL); if (IS_ERR(bci->ac)) { @@ -1023,20 +1038,6 @@ static int twl4030_bci_probe(struct platform_device *pdev) return ret; } - INIT_WORK(&bci->work, twl4030_bci_usb_work); - INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker); - - bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; - if (bci->dev->of_node) { - struct device_node *phynode; - - phynode = of_find_compatible_node(bci->dev->of_node->parent, - NULL, "ti,twl4030-usb"); - if (phynode) - bci->transceiver = devm_usb_get_phy_by_node( - bci->dev, phynode, &bci->usb_nb); - } - /* Enable interrupts now. */ reg = ~(u32)(TWL4030_ICHGLOW | TWL4030_ICHGEOC | TWL4030_TBATOR2 | TWL4030_TBATOR1 | TWL4030_BATSTS);
And initialize workers and notifiers as soon as possible. This avoids a potential race if irqs are enabled and triggered too early before the worker is properly set up. Suggested-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com> --- drivers/power/supply/twl4030_charger.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)