Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Peter Chen <peter.chen@nxp.com>
To:     Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: RE: [PATCH v4 2/2] usb: chipidea: Refactor USB PHY selection and keep
 a single PHY
Thread-Topic: [PATCH v4 2/2] usb: chipidea: Refactor USB PHY selection and
 keep a single PHY
Thread-Index: AQHUydMmUuHv2CNDn0KF2MOzT4y1fKXrkYkw
Date:   Fri, 22 Feb 2019 09:40:47 +0000
Message-ID: <VI1PR04MB5327B630752F676889265EF88B7F0@VI1PR04MB5327.eurprd04.prod.outlook.com>
References: <20190221104914.32031-1-paul.kocialkowski@bootlin.com>
 <20190221104914.32031-2-paul.kocialkowski@bootlin.com>
In-Reply-To: <20190221104914.32031-2-paul.kocialkowski@bootlin.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 3ee37038-6d4e-49b7-3bcc-08d698a9d315
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Feb 2019 09:40:47.6592
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6157
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

=20
>=20
> Refactor the code in charge of looking up the USB PHY when no platdata is
> provided. Attempt to get a generic USB PHY first, then look for a legacy =
USB PHY
> through device-tree and finally get any registered PHY with the correct t=
ype.
>=20
> This way, only a single USB PHY is obtained and the flow is easier to und=
erstand
> and follow.
>=20
> All error pointers (except for EPROBE_DEFER) are considered as PHY not fo=
und.
>=20
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> ---
>  drivers/usb/chipidea/core.c | 49 ++++++++++++++++++++++++-------------
>  1 file changed, 32 insertions(+), 17 deletions(-)
>=20
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c in=
dex
> 016e4004fe9d..27749ace2d93 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -954,32 +954,47 @@ static int ci_hdrc_probe(struct platform_device *pd=
ev)
>  	} else if (ci->platdata->usb_phy) {
>  		ci->usb_phy =3D ci->platdata->usb_phy;
>  	} else {
> -		ci->usb_phy =3D devm_usb_get_phy_by_phandle(dev->parent, "phys",
> -							  0);
> +		/* Look for a generic PHY first */
>  		ci->phy =3D devm_phy_get(dev->parent, "usb-phy");
>=20
> -		/* Fallback to grabbing any registered USB2 PHY */
> -		if (IS_ERR(ci->usb_phy) &&
> -		    PTR_ERR(ci->usb_phy) !=3D -EPROBE_DEFER)
> +		if (PTR_ERR(ci->phy) =3D=3D -EPROBE_DEFER) {
> +			ret =3D -EPROBE_DEFER;
> +			goto ulpi_exit;
> +		} else if (IS_ERR(ci->phy)) {
> +			ci->phy =3D NULL;
> +		}
> +
> +		/* Look for a legacy USB PHY from device-tree next */
> +		if (!ci->phy) {
> +			ci->usb_phy =3D devm_usb_get_phy_by_phandle(dev->parent,
> +								  "phys", 0);
> +
> +			if (PTR_ERR(ci->usb_phy) =3D=3D -EPROBE_DEFER) {
> +				ret =3D -EPROBE_DEFER;
> +				goto ulpi_exit;
> +			} else if (IS_ERR(ci->usb_phy)) {
> +				ci->usb_phy =3D NULL;
> +			}
> +		}
> +
> +		/* Look for any registered legacy USB PHY as last resort */
> +		if (!ci->phy && !ci->usb_phy) {
>  			ci->usb_phy =3D devm_usb_get_phy(dev->parent,
>  						       USB_PHY_TYPE_USB2);
>=20
> -		/* if both generic PHY and USB PHY layers aren't enabled */
> -		if (PTR_ERR(ci->phy) =3D=3D -ENOSYS &&
> -				PTR_ERR(ci->usb_phy) =3D=3D -ENXIO) {
> -			ret =3D -ENXIO;
> -			goto ulpi_exit;
> +			if (PTR_ERR(ci->usb_phy) =3D=3D -EPROBE_DEFER) {
> +				ret =3D -EPROBE_DEFER;
> +				goto ulpi_exit;
> +			} else if (IS_ERR(ci->usb_phy)) {
> +				ci->usb_phy =3D NULL;
> +			}
>  		}
>=20
> -		if (IS_ERR(ci->phy) && IS_ERR(ci->usb_phy)) {
> -			ret =3D -EPROBE_DEFER;
> +		/* No USB PHY was found in the end */
> +		if (!ci->phy && !ci->usb_phy) {
> +			ret =3D -ENXIO;
>  			goto ulpi_exit;
>  		}
> -
> -		if (IS_ERR(ci->phy))
> -			ci->phy =3D NULL;
> -		else if (IS_ERR(ci->usb_phy))
> -			ci->usb_phy =3D NULL;
>  	}
>=20
=20
This patch should work, I will queue it if test is ok.

Peter