pinctrl STM32 updates
Subsystems (4)
cover pinctrl STM32 updates
Please find 2 updates for STM32 pinctrl driver:
-Fix a memory leak issue present since the beginning of the driver. -Handle error case when a hwspinlock can't get locked.
regards
Alex
Alexandre Torgue (2):
pinctrl: stm32: fix memory leak issue
pinctrl: stm32: return error upon hwspinlock failure
drivers/pinctrl/stm32/pinctrl-stm32.c | 70 ++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 30 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 pinctrl: stm32: fix memory leak issue
configs is allocated by pinconf_generic_parse_dt_config(), pinctrl_utils_add_map_configs() duplicates configs so it can and has to be freed to prevent memory leaks.
drivers/pinctrl/stm32/pinctrl-stm32.c +16 -10
@@ -414,7 +414,7 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,unsigned int num_configs;bool has_config =0 ;unsigned reserve =0 ; -int num_pins, num_funcs, maps_per_pin, i, err; +int num_pins, num_funcs, maps_per_pin, i, err =0 ; pctl =pinctrl_dev_get_drvdata (pctldev);
@@ -441,41 +441,45 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev,if (has_config && num_pins >=1 ) maps_per_pin++; -if (!num_pins || !maps_per_pin) -return -EINVAL ; +if (!num_pins || !maps_per_pin) { + err = -EINVAL ; + goto exit; + } reserve = num_pins * maps_per_pin; err =pinctrl_utils_reserve_map (pctldev, map, reserved_maps, num_maps, reserve);if (err) -return err; + goto exit;for (i =0 ; i < num_pins; i++) { err =of_property_read_u32_index (node,"pinmux" , i, &pinfunc);if (err) -return err; + goto exit; pin =STM32_GET_PIN_NO (pinfunc); func =STM32_GET_PIN_FUNC (pinfunc);if (!stm32_pctrl_is_function_valid (pctl, pin, func)) {dev_err (pctl->dev,"invalid function.\n" ); -return -EINVAL ; + err = -EINVAL ; + goto exit; } grp =stm32_pctrl_find_group_by_pin (pctl, pin);if (!grp) {dev_err (pctl->dev,"unable to match pin %d to group\n" , pin); -return -EINVAL ; + err = -EINVAL ; + goto exit; } err =stm32_pctrl_dt_node_to_map_func (pctl, pin, func, grp, map, reserved_maps, num_maps);if (err) -return err; + goto exit;if (has_config) { err = pinctrl_utils_add_map_configs(pctldev, map,
@@ -483,11 +487,13 @@ static int stm32_pctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, configs, num_configs, PIN_MAP_TYPE_CONFIGS_GROUP);if (err) -return err; + goto exit; } } -return 0 ; +exit: +kfree (configs); +return err; } static int stm32_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
Signature · 1 line
2.7.4
PATCH 2/2 pinctrl: stm32: return error upon hwspinlock failure
In reply to Alexandre TorgueReturn error to the caller when the hwspinlock can't get locked.
drivers/pinctrl/stm32/pinctrl-stm32.c +24 -20
@@ -583,8 +583,8 @@ static int stm32_pmx_get_func_groups(struct pinctrl_dev *pctldev,return 0 ; } -static void stm32_pmx_set_mode (struct stm32_gpio_bank *bank, -int pin,u32 mode,u32 alt) +static int stm32_pmx_set_mode (struct stm32_gpio_bank *bank, +int pin,u32 mode,u32 alt) {struct stm32_pinctrl *pctl =dev_get_drvdata (bank->gpio_chip.parent);u32 val;
@@ -620,6 +620,8 @@ static void stm32_pmx_set_mode(struct stm32_gpio_bank *bank, unlock:spin_unlock_irqrestore (&bank->lock, flags);clk_disable (bank->clk); + +return err; } void stm32_pmx_get_mode(struct stm32_gpio_bank *bank, int pin, u32 *mode,
@@ -676,9 +678,7 @@ static int stm32_pmx_set_mux(struct pinctrl_dev *pctldev, mode =stm32_gpio_get_mode (function); alt =stm32_gpio_get_alt (function); -stm32_pmx_set_mode (bank, pin, mode, alt); - -return 0 ; +return stm32_pmx_set_mode (bank, pin, mode, alt); } static int stm32_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,
@@ -688,9 +688,7 @@ static int stm32_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,struct stm32_gpio_bank *bank =gpiochip_get_data (range->gc);int pin =stm32_gpio_pin (gpio); -stm32_pmx_set_mode (bank, pin, !input,0 ); - -return 0 ; +return stm32_pmx_set_mode (bank, pin, !input,0 ); }static const struct pinmux_ops stm32_pmx_ops = {
@@ -704,8 +702,8 @@ static const struct pinmux_ops stm32_pmx_ops = {/* Pinconf functions */ -static void stm32_pconf_set_driving (struct stm32_gpio_bank *bank, -unsigned offset,u32 drive) +static int stm32_pconf_set_driving (struct stm32_gpio_bank *bank, +unsigned offset,u32 drive) {struct stm32_pinctrl *pctl =dev_get_drvdata (bank->gpio_chip.parent);unsigned long flags;
@@ -734,6 +732,8 @@ static void stm32_pconf_set_driving(struct stm32_gpio_bank *bank, unlock:spin_unlock_irqrestore (&bank->lock, flags);clk_disable (bank->clk); + +return err; } static u32 stm32_pconf_get_driving(struct stm32_gpio_bank *bank,
@@ -754,8 +754,8 @@ static u32 stm32_pconf_get_driving(struct stm32_gpio_bank *bank,return (val >> offset); } -static void stm32_pconf_set_speed (struct stm32_gpio_bank *bank, -unsigned offset,u32 speed) +static int stm32_pconf_set_speed (struct stm32_gpio_bank *bank, +unsigned offset,u32 speed) {struct stm32_pinctrl *pctl =dev_get_drvdata (bank->gpio_chip.parent);unsigned long flags;
@@ -784,6 +784,8 @@ static void stm32_pconf_set_speed(struct stm32_gpio_bank *bank, unlock:spin_unlock_irqrestore (&bank->lock, flags);clk_disable (bank->clk); + +return err; } static u32 stm32_pconf_get_speed(struct stm32_gpio_bank *bank,
@@ -804,8 +806,8 @@ static u32 stm32_pconf_get_speed(struct stm32_gpio_bank *bank,return (val >> (offset *2 )); } -static void stm32_pconf_set_bias (struct stm32_gpio_bank *bank, -unsigned offset,u32 bias) +static int stm32_pconf_set_bias (struct stm32_gpio_bank *bank, +unsigned offset,u32 bias) {struct stm32_pinctrl *pctl =dev_get_drvdata (bank->gpio_chip.parent);unsigned long flags;
@@ -834,6 +836,8 @@ static void stm32_pconf_set_bias(struct stm32_gpio_bank *bank, unlock:spin_unlock_irqrestore (&bank->lock, flags);clk_disable (bank->clk); + +return err; } static u32 stm32_pconf_get_bias(struct stm32_gpio_bank *bank,
@@ -896,22 +900,22 @@ static int stm32_pconf_parse_conf(struct pinctrl_dev *pctldev,switch (param) {case PIN_CONFIG_DRIVE_PUSH_PULL : -stm32_pconf_set_driving (bank, offset,0 ); + ret =stm32_pconf_set_driving (bank, offset,0 );break ;case PIN_CONFIG_DRIVE_OPEN_DRAIN : -stm32_pconf_set_driving (bank, offset,1 ); + ret =stm32_pconf_set_driving (bank, offset,1 );break ;case PIN_CONFIG_SLEW_RATE : -stm32_pconf_set_speed (bank, offset, arg); + ret =stm32_pconf_set_speed (bank, offset, arg);break ;case PIN_CONFIG_BIAS_DISABLE : -stm32_pconf_set_bias (bank, offset,0 ); + ret =stm32_pconf_set_bias (bank, offset,0 );break ;case PIN_CONFIG_BIAS_PULL_UP : -stm32_pconf_set_bias (bank, offset,1 ); + ret =stm32_pconf_set_bias (bank, offset,1 );break ;case PIN_CONFIG_BIAS_PULL_DOWN : -stm32_pconf_set_bias (bank, offset,2 ); + ret =stm32_pconf_set_bias (bank, offset,2 );break ;case PIN_CONFIG_OUTPUT :__stm32_gpio_set (bank, offset, arg);
Signature · 1 line
2.7.4
Quoted 4 lines · Alexandre Torgue
Please find 2 updates for STM32 pinctrl driver:
-Fix a memory leak issue present since the beginning of the driver. -Handle error case when a hwspinlock can't get locked.
Patches applied for v5.1.
Yours,
Linus Walleij