Received-SPF: pass (google.com: domain of linux-kernel+bounces-209358-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Potthuri, Sai Krishna" <sai.krishna.potthuri@amd.com>
To: Sean Anderson <sean.anderson@linux.dev>
CC: Linus Walleij <linus.walleij@linaro.org>, "Simek, Michal"
	<michal.simek@amd.com>, "linux-gpio@vger.kernel.org"
	<linux-gpio@vger.kernel.org>, Andy Shevchenko <andy.shevchenko@gmail.com>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v3 2/2] pinctrl: zynqmp: Support muxing individual pins
Thread-Topic: [PATCH v3 2/2] pinctrl: zynqmp: Support muxing individual pins
Thread-Index: AQHau4a+n7chh+OvrkKaNvEZeTD4j7HCIzTw
Date: Tue, 11 Jun 2024 07:03:51 +0000
Message-ID:
 <BY5PR12MB4258577B994214AA6A509288DBC72@BY5PR12MB4258.namprd12.prod.outlook.com>
References: <20240610223550.2449230-1-sean.anderson@linux.dev>
 <20240610223550.2449230-3-sean.anderson@linux.dev>
In-Reply-To: <20240610223550.2449230-3-sean.anderson@linux.dev>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0:
 =?us-ascii?Q?5WeVjC0iWkuEGCPcsPRuvDjJagHjzbRfPf1FVnEObyxjx7Aj5E7LgPXcTefo?=
 =?us-ascii?Q?N9OXkMq44ETRwMZmh5dcE0p5zF4VKKIRckHZC+dk/63vfQpsKaBpUbj2tq9j?=
 =?us-ascii?Q?/UGRTnU6z07t8rMImeOWl34F4+L9xNWHeWFVeoVfchodBuWkAvsHKjJyhFMk?=
 =?us-ascii?Q?IkVxvgXfjlbv3aqRnwmkg3CHJq5B6tFcKxex6utG7cDgpHcd02/Ey9LFNHhM?=
 =?us-ascii?Q?Jdc10GNRc3bTAUKVuM9+TNh3lnKHrEelgvz0ewJrEKm9CrHMVUyzQnM/Jizi?=
 =?us-ascii?Q?J3OxJSPeO9JHnVSapnquG9ku869PHtRrHHuW9fFEhxA+ebZ2W8mJPPXrjyDf?=
 =?us-ascii?Q?mlaJ1dDF5xtlx2/wpUPiWktJfeLXJty4b7/OdWmD4iTR8jStCA3sKiFm8B1K?=
 =?us-ascii?Q?dmvFWSLK516cBuHWWrVzciET4Hfj5cqR51GUZi7RdjHdGFWyyWBiO0cCDkGO?=
 =?us-ascii?Q?HeKbok7+DZ6s0kZcvOtkrL/3ErUC67ZYrXeHylugFHkGTj+9FNXMjUyMhiOK?=
 =?us-ascii?Q?c/5DtmJrbPBQd3ajkLue2YHhAMI9aJRez0gHgfCwzEOuXL0gRuMb83RFkNTX?=
 =?us-ascii?Q?rd+qkxlXoLlOv6tA+Bi/sts7Og1jRgY8CGjnTafBgLU1adiudQNByT/nIYuz?=
 =?us-ascii?Q?kgj7cfvZbFD/tqpY92JcF8uCybSsq/Y8t1GiMBx1l32dUExqqV4rpMbF6mFh?=
 =?us-ascii?Q?XBATPryTsbEb6PBVwDrmNCLntrI+3/4egh4cQupsRHlLY3xg52Wpw1OxBnOP?=
 =?us-ascii?Q?jz6WfJODXLPTtDdDdVS1fIYcZHokYEgqw4mpUtnx8FlmjFhg8TckrL17ANjv?=
 =?us-ascii?Q?A6UzSoVXH/4TBCZpxfu4ztdpAPNTEF36F9kHp9WBtzpq990VdNdA2E1xLmKm?=
 =?us-ascii?Q?XeCnobdQYR/FAIlJuMLZDu/uOszz+D4GuAntvpZdHDb4VYgbTKUknWiUuza5?=
 =?us-ascii?Q?CHiTSzvBW6MfTcKZ46Pzvjw595Kn4uLDyndm9XZGq6jU3CTiw6Hr/i7ApWKF?=
 =?us-ascii?Q?LAmDi+xu1UdP1cqV2EFuX5iuUeQ+pzuU9u1htrt4lj53T9rFr5PLxzAE5tSQ?=
 =?us-ascii?Q?9iyJHi/T78xwUCnJuPTYVWXrxHfUHBO+OjQUW6Jr82qQLmbtMahyg12bMatP?=
 =?us-ascii?Q?kTPif8vhWjIpwHm1wfw7+gIKYMTTwwHGq9Odd/WEYaEhRFCgED2AY0bevTna?=
 =?us-ascii?Q?l4YT0AfnF1RxloF6l1ldGshGgSpPPLVq39FMd0nb7r5g9Gb6dTTKDnD6Wujc?=
 =?us-ascii?Q?R+eOVsSiwhe9/8HdKqR9+teddAW3hsXmhnGiBe3lALOeOUwjnQsAU8YlPFzp?=
 =?us-ascii?Q?0H+tnocuRUKy8jLNpJ+pmAPEGDJMHaNMx/fQcIbGWQsh9GmhebbtIUSwo/Jg?=
 =?us-ascii?Q?y9CLIhjDQPkVH49KWQvWjyBGZTEt7SKvY0pKVLc6IqrOSM0hFoLexaGFNUas?=
 =?us-ascii?Q?qmcqPQ+m3LRGH8cia16iAkiVXCF4ZRaBXoZhsSwjphWAYua4GQ6OlD40PlY+?=
 =?us-ascii?Q?qwx9sXxVELD3mcf0H778Zhwnn8+uHrpRxsdpgXMT91FODSXMzYpFW3RYZ+s0?=
 =?us-ascii?Q?mNvKsGuZEN10xPnybQY=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4258.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ac3e0cd8-7841-41e4-e6a1-08dc89e4a67a
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Jun 2024 07:03:51.8359
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: w2WTdBV254j8da4vPQrmSF/15/tUsJyDJYpil/M92S2okrehLLLkvmLi/ijfX86/q3A2m0qeQZKgGLS3R/Ryjg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6993


