gpio: mlxbf2: Fix sleeping while holding spinlock

AxelLin · brgl · commit e6862430fa5e · 2020-05-25T11:09:34.000+02:00
mutex_lock() can sleep, don't call mutex_lock() while holding spin_lock. Fixes: bc0ae0e ("gpio: add driver for Mellanox BlueField 2 GPIO controller") Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: asmaa@mellanox.com Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c
@@ -127,17 +127,17 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)
 {
 	u32 arm_gpio_lock_val;
 
-	spin_lock(&gs->gc.bgpio_lock);
 	mutex_lock(yu_arm_gpio_lock_param.lock);
+	spin_lock(&gs->gc.bgpio_lock);
 
 	arm_gpio_lock_val = readl(yu_arm_gpio_lock_param.io);
 
 	/*
 	 * When lock active bit[31] is set, ModeX is write enabled
 	 */
 	if (YU_LOCK_ACTIVE_BIT(arm_gpio_lock_val)) {
-		mutex_unlock(yu_arm_gpio_lock_param.lock);
 		spin_unlock(&gs->gc.bgpio_lock);
+		mutex_unlock(yu_arm_gpio_lock_param.lock);
 		return -EINVAL;
 	}
 
@@ -152,8 +152,8 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)
 static void mlxbf2_gpio_lock_release(struct mlxbf2_gpio_context *gs)
 {
 	writel(YU_ARM_GPIO_LOCK_RELEASE, yu_arm_gpio_lock_param.io);
-	mutex_unlock(yu_arm_gpio_lock_param.lock);
 	spin_unlock(&gs->gc.bgpio_lock);
+	mutex_unlock(yu_arm_gpio_lock_param.lock);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -127,17 +127,17 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)`
`127`	`127`	`{`
`128`	`128`	`u32 arm_gpio_lock_val;`
`129`	`129`
`130`		`- spin_lock(&gs->gc.bgpio_lock);`
`131`	`130`	`mutex_lock(yu_arm_gpio_lock_param.lock);`
	`131`	`+ spin_lock(&gs->gc.bgpio_lock);`
`132`	`132`
`133`	`133`	`arm_gpio_lock_val = readl(yu_arm_gpio_lock_param.io);`
`134`	`134`
`135`	`135`	`/*`
`136`	`136`	`* When lock active bit[31] is set, ModeX is write enabled`
`137`	`137`	`*/`
`138`	`138`	`if (YU_LOCK_ACTIVE_BIT(arm_gpio_lock_val)) {`
`139`		`- mutex_unlock(yu_arm_gpio_lock_param.lock);`
`140`	`139`	`spin_unlock(&gs->gc.bgpio_lock);`
	`140`	`+ mutex_unlock(yu_arm_gpio_lock_param.lock);`
`141`	`141`	`return -EINVAL;`
`142`	`142`	`}`
`143`	`143`
`@@ -152,8 +152,8 @@ static int mlxbf2_gpio_lock_acquire(struct mlxbf2_gpio_context *gs)`
`152`	`152`	`static void mlxbf2_gpio_lock_release(struct mlxbf2_gpio_context *gs)`
`153`	`153`	`{`
`154`	`154`	`writel(YU_ARM_GPIO_LOCK_RELEASE, yu_arm_gpio_lock_param.io);`
`155`		`- mutex_unlock(yu_arm_gpio_lock_param.lock);`
`156`	`155`	`spin_unlock(&gs->gc.bgpio_lock);`
	`156`	`+ mutex_unlock(yu_arm_gpio_lock_param.lock);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`/*`