Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 10 Nov 2022 14:22:40 +0100
From:   Thierry Reding <thierry.reding@gmail.com>
To:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Dmitry Torokhov <dmitry.torokhov@gmail.com>,
        linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        Linus Walleij <linus.walleij@linaro.org>
Subject: Re: [PATCH v2 1/2] gpiolib: of: Prepare of_gpiochip_add() /
 of_gpiochip_remove() for fwnode
Message-ID: <Y2z7IJv2IQy+Mlsh@orome>
References: <20221108133853.61884-1-andriy.shevchenko@linux.intel.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="/mBCcUfC9k4UM3tz"
Content-Disposition: inline
In-Reply-To: <20221108133853.61884-1-andriy.shevchenko@linux.intel.com>
User-Agent: Mutt/2.2.7 (2022-08-07)
Precedence: bulk


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

On Tue, Nov 08, 2022 at 03:38:52PM +0200, Andy Shevchenko wrote:
> GPIO library is getting rid of of_node, fwnode should be utilized instead.
> Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode.
>=20
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> v2: added tag (Dmitry)
>  drivers/gpio/gpiolib-of.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>=20
> diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
> index be9c34cca322..000020eb78d8 100644
> --- a/drivers/gpio/gpiolib-of.c
> +++ b/drivers/gpio/gpiolib-of.c
> @@ -1104,9 +1104,11 @@ static int of_gpiochip_add_pin_range(struct gpio_c=
hip *chip) { return 0; }
> =20
>  int of_gpiochip_add(struct gpio_chip *chip)
>  {
> +	struct device_node *np;
>  	int ret;
> =20
> -	if (!chip->of_node)
> +	np =3D to_of_node(chip->fwnode);
> +	if (!np)

This breaks a number of GPIO controllers on Tegra where chip->fwnode
ends up never getting set. I also see this break drivers like the MFD-
based gpio-max77620, so I don't think this is anything specific to the
Tegra drivers.

Looking at how fwnode handling works, it seems like we're checking the
wrong value here, since chip->fwnode is only for explicit overrides of
the fwnode value.

The below patch fixes the regression for me:

--- >8 ---
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index 4be3c21aa718..760f018ae7de 100644
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -1067,7 +1067,7 @@ int of_gpiochip_add(struct gpio_chip *chip)
        struct device_node *np;
        int ret;

-       np =3D to_of_node(chip->fwnode);
+       np =3D to_of_node(chip->gpiodev->dev.fwnode);
        if (!np)
                return 0;

--- >8 ---

That uses the GPIO device's fwnode, which can be chip->fwnode if
chip->fwnode was explicitly specified. Otherwise this defaults to=20

See gpiochip_add_data_with_key() in drivers/gpio/gpiolib.c:

    677 |	/*
    678 |	 * Assign fwnode depending on the result of the previous calls,
    679 |	 * if none of them succeed, assign it to the parent's one.
    680 |	 */
    681 |	gdev->dev.fwnode =3D dev_fwnode(&gdev->dev) ?: fwnode;

Looks like this is only important to make sure gdev->dev.fwnode is valid
for OF, for ACPI this should be a no-op.

Thierry

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

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

iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmNs+x4ACgkQ3SOs138+
s6Fabw/9Ez3zRB8odDhkKTz+3aOmy7YcMqcp4oS2/TIuznqOTAEGk5yFId/rClH8
zrborlaubJde/K9j2v8CjfyMg9Ev4sJa5OehZoWx+rRV7dtTG4PBjsfzMOO6Q40n
308PRiQx5lTlJw4v6/qNb7TGDj4TxVf/EfP8YI/301Bmyc2NglRZsja9r//9ZnsW
Ka2NFY+utfgIKYnCsWoix0qc9Xn/Be0F94TpwKiKwCwnPSkgWIEisGPhlKNv0RVh
y7+DPV4KVlXJproeG8dH3g6R5zIEMJ87kI/AXKlKf6BV8IU6pjnYs8PjObClOHO+
g+yyPvUfq1S4vNRqW3GLb8nnYlEp6H/dIJmbxm0PxdzLzuYf+TSkBlAWQv8VgTRi
tvbIto4Q2pXjcnMvb7tYq/YFg0mo+Z/0dNMhyaUptjj+zFCpz73EvsLm6kQouIWG
A3SSWeCabkEHWQqSgkGSbtmWwjxFyhJ5DDZkjkVU0U2wXw4lbnyn5+Pwpu+UBO/4
4lJn3YglelJpYQKi4x9WS6ZFNte/u03Jk4hUP1JvE0M1T5g725lL4qyARa4CXCaY
1KfrXQhekbDwX29PmiztWAya5YkCIp6zIVnVuvZtU9FKtaI6TDCanX1csVx0HY5A
1DgF2X4xTxVRqMJyxpOAtu66saLz5X4LrFDOKlwMLTRcipp6W3A=
=Mxfw
-----END PGP SIGNATURE-----

--/mBCcUfC9k4UM3tz--