usb: ehci-exynos: Use devm_clk_get_enabled() helpers

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

drivers/usb/host/ehci-exynos.c +0 -8

index f644b131cc0b..05aa3d9c2a3b 100644
@@ -159,19 +159,12 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 
 	err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
 	if (err)
-		goto fail_clk;
-
-	exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
-
-	if (IS_ERR(exynos_ehci->clk)) {
-		dev_err(&pdev->dev, "Failed to get usbhost clock\n");
-		err = PTR_ERR(exynos_ehci->clk);
-		goto fail_clk;

drivers/usb/host/ehci-exynos.c +0 -13

 	hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(hcd->regs)) {

@@ -223,8 +216,6 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 	exynos_ehci_phy_disable(&pdev->dev);
 	pdev->dev.of_node = exynos_ehci->of_node;
 fail_io:
-	clk_disable_unprepare(exynos_ehci->clk);
-fail_clk:
 	usb_put_hcd(hcd);
 	return err;
 }

@@ -240,8 +231,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 
 	exynos_ehci_phy_disable(&pdev->dev);
 
-	clk_disable_unprepare(exynos_ehci->clk);
-
 	usb_put_hcd(hcd);
 }
 

@@ -249,7 +238,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 static int exynos_ehci_suspend(struct device *dev)
 {
 	struct usb_hcd *hcd = dev_get_drvdata(dev);
-	struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
 
 	bool do_wakeup = device_may_wakeup(dev);
 	int rc;

@@ -260,25 +248,17 @@ static int exynos_ehci_suspend(struct device *dev)
 
 	exynos_ehci_phy_disable(dev);
 
-	clk_disable_unprepare(exynos_ehci->clk);
-
 	return rc;
 }
 
 static int exynos_ehci_resume(struct device *dev)
 {
 	struct usb_hcd *hcd = dev_get_drvdata(dev);
-	struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
 	int ret;
 
-	ret = clk_prepare_enable(exynos_ehci->clk);
-	if (ret)
-		return ret;
-
 	ret = exynos_ehci_phy_enable(dev);
 	if (ret) {
 		dev_err(dev, "Failed to enable USB phy\n");
-		clk_disable_unprepare(exynos_ehci->clk);
 		return ret;
 	}
 

Signature · 1 line

2.43.0

Quoted 34 lines · Anand Moon

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

drivers/usb/host/ehci-exynos.c +1 -9

index f644b131cc0b..05aa3d9c2a3b 100644
@@ -159,19 +159,12 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 
      err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
      if (err)
-             goto fail_clk;
-
-     exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
-
-     if (IS_ERR(exynos_ehci->clk)) {
-             dev_err(&pdev->dev, "Failed to get usbhost clock\n");
-             err = PTR_ERR(exynos_ehci->clk);
-             goto fail_clk;
-     }
+             goto fail_io;
 

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct platform_device *pdev) · line 167

Quoted 7 lines

drivers/usb/host/ehci-exynos.c +4 -3

-     err = clk_prepare_enable(exynos_ehci->clk);
-     if (err)
-             goto fail_clk;
+     exynos_ehci->clk = devm_clk_get_enabled(&pdev->dev, "usbhost");
+     if (IS_ERR(exynos_ehci->clk))
+             return dev_err_probe(&pdev->dev, PTR_ERR(exynos_ehci->clk),
+                               "Failed to get usbhost clock\n");

What about the usb_put_hcd(hcd) call that used to happen here?

Alan Stern

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

Signed-off-by Anand Moon <[email protected]>

---
  drivers/usb/host/ehci-exynos.c | 30 +++++-------------------------
  1 file changed, 5 insertions(+), 25 deletions(-)

drivers/usb/host/ehci-exynos.c +5 -17

index f644b131cc0b..05aa3d9c2a3b 100644
@@ -159,19 +159,12 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 
  	err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
  	if (err)
-		goto fail_clk;
-
-	exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
-
-	if (IS_ERR(exynos_ehci->clk)) {
-		dev_err(&pdev->dev, "Failed to get usbhost clock\n");
-		err = PTR_ERR(exynos_ehci->clk);
-		goto fail_clk;
-	}
+		goto fail_io;
 
-	err = clk_prepare_enable(exynos_ehci->clk);
-	if (err)
-		goto fail_clk;
+	exynos_ehci->clk = devm_clk_get_enabled(&pdev->dev, "usbhost");
+	if (IS_ERR(exynos_ehci->clk))
+		return dev_err_probe(&pdev->dev, PTR_ERR(exynos_ehci->clk),
+				  "Failed to get usbhost clock\n");
 
  	hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
  	if (IS_ERR(hcd->regs)) {

@@ -223,8 +216,6 @@ static int exynos_ehci_probe(struct platform_device *pdev)
  	exynos_ehci_phy_disable(&pdev->dev);
  	pdev->dev.of_node = exynos_ehci->of_node;
  fail_io:
-	clk_disable_unprepare(exynos_ehci->clk);
-fail_clk:
  	usb_put_hcd(hcd);
  	return err;
  }

@@ -240,8 +231,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 
  	exynos_ehci_phy_disable(&pdev->dev);
 
-	clk_disable_unprepare(exynos_ehci->clk);
-
  	usb_put_hcd(hcd);
  }
 

