Commit 41e6b563 authored by Mario Limonciello's avatar Mario Limonciello Committed by sanglipeng
Browse files

pinctrl: amd: Use amd_pinconf_set() for all config options 

stable inclusion
from stable-v5.10.188
commit 54aa4c03861e125e77deb84358db4a8637af456c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8KYFP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=54aa4c03861e125e77deb84358db4a8637af456c



--------------------------------

[ Upstream commit 635a750d ]

On ASUS TUF A16 it is reported that the ITE5570 ACPI device connected to
GPIO 7 is causing an interrupt storm.  This issue doesn't happen on
Windows.

Comparing the GPIO register configuration between Windows and Linux
bit 20 has been configured as a pull up on Windows, but not on Linux.
Checking GPIO declaration from the firmware it is clear it *should* have
been a pull up on Linux as well.

```
GpioInt (Level, ActiveLow, Exclusive, PullUp, 0x0000,
	 "\\_SB.GPIO", 0x00, ResourceConsumer, ,)
{   // Pin list
0x0007
}
```

On Linux amd_gpio_set_config() is currently only used for programming
the debounce. Actually the GPIO core calls it with all the arguments
that are supported by a GPIO, pinctrl-amd just responds `-ENOTSUPP`.

To solve this issue expand amd_gpio_set_config() to support the other
arguments amd_pinconf_set() supports, namely `PIN_CONFIG_BIAS_PULL_DOWN`,
`PIN_CONFIG_BIAS_PULL_UP`, and `PIN_CONFIG_DRIVE_STRENGTH`.

Reported-by: default avatarNik P <npliashechnikov@gmail.com>
Reported-by: default avatarNathan Schulte <nmschulte@gmail.com>
Reported-by: default avatarFriedrich Vock <friedrich.vock@gmx.de>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336


Reported-by: default avatar <dridri85@gmail.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217493
Link: https://lore.kernel.org/linux-input/20230530154058.17594-1-friedrich.vock@gmx.de/


Tested-by: default avatarJan Visser <starquake@linuxeverywhere.org>
Fixes: 2956b5d9 ("pinctrl / gpio: Introduce .set_config() callback for GPIO chips")
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230705133005.577-3-mario.limonciello@amd.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 9221c1d2

drivers/pinctrl/pinctrl-amd.c

+15 −13
Original line number Diff line number Diff line
@@ -189,18 +189,6 @@ static int amd_gpio_set_debounce(struct gpio_chip *gc, unsigned offset, 
	return ret;

}



static int amd_gpio_set_config(struct gpio_chip *gc, unsigned offset,

			       unsigned long config)

{

	u32 debounce;



	if (pinconf_to_config_param(config) != PIN_CONFIG_INPUT_DEBOUNCE)

		return -ENOTSUPP;



	debounce = pinconf_to_config_argument(config);

	return amd_gpio_set_debounce(gc, offset, debounce);

}



#ifdef CONFIG_DEBUG_FS

static void amd_gpio_dbg_show(struct seq_file *s, struct gpio_chip *gc)

{
@@ -676,7 +664,7 @@ static int amd_pinconf_get(struct pinctrl_dev *pctldev, 
}



static int amd_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,

				unsigned long *configs, unsigned num_configs)

			   unsigned long *configs, unsigned int num_configs)

{

	int i;

	u32 arg;
@@ -766,6 +754,20 @@ static int amd_pinconf_group_set(struct pinctrl_dev *pctldev, 
	return 0;

}



static int amd_gpio_set_config(struct gpio_chip *gc, unsigned int pin,

			       unsigned long config)

{

	struct amd_gpio *gpio_dev = gpiochip_get_data(gc);



	if (pinconf_to_config_param(config) == PIN_CONFIG_INPUT_DEBOUNCE) {

		u32 debounce = pinconf_to_config_argument(config);



		return amd_gpio_set_debounce(gc, pin, debounce);

	}



	return amd_pinconf_set(gpio_dev->pctrl, pin, &config, 1);

}



static const struct pinconf_ops amd_pinconf_ops = {

	.pin_config_get		= amd_pinconf_get,

	.pin_config_set		= amd_pinconf_set,