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

pinctrl: amd: Don't save/restore interrupt status and wake status bits

Browse Source 
commit b8c824a869f220c6b46df724f85794349bafbf23 upstream.

Saving/restoring interrupt and wake status bits across suspend can
cause the suspend to fail if an IRQ is serviced across the
suspend cycle.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
Fixes: 79d2c8bede ("pinctrl/amd: save pin registers over suspend/resume")
Link: https://lore.kernel.org/r/20220613064127.220416-3-Basavaraj.Natikar@amd.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Basavaraj Natikar 2022-06-13 12:11:26 +05:30 committed by Greg Kroah-Hartman
parent 8e52d0c57d
commit 71b7edfc76
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/pinctrl/pinctrl-amd.c
View File

@ -793,6 +793,7 @@ static int amd_gpio_suspend(struct device *dev)
{ {
struct amd_gpio *gpio_dev = dev_get_drvdata(dev); struct amd_gpio *gpio_dev = dev_get_drvdata(dev);
struct pinctrl_desc *desc = gpio_dev->pctrl->desc; struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
unsigned long flags;
int i; int i;
for (i = 0; i < desc->npins; i++) { for (i = 0; i < desc->npins; i++) {
@ -801,7 +802,9 @@ static int amd_gpio_suspend(struct device *dev)
if (!amd_gpio_should_save(gpio_dev, pin)) if (!amd_gpio_should_save(gpio_dev, pin))
continue; continue;
gpio_dev->saved_regs[i] = readl(gpio_dev->base + pin*4); raw_spin_lock_irqsave(&gpio_dev->lock, flags);
gpio_dev->saved_regs[i] = readl(gpio_dev->base + pin * 4) & ~PIN_IRQ_PENDING;
raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
} }
return 0; return 0;
@ -811,6 +814,7 @@ static int amd_gpio_resume(struct device *dev)
{ {
struct amd_gpio *gpio_dev = dev_get_drvdata(dev); struct amd_gpio *gpio_dev = dev_get_drvdata(dev);
struct pinctrl_desc *desc = gpio_dev->pctrl->desc; struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
unsigned long flags;
int i; int i;
for (i = 0; i < desc->npins; i++) { for (i = 0; i < desc->npins; i++) {
@ -819,7 +823,10 @@ static int amd_gpio_resume(struct device *dev)
if (!amd_gpio_should_save(gpio_dev, pin)) if (!amd_gpio_should_save(gpio_dev, pin))
continue; continue;
writel(gpio_dev->saved_regs[i], gpio_dev->base + pin*4); raw_spin_lock_irqsave(&gpio_dev->lock, flags);
gpio_dev->saved_regs[i] |= readl(gpio_dev->base + pin * 4) & PIN_IRQ_PENDING;
writel(gpio_dev->saved_regs[i], gpio_dev->base + pin * 4);
raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
} }
return 0; return 0;