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, 7 Jul 2022 17:31:28 -0700
From:   Colin Foster <colin.foster@in-advantage.com>
To:     Horatiu Vultur <horatiu.vultur@microchip.com>
Cc:     linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        linus.walleij@linaro.org, kavyasree.kotagiri@microchip.com,
        alexandre.belloni@bootlin.com, UNGLinuxDriver@microchip.com,
        maxime.chevallier@bootlin.com
Subject: Re: [PATCH 2/2] pinctrl: ocelot: Fix pincfg
Message-ID: <Ysd64LTu7CtBjV4R@COLIN-DESKTOP1.localdomain>
References: <20220707185342.2697569-1-horatiu.vultur@microchip.com>
 <20220707185342.2697569-3-horatiu.vultur@microchip.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220707185342.2697569-3-horatiu.vultur@microchip.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?om1qugLIiMEX/YF46FnqTtz8Q5HT+bNe+JyM2Gaa/Fp9oe4nkiP/z3XqIaNc?=
 =?us-ascii?Q?vVH+tdNelvKSH0M7+6xDLqPHTCrDJEHcIp2RyX9ED5oyUVtKharsGQd35/dc?=
 =?us-ascii?Q?sVMvGIuoJFj0Mzso+ns8D69jDXV35OystEg3zLpohzqvhXiD+du/G99nIW56?=
 =?us-ascii?Q?ADclRZtiEHHEFKGiQ2oJ3BSJR50tGol48SK8woG9V/C971vYp7bu0qbEVVLg?=
 =?us-ascii?Q?8zlMVX9+/7Gw5FuLAKoQr0YkcvjFUQ5ad6BgE4MqoX9wVP3zj6O91hbLtoVl?=
 =?us-ascii?Q?QK4LU2vk6Wjm9f7RrvuNXYgcinVh/+G50rOA+cYFYMALeq8Y/fx3zGDlt4aC?=
 =?us-ascii?Q?qHdYxjlQH3ebJLwds2jqPYmm7I6m1PoSPZvfGCILrEte0wymn700gJLqzdz4?=
 =?us-ascii?Q?ttzX1wAODnsyoVCe1h2D9H2tovn+4yDyN7CNFHaWtgzdR6k9TUCl5Y/zXP8Q?=
 =?us-ascii?Q?0wIrJCX0ZT4voMomE+iGJN7mSUSmcPUKIVb0+t8ibFcStnxUfVuhAa7rsqeu?=
 =?us-ascii?Q?kuf2HtOQEGBLAnPdTY9uTe8mL13mAs1hB9q010/sTO5stzl924n9KFrnOVBF?=
 =?us-ascii?Q?noottGcbcujJtOZ67MWGR+MLBt6Y3qWo3S9p19zS5bvg/FDM5dtIQ7iA64/B?=
 =?us-ascii?Q?+dJQSYzZwp0zD8THCMQ5SOpanUa4flZYOCnuRu8mp8HBI4NVIJgn85LIrr8d?=
 =?us-ascii?Q?cDxAWli1OFSms1LBQYeaqALHX2WUdCq6sXqRikwngIoxozu06Fjtm0UxTJcS?=
 =?us-ascii?Q?OpX9o07FfA2ZI7jvj6cfsyRDXznJnsAz91nlG+0Z1JgASiiVE20cvBHfmiq5?=
 =?us-ascii?Q?WvoKtuopDga+VycOoimDMh1GFbvz+Op0iNoSd1h/FgbR05kapY1KlZZB/mx/?=
 =?us-ascii?Q?ni2HUkjjKjqoeXFVbMB3Gll/+GpHKwm/PM13E6Dzj4xoAWIEWpibTWzwwDqJ?=
 =?us-ascii?Q?AX6LTPboAGWUSrgzHMBf5iXqYKC8MuiQTc/0+UTZzOe7MysUrjv4b2jrSzP3?=
 =?us-ascii?Q?1zVYAN2CnxjtpdZPalsqQCi+sNM5m6UiAZiv2jhF/g/yrnSQg9QkYkUlqt7m?=
 =?us-ascii?Q?jXBnIAcfYVLJkfsksfFw4TU4N4NmFt3RSODb4xfatDiL2I4ySNHHAg3YCcCw?=
 =?us-ascii?Q?HfjPo1IhSKfnGYTXfsOJy7DPfj5ecXNWTQo6Q5iVRlnkmWlU7hY8B+pMJiSl?=
 =?us-ascii?Q?wYn0xRQyL5eZ8H1t6JNo8dUC6iM02iP4G5zxN4B3zxhnKL0bjf8yIhWFlgLO?=
 =?us-ascii?Q?HpOSnFUd3mZzu3bCdzKwGk0d7wfC4Zy3J6EjDrYkGkzOefCwVk79cRFIUe/j?=
 =?us-ascii?Q?G0Oex2BxA7SW4NFRwasEpYC2vrJETwaYc02ixc20+W31DjugKkmLv6BTTpMh?=
 =?us-ascii?Q?CGvb0QwwoAQkKTNKAg3BFhUCAnf7s3y0Lx3Xj3tqkVx3Bg6QZA4TcYdPcyDC?=
 =?us-ascii?Q?+LlAqej8lUVksCIKhDhwANhWsGgeq2D7SQdymXPhHp0o0LOVXNXgzwbrNhfm?=
 =?us-ascii?Q?8gPadHaItroN7FdyJHTjhrYQBVNcbXqtmAURiUhsdnSRymJzoHO20mWkpglB?=
 =?us-ascii?Q?C14pcolcPjmkML+0VoFmIegD8bO6fYYBlh1uRcTeXQJD4dTOihUfW4rNpMR/?=
 =?us-ascii?Q?Dw=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ae04061-7243-45c4-5f73-08da607936e4
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2022 00:31:35.9279
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: X4cGKJH8hDwFAT1ialAxkyO/rO9keaU7jB5ce3tofffTSfor/lNfvVLmfkGLqTiYPRdI1f7uVeRn3wQ9Bp3LdST5Myma/EgSrfU0eq8sWoA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4618
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Horatiu,

