Commit 7ca497be authored by Robin Murphy's avatar Robin Murphy Committed by Bartosz Golaszewski
Browse files

gpio: rockchip: Stop calling pinctrl for set_direction 



Marking the whole controller as sleeping due to the pinctrl calls in the
.direction_{input,output} callbacks has the unfortunate side effect that
legitimate invocations of .get and .set, which cannot themselves sleep,
in atomic context now spew WARN()s from gpiolib.

However, as Heiko points out, the driver doing this is a bit silly to
begin with, as the pinctrl .gpio_set_direction hook doesn't even care
about the direction, the hook is only used to claim the mux. And sure
enough, the .gpio_request_enable hook exists to serve this very purpose,
so switch to that and remove the problematic business entirely.

Cc: stable@vger.kernel.org
Fixes: 20cf2aed ("gpio: rockchip: mark the GPIO controller as sleeping")
Suggested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://lore.kernel.org/r/bddc0469f25843ca5ae0cf578ab3671435ae98a7.1769429546.git.robin.murphy@arm.com


Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
parent 63804fed

drivers/gpio/gpio-rockchip.c

+0 −8
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/pinconf-generic.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>
@@ -164,12 +163,6 @@ static int rockchip_gpio_set_direction(struct gpio_chip *chip, 
	unsigned long flags;

	u32 data = input ? 0 : 1;





	if (input)

		pinctrl_gpio_direction_input(chip, offset);

	else

		pinctrl_gpio_direction_output(chip, offset);



	raw_spin_lock_irqsave(&bank->slock, flags);

	rockchip_gpio_writel_bit(bank, offset, data, bank->gpio_regs->port_ddr);

	raw_spin_unlock_irqrestore(&bank->slock, flags);
@@ -593,7 +586,6 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank) 
	gc->ngpio = bank->nr_pins;

	gc->label = bank->name;

	gc->parent = bank->dev;

	gc->can_sleep = true;



	ret = gpiochip_add_data(gc, bank);

	if (ret) {

drivers/pinctrl/pinctrl-rockchip.c

+4 −5
Original line number Diff line number Diff line
@@ -3545,10 +3545,9 @@ static int rockchip_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, 
	return 0;

}



static int rockchip_pmx_gpio_set_direction(struct pinctrl_dev *pctldev,

static int rockchip_pmx_gpio_request_enable(struct pinctrl_dev *pctldev,

					    struct pinctrl_gpio_range *range,

					   unsigned offset,

					   bool input)

					    unsigned int offset)

{

	struct rockchip_pinctrl *info = pinctrl_dev_get_drvdata(pctldev);

	struct rockchip_pin_bank *bank;
@@ -3562,7 +3561,7 @@ static const struct pinmux_ops rockchip_pmx_ops = { 
	.get_function_name	= rockchip_pmx_get_func_name,

	.get_function_groups	= rockchip_pmx_get_groups,

	.set_mux		= rockchip_pmx_set,

	.gpio_set_direction	= rockchip_pmx_gpio_set_direction,

	.gpio_request_enable	= rockchip_pmx_gpio_request_enable,

};



/*