More fixes for twl4030 charger

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 <[email protected]>

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
 drivers/power/supply/twl4030_charger.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

drivers/power/supply/twl4030_charger.c +3 -0

index 1fbbe0cc216a..9d974f1e3957 100644
@@ -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");
 	}

Am 03.07.2017 um 14:55 schrieb Sebastian Reichel <[email protected]>:

Hi,

Quoted 28 lines · H. Nikolaus Schaller

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 <[email protected]>

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
drivers/power/supply/twl4030_charger.c | 29 +++++++++++++++--------------

1 file changed, 15 insertions(+), 14 deletions(-)

drivers/power/supply/twl4030_charger.c +3 -0

index 1fbbe0cc216a..9d974f1e3957 100644
@@ -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");
 	}
 

drivers/power/supply/twl4030_charger.c static int twl4030_bci_probe(struct platform_device *pdev) · line 1004

Quoted 9 lines

drivers/power/supply/twl4030_charger.c +9 -0

+	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.

This fixes an issue if both this twl4030_charger driver and phy-twl4030-usb are compiled as modules and loaded in random order.

It has been observed on GTA04 and OpenPandora devices that in worst case the boot process hangs and in best case the AC detection fails with a warning.

Therefore we add deferred probing checks for the usb_phy and the iio channel for AC detection.

Signed-off-by H. Nikolaus Schaller <[email protected]>

---
 drivers/power/supply/twl4030_charger.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

drivers/power/supply/twl4030_charger.c +13 -1

index 9d974f1e3957..0d2125e4f735 100644
@@ -989,8 +989,12 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 
 	bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
 	if (IS_ERR(bci->channel_vac)) {
+		ret = PTR_ERR(bci->channel_vac);
+		if (ret == -EPROBE_DEFER)
+			return ret;	/* iio not ready */
+		dev_warn(&pdev->dev, "could not request vac iio channel (%d)",
+			ret);
 		bci->channel_vac = NULL;
-		dev_warn(&pdev->dev, "could not request vac iio channel");
 	}
 
 	if (bci->dev->of_node) {

@@ -1002,6 +1006,14 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 			bci->transceiver = devm_usb_get_phy_by_node(
 				bci->dev, phynode, &bci->usb_nb);
 			bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
+			if (IS_ERR(bci->transceiver)) {
+				ret = PTR_ERR(bci->transceiver);
+				if (ret == -EPROBE_DEFER)
+					return ret;	/* phy not ready */
+				dev_warn(&pdev->dev, "could not request transceiver (%d)",
+					ret);
+				bci->transceiver = NULL;
+			}
 		}
 	}
 

Signature · 1 line

2.12.2

Am 19.06.2017 um 10:41 schrieb H. Nikolaus Schaller <[email protected]>:

Changes V7:
* removed already merged patches from patch set
* further fix for potentially wrong irq and notifier initialization sequence (suggested by Sebastian Reichel)
* NULLify transceiver pointer in case of errors (suggested by Sebastian Reichel)