On Thu, Jul 07, 2022 at 08:53:42PM +0200, Horatiu Vultur wrote:
> The blamed commit changed to use regmaps instead of __iomem. But it
> didn't update the register offsets to be at word offset, so it uses byte
> offset.
> 
> Fixes: 076d9e71bcf8 ("pinctrl: ocelot: convert pinctrl to regmap")
> Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>

Sorry about this one. It sounded familiar though:
https://patchwork.ozlabs.org/project/linux-gpio/patch/20220125161245.418882-1-horatiu.vultur@microchip.com/

The only takeaway from that was the use of regmap_get_reg_stride, which
was done in
commit baf927a833ca ("microchip-sgpio: Fix support for regmap")

And I see it is only for pincfg - which I don't have any hardware to
test that. Apologies again!

> ---
>  drivers/pinctrl/pinctrl-ocelot.c | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c
> index 6212abe2b66f..e84f2f82901f 100644
> --- a/drivers/pinctrl/pinctrl-ocelot.c
> +++ b/drivers/pinctrl/pinctrl-ocelot.c
> @@ -303,6 +303,13 @@ static const char *const ocelot_function_names[] = {
>  	[FUNC_RCVRD_CLK]	= "rcvrd_clk",
>  };
>  
> +const struct regmap_config regmap_pincfg = {
> +		.reg_bits = 32,
> +		.val_bits = 32,
> +		.reg_stride = 4,
> +		.name = "pincfg",
> +};
> +
>  struct ocelot_pmx_func {
>  	const char **groups;
>  	unsigned int ngroups;
> @@ -1334,7 +1341,8 @@ static int ocelot_hw_get_value(struct ocelot_pinctrl *info,
>  	if (info->pincfg) {
>  		u32 regcfg;
>  
> -		ret = regmap_read(info->pincfg, pin, &regcfg);
> +		ret = regmap_read(info->pincfg, pin * regmap_pincfg.reg_stride,
> +				  &regcfg);
>  		if (ret)
>  			return ret;
>  
> @@ -1368,14 +1376,16 @@ static int ocelot_pincfg_clrsetbits(struct ocelot_pinctrl *info, u32 regaddr,
>  	u32 val;
>  	int ret;
>  
> -	ret = regmap_read(info->pincfg, regaddr, &val);
> +	ret = regmap_read(info->pincfg, regaddr * regmap_pincfg.reg_stride,
> +			  &val);
>  	if (ret)
>  		return ret;
>  
>  	val &= ~clrbits;
>  	val |= setbits;
>  
> -	ret = regmap_write(info->pincfg, regaddr, val);
> +	ret = regmap_write(info->pincfg, regaddr * regmap_pincfg.reg_stride,
> +			   val);
>  
>  	return ret;
>  }
> @@ -1940,21 +1950,13 @@ static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev)
>  {
>  	void __iomem *base;
>  
> -	const struct regmap_config regmap_config = {
> -		.reg_bits = 32,
> -		.val_bits = 32,
> -		.reg_stride = 4,
> -		.max_register = 32,
> -		.name = "pincfg",
> -	};
> -
> -	base = devm_platform_ioremap_resource(pdev, 1);
> +		base = devm_platform_ioremap_resource(pdev, 1);
>  	if (IS_ERR(base)) {
>  		dev_dbg(&pdev->dev, "Failed to ioremap config registers (no extended pinconf)\n");
>  		return NULL;
>  	}
>  
> -	return devm_regmap_init_mmio(&pdev->dev, base, &regmap_config);
> +	return devm_regmap_init_mmio(&pdev->dev, base, &regmap_pincfg);
>  }
>  
>  static int ocelot_pinctrl_probe(struct platform_device *pdev)
> -- 
> 2.33.0
>