@@ -249,7 +238,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
  static int exynos_ehci_suspend(struct device *dev)
  {
  	struct usb_hcd *hcd = dev_get_drvdata(dev);
-	struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
 
  	bool do_wakeup = device_may_wakeup(dev);
  	int rc;

drivers/usb/host/ehci-exynos.c +0 -7

-
  	return rc;
  }
 
  static int exynos_ehci_resume(struct device *dev)
  {
  	struct usb_hcd *hcd = dev_get_drvdata(dev);
-	struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
  	int ret;
 
-	ret = clk_prepare_enable(exynos_ehci->clk);
-	if (ret)
-		return ret;
-
  	ret = exynos_ehci_phy_enable(dev);
  	if (ret) {
  		dev_err(dev, "Failed to enable USB phy\n");
-		clk_disable_unprepare(exynos_ehci->clk);
  		return ret;
  	}
 

Quoted 71 lines · Anand Moon

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

Signed-off-by Anand Moon <[email protected]>

---
  drivers/usb/host/ehci-exynos.c | 30 +++++-------------------------
  1 file changed, 5 insertions(+), 25 deletions(-)

drivers/usb/host/ehci-exynos.c +5 -17

index f644b131cc0b..05aa3d9c2a3b 100644
@@ -159,19 +159,12 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 
      err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
      if (err)
-             goto fail_clk;
-
-     exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
-
-     if (IS_ERR(exynos_ehci->clk)) {
-             dev_err(&pdev->dev, "Failed to get usbhost clock\n");
-             err = PTR_ERR(exynos_ehci->clk);
-             goto fail_clk;
-     }
+             goto fail_io;
 
-     err = clk_prepare_enable(exynos_ehci->clk);
-     if (err)
-             goto fail_clk;
+     exynos_ehci->clk = devm_clk_get_enabled(&pdev->dev, "usbhost");
+     if (IS_ERR(exynos_ehci->clk))
+             return dev_err_probe(&pdev->dev, PTR_ERR(exynos_ehci->clk),
+                               "Failed to get usbhost clock\n");
 
      hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
      if (IS_ERR(hcd->regs)) {

@@ -223,8 +216,6 @@ static int exynos_ehci_probe(struct platform_device *pdev)
      exynos_ehci_phy_disable(&pdev->dev);
      pdev->dev.of_node = exynos_ehci->of_node;
  fail_io:
-     clk_disable_unprepare(exynos_ehci->clk);
-fail_clk:
      usb_put_hcd(hcd);
      return err;
  }

@@ -240,8 +231,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 
      exynos_ehci_phy_disable(&pdev->dev);
 
-     clk_disable_unprepare(exynos_ehci->clk);
-
      usb_put_hcd(hcd);
  }
 

@@ -249,7 +238,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
  static int exynos_ehci_suspend(struct device *dev)
  {
      struct usb_hcd *hcd = dev_get_drvdata(dev);
-     struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
 
      bool do_wakeup = device_may_wakeup(dev);
      int rc;

drivers/usb/host/ehci-exynos.c static int exynos_ehci_suspend(struct device *dev) · line 263

Quoted 4 lines

drivers/usb/host/ehci-exynos.c +0 -1

@@ -260,25 +248,17 @@ static int exynos_ehci_suspend(struct device *dev)
 
      exynos_ehci_phy_disable(dev);
 
-     clk_disable_unprepare(exynos_ehci->clk);

Hi,

I don't think that removing clk_[en|dis]abble from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Why did you removed it?

CJ

Quoted 22 lines

drivers/usb/host/ehci-exynos.c +0 -7

-
      return rc;
  }
 
  static int exynos_ehci_resume(struct device *dev)
  {
      struct usb_hcd *hcd = dev_get_drvdata(dev);
-     struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
      int ret;
 
-     ret = clk_prepare_enable(exynos_ehci->clk);
-     if (ret)
-             return ret;
-
      ret = exynos_ehci_phy_enable(dev);
      if (ret) {
              dev_err(dev, "Failed to enable USB phy\n");
-             clk_disable_unprepare(exynos_ehci->clk);
              return ret;
      }
 

Hi Christophe,

Quoted 80 lines · Christophe JAILLET

Quoted 71 lines · Anand Moon

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

Signed-off-by Anand Moon <[email protected]>

---
   drivers/usb/host/ehci-exynos.c | 30 +++++-------------------------
   1 file changed, 5 insertions(+), 25 deletions(-)

drivers/usb/host/ehci-exynos.c +5 -17

index f644b131cc0b..05aa3d9c2a3b 100644
@@ -159,19 +159,12 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 
       err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
       if (err)
-             goto fail_clk;
-
-     exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
-
-     if (IS_ERR(exynos_ehci->clk)) {
-             dev_err(&pdev->dev, "Failed to get usbhost clock\n");
-             err = PTR_ERR(exynos_ehci->clk);
-             goto fail_clk;
-     }
+             goto fail_io;
 
-     err = clk_prepare_enable(exynos_ehci->clk);
-     if (err)
-             goto fail_clk;
+     exynos_ehci->clk = devm_clk_get_enabled(&pdev->dev, "usbhost");
+     if (IS_ERR(exynos_ehci->clk))
+             return dev_err_probe(&pdev->dev, PTR_ERR(exynos_ehci->clk),
+                               "Failed to get usbhost clock\n");
 
       hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
       if (IS_ERR(hcd->regs)) {

@@ -223,8 +216,6 @@ static int exynos_ehci_probe(struct platform_device *pdev)
       exynos_ehci_phy_disable(&pdev->dev);
       pdev->dev.of_node = exynos_ehci->of_node;
   fail_io:
-     clk_disable_unprepare(exynos_ehci->clk);
-fail_clk:
       usb_put_hcd(hcd);
       return err;
   }

@@ -240,8 +231,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 
       exynos_ehci_phy_disable(&pdev->dev);
 
-     clk_disable_unprepare(exynos_ehci->clk);
-
       usb_put_hcd(hcd);
   }
 

