Skip to content

Commit cb39ac9

Browse files
johankorjfvogel
authored andcommitted
gpio: vf610: add locking to gpio direction functions
[ Upstream commit 4e667a1 ] Add locking to `vf610_gpio_direction_input|output()` functions. Without this locking, a race condition exists between concurrent calls to these functions, potentially leading to incorrect GPIO direction settings. To verify the correctness of this fix, a `trylock` patch was applied, where after a couple of reboots the race was confirmed. I.e., one user had to wait before acquiring the lock. With this patch the race has not been encountered. It's worth mentioning that any type of debugging (printing, tracing, etc.) would "resolve"/hide the issue. Fixes: 659d8a6 ("gpio: vf610: add imx7ulp support") Signed-off-by: Johan Korsnes <johan.korsnes@remarkable.no> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Haibo Chen <haibo.chen@nxp.com> Cc: Bartosz Golaszewski <brgl@bgdev.pl> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250217091643.679644-1-johan.korsnes@remarkable.no Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit c13e4b0321ed8d91bf43d8d8396f7ee5c06c9bcc) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 751eb99 commit cb39ac9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/gpio/gpio-vf610.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ struct vf610_gpio_port {
3636
struct clk *clk_port;
3737
struct clk *clk_gpio;
3838
int irq;
39+
spinlock_t lock; /* protect gpio direction registers */
3940
};
4041

4142
#define GPIO_PDOR 0x00
@@ -124,6 +125,7 @@ static int vf610_gpio_direction_input(struct gpio_chip *chip, unsigned int gpio)
124125
u32 val;
125126

126127
if (port->sdata->have_paddr) {
128+
guard(spinlock_irqsave)(&port->lock);
127129
val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
128130
val &= ~mask;
129131
vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
@@ -142,6 +144,7 @@ static int vf610_gpio_direction_output(struct gpio_chip *chip, unsigned int gpio
142144
vf610_gpio_set(chip, gpio, value);
143145

144146
if (port->sdata->have_paddr) {
147+
guard(spinlock_irqsave)(&port->lock);
145148
val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
146149
val |= mask;
147150
vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);
@@ -297,6 +300,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
297300
return -ENOMEM;
298301

299302
port->sdata = device_get_match_data(dev);
303+
spin_lock_init(&port->lock);
300304

301305
dual_base = port->sdata->have_dual_base;
302306

0 commit comments

Comments
 (0)