From: Gabor Juhos j4g8y7@gmail.com
[ Upstream commit 4229c28323db141eda69cb99427be75d3edba071 ]
The regmap_update_bits() function can fail, so propagate its error up to the stack instead of silently ignoring that.
Signed-off-by: Imre Kaloz kaloz@openwrt.org Reviewed-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Gabor Juhos j4g8y7@gmail.com Link: https://lore.kernel.org/20250514-pinctrl-a37xx-fixes-v2-7-07e9ac1ab737@gmail... Signed-off-by: Linus Walleij linus.walleij@linaro.org Signed-off-by: Sasha Levin sashal@kernel.org ---
Based on my analysis of the commit and the code context, here's my assessment: **YES** This commit should be backported to stable kernel trees. Here's my extensive analysis: ## Code Analysis The commit changes `armada_37xx_pmx_set_by_name()` function from: ```c regmap_update_bits(info->regmap, reg, mask, val); return 0; ``` To: ```c return regmap_update_bits(info->regmap, reg, mask, val); ``` ## Why This Should Be Backported 1. **Bug Fix Nature**: This is a clear bug fix that addresses silent error handling. The `regmap_update_bits()` function returns an integer error code (0 on success, negative on failure), but the original code was ignoring this return value and always returning success (0). 2. **Error Propagation Impact**: The function `armada_37xx_pmx_set_by_name()` is called from: - `armada_37xx_pmx_set()` - the main pinmux set function - `armada_37xx_gpio_request_enable()` - GPIO request handler that already checks return values 3. **Consistency with Similar Fixes**: Looking at the historical commits provided: - **Similar Commit #2** (Backport Status: YES) shows the exact same pattern where `armada_37xx_gpio_request_enable()` was updated to check return values from `armada_37xx_pmx_set_by_name()` - This current commit completes that fix by ensuring the function actually returns errors when they occur 4. **Critical Subsystem**: This affects the pinctrl subsystem which is fundamental to GPIO and pin configuration. Silent failures in pin configuration can lead to: - Hardware not being configured correctly - GPIO requests appearing to succeed when they actually failed - Difficult-to-debug hardware issues 5. **Minimal Risk**: The change is extremely small and contained: - No new functionality added - No architectural changes - Simple error propagation fix - Maintains existing API contract 6. **Stable Tree Criteria Compliance**: - ✅ Fixes an important bug affecting users - ✅ Small, contained change - ✅ No new features - ✅ Minimal regression risk - ✅ Affects critical kernel subsystem 7. **Real-World Impact**: Without this fix, regmap failures (which can occur due to hardware issues, power management problems, or I2C/SPI communication errors) would be silently ignored, leading to unpredictable system behavior where pin configurations appear successful but are actually failed. The commit follows the pattern established in the historical commit #2 which was marked for backporting, and represents the completion of proper error handling in this driver's critical path.
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 4c4ada06423d7..82e3a7dc8f551 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -358,9 +358,7 @@ static int armada_37xx_pmx_set_by_name(struct pinctrl_dev *pctldev,
val = grp->val[func];
- regmap_update_bits(info->regmap, reg, mask, val); - - return 0; + return regmap_update_bits(info->regmap, reg, mask, val); }
static int armada_37xx_pmx_set(struct pinctrl_dev *pctldev,