lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: renesas: rza2: Add lock around pinctrl_generic{{add,remove}_group,{add,remove}_function}

Browse Source 
[ Upstream commit 8fcc1c40b747069644db6102c1d84c942c9d4d86 ]

The pinctrl group and function creation/remove calls expect
caller to take care of locking. Add lock around these functions.

Fixes: b59d0e7827 ("pinctrl: Add RZ/A2 pin and gpio controller")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20230815131558.33787-4-biju.das.jz@bp.renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Biju Das 2023-08-15 14:15:58 +01:00 committed by Greg Kroah-Hartman
parent 197c546a59
commit f49cac7634
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/pinctrl/pinctrl-rza2.c
View File

@ -14,6 +14,7 @@
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/pinctrl/pinmux.h> #include <linux/pinctrl/pinmux.h>
@ -46,6 +47,7 @@ struct rza2_pinctrl_priv {
struct pinctrl_dev *pctl; struct pinctrl_dev *pctl;
struct pinctrl_gpio_range gpio_range; struct pinctrl_gpio_range gpio_range;
int npins; int npins;
struct mutex mutex; /* serialize adding groups and functions */
}; };
#define RZA2_PDR(port) (0x0000 + (port) * 2) /* Direction 16-bit */ #define RZA2_PDR(port) (0x0000 + (port) * 2) /* Direction 16-bit */
@ -359,10 +361,14 @@ static int rza2_dt_node_to_map(struct pinctrl_dev *pctldev,
psel_val[i] = MUX_FUNC(value); psel_val[i] = MUX_FUNC(value);
} }
mutex_lock(&priv->mutex);
/* Register a single pin group listing all the pins we read from DT */ /* Register a single pin group listing all the pins we read from DT */
gsel = pinctrl_generic_add_group(pctldev, np->name, pins, npins, NULL); gsel = pinctrl_generic_add_group(pctldev, np->name, pins, npins, NULL);
if (gsel < 0) if (gsel < 0) {
return gsel; ret = gsel;
goto unlock;
}
/* /*
* Register a single group function where the 'data' is an array PSEL * Register a single group function where the 'data' is an array PSEL
@ -391,6 +397,8 @@ static int rza2_dt_node_to_map(struct pinctrl_dev *pctldev,
(*map)->data.mux.function = np->name; (*map)->data.mux.function = np->name;
*num_maps = 1; *num_maps = 1;
mutex_unlock(&priv->mutex);
return 0; return 0;
remove_function: remove_function:
@ -399,6 +407,9 @@ remove_function:
remove_group: remove_group:
pinctrl_generic_remove_group(pctldev, gsel); pinctrl_generic_remove_group(pctldev, gsel);
unlock:
mutex_unlock(&priv->mutex);
dev_err(priv->dev, "Unable to parse DT node %s\n", np->name); dev_err(priv->dev, "Unable to parse DT node %s\n", np->name);
return ret; return ret;
@ -476,6 +487,8 @@ static int rza2_pinctrl_probe(struct platform_device *pdev)
if (IS_ERR(priv->base)) if (IS_ERR(priv->base))
return PTR_ERR(priv->base); return PTR_ERR(priv->base);
mutex_init(&priv->mutex);
platform_set_drvdata(pdev, priv); platform_set_drvdata(pdev, priv);
priv->npins = (int)(uintptr_t)of_device_get_match_data(&pdev->dev) * priv->npins = (int)(uintptr_t)of_device_get_match_data(&pdev->dev) *