From: Greg Kroah-Hartman Date: Mon, 25 Oct 2021 19:04:40 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.4.290~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e72da97e98a287cbd08968f4d8d896c5147dff68;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: pinctrl-stm32-use-valid-pin-identifier-in-stm32_pinctrl_resume.patch --- diff --git a/queue-5.10/pinctrl-stm32-use-valid-pin-identifier-in-stm32_pinctrl_resume.patch b/queue-5.10/pinctrl-stm32-use-valid-pin-identifier-in-stm32_pinctrl_resume.patch new file mode 100644 index 00000000000..bec77959c29 --- /dev/null +++ b/queue-5.10/pinctrl-stm32-use-valid-pin-identifier-in-stm32_pinctrl_resume.patch @@ -0,0 +1,37 @@ +From c370bb474016ab9edfdabd7c08a88dd13a71ddbd Mon Sep 17 00:00:00 2001 +From: Fabien Dessenne +Date: Fri, 8 Oct 2021 14:25:17 +0200 +Subject: pinctrl: stm32: use valid pin identifier in stm32_pinctrl_resume() + +From: Fabien Dessenne + +commit c370bb474016ab9edfdabd7c08a88dd13a71ddbd upstream. + +When resuming from low power, the driver attempts to restore the +configuration of some pins. This is done by a call to: + stm32_pinctrl_restore_gpio_regs(struct stm32_pinctrl *pctl, u32 pin) +where 'pin' must be a valid pin value (i.e. matching some 'groups->pin'). +Fix the current implementation which uses some wrong 'pin' value. + +Fixes: e2f3cf18c3e2 ("pinctrl: stm32: add suspend/resume management") +Signed-off-by: Fabien Dessenne +Link: https://lore.kernel.org/r/20211008122517.617633-1-fabien.dessenne@foss.st.com +Signed-off-by: Linus Walleij +Signed-off-by: Greg Kroah-Hartman +--- + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/pinctrl/stm32/pinctrl-stm32.c ++++ b/drivers/pinctrl/stm32/pinctrl-stm32.c +@@ -1645,8 +1645,8 @@ int __maybe_unused stm32_pinctrl_resume( + struct stm32_pinctrl_group *g = pctl->groups; + int i; + +- for (i = g->pin; i < g->pin + pctl->ngroups; i++) +- stm32_pinctrl_restore_gpio_regs(pctl, i); ++ for (i = 0; i < pctl->ngroups; i++, g++) ++ stm32_pinctrl_restore_gpio_regs(pctl, g->pin); + + return 0; + } diff --git a/queue-5.10/series b/queue-5.10/series index 25ffc212edd..e24551eee56 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -92,3 +92,4 @@ tracing-have-all-levels-of-checks-prevent-recursion.patch e1000e-separate-tgp-board-type-from-spt.patch selftests-bpf-fix-backported-assert_false.patch arm-9122-1-select-have_futex_cmpxchg.patch +pinctrl-stm32-use-valid-pin-identifier-in-stm32_pinctrl_resume.patch