Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71b7edfc authored by Basavaraj Natikar's avatar Basavaraj Natikar Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
Fixes: 79d2c8be ("pinctrl/amd: save pin registers over suspend/resume")
Link: https://lore.kernel.org/r/20220613064127.220416-3-Basavaraj.Natikar@amd.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e52d0c5

drivers/pinctrl/pinctrl-amd.c

+9 −2
Original line number Diff line number Diff line
@@ -793,6 +793,7 @@ static int amd_gpio_suspend(struct device *dev) 
{

	struct amd_gpio *gpio_dev = dev_get_drvdata(dev);

	struct pinctrl_desc *desc = gpio_dev->pctrl->desc;

	unsigned long flags;

	int 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))

			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;
@@ -811,6 +814,7 @@ static int amd_gpio_resume(struct device *dev) 
{

	struct amd_gpio *gpio_dev = dev_get_drvdata(dev);

	struct pinctrl_desc *desc = gpio_dev->pctrl->desc;

	unsigned long flags;

	int 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))

			continue;



		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;