> -----Original Message-----
> From: Sean Anderson <sean.anderson@linux.dev>
> Sent: Tuesday, June 11, 2024 4:06 AM
> To: Linus Walleij <linus.walleij@linaro.org>; Simek, Michal
> <michal.simek@amd.com>; linux-gpio@vger.kernel.org
> Cc: Andy Shevchenko <andy.shevchenko@gmail.com>; Potthuri, Sai Krishna
> <sai.krishna.potthuri@amd.com>; linux-arm-kernel@lists.infradead.org;
> linux-kernel@vger.kernel.org; Sean Anderson <sean.anderson@linux.dev>
> Subject: [PATCH v3 2/2] pinctrl: zynqmp: Support muxing individual pins
>=20
> While muxing groups of pins at once can be convenient for large interface=
s,
> it can also be rigid. This is because the group is set to all pins which =
support
> a particular function, even though not all pins may be used. For example,
> the sdhci0 function may be used with a 8-bit eMMC, 4-bit SD card, or even=
 a
> 1-bit SD card. In these cases, the extra pins may be repurposed for other
> uses, but this is not currently allowed.
>=20
> There is not too much point in pin "groups" when there are not actual pin
> groups at the hardware level. The pins can all be muxed individually, so
> there's no point in adding artificial groups on top.
> Just mux the pins like the hardware allows.
>=20
> To this effect, add a new group for each pin which can be muxed. These
> groups are part of each function the pin can be muxed to. We treat group
> selectors beyond the number of groups as "pin" groups. To set this up, we
> initialize groups before functions, and then create a bitmap of used pins=
 for
> each function. These used pins are appended to the function's list of
> groups.
>=20
> Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
Reviewed-by: Sai Krishna Potthuri <sai.krishna.potthuri@amd.com>

Regards
Sai Krishna

