Message ID | 20240228-mbly-gpio-v2-5-3ba757474006@bootlin.com |
---|---|
State | New |
Headers | show |
Series | Rework Nomadik GPIO to add Mobileye EyeQ5 support | expand |
On Wed, Feb 28, 2024 at 12:28 PM Théo Lebrun <theo.lebrun@bootlin.com> wrote: > Previously, the statement looked like: > > slpm[x] &= ~BIT(g->grp.pins[i]); > > Where: > - slpm is a unsigned int pointer; > - g->grp.pins[i] is a pin number. It can grow to more than 32. > > The expected shift amount is a pin bank offset. > > This bug does not occur on every group or pin: the altsetting must be > NMK_GPIO_ALT_C and the pin must be 32 or above. It might have occured. > For example, in pinctrl-nomadik-db8500.c, pin group i2c3_c_2 has the > right altsetting and pins 229 and 230. > > Fixes: dbfe8ca259e1 ("pinctrl/nomadik: implement pin multiplexing") > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com> Patch applied! Since the bug is not affecting the deployed UX500 systems I have merged it with the rest as non-urgent fix, but it can be backported as a standalone patch if the stable maintainers want it after the release of v6.9-rc1. Yours, Linus Walleij
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index 7911353ac97d..4f7c4af4f93c 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -1579,8 +1579,10 @@ static int nmk_pmx_set(struct pinctrl_dev *pctldev, unsigned function, * Then mask the pins that need to be sleeping now when we're * switching to the ALT C function. */ - for (i = 0; i < g->grp.npins; i++) - slpm[g->grp.pins[i] / NMK_GPIO_PER_CHIP] &= ~BIT(g->grp.pins[i]); + for (i = 0; i < g->grp.npins; i++) { + unsigned int bit = g->grp.pins[i] % NMK_GPIO_PER_CHIP; + slpm[g->grp.pins[i] / NMK_GPIO_PER_CHIP] &= ~BIT(bit); + } nmk_gpio_glitch_slpm_init(slpm); }