[09/11] USB: dwc3: refactor phy handling

Message ID	20230404072524.19014-10-johan+linaro@kernel.org (mailing list archive)
State	Accepted
Commit	1d72fab476567a0e4f51ee0a93882208ba28dc54
Headers	show Return-Path: <linux-usb-owner@vger.kernel.org> From: Johan Hovold <johan+linaro@kernel.org> To: Thinh Nguyen <Thinh.Nguyen@synopsys.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org> Subject: [PATCH 09/11] USB: dwc3: refactor phy handling Date: Tue, 4 Apr 2023 09:25:22 +0200 Message-Id: <20230404072524.19014-10-johan+linaro@kernel.org> In-Reply-To: <20230404072524.19014-1-johan+linaro@kernel.org> References: <20230404072524.19014-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	USB: dwc3: error handling fixes and cleanups \| expand [00/11] USB: dwc3: error handling fixes and cleanups [01/11] USB: dwc3: fix runtime pm imbalance on probe errors [02/11] USB: dwc3: fix runtime pm imbalance on unbind [03/11] USB: dwc3: disable autosuspend on unbind [04/11] USB: dwc3: gadget: drop dead hibernation code [05/11] USB: dwc3: drop dead hibernation code [06/11] USB: dwc3: clean up probe error labels [07/11] USB: dwc3: clean up phy init error handling [08/11] USB: dwc3: clean up core init error handling [09/11] USB: dwc3: refactor phy handling [10/11] USB: dwc3: refactor clock lookups [11/11] USB: dwc3: clean up probe declarations

Message ID

20230404072524.19014-10-johan+linaro@kernel.org (mailing list archive)

State

Accepted

Commit

1d72fab476567a0e4f51ee0a93882208ba28dc54

Headers

From: Johan Hovold <johan+linaro@kernel.org>
To: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 09/11] USB: dwc3: refactor phy handling
Date: Tue,  4 Apr 2023 09:25:22 +0200
Message-Id: <20230404072524.19014-10-johan+linaro@kernel.org>
In-Reply-To: <20230404072524.19014-1-johan+linaro@kernel.org>
References: <20230404072524.19014-1-johan+linaro@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

USB: dwc3: error handling fixes and cleanups | expand

Commit Message

Johan Hovold April 4, 2023, 7:25 a.m. UTC

Refactor the PHY handling using four new helpers to initialise,
deinitialise, power on and power off all the PHYs.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 drivers/usb/dwc3/core.c | 143 ++++++++++++++++++++++++----------------
 1 file changed, 86 insertions(+), 57 deletions(-)

Comments

Thinh Nguyen April 7, 2023, 1:31 a.m. UTC | #1