> ---
>=20
> Changes in v3:
> - Fix zynqmp_pinmux_set_mux and zynqmp_pinconf_group_set not
> handling
>   "pin" groups (thanks Sai Krishna).
>=20
> Changes in v2:
> - Use __set_bit instead of set_bit
> - Use size_add when calculating the number of kcalloc members
> - Expand commit message with some more motivation
>=20
>  drivers/pinctrl/pinctrl-zynqmp.c | 83 +++++++++++++++++++++-----------
>  1 file changed, 54 insertions(+), 29 deletions(-)
>=20
> diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-
> zynqmp.c
> index 5c46b7d7ebcb..e4ff3c55b87d 100644
> --- a/drivers/pinctrl/pinctrl-zynqmp.c
> +++ b/drivers/pinctrl/pinctrl-zynqmp.c
> @@ -10,6 +10,7 @@
>=20
>  #include <dt-bindings/pinctrl/pinctrl-zynqmp.h>
>=20
> +#include <linux/bitmap.h>
>  #include <linux/init.h>
>  #include <linux/module.h>
>  #include <linux/of_address.h>
> @@ -97,7 +98,7 @@ static int zynqmp_pctrl_get_groups_count(struct
> pinctrl_dev *pctldev)  {
>  	struct zynqmp_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev);
>=20
> -	return pctrl->ngroups;
> +	return pctrl->ngroups + zynqmp_desc.npins;
>  }
>=20
>  static const char *zynqmp_pctrl_get_group_name(struct pinctrl_dev
> *pctldev, @@ -105,7 +106,10 @@ static const char
> *zynqmp_pctrl_get_group_name(struct pinctrl_dev *pctldev,  {
>  	struct zynqmp_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev);
>=20
> -	return pctrl->groups[selector].name;
> +	if (selector < pctrl->ngroups)
> +		return pctrl->groups[selector].name;
> +
> +	return zynqmp_desc.pins[selector - pctrl->ngroups].name;
>  }
>=20
>  static int zynqmp_pctrl_get_group_pins(struct pinctrl_dev *pctldev, @@ -
> 115,8 +119,13 @@ static int zynqmp_pctrl_get_group_pins(struct
> pinctrl_dev *pctldev,  {
>  	struct zynqmp_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev);
>=20
> -	*pins =3D pctrl->groups[selector].pins;
> -	*npins =3D pctrl->groups[selector].npins;
> +	if (selector < pctrl->ngroups) {
> +		*pins =3D pctrl->groups[selector].pins;
> +		*npins =3D pctrl->groups[selector].npins;
> +	} else {
> +		*pins =3D &zynqmp_desc.pins[selector - pctrl-
> >ngroups].number;
> +		*npins =3D 1;
> +	}
>=20
>  	return 0;
>  }
> @@ -197,17 +206,16 @@ static int zynqmp_pinmux_set_mux(struct
> pinctrl_dev *pctldev,
>  				 unsigned int function,
>  				 unsigned int group)
>  {
> -	struct zynqmp_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev);
> -	const struct zynqmp_pctrl_group *pgrp =3D &pctrl->groups[group];
> +	const unsigned int *pins;
> +	unsigned int npins;
>  	int ret, i;
>=20
> -	for (i =3D 0; i < pgrp->npins; i++) {
> -		unsigned int pin =3D pgrp->pins[i];
> -
> -		ret =3D zynqmp_pm_pinctrl_set_function(pin, function);
> +	zynqmp_pctrl_get_group_pins(pctldev, group, &pins, &npins);
> +	for (i =3D 0; i < npins; i++) {
> +		ret =3D zynqmp_pm_pinctrl_set_function(pins[i], function);
>  		if (ret) {
>  			dev_err(pctldev->dev, "set mux failed for pin %u\n",
> -				pin);
> +				pins[i]);
>  			return ret;
>  		}
>  	}
> @@ -467,12 +475,13 @@ static int zynqmp_pinconf_group_set(struct
> pinctrl_dev *pctldev,
>  				    unsigned long *configs,
>  				    unsigned int num_configs)
>  {
> +	const unsigned int *pins;
> +	unsigned int npins;
>  	int i, ret;
> -	struct zynqmp_pinctrl *pctrl =3D pinctrl_dev_get_drvdata(pctldev);
> -	const struct zynqmp_pctrl_group *pgrp =3D &pctrl->groups[selector];
>=20
> -	for (i =3D 0; i < pgrp->npins; i++) {
> -		ret =3D zynqmp_pinconf_cfg_set(pctldev, pgrp->pins[i], configs,
> +	zynqmp_pctrl_get_group_pins(pctldev, selector, &pins, &npins);
> +	for (i =3D 0; i < npins; i++) {
> +		ret =3D zynqmp_pinconf_cfg_set(pctldev, pins[i], configs,
>  					     num_configs);
>  		if (ret)
>  			return ret;
> @@ -560,10 +569,12 @@ static int
> zynqmp_pinctrl_prepare_func_groups(struct device *dev, u32 fid,  {
>  	u16 resp[NUM_GROUPS_PER_RESP] =3D {0};
>  	const char **fgroups;
> -	int ret, index, i;
> +	int ret, index, i, pin;
> +	unsigned int npins;
> +	unsigned long *used_pins __free(bitmap) =3D
> +		bitmap_zalloc(zynqmp_desc.npins, GFP_KERNEL);
>=20
> -	fgroups =3D devm_kcalloc(dev, func->ngroups, sizeof(*fgroups),
> GFP_KERNEL);
> -	if (!fgroups)
> +	if (!used_pins)
>  		return -ENOMEM;
>=20
>  	for (index =3D 0; index < func->ngroups; index +=3D
> NUM_GROUPS_PER_RESP) { @@ -578,23 +589,37 @@ static int
> zynqmp_pinctrl_prepare_func_groups(struct device *dev, u32 fid,
>  			if (resp[i] =3D=3D RESERVED_GROUP)
>  				continue;
>=20
> -			fgroups[index + i] =3D devm_kasprintf(dev,
> GFP_KERNEL,
> -							    "%s_%d_grp",
> -							    func->name,
> -							    index + i);
> -			if (!fgroups[index + i])
> -				return -ENOMEM;
> -
>  			groups[resp[i]].name =3D devm_kasprintf(dev,
> GFP_KERNEL,
>  							      "%s_%d_grp",
>  							      func->name,
>  							      index + i);
>  			if (!groups[resp[i]].name)
>  				return -ENOMEM;
> +
> +			for (pin =3D 0; pin < groups[resp[i]].npins; pin++)
> +				__set_bit(groups[resp[i]].pins[pin],
> used_pins);
>  		}
>  	}
>  done:
> +	npins =3D bitmap_weight(used_pins, zynqmp_desc.npins);
> +	fgroups =3D devm_kcalloc(dev, size_add(func->ngroups, npins),
> +			       sizeof(*fgroups), GFP_KERNEL);
> +	if (!fgroups)
> +		return -ENOMEM;
> +
> +	for (i =3D 0; i < func->ngroups; i++) {
> +		fgroups[i] =3D devm_kasprintf(dev, GFP_KERNEL, "%s_%d_grp",
> +					    func->name, i);
> +		if (!fgroups[i])
> +			return -ENOMEM;
> +	}
> +
> +	pin =3D 0;
> +	for_each_set_bit(pin, used_pins, zynqmp_desc.npins)
> +		fgroups[i++] =3D zynqmp_desc.pins[pin].name;
> +
>  	func->groups =3D fgroups;
> +	func->ngroups +=3D npins;
>=20
>  	return 0;
>  }
> @@ -772,6 +797,10 @@ static int
> zynqmp_pinctrl_prepare_function_info(struct device *dev,
>  	if (!groups)
>  		return -ENOMEM;
>=20
> +	ret =3D zynqmp_pinctrl_prepare_group_pins(dev, groups, pctrl-
> >ngroups);
> +	if (ret)
> +		return ret;
> +
>  	for (i =3D 0; i < pctrl->nfuncs; i++) {
>  		ret =3D zynqmp_pinctrl_prepare_func_groups(dev, i, &funcs[i],
>  							 groups);
> @@ -779,10 +808,6 @@ static int
> zynqmp_pinctrl_prepare_function_info(struct device *dev,
>  			return ret;
>  	}
>=20
> -	ret =3D zynqmp_pinctrl_prepare_group_pins(dev, groups, pctrl-
> >ngroups);
> -	if (ret)
> -		return ret;
> -
>  	pctrl->funcs =3D funcs;
>  	pctrl->groups =3D groups;
>=20
> --
> 2.35.1.1320.gc452695387.dirty