@@ -249,7 +238,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
   static int exynos_ehci_suspend(struct device *dev)
   {
       struct usb_hcd *hcd = dev_get_drvdata(dev);
-     struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
 
       bool do_wakeup = device_may_wakeup(dev);
       int rc;

drivers/usb/host/ehci-exynos.c static int exynos_ehci_suspend(struct device *dev) · line 263

Quoted 4 lines

drivers/usb/host/ehci-exynos.c +0 -1

@@ -260,25 +248,17 @@ static int exynos_ehci_suspend(struct device *dev)
 
       exynos_ehci_phy_disable(dev);
 
-     clk_disable_unprepare(exynos_ehci->clk);

Hi,

Quoted 5 lines

I don't think that removing clk_[en|dis]abble from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Yes correct,

Quoted 3 lines

Why did you removed it?

devm_clk_get_enabled function register callback for clk_prepare_enable and clk_disable_unprepare, so when the clock resource is not used it should get disabled.

[0] https://elixir.bootlin.com/linux/latest/source/drivers/clk/clk-devres.c#L75

I have also tested with rtc suspend & resume and did not find any issue.

Quoted 1 line

CJ

Thanks
-Anand

Quoted 23 lines

Quoted 22 lines

drivers/usb/host/ehci-exynos.c +0 -7

-
       return rc;
   }
 
   static int exynos_ehci_resume(struct device *dev)
   {
       struct usb_hcd *hcd = dev_get_drvdata(dev);
-     struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
       int ret;
 
-     ret = clk_prepare_enable(exynos_ehci->clk);
-     if (ret)
-             return ret;
-
       ret = exynos_ehci_phy_enable(dev);
       if (ret) {
               dev_err(dev, "Failed to enable USB phy\n");
-             clk_disable_unprepare(exynos_ehci->clk);
               return ret;
       }
 

Hi Christophe,

Quoted 80 lines · Christophe JAILLET

Quoted 71 lines · Anand Moon

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

Signed-off-by Anand Moon <[email protected]>

---
   drivers/usb/host/ehci-exynos.c | 30 +++++-------------------------
   1 file changed, 5 insertions(+), 25 deletions(-)

drivers/usb/host/ehci-exynos.c +5 -17

index f644b131cc0b..05aa3d9c2a3b 100644
@@ -159,19 +159,12 @@ static int exynos_ehci_probe(struct platform_device *pdev)
 
       err = exynos_ehci_get_phy(&pdev->dev, exynos_ehci);
       if (err)
-             goto fail_clk;
-
-     exynos_ehci->clk = devm_clk_get(&pdev->dev, "usbhost");
-
-     if (IS_ERR(exynos_ehci->clk)) {
-             dev_err(&pdev->dev, "Failed to get usbhost clock\n");
-             err = PTR_ERR(exynos_ehci->clk);
-             goto fail_clk;
-     }
+             goto fail_io;
 
-     err = clk_prepare_enable(exynos_ehci->clk);
-     if (err)
-             goto fail_clk;
+     exynos_ehci->clk = devm_clk_get_enabled(&pdev->dev, "usbhost");
+     if (IS_ERR(exynos_ehci->clk))
+             return dev_err_probe(&pdev->dev, PTR_ERR(exynos_ehci->clk),
+                               "Failed to get usbhost clock\n");
 
       hcd->regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
       if (IS_ERR(hcd->regs)) {

@@ -223,8 +216,6 @@ static int exynos_ehci_probe(struct platform_device *pdev)
       exynos_ehci_phy_disable(&pdev->dev);
       pdev->dev.of_node = exynos_ehci->of_node;
   fail_io:
-     clk_disable_unprepare(exynos_ehci->clk);
-fail_clk:
       usb_put_hcd(hcd);
       return err;
   }

@@ -240,8 +231,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 
       exynos_ehci_phy_disable(&pdev->dev);
 
-     clk_disable_unprepare(exynos_ehci->clk);
-
       usb_put_hcd(hcd);
   }
 

@@ -249,7 +238,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
   static int exynos_ehci_suspend(struct device *dev)
   {
       struct usb_hcd *hcd = dev_get_drvdata(dev);
-     struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
 
       bool do_wakeup = device_may_wakeup(dev);
       int rc;

drivers/usb/host/ehci-exynos.c static int exynos_ehci_suspend(struct device *dev) · line 263

Quoted 4 lines

drivers/usb/host/ehci-exynos.c +0 -1

@@ -260,25 +248,17 @@ static int exynos_ehci_suspend(struct device *dev)
 
       exynos_ehci_phy_disable(dev);
 
-     clk_disable_unprepare(exynos_ehci->clk);

Hi,

Quoted 5 lines

I don't think that removing clk_[en|dis]abble from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Yes correct,

Quoted 3 lines

Why did you removed it?

devm_clk_get_enabled function register callback for clk_prepare_enable and clk_disable_unprepare, so when the clock resource is not used it should get disabled.

[0] https://elixir.bootlin.com/linux/latest/source/drivers/clk/clk-devres.c#L75

I have also tested with rtc suspend & resume and did not find any issue.

Quoted 1 line

CJ

Thanks
-Anand

Quoted 23 lines

Quoted 22 lines

drivers/usb/host/ehci-exynos.c +0 -7

-
       return rc;
   }
 
   static int exynos_ehci_resume(struct device *dev)
   {
       struct usb_hcd *hcd = dev_get_drvdata(dev);
-     struct exynos_ehci_hcd *exynos_ehci = to_exynos_ehci(hcd);
       int ret;
 
-     ret = clk_prepare_enable(exynos_ehci->clk);
-     if (ret)
-             return ret;
-
       ret = exynos_ehci_phy_enable(dev);
       if (ret) {
               dev_err(dev, "Failed to enable USB phy\n");
-             clk_disable_unprepare(exynos_ehci->clk);
               return ret;
       }
 

Quoted 16 lines · Christophe JAILLET

Quoted 14 lines · Anand Moon

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

drivers/usb/host/ehci-exynos.c +0 -0

@@ -260,25 +248,17 @@ static int exynos_ehci_suspend(struct device *dev)
 
      exynos_ehci_phy_disable(dev);
 

Quoted 7 lines

Review static int exynos_ehci_suspend(struct device *dev) · line 263

Quoted 1 line

(quoted diff) +0 -1

-     clk_disable_unprepare(exynos_ehci->clk);

I don't think that removing clk_[en|dis]abble from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Yes correct,

Quoted 2 lines

Why did you removed it?

devm_clk_get_enabled function register callback for clk_prepare_enable and clk_disable_unprepare, so when the clock resource is not used it should get disabled.

[0] https://elixir.bootlin.com/linux/latest/source/drivers/clk/clk-devres.c#L75

I have also tested with rtc suspend & resume and did not find any issue.

Quoted 33 lines · Anand Moon

Quoted 16 lines · Christophe JAILLET

Quoted 14 lines · Anand Moon

The devm_clk_get_enabled() helpers:
- call devm_clk_get()
- call clk_prepare_enable() and register what is needed in order to call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

While at it, use dev_err_probe consistently, and use its return value to return the error code.

drivers/usb/host/ehci-exynos.c +0 -0

@@ -260,25 +248,17 @@ static int exynos_ehci_suspend(struct device *dev)
 
      exynos_ehci_phy_disable(dev);
 

Quoted 7 lines

Review static int exynos_ehci_suspend(struct device *dev) · line 263

Quoted 1 line

(quoted diff) +0 -1

-     clk_disable_unprepare(exynos_ehci->clk);

I don't think that removing clk_[en|dis]abble from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Yes correct,

Quoted 2 lines

Why did you removed it?

devm_clk_get_enabled function register callback for clk_prepare_enable and clk_disable_unprepare, so when the clock resource is not used it should get disabled.

Quoted 3 lines

[0] https://elixir.bootlin.com/linux/latest/source/drivers/clk/clk-devres.c#L75

I have also tested with rtc suspend & resume and did not find any issue.

You seem to be totally confused about how devres works, and arguing back after Christophe points this out to you instead of going back and doing the homework you should have done before posting these patches is really not OK (e.g. as you're wasting other people's time).

And you clearly did not test these patches enough to confirm that you didn't break the driver.

Johan

Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM are disabled, without having to use #ifdef guards. If CONFIG_PM unused, they will simply be discarded by the compiler.

Use RUNTIME_PM_OPS runtime macro for suspend/resume function.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

drivers/usb/host/ehci-exynos.c +0 -1

index 05aa3d9c2a3b..4676f45655cd 100644
@@ -234,7 +234,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
 	usb_put_hcd(hcd);
 }
 
-#ifdef CONFIG_PM
 static int exynos_ehci_suspend(struct device *dev)
 {
 	struct usb_hcd *hcd = dev_get_drvdata(dev);

drivers/usb/host/ehci-exynos.c +2 -3

 static const struct dev_pm_ops exynos_ehci_pm_ops = {
-	.suspend	= exynos_ehci_suspend,
-	.resume		= exynos_ehci_resume,
+	RUNTIME_PM_OPS(exynos_ehci_suspend, exynos_ehci_resume, NULL)
 };
 
 #ifdef CONFIG_OF

@@ -292,7 +286,7 @@ static struct platform_driver exynos_ehci_driver = {
 	.shutdown	= usb_hcd_platform_shutdown,
 	.driver = {
 		.name	= "exynos-ehci",
-		.pm	= &exynos_ehci_pm_ops,
+		.pm	= pm_ptr(&exynos_ehci_pm_ops),
 		.of_match_table = of_match_ptr(exynos_ehci_match),
 	}
 };

Signature · 1 line

2.43.0

Quoted 20 lines · Anand Moon

Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM are disabled, without having to use #ifdef guards. If CONFIG_PM unused, they will simply be discarded by the compiler.

Use RUNTIME_PM_OPS runtime macro for suspend/resume function.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

drivers/usb/host/ehci-exynos.c +0 -0

index 05aa3d9c2a3b..4676f45655cd 100644
@@ -234,7 +234,6 @@ static void exynos_ehci_remove(struct platform_device *pdev)
      usb_put_hcd(hcd);
 }
 

drivers/usb/host/ehci-exynos.c static int exynos_ehci_resume(struct device *dev) · line 274

Quoted 12 lines

drivers/usb/host/ehci-exynos.c +0 -5

-#ifdef CONFIG_PM
 static int exynos_ehci_suspend(struct device *dev)
 {
      struct usb_hcd *hcd = dev_get_drvdata(dev);

@@ -268,14 +267,9 @@ static int exynos_ehci_resume(struct device *dev)
      ehci_resume(hcd, false);
      return 0;
 }
-#else
-#define exynos_ehci_suspend  NULL
-#define exynos_ehci_resume   NULL
-#endif

Doesn't this now generate warnings about functions being defined but not used when you build with CONFIG_PM disabled?

Alan Stern

Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM are disabled, without having to use #ifdef guards. If CONFIG_PM unused, they will simply be discarded by the compiler.

Use RUNTIME_PM_OPS runtime macro for suspend/resume function.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

static const struct dev_pm_ops exynos_ehci_pm_ops = {

Quoted 13 lines · Anand Moon

Use the new PM macros for the suspend and resume functions to be automatically dropped by the compiler when CONFIG_PM are disabled, without having to use #ifdef guards. If CONFIG_PM unused, they will simply be discarded by the compiler.

Use RUNTIME_PM_OPS runtime macro for suspend/resume function.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

static const struct dev_pm_ops exynos_ehci_pm_ops = {

drivers/usb/host/ehci-exynos.c static int exynos_ehci_resume(struct device *dev) · line 273

Quoted 4 lines

drivers/usb/host/ehci-exynos.c +1 -2

-     .suspend        = exynos_ehci_suspend,
-     .resume         = exynos_ehci_resume,
+     RUNTIME_PM_OPS(exynos_ehci_suspend, exynos_ehci_resume, NULL)
 };

This is also broken and clearly not tested. See the definition of RUNTIME_PM_OPS() which sets the runtime pm callbacks, not the suspend ones:

        #define RUNTIME_PM_OPS(suspend_fn, resume_fn, idle_fn) \
                .runtime_suspend = suspend_fn, \
                .runtime_resume = resume_fn, \
                .runtime_idle = idle_fn,

Johan

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
  drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
  1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
  	struct clk		*clks[DWC3_EXYNOS_MAX_CLOCKS];
  	int			num_clks;
  	int			suspend_clk_idx;
-
-	struct regulator	*vdd33;
-	struct regulator	*vdd10;
  };
 
  static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
  	struct device_node	*node = dev->of_node;
  	const struct dwc3_exynos_driverdata *driver_data;
  	int			i, ret;
+	static const char * const regulators[] = { "vdd33", "vdd10" };
 
  	exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
  	if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
  	if (exynos->suspend_clk_idx >= 0)
  		clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-	exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-	if (IS_ERR(exynos->vdd33)) {
-		ret = PTR_ERR(exynos->vdd33);
-		goto vdd33_err;
-	}
-	ret = regulator_enable(exynos->vdd33);
-	if (ret) {
-		dev_err(dev, "Failed to enable VDD33 supply\n");
-		goto vdd33_err;
-	}
-
-	exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-	if (IS_ERR(exynos->vdd10)) {
-		ret = PTR_ERR(exynos->vdd10);
-		goto vdd10_err;
-	}
-	ret = regulator_enable(exynos->vdd10);
-	if (ret) {
-		dev_err(dev, "Failed to enable VDD10 supply\n");
-		goto vdd10_err;
-	}
+	ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+	if (ret)
+		return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
  	if (node) {
  		ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
  	return 0;
 
  populate_err:
-	regulator_disable(exynos->vdd10);
-vdd10_err:
-	regulator_disable(exynos->vdd33);
-vdd33_err:
  	for (i = exynos->num_clks - 1; i >= 0; i--)
  		clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
  	if (exynos->suspend_clk_idx >= 0)
  		clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-	regulator_disable(exynos->vdd33);
-	regulator_disable(exynos->vdd10);
  }
 
  static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c +0 -12

-
  	return 0;
  }
 

@@ -207,17 +177,6 @@ static int dwc3_exynos_resume(struct device *dev)
  	struct dwc3_exynos *exynos = dev_get_drvdata(dev);
  	int i, ret;
 
-	ret = regulator_enable(exynos->vdd33);
-	if (ret) {
-		dev_err(dev, "Failed to enable VDD33 supply\n");
-		return ret;
-	}
-	ret = regulator_enable(exynos->vdd10);
-	if (ret) {
-		dev_err(dev, "Failed to enable VDD10 supply\n");
-		return ret;
-	}
-
  	for (i = 0; i < exynos->num_clks; i++) {
  		ret = clk_prepare_enable(exynos->clks[i]);
  		if (ret) {

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
  drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
  1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
      struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
      int                     num_clks;
      int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
  };
 
  static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
      struct device_node      *node = dev->of_node;
      const struct dwc3_exynos_driverdata *driver_data;
      int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
      exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
      if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
      if (exynos->suspend_clk_idx >= 0)
              clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
      if (node) {
              ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
      return 0;
 
  populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
      for (i = exynos->num_clks - 1; i >= 0; i--)
              clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
      if (exynos->suspend_clk_idx >= 0)
              clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
  }
 
  static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
      for (i = exynos->num_clks - 1; i >= 0; i--)
              clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Why did you removed it?

CJ

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
   drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
   1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
       struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
       int                     num_clks;
       int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
   };
 
   static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       struct device_node      *node = dev->of_node;
       const struct dwc3_exynos_driverdata *driver_data;
       int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
       exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
       if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       if (exynos->suspend_clk_idx >= 0)
               clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
       if (node) {
               ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       return 0;
 
   populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
       for (i = exynos->num_clks - 1; i >= 0; i--)
               clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
       if (exynos->suspend_clk_idx >= 0)
               clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
   }
 
   static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
       for (i = exynos->num_clks - 1; i >= 0; i--)
               clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

[0] https://elixir.bootlin.com/linux/latest/source/drivers/regulator/devres.c#L330

I have tested with rtc suspend resume and did not find any issue with this.patch.

Quoted 3 lines

CJ

Thanks
-Anand

Quoted 106 lines · Anand Moon

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
   drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
   1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
       struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
       int                     num_clks;
       int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
   };
 
   static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       struct device_node      *node = dev->of_node;
       const struct dwc3_exynos_driverdata *driver_data;
       int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
       exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
       if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       if (exynos->suspend_clk_idx >= 0)
               clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
       if (node) {
               ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       return 0;
 
   populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
       for (i = exynos->num_clks - 1; i >= 0; i--)
               clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
       if (exynos->suspend_clk_idx >= 0)
               clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
   }
 
   static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
       for (i = exynos->num_clks - 1; i >= 0; i--)
               clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

Quoted 7 lines

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

The code in suspend/resume is not about freeing some resources. It is about enabling/disabling some hardware to save some power.

Think to the probe/remove functions as the software in the kernel that knows how to handle some hardawre, and the suspend/resume as the on/off button to power-on and off the electrical chips.

When the system is suspended, the software is still around. But some hardware can be set in a low consumption mode to save some power.

IMHO, part of the code you removed changed this behaviour and increase the power consumption when the system is suspended.

CJ

Hi Christophe,

Quoted 126 lines · Christophe JAILLET

Quoted 106 lines · Anand Moon

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
   drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
   1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
       struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
       int                     num_clks;
       int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
   };
 
   static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       struct device_node      *node = dev->of_node;
       const struct dwc3_exynos_driverdata *driver_data;
       int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
       exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
       if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       if (exynos->suspend_clk_idx >= 0)
               clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
       if (node) {
               ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
       return 0;
 
   populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
       for (i = exynos->num_clks - 1; i >= 0; i--)
               clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
       if (exynos->suspend_clk_idx >= 0)
               clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
   }
 
   static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
       for (i = exynos->num_clks - 1; i >= 0; i--)
               clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

Quoted 7 lines

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

The code in suspend/resume is not about freeing some resources. It is about enabling/disabling some hardware to save some power.

Think to the probe/remove functions as the software in the kernel that knows how to handle some hardawre, and the suspend/resume as the on/off button to power-on and off the electrical chips.

When the system is suspended, the software is still around. But some hardware can be set in a low consumption mode to save some power.

Quoted 3 lines

IMHO, part of the code you removed changed this behaviour and increase the power consumption when the system is suspended.

You are correct, I have changed the regulator API from devm_regulator_get_enable to devm_regulator_bulk_get_enable which changes this behavior.
I will fix it in the next version.

Quoted 1 line

CJ

Hi Christophe, Krzysztof,

Quoted 140 lines · Anand Moon

Hi Christophe,

Quoted 123 lines · Christophe JAILLET

Quoted 106 lines · Anand Moon

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
    drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
    1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
        struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
        int                     num_clks;
        int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
    };
 
    static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        struct device_node      *node = dev->of_node;
        const struct dwc3_exynos_driverdata *driver_data;
        int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
        exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
        if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        if (exynos->suspend_clk_idx >= 0)
                clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
        if (node) {
                ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        return 0;
 
    populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
        for (i = exynos->num_clks - 1; i >= 0; i--)
                clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
        if (exynos->suspend_clk_idx >= 0)
                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
    }
 
    static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
        for (i = exynos->num_clks - 1; i >= 0; i--)
                clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

Quoted 7 lines

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

The code in suspend/resume is not about freeing some resources. It is about enabling/disabling some hardware to save some power.

Think to the probe/remove functions as the software in the kernel that knows how to handle some hardawre, and the suspend/resume as the on/off button to power-on and off the electrical chips.

Quoted 6 lines

When the system is suspended, the software is still around. But some hardware can be set in a low consumption mode to save some power.

IMHO, part of the code you removed changed this behaviour and increase the power consumption when the system is suspended.

You are correct, I have changed the regulator API from devm_regulator_get_enable to devm_regulator_bulk_get_enable which changes this behavior.
I will fix it in the next version.

Quoted 1 line

Quoted 1 line

CJ

I could not find any example in the kernel to support devm_regulator_bulk_disable
but here is my modified file.

If you have any suggestions for this plz let me know.

-----8<----------8<----------

drivers/usb/dwc3/dwc3-exynos.c +9 -1

index 6d07592ad022..2f808cb9a006 100644
@@ -34,6 +34,8 @@ struct dwc3_exynos {
         int                     suspend_clk_idx;
  };
 
+static const char * const regulators[] = { "vdd33", "vdd10" };
+
  static int dwc3_exynos_probe(struct platform_device *pdev)
  {
         struct dwc3_exynos      *exynos;

@@ -41,7 +43,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         struct device_node      *node = dev->of_node;
         const struct dwc3_exynos_driverdata *driver_data;
         int                     i, ret;
-       static const char * const regulators[] = { "vdd33", "vdd10" };
 
         exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
         if (!exynos)

@@ -166,6 +167,8 @@ static int __maybe_unused
 dwc3_exynos_suspend(struct device *dev)
         struct dwc3_exynos *exynos = dev_get_drvdata(dev);
         int i;
 
+       devm_regulator_bulk_disable(dev);
+
         for (i = exynos->num_clks - 1; i >= 0; i--)
                 clk_disable_unprepare(exynos->clks[i]);

@@ -177,6 +180,11 @@ static int __maybe_unused
 dwc3_exynos_resume(struct device *dev)
         struct dwc3_exynos *exynos = dev_get_drvdata(dev);
         int i, ret;
 
+       ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators),
+                                               regulators);
+       if (ret)
+               dev_err(dev, "Failed to enable regulators\n");
+
         for (i = 0; i < exynos->num_clks; i++) {
                 ret = clk_prepare_enable(exynos->clks[i]);

                 if (ret) {

To support these changes we need to export the
devm_regulator_bulk_disable function.
-----8<----------8<----------

drivers/regulator/devres.c +1 -1

index 90bb0d178885..97eed739f929 100644
@@ -318,7 +318,7 @@ void devm_regulator_bulk_put(struct
 regulator_bulk_data *consumers)
  }
  EXPORT_SYMBOL_GPL(devm_regulator_bulk_put);
 
-static void devm_regulator_bulk_disable(void *res)
+void devm_regulator_bulk_disable(void *res)
  {
         struct regulator_bulk_devres *devres = res;

         int i;

drivers/regulator/devres.c +1 -0

@@ -326,6 +326,7 @@ static void devm_regulator_bulk_disable(void *res)
         for (i = 0; i < devres->num_consumers; i++)
                 regulator_disable(devres->consumers[i].consumer);
  }
+EXPORT_SYMBOL_GPL(devm_regulator_bulk_disable);
 
  /**
   * devm_regulator_bulk_get_enable - managed get'n enable multiple regulators

include/linux/regulator/consumer.h +1 -1

index 4660582a3302..ce7d28306b17 100644
@@ -214,6 +214,7 @@ int __must_check regulator_bulk_enable(int num_consumers,
                                        struct regulator_bulk_data *consumers);
  int devm_regulator_bulk_get_enable(struct device *dev, int num_consumers,
                                    const char * const *id);
+void devm_regulator_bulk_disable(void *res);
  int regulator_bulk_disable(int num_consumers,
                            struct regulator_bulk_data *consumers);
  int regulator_bulk_force_disable(int num_consumers,
--------------------------------------------------------------------------

Thanks
-Anand

Quoted 143 lines · Anand Moon

Hi Christophe, Krzysztof,

Quoted 140 lines · Anand Moon

Hi Christophe,

Quoted 123 lines · Christophe JAILLET

Quoted 106 lines · Anand Moon

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
    drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
    1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
        struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
        int                     num_clks;
        int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
    };
 
    static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        struct device_node      *node = dev->of_node;
        const struct dwc3_exynos_driverdata *driver_data;
        int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
        exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
        if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        if (exynos->suspend_clk_idx >= 0)
                clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
        if (node) {
                ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        return 0;
 
    populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
        for (i = exynos->num_clks - 1; i >= 0; i--)
                clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
        if (exynos->suspend_clk_idx >= 0)
                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
    }
 
    static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
        for (i = exynos->num_clks - 1; i >= 0; i--)
                clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

Quoted 7 lines

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

The code in suspend/resume is not about freeing some resources. It is about enabling/disabling some hardware to save some power.

Think to the probe/remove functions as the software in the kernel that knows how to handle some hardawre, and the suspend/resume as the on/off button to power-on and off the electrical chips.

Quoted 6 lines

When the system is suspended, the software is still around. But some hardware can be set in a low consumption mode to save some power.

IMHO, part of the code you removed changed this behaviour and increase the power consumption when the system is suspended.

You are correct, I have changed the regulator API from devm_regulator_get_enable to devm_regulator_bulk_get_enable which changes this behavior.
I will fix it in the next version.

Quoted 7 lines

Quoted 1 line

Quoted 1 line

CJ

I could not find any example in the kernel to support devm_regulator_bulk_disable
but here is my modified file.

If you have any suggestions for this plz let me know.

I don't think that your approach is correct, and I don't think that the proposed patch does what you expect it to do.

Calling a devm_ function in suspend/resume functions looks really strange to me and is likely broken.

Especially here, devm_regulator_bulk_get_enable() in the resume function allocates some memory that is not freed in devm_regulator_bulk_disable(), because the API is not designed to work like that. So this could generate a kind of memory leak.

*I think that the code is good enough as-is*, but if you really want to change something, maybe:
- devm_regulator_get()+regulator_enable() in the probe could be
changed to devm_regulator_get_enable()
- the resume/suspend function should be left as-is with
regulator_disable()/regulator_ensable()
- remove regulator_disable() from the error handling path of the
probe and from the remove function.

I *think* it would work.

CJ

Quoted 143 lines · Anand Moon

Hi Christophe, Krzysztof,

Quoted 140 lines · Anand Moon

Hi Christophe,

Quoted 123 lines · Christophe JAILLET

Quoted 106 lines · Anand Moon

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
    drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
    1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
        struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
        int                     num_clks;
        int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
    };
 
    static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        struct device_node      *node = dev->of_node;
        const struct dwc3_exynos_driverdata *driver_data;
        int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
        exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
        if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        if (exynos->suspend_clk_idx >= 0)
                clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
        if (node) {
                ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
        return 0;
 
    populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
        for (i = exynos->num_clks - 1; i >= 0; i--)
                clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
        if (exynos->suspend_clk_idx >= 0)
                clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
    }
 
    static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
        for (i = exynos->num_clks - 1; i >= 0; i--)
                clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

Quoted 7 lines

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

The code in suspend/resume is not about freeing some resources. It is about enabling/disabling some hardware to save some power.

Think to the probe/remove functions as the software in the kernel that knows how to handle some hardawre, and the suspend/resume as the on/off button to power-on and off the electrical chips.

Quoted 6 lines

When the system is suspended, the software is still around. But some hardware can be set in a low consumption mode to save some power.

IMHO, part of the code you removed changed this behaviour and increase the power consumption when the system is suspended.

You are correct, I have changed the regulator API from devm_regulator_get_enable to devm_regulator_bulk_get_enable which changes this behavior.
I will fix it in the next version.

Quoted 7 lines

Quoted 1 line

Quoted 1 line

CJ

I could not find any example in the kernel to support devm_regulator_bulk_disable
but here is my modified file.

If you have any suggestions for this plz let me know.

I don't think that your approach is correct, and I don't think that the proposed patch does what you expect it to do.

Calling a devm_ function in suspend/resume functions looks really strange to me and is likely broken.

Especially here, devm_regulator_bulk_get_enable() in the resume function allocates some memory that is not freed in devm_regulator_bulk_disable(), because the API is not designed to work like that. So this could generate a kind of memory leak.

*I think that the code is good enough as-is*, but if you really want to change something, maybe:
- devm_regulator_get()+regulator_enable() in the probe could be
changed to devm_regulator_get_enable()
- the resume/suspend function should be left as-is with
regulator_disable()/regulator_ensable()
- remove regulator_disable() from the error handling path of the
probe and from the remove function.

I *think* it would work.

CJ

Hi Christophe,

Quoted 174 lines · Christophe JAILLET

Quoted 143 lines · Anand Moon

Hi Christophe, Krzysztof,

Quoted 140 lines · Anand Moon

Hi Christophe,

Quoted 123 lines · Christophe JAILLET

Quoted 106 lines · Anand Moon

Hi Christophe,

Quoted 93 lines · Christophe JAILLET

Quoted 83 lines · Anand Moon

Use devm_regulator_bulk_get_enable() instead of open coded 'devm_regulator_get(), regulator_enable(), regulator_disable().

Signed-off-by Anand Moon <[email protected]>

---
     drivers/usb/dwc3/dwc3-exynos.c | 49 +++-------------------------------
     1 file changed, 4 insertions(+), 45 deletions(-)

drivers/usb/dwc3/dwc3-exynos.c +4 -31

index 5d365ca51771..7c77f3c69825 100644
@@ -32,9 +32,6 @@ struct dwc3_exynos {
         struct clk              *clks[DWC3_EXYNOS_MAX_CLOCKS];
         int                     num_clks;
         int                     suspend_clk_idx;
-
-     struct regulator        *vdd33;
-     struct regulator        *vdd10;
     };
 
     static int dwc3_exynos_probe(struct platform_device *pdev)

@@ -44,6 +41,7 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         struct device_node      *node = dev->of_node;
         const struct dwc3_exynos_driverdata *driver_data;
         int                     i, ret;
+     static const char * const regulators[] = { "vdd33", "vdd10" };
 
         exynos = devm_kzalloc(dev, sizeof(*exynos), GFP_KERNEL);
         if (!exynos)

@@ -78,27 +76,9 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         if (exynos->suspend_clk_idx >= 0)
                 clk_prepare_enable(exynos->clks[exynos->suspend_clk_idx]);
 
-     exynos->vdd33 = devm_regulator_get(dev, "vdd33");
-     if (IS_ERR(exynos->vdd33)) {
-             ret = PTR_ERR(exynos->vdd33);
-             goto vdd33_err;
-     }
-     ret = regulator_enable(exynos->vdd33);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD33 supply\n");
-             goto vdd33_err;
-     }
-
-     exynos->vdd10 = devm_regulator_get(dev, "vdd10");
-     if (IS_ERR(exynos->vdd10)) {
-             ret = PTR_ERR(exynos->vdd10);
-             goto vdd10_err;
-     }
-     ret = regulator_enable(exynos->vdd10);
-     if (ret) {
-             dev_err(dev, "Failed to enable VDD10 supply\n");
-             goto vdd10_err;
-     }
+     ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators), regulators);
+     if (ret)
+             return dev_err_probe(dev, ret, "Failed to enable regulators\n");
 
         if (node) {
                 ret = of_platform_populate(node, NULL, NULL, dev);

@@ -115,10 +95,6 @@ static int dwc3_exynos_probe(struct platform_device *pdev)
         return 0;
 
     populate_err:
-     regulator_disable(exynos->vdd10);
-vdd10_err:
-     regulator_disable(exynos->vdd33);
-vdd33_err:
         for (i = exynos->num_clks - 1; i >= 0; i--)
                 clk_disable_unprepare(exynos->clks[i]);
 

@@ -140,9 +116,6 @@ static void dwc3_exynos_remove(struct platform_device *pdev)
 
         if (exynos->suspend_clk_idx >= 0)
                 clk_disable_unprepare(exynos->clks[exynos->suspend_clk_idx]);
-
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);
     }
 
     static const struct dwc3_exynos_driverdata exynos5250_drvdata = {

drivers/usb/dwc3/dwc3-exynos.c static int dwc3_exynos_suspend(struct device *dev) · line 200

Quoted 5 lines

drivers/usb/dwc3/dwc3-exynos.c +0 -2

@@ -196,9 +169,6 @@ static int dwc3_exynos_suspend(struct device *dev)
         for (i = exynos->num_clks - 1; i >= 0; i--)
                 clk_disable_unprepare(exynos->clks[i]);
 
-     regulator_disable(exynos->vdd33);
-     regulator_disable(exynos->vdd10);

Hi,

Quoted 5 lines

Same here, I don't think that removing regulator_[en|dis]able from the suspend and resume function is correct.

The goal is to stop some hardware when the system is suspended, in order to save some power.

Ok,

Quoted 2 lines

Why did you removed it?

Quoted 7 lines

As per the description of the function devm_regulator_bulk_get_enable

* This helper function allows drivers to get several regulator
* consumers in one operation with management, the regulators will
* automatically be freed when the device is unbound. If any of the
* regulators cannot be acquired then any regulators that were
* allocated will be freed before returning to the caller.

The code in suspend/resume is not about freeing some resources. It is about enabling/disabling some hardware to save some power.

Think to the probe/remove functions as the software in the kernel that knows how to handle some hardawre, and the suspend/resume as the on/off button to power-on and off the electrical chips.

Quoted 6 lines

When the system is suspended, the software is still around. But some hardware can be set in a low consumption mode to save some power.

IMHO, part of the code you removed changed this behaviour and increase the power consumption when the system is suspended.

You are correct, I have changed the regulator API from devm_regulator_get_enable to devm_regulator_bulk_get_enable which changes this behavior.
I will fix it in the next version.

Quoted 7 lines

Quoted 1 line

Quoted 1 line

CJ

I could not find any example in the kernel to support devm_regulator_bulk_disable
but here is my modified file.

If you have any suggestions for this plz let me know.

I don't think that your approach is correct, and I don't think that the proposed patch does what you expect it to do.

Calling a devm_ function in suspend/resume functions looks really strange to me and is likely broken.

Especially here, devm_regulator_bulk_get_enable() in the resume function allocates some memory that is not freed in devm_regulator_bulk_disable(), because the API is not designed to work like that. So this could generate a kind of memory leak.

*I think that the code is good enough as-is*, but if you really want to change something, maybe:
- devm_regulator_get()+regulator_enable() in the probe could be
changed to devm_regulator_get_enable()
- the resume/suspend function should be left as-is with
regulator_disable()/regulator_ensable()
- remove regulator_disable() from the error handling path of the
probe and from the remove function.

Quoted 2 lines

I *think* it would work.

No devm_regulator_get_enable use the same logic as devm_regulator_bulk_get_enable
to enable the regulator.

[0] https://elixir.bootlin.com/linux/latest/source/drivers/regulator/devres.c#L126

So as of now I am dropping the changes on the regulator in this patch series.

Quoted 3 lines

CJ

Thanks for your inputs.

Thanks

-Anand