Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 21 Oct 2021 16:01:31 +0200
From:   Thierry Reding <thierry.reding@gmail.com>
To:     Dmitry Osipenko <digetx@gmail.com>
Cc:     Thierry Reding <treding@nvidia.com>,
        Jonathan Hunter <jonathanh@nvidia.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Mathias Nyman <mathias.nyman@intel.com>,
        JC Kuo <jckuo@nvidia.com>, Nicolas Chauvet <kwizart@gmail.com>,
        linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-tegra@vger.kernel.org
Subject: Re: [PATCH v1] usb: xhci: tegra: Check padctrl interrupt presence in
 device tree
Message-ID: <YXFyu+Q5ifG8Au9w@orome.fritz.box>
References: <20211021115501.14932-1-digetx@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="BOA8n6/bNvmkjro8"
Content-Disposition: inline
In-Reply-To: <20211021115501.14932-1-digetx@gmail.com>
User-Agent: Mutt/2.1.3 (987dde4c) (2021-09-10)
Precedence: bulk


--BOA8n6/bNvmkjro8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Oct 21, 2021 at 02:55:01PM +0300, Dmitry Osipenko wrote:
> Older device-trees don't specify padctrl interrupt and xhci-tegra driver
> now fails to probe with -EINVAL using those device-trees. Check interrupt
> presence and disallow runtime PM suspension if it's missing to fix the
> trouble.
>=20
> Fixes: 971ee247060d ("usb: xhci: tegra: Enable ELPG for runtime/system PM=
")
> Reported-by: Nicolas Chauvet <kwizart@gmail.com>
> Tested-by: Nicolas Chauvet <kwizart@gmail.com>
> Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
> ---
>  drivers/usb/host/xhci-tegra.c | 32 +++++++++++++++++++++-----------
>  1 file changed, 21 insertions(+), 11 deletions(-)

Thanks for typing this up. A couple of minor comments below.

> diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
> index 1bf494b649bd..47927a1df3dc 100644
> --- a/drivers/usb/host/xhci-tegra.c
> +++ b/drivers/usb/host/xhci-tegra.c
> @@ -1454,10 +1454,13 @@ static int tegra_xusb_probe(struct platform_devic=
e *pdev)
>  		goto put_padctl;
>  	}
> =20
> -	tegra->padctl_irq =3D of_irq_get(np, 0);
> -	if (tegra->padctl_irq <=3D 0) {
> -		err =3D (tegra->padctl_irq =3D=3D 0) ? -ENODEV : tegra->padctl_irq;
> -		goto put_padctl;
> +	/* Older device-trees don't specify padctrl interrupt */
> +	if (of_property_read_bool(np, "interrupts")) {

Can't we just rely on the return value from of_irq_get() instead of
explicitly checking for the presence of the "interrupts" property? All
we really want is to make this interrupt optional. As far as I can tell,
of_irq_get() will return -EINVAL (via of_irq_parse_one() and then
of_property_read_u32_index()) if the property doesn't exist, so I'd
think it should be possible to turn this into something like this:

	tegra->padctl_irq =3D of_irq_get(np, 0);
	if (tegra->padctl_irq =3D=3D -EINVAL)
		tegra->padctl_irq =3D 0;

> +		tegra->padctl_irq =3D of_irq_get(np, 0);
> +		if (tegra->padctl_irq <=3D 0) {
> +			err =3D (tegra->padctl_irq =3D=3D 0) ? -ENODEV : tegra->padctl_irq;
> +			goto put_padctl;
> +		}
>  	}
> =20
>  	tegra->host_clk =3D devm_clk_get(&pdev->dev, "xusb_host");
> @@ -1696,11 +1699,15 @@ static int tegra_xusb_probe(struct platform_devic=
e *pdev)
>  		goto remove_usb3;
>  	}
> =20
> -	err =3D devm_request_threaded_irq(&pdev->dev, tegra->padctl_irq, NULL, =
tegra_xusb_padctl_irq,
> -					IRQF_ONESHOT, dev_name(&pdev->dev), tegra);
> -	if (err < 0) {
> -		dev_err(&pdev->dev, "failed to request padctl IRQ: %d\n", err);
> -		goto remove_usb3;
> +	if (tegra->padctl_irq) {
> +		err =3D devm_request_threaded_irq(&pdev->dev, tegra->padctl_irq,
> +						NULL, tegra_xusb_padctl_irq,
> +						IRQF_ONESHOT, dev_name(&pdev->dev),
> +						tegra);
> +		if (err < 0) {
> +			dev_err(&pdev->dev, "failed to request padctl IRQ: %d\n", err);
> +			goto remove_usb3;
> +		}
>  	}
> =20
>  	err =3D tegra_xusb_enable_firmware_messages(tegra);
> @@ -2132,7 +2139,7 @@ static __maybe_unused int tegra_xusb_suspend(struct=
 device *dev)
>  		tegra->suspended =3D true;
>  		pm_runtime_disable(dev);
> =20
> -		if (device_may_wakeup(dev)) {
> +		if (device_may_wakeup(dev) && tegra->padctl_irq) {

I wondered if perhaps there was a way to make device_may_wakeup() return
false if we don't have that IRQ. Intuitively I would've thought that the
calls to device_wakeup_enable() and device_init_wakeup() set this all up
but after looking at the code I'm not sure if omitting them would
actually cause device_may_wakeup() to return false. That would certainly
be nicer than these double checks.

>  			if (enable_irq_wake(tegra->padctl_irq))
>  				dev_err(dev, "failed to enable padctl wakes\n");
>  		}
> @@ -2161,7 +2168,7 @@ static __maybe_unused int tegra_xusb_resume(struct =
device *dev)
>  		return err;
>  	}
> =20
> -	if (device_may_wakeup(dev)) {
> +	if (device_may_wakeup(dev) && tegra->padctl_irq) {
>  		if (disable_irq_wake(tegra->padctl_irq))
>  			dev_err(dev, "failed to disable padctl wakes\n");
>  	}
> @@ -2179,6 +2186,9 @@ static __maybe_unused int tegra_xusb_runtime_suspen=
d(struct device *dev)
>  	struct tegra_xusb *tegra =3D dev_get_drvdata(dev);
>  	int ret;
> =20
> +	if (!tegra->padctl_irq)
> +		return -EOPNOTSUPP;
> +

Similarly, couldn't we enable all that runtime PM stuff conditionally so
that these functions would only ever get called when runtime PM is
actually available? That seems a bit nicer than having this return
-EOPNOTSUPP.

Thierry

--BOA8n6/bNvmkjro8
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmFxcrgACgkQ3SOs138+
s6HvVQ/+Myd2kXFOTgsuH0PDcev44JhEZW5yiTo9q5pVPayqCqOju+hD3MpegGXs
5ZwTUmuP0gKunLoommLnUUReM81gD9yJmMojPzeXHqVXMH6NKzCuTyqHUlVKT+6L
zz4O7GGD6Iq/a9+iGNRd0nTv5VrEnkut/KKtWRPWE+YVxlIT6IGak3vDUQaPAbjK
+9va7kAFk+DhfyC1P8ELComqXWj6HUx2d8Gxumv5J0WGesdPvJw9hwLzMUkOHJkc
VRUMctSKUefE1F63Ly/N7w5bgIM/dQ2WTSenC70q4uVC6aUoC8DhhkfsRZ6i1Xxu
VrZqvM8VuK5PrBaOk9MH6idg51yTw5//1X5jfAa1BMXGX+JmjMPlmOE10d9xTo9U
cC8YQu1H6RmPgcek1iSCpPG5Yfnw4GW8nqtl8PgibO+2dDY0m8gu8KhSPrte8WhF
9IavcRg44lnVxOx/qzNvRGhA9Pm/owuSV52f615EIy5ZMXEngA2QFuVuMFeEaahE
mhB1Geqro8+tpWL4OO9fzcMukImI6fgUmcIHX1xZ327JVr3ngNx4r83R4SpDm2rf
c9FUdXuCrcmtbe7MaK6cjthPDXUnZh6SI1ff2BbxOjLlmkc+KdyWDw1AOWX1xBjB
v/+k8SssaWcQ+4+KcTxDF2+D1JXVNpqaueJhsvfRl6l0LiPTMrU=
=ZYNf
-----END PGP SIGNATURE-----

--BOA8n6/bNvmkjro8--