korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 00:34:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

gpio: nomadik: fix offset bug in nmk_pmx_set()

Browse Source 
[ Upstream commit 53cf6b72e0 ]

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: dbfe8ca259 ("pinctrl/nomadik: implement pin multiplexing")
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Link: https://lore.kernel.org/r/20240228-mbly-gpio-v2-5-3ba757474006@bootlin.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Théo Lebrun 2024-02-28 12:28:03 +01:00 committed by Sasha Levin
parent 897a6f43ec
commit 1f40990563
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pinctrl/nomadik/pinctrl-nomadik.c
View File

@ -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 * Then mask the pins that need to be sleeping now when we're
* switching to the ALT C function. * switching to the ALT C function.
*/ */
for (i = 0; i < g->grp.npins; i++) for (i = 0; i < g->grp.npins; i++) {
slpm[g->grp.pins[i] / NMK_GPIO_PER_CHIP] &= ~BIT(g->grp.pins[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); nmk_gpio_glitch_slpm_init(slpm);
} }