RE: [PATCH v2 1/9] usb: cdns3: introduce cdns3_set_phy_power API

From: Jun Li <jun.li@nxp.com>
To: Peter Chen <peter.chen@nxp.com>,
	"balbi@kernel.org" <balbi@kernel.org>,
	"mathias.nyman@intel.com" <mathias.nyman@intel.com>
Cc: "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
	dl-linux-imx <linux-imx@nxp.com>,
	"pawell@cadence.com" <pawell@cadence.com>,
	"rogerq@ti.com" <rogerq@ti.com>,
	"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Subject: RE: [PATCH v2 1/9] usb: cdns3: introduce cdns3_set_phy_power API
Date: Sun, 24 May 2020 05:56:51 +0000	[thread overview]
Message-ID: <VE1PR04MB65283CE4D3BE7C6909BFEB6A89B20@VE1PR04MB6528.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20200523232304.23976-2-peter.chen@nxp.com>

Hi,
> -----Original Message-----
> From: Peter Chen <peter.chen@nxp.com>
> Sent: 2020年5月24日 7:23
> To: balbi@kernel.org; mathias.nyman@intel.com
> Cc: linux-usb@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>;
> pawell@cadence.com; rogerq@ti.com; gregkh@linuxfoundation.org; Jun Li
> <jun.li@nxp.com>; Peter Chen <peter.chen@nxp.com>
> Subject: [PATCH v2 1/9] usb: cdns3: introduce cdns3_set_phy_power API
> 
> Since we have both USB2 and USB3 PHYs for cdns3 controller, it is better we have
> a unity API to handle both USB2 and USB3's power, it could simplify code for error
> handling and further power management implementation.
> 
> Signed-off-by: Peter Chen <peter.chen@nxp.com>

Reviewed-by: Jun Li <jun.li@nxp.com>

> ---
>  drivers/usb/cdns3/core.c | 44 ++++++++++++++++++++++++++--------------
>  1 file changed, 29 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c index
> 19bbb5b7e6b6..bfd09aa98c12 100644
> --- a/drivers/usb/cdns3/core.c
> +++ b/drivers/usb/cdns3/core.c
> @@ -384,6 +384,28 @@ static int cdns3_role_set(struct usb_role_switch *sw, enum
> usb_role role)
>  	return ret;
>  }
> 
> +static int cdns3_set_phy_power(struct cdns3 *cdns, bool on) {
> +	int ret = 0;
> +
> +	if (on) {
> +		ret = phy_power_on(cdns->usb2_phy);
> +		if (ret)
> +			return ret;
> +
> +		ret = phy_power_on(cdns->usb3_phy);
> +		if (ret) {
> +			phy_power_off(cdns->usb2_phy);
> +			return ret;
> +		}
> +	} else {
> +		phy_power_off(cdns->usb3_phy);
> +		phy_power_off(cdns->usb2_phy);
> +	}
> +
> +	return 0;
> +}
> +
>  /**
>   * cdns3_probe - probe for cdns3 core device
>   * @pdev: Pointer to cdns3 core platform device @@ -477,14 +499,10 @@ static int
> cdns3_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto err1;
> 
> -	ret = phy_power_on(cdns->usb2_phy);
> +	ret = cdns3_set_phy_power(cdns, true);
>  	if (ret)
>  		goto err2;
> 
> -	ret = phy_power_on(cdns->usb3_phy);
> -	if (ret)
> -		goto err3;
> -
>  	sw_desc.set = cdns3_role_set;
>  	sw_desc.get = cdns3_role_get;
>  	sw_desc.allow_userspace_control = true; @@ -496,16 +514,16 @@ static int
> cdns3_probe(struct platform_device *pdev)
>  	if (IS_ERR(cdns->role_sw)) {
>  		ret = PTR_ERR(cdns->role_sw);
>  		dev_warn(dev, "Unable to register Role Switch\n");
> -		goto err4;
> +		goto err3;
>  	}
> 
>  	ret = cdns3_drd_init(cdns);
>  	if (ret)
> -		goto err5;
> +		goto err4;
> 
>  	ret = cdns3_core_init_role(cdns);
>  	if (ret)
> -		goto err5;
> +		goto err4;
> 
>  	device_set_wakeup_capable(dev, true);
>  	pm_runtime_set_active(dev);
> @@ -522,14 +540,11 @@ static int cdns3_probe(struct platform_device *pdev)
>  	dev_dbg(dev, "Cadence USB3 core: probe succeed\n");
> 
>  	return 0;
> -err5:
> +err4:
>  	cdns3_drd_exit(cdns);
>  	usb_role_switch_unregister(cdns->role_sw);
> -err4:
> -	phy_power_off(cdns->usb3_phy);
> -
>  err3:
> -	phy_power_off(cdns->usb2_phy);
> +	cdns3_set_phy_power(cdns, false);
>  err2:
>  	phy_exit(cdns->usb3_phy);
>  err1:
> @@ -553,8 +568,7 @@ static int cdns3_remove(struct platform_device *pdev)
>  	pm_runtime_put_noidle(&pdev->dev);
>  	cdns3_exit_roles(cdns);
>  	usb_role_switch_unregister(cdns->role_sw);
> -	phy_power_off(cdns->usb2_phy);
> -	phy_power_off(cdns->usb3_phy);
> +	cdns3_set_phy_power(cdns, false);
>  	phy_exit(cdns->usb2_phy);
>  	phy_exit(cdns->usb3_phy);
>  	return 0;
> --
> 2.17.1