On Tue, Apr 04, 2023, Johan Hovold wrote:
> Refactor the PHY handling using four new helpers to initialise,
> deinitialise, power on and power off all the PHYs.
> 
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
>  drivers/usb/dwc3/core.c | 143 ++++++++++++++++++++++++----------------
>  1 file changed, 86 insertions(+), 57 deletions(-)
> 
> diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> index c499ef026500..52cd5ddfebd5 100644
> --- a/drivers/usb/dwc3/core.c
> +++ b/drivers/usb/dwc3/core.c
> @@ -721,6 +721,76 @@ static int dwc3_phy_setup(struct dwc3 *dwc)
>  	return 0;
>  }
>  
> +static int dwc3_phy_init(struct dwc3 *dwc)
> +{
> +	int ret;
> +
> +	usb_phy_init(dwc->usb2_phy);
> +	usb_phy_init(dwc->usb3_phy);
> +
> +	ret = phy_init(dwc->usb2_generic_phy);
> +	if (ret < 0)
> +		goto err_shutdown_usb3_phy;
> +
> +	ret = phy_init(dwc->usb3_generic_phy);
> +	if (ret < 0)
> +		goto err_exit_usb2_phy;
> +
> +	return 0;
> +
> +err_exit_usb2_phy:
> +	phy_exit(dwc->usb2_generic_phy);
> +err_shutdown_usb3_phy:
> +	usb_phy_shutdown(dwc->usb3_phy);
> +	usb_phy_shutdown(dwc->usb2_phy);
> +
> +	return ret;
> +}
> +
> +static void dwc3_phy_exit(struct dwc3 *dwc)
> +{
> +	phy_exit(dwc->usb3_generic_phy);
> +	phy_exit(dwc->usb2_generic_phy);
> +
> +	usb_phy_shutdown(dwc->usb3_phy);
> +	usb_phy_shutdown(dwc->usb2_phy);
> +}
> +
> +static int dwc3_phy_power_on(struct dwc3 *dwc)
> +{
> +	int ret;
> +
> +	usb_phy_set_suspend(dwc->usb2_phy, 0);
> +	usb_phy_set_suspend(dwc->usb3_phy, 0);
> +
> +	ret = phy_power_on(dwc->usb2_generic_phy);
> +	if (ret < 0)
> +		goto err_suspend_usb3_phy;
> +
> +	ret = phy_power_on(dwc->usb3_generic_phy);
> +	if (ret < 0)
> +		goto err_power_off_usb2_phy;
> +
> +	return 0;
> +
> +err_power_off_usb2_phy:
> +	phy_power_off(dwc->usb2_generic_phy);
> +err_suspend_usb3_phy:
> +	usb_phy_set_suspend(dwc->usb3_phy, 1);
> +	usb_phy_set_suspend(dwc->usb2_phy, 1);
> +
> +	return ret;
> +}
> +
> +static void dwc3_phy_power_off(struct dwc3 *dwc)
> +{
> +	phy_power_off(dwc->usb3_generic_phy);
> +	phy_power_off(dwc->usb2_generic_phy);
> +
> +	usb_phy_set_suspend(dwc->usb3_phy, 1);
> +	usb_phy_set_suspend(dwc->usb2_phy, 1);
> +}
> +
>  static int dwc3_clk_enable(struct dwc3 *dwc)
>  {
>  	int ret;
> @@ -756,17 +826,8 @@ static void dwc3_clk_disable(struct dwc3 *dwc)
>  static void dwc3_core_exit(struct dwc3 *dwc)
>  {
>  	dwc3_event_buffers_cleanup(dwc);
> -
> -	usb_phy_set_suspend(dwc->usb2_phy, 1);
> -	usb_phy_set_suspend(dwc->usb3_phy, 1);
> -	phy_power_off(dwc->usb2_generic_phy);
> -	phy_power_off(dwc->usb3_generic_phy);
> -
> -	usb_phy_shutdown(dwc->usb2_phy);
> -	usb_phy_shutdown(dwc->usb3_phy);
> -	phy_exit(dwc->usb2_generic_phy);
> -	phy_exit(dwc->usb3_generic_phy);
> -
> +	dwc3_phy_power_off(dwc);
> +	dwc3_phy_exit(dwc);
>  	dwc3_clk_disable(dwc);
>  	reset_control_assert(dwc->reset);
>  }
> @@ -1029,20 +1090,13 @@ static int dwc3_core_init(struct dwc3 *dwc)
>  		dwc->phys_ready = true;
>  	}
>  
> -	usb_phy_init(dwc->usb2_phy);
> -	usb_phy_init(dwc->usb3_phy);
> -
> -	ret = phy_init(dwc->usb2_generic_phy);
> -	if (ret < 0)
> -		goto err_shutdown_usb3_phy;
> -
> -	ret = phy_init(dwc->usb3_generic_phy);
> -	if (ret < 0)
> -		goto err_exit_usb2_phy;
> +	ret = dwc3_phy_init(dwc);
> +	if (ret)
> +		goto err_exit_ulpi;
>  
>  	ret = dwc3_core_soft_reset(dwc);
>  	if (ret)
> -		goto err_exit_usb3_phy;
> +		goto err_exit_phy;
>  
>  	if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD &&
>  	    !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) {
> @@ -1073,20 +1127,14 @@ static int dwc3_core_init(struct dwc3 *dwc)
>  
>  	dwc3_set_incr_burst_type(dwc);
>  
> -	usb_phy_set_suspend(dwc->usb2_phy, 0);
> -	usb_phy_set_suspend(dwc->usb3_phy, 0);
> -	ret = phy_power_on(dwc->usb2_generic_phy);
> -	if (ret < 0)
> -		goto err_suspend_usb3_phy;
> -
> -	ret = phy_power_on(dwc->usb3_generic_phy);
> -	if (ret < 0)
> -		goto err_power_off_usb2_phy;
> +	dwc3_phy_power_on(dwc);
> +	if (ret)
> +		goto err_exit_phy;
>  
>  	ret = dwc3_event_buffers_setup(dwc);
>  	if (ret) {
>  		dev_err(dwc->dev, "failed to setup event buffers\n");
> -		goto err_power_off_usb3_phy;
> +		goto err_power_off_phy;
>  	}
>  
>  	/*
> @@ -1203,20 +1251,10 @@ static int dwc3_core_init(struct dwc3 *dwc)
>  
>  	return 0;
>  
> -err_power_off_usb3_phy:
> -	phy_power_off(dwc->usb3_generic_phy);
> -err_power_off_usb2_phy:
> -	phy_power_off(dwc->usb2_generic_phy);
> -err_suspend_usb3_phy:
> -	usb_phy_set_suspend(dwc->usb3_phy, 1);
> -	usb_phy_set_suspend(dwc->usb2_phy, 1);
> -err_exit_usb3_phy:
> -	phy_exit(dwc->usb3_generic_phy);
> -err_exit_usb2_phy:
> -	phy_exit(dwc->usb2_generic_phy);
> -err_shutdown_usb3_phy:
> -	usb_phy_shutdown(dwc->usb3_phy);
> -	usb_phy_shutdown(dwc->usb2_phy);
> +err_power_off_phy:
> +	dwc3_phy_power_off(dwc);
> +err_exit_phy:
> +	dwc3_phy_exit(dwc);
>  err_exit_ulpi:
>  	dwc3_ulpi_exit(dwc);
>  
> @@ -1832,17 +1870,8 @@ static int dwc3_probe(struct platform_device *pdev)
>  err_exit_debugfs:
>  	dwc3_debugfs_exit(dwc);
>  	dwc3_event_buffers_cleanup(dwc);
> -
> -	usb_phy_set_suspend(dwc->usb2_phy, 1);
> -	usb_phy_set_suspend(dwc->usb3_phy, 1);
> -	phy_power_off(dwc->usb2_generic_phy);
> -	phy_power_off(dwc->usb3_generic_phy);
> -
> -	usb_phy_shutdown(dwc->usb2_phy);
> -	usb_phy_shutdown(dwc->usb3_phy);
> -	phy_exit(dwc->usb2_generic_phy);
> -	phy_exit(dwc->usb3_generic_phy);
> -
> +	dwc3_phy_power_off(dwc);
> +	dwc3_phy_exit(dwc);
>  	dwc3_ulpi_exit(dwc);
>  err_free_event_buffers:
>  	dwc3_free_event_buffers(dwc);
> -- 
> 2.39.2
> 

Acked-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>

Thanks,
Thinh

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c499ef026500..52cd5ddfebd5 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -721,6 +721,76 @@  static int dwc3_phy_setup(struct dwc3 *dwc)
 	return 0;
 }
 
+static int dwc3_phy_init(struct dwc3 *dwc)
+{
+	int ret;
+
+	usb_phy_init(dwc->usb2_phy);
+	usb_phy_init(dwc->usb3_phy);
+
+	ret = phy_init(dwc->usb2_generic_phy);
+	if (ret < 0)
+		goto err_shutdown_usb3_phy;
+
+	ret = phy_init(dwc->usb3_generic_phy);
+	if (ret < 0)
+		goto err_exit_usb2_phy;
+
+	return 0;
+
+err_exit_usb2_phy:
+	phy_exit(dwc->usb2_generic_phy);
+err_shutdown_usb3_phy:
+	usb_phy_shutdown(dwc->usb3_phy);
+	usb_phy_shutdown(dwc->usb2_phy);
+
+	return ret;
+}
+
+static void dwc3_phy_exit(struct dwc3 *dwc)
+{
+	phy_exit(dwc->usb3_generic_phy);
+	phy_exit(dwc->usb2_generic_phy);
+
+	usb_phy_shutdown(dwc->usb3_phy);
+	usb_phy_shutdown(dwc->usb2_phy);
+}
+
+static int dwc3_phy_power_on(struct dwc3 *dwc)
+{
+	int ret;
+
+	usb_phy_set_suspend(dwc->usb2_phy, 0);
+	usb_phy_set_suspend(dwc->usb3_phy, 0);
+
+	ret = phy_power_on(dwc->usb2_generic_phy);
+	if (ret < 0)
+		goto err_suspend_usb3_phy;
+
+	ret = phy_power_on(dwc->usb3_generic_phy);
+	if (ret < 0)
+		goto err_power_off_usb2_phy;
+
+	return 0;
+
+err_power_off_usb2_phy:
+	phy_power_off(dwc->usb2_generic_phy);
+err_suspend_usb3_phy:
+	usb_phy_set_suspend(dwc->usb3_phy, 1);
+	usb_phy_set_suspend(dwc->usb2_phy, 1);
+
+	return ret;
+}
+
+static void dwc3_phy_power_off(struct dwc3 *dwc)
+{
+	phy_power_off(dwc->usb3_generic_phy);
+	phy_power_off(dwc->usb2_generic_phy);
+
+	usb_phy_set_suspend(dwc->usb3_phy, 1);
+	usb_phy_set_suspend(dwc->usb2_phy, 1);
+}
+
 static int dwc3_clk_enable(struct dwc3 *dwc)
 {
 	int ret;
@@ -756,17 +826,8 @@  static void dwc3_clk_disable(struct dwc3 *dwc)
 static void dwc3_core_exit(struct dwc3 *dwc)
 {
 	dwc3_event_buffers_cleanup(dwc);
-
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
-	phy_power_off(dwc->usb2_generic_phy);
-	phy_power_off(dwc->usb3_generic_phy);
-
-	usb_phy_shutdown(dwc->usb2_phy);
-	usb_phy_shutdown(dwc->usb3_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
-
+	dwc3_phy_power_off(dwc);
+	dwc3_phy_exit(dwc);
 	dwc3_clk_disable(dwc);
 	reset_control_assert(dwc->reset);
 }
@@ -1029,20 +1090,13 @@  static int dwc3_core_init(struct dwc3 *dwc)
 		dwc->phys_ready = true;
 	}
 
-	usb_phy_init(dwc->usb2_phy);
-	usb_phy_init(dwc->usb3_phy);
-
-	ret = phy_init(dwc->usb2_generic_phy);
-	if (ret < 0)
-		goto err_shutdown_usb3_phy;
-
-	ret = phy_init(dwc->usb3_generic_phy);
-	if (ret < 0)
-		goto err_exit_usb2_phy;
+	ret = dwc3_phy_init(dwc);
+	if (ret)
+		goto err_exit_ulpi;
 
 	ret = dwc3_core_soft_reset(dwc);
 	if (ret)
-		goto err_exit_usb3_phy;
+		goto err_exit_phy;
 
 	if (hw_mode == DWC3_GHWPARAMS0_MODE_DRD &&
 	    !DWC3_VER_IS_WITHIN(DWC3, ANY, 194A)) {
@@ -1073,20 +1127,14 @@  static int dwc3_core_init(struct dwc3 *dwc)
 
 	dwc3_set_incr_burst_type(dwc);
 
-	usb_phy_set_suspend(dwc->usb2_phy, 0);
-	usb_phy_set_suspend(dwc->usb3_phy, 0);
-	ret = phy_power_on(dwc->usb2_generic_phy);
-	if (ret < 0)
-		goto err_suspend_usb3_phy;
-
-	ret = phy_power_on(dwc->usb3_generic_phy);
-	if (ret < 0)
-		goto err_power_off_usb2_phy;
+	dwc3_phy_power_on(dwc);
+	if (ret)
+		goto err_exit_phy;
 
 	ret = dwc3_event_buffers_setup(dwc);
 	if (ret) {
 		dev_err(dwc->dev, "failed to setup event buffers\n");
-		goto err_power_off_usb3_phy;
+		goto err_power_off_phy;
 	}
 
 	/*
@@ -1203,20 +1251,10 @@  static int dwc3_core_init(struct dwc3 *dwc)
 
 	return 0;
 
-err_power_off_usb3_phy:
-	phy_power_off(dwc->usb3_generic_phy);
-err_power_off_usb2_phy:
-	phy_power_off(dwc->usb2_generic_phy);
-err_suspend_usb3_phy:
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-err_exit_usb3_phy:
-	phy_exit(dwc->usb3_generic_phy);
-err_exit_usb2_phy:
-	phy_exit(dwc->usb2_generic_phy);
-err_shutdown_usb3_phy:
-	usb_phy_shutdown(dwc->usb3_phy);
-	usb_phy_shutdown(dwc->usb2_phy);
+err_power_off_phy:
+	dwc3_phy_power_off(dwc);
+err_exit_phy:
+	dwc3_phy_exit(dwc);
 err_exit_ulpi:
 	dwc3_ulpi_exit(dwc);
 
@@ -1832,17 +1870,8 @@  static int dwc3_probe(struct platform_device *pdev)
 err_exit_debugfs:
 	dwc3_debugfs_exit(dwc);
 	dwc3_event_buffers_cleanup(dwc);
-
-	usb_phy_set_suspend(dwc->usb2_phy, 1);
-	usb_phy_set_suspend(dwc->usb3_phy, 1);
-	phy_power_off(dwc->usb2_generic_phy);
-	phy_power_off(dwc->usb3_generic_phy);
-
-	usb_phy_shutdown(dwc->usb2_phy);
-	usb_phy_shutdown(dwc->usb3_phy);
-	phy_exit(dwc->usb2_generic_phy);
-	phy_exit(dwc->usb3_generic_phy);
-
+	dwc3_phy_power_off(dwc);
+	dwc3_phy_exit(dwc);
 	dwc3_ulpi_exit(dwc);
 err_free_event_buffers:
 	dwc3_free_event_buffers(dwc);

[09/11] USB: dwc3: refactor phy handling

Commit Message

Comments

Patch