* [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on resume"
@ 2023-04-11 13:49 Kornel Dulęba
2023-04-11 13:51 ` Limonciello, Mario
2023-04-11 20:46 ` Linus Walleij
0 siblings, 2 replies; 3+ messages in thread
From: Kornel Dulęba @ 2023-04-11 13:49 UTC (permalink / raw)
To: linux-gpio, linux-kernel
Cc: Basavaraj Natikar, Shyam Sundar S K, Linus Walleij, upstream, rad,
mattedavis, Gong Richard, Mario Limonciello, Kornel Dulęba
This reverts commit b26cd9325be4c1fcd331b77f10acb627c560d4d7.
This patch introduces a regression on Lenovo Z13, which can't wake
from the lid with it applied; and some unspecified AMD based Dell
platforms are unable to wake from hitting the power button
Signed-off-by: Kornel Dulęba <korneld@chromium.org>
---
drivers/pinctrl/pinctrl-amd.c | 36 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 609821b756c2..9236a132c7ba 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -872,34 +872,32 @@ static const struct pinconf_ops amd_pinconf_ops = {
.pin_config_group_set = amd_pinconf_group_set,
};
-static void amd_gpio_irq_init_pin(struct amd_gpio *gpio_dev, int pin)
+static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)
{
- const struct pin_desc *pd;
+ struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
unsigned long flags;
u32 pin_reg, mask;
+ int i;
mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) |
BIT(INTERRUPT_MASK_OFF) | BIT(INTERRUPT_ENABLE_OFF) |
BIT(WAKE_CNTRL_OFF_S4);
- pd = pin_desc_get(gpio_dev->pctrl, pin);
- if (!pd)
- return;
+ for (i = 0; i < desc->npins; i++) {
+ int pin = desc->pins[i].number;
+ const struct pin_desc *pd = pin_desc_get(gpio_dev->pctrl, pin);
- raw_spin_lock_irqsave(&gpio_dev->lock, flags);
- pin_reg = readl(gpio_dev->base + pin * 4);
- pin_reg &= ~mask;
- writel(pin_reg, gpio_dev->base + pin * 4);
- raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
-}
+ if (!pd)
+ continue;
-static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)
-{
- struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
- int i;
+ raw_spin_lock_irqsave(&gpio_dev->lock, flags);
- for (i = 0; i < desc->npins; i++)
- amd_gpio_irq_init_pin(gpio_dev, i);
+ pin_reg = readl(gpio_dev->base + i * 4);
+ pin_reg &= ~mask;
+ writel(pin_reg, gpio_dev->base + i * 4);
+
+ raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
+ }
}
#ifdef CONFIG_PM_SLEEP
@@ -952,10 +950,8 @@ static int amd_gpio_resume(struct device *dev)
for (i = 0; i < desc->npins; i++) {
int pin = desc->pins[i].number;
- if (!amd_gpio_should_save(gpio_dev, pin)) {
- amd_gpio_irq_init_pin(gpio_dev, pin);
+ 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;
--
2.40.0.577.gac1e443424-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on resume"
2023-04-11 13:49 [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on resume" Kornel Dulęba
@ 2023-04-11 13:51 ` Limonciello, Mario
2023-04-11 20:46 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Limonciello, Mario @ 2023-04-11 13:51 UTC (permalink / raw)
To: Kornel Dulęba, linux-gpio, linux-kernel
Cc: Basavaraj Natikar, Shyam Sundar S K, Linus Walleij, upstream, rad,
mattedavis, Gong Richard
On 4/11/2023 08:49, Kornel Dulęba wrote:
> This reverts commit b26cd9325be4c1fcd331b77f10acb627c560d4d7.
>
> This patch introduces a regression on Lenovo Z13, which can't wake
> from the lid with it applied; and some unspecified AMD based Dell
> platforms are unable to wake from hitting the power button
>
> Signed-off-by: Kornel Dulęba <korneld@chromium.org>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217315
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Cc: stable@vger.kernel.org
> ---
> drivers/pinctrl/pinctrl-amd.c | 36 ++++++++++++++++-------------------
> 1 file changed, 16 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
> index 609821b756c2..9236a132c7ba 100644
> --- a/drivers/pinctrl/pinctrl-amd.c
> +++ b/drivers/pinctrl/pinctrl-amd.c
> @@ -872,34 +872,32 @@ static const struct pinconf_ops amd_pinconf_ops = {
> .pin_config_group_set = amd_pinconf_group_set,
> };
>
> -static void amd_gpio_irq_init_pin(struct amd_gpio *gpio_dev, int pin)
> +static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)
> {
> - const struct pin_desc *pd;
> + struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
> unsigned long flags;
> u32 pin_reg, mask;
> + int i;
>
> mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) |
> BIT(INTERRUPT_MASK_OFF) | BIT(INTERRUPT_ENABLE_OFF) |
> BIT(WAKE_CNTRL_OFF_S4);
>
> - pd = pin_desc_get(gpio_dev->pctrl, pin);
> - if (!pd)
> - return;
> + for (i = 0; i < desc->npins; i++) {
> + int pin = desc->pins[i].number;
> + const struct pin_desc *pd = pin_desc_get(gpio_dev->pctrl, pin);
>
> - raw_spin_lock_irqsave(&gpio_dev->lock, flags);
> - pin_reg = readl(gpio_dev->base + pin * 4);
> - pin_reg &= ~mask;
> - writel(pin_reg, gpio_dev->base + pin * 4);
> - raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
> -}
> + if (!pd)
> + continue;
>
> -static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)
> -{
> - struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
> - int i;
> + raw_spin_lock_irqsave(&gpio_dev->lock, flags);
>
> - for (i = 0; i < desc->npins; i++)
> - amd_gpio_irq_init_pin(gpio_dev, i);
> + pin_reg = readl(gpio_dev->base + i * 4);
> + pin_reg &= ~mask;
> + writel(pin_reg, gpio_dev->base + i * 4);
> +
> + raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
> + }
> }
>
> #ifdef CONFIG_PM_SLEEP
> @@ -952,10 +950,8 @@ static int amd_gpio_resume(struct device *dev)
> for (i = 0; i < desc->npins; i++) {
> int pin = desc->pins[i].number;
>
> - if (!amd_gpio_should_save(gpio_dev, pin)) {
> - amd_gpio_irq_init_pin(gpio_dev, pin);
> + 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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on resume"
2023-04-11 13:49 [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on resume" Kornel Dulęba
2023-04-11 13:51 ` Limonciello, Mario
@ 2023-04-11 20:46 ` Linus Walleij
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2023-04-11 20:46 UTC (permalink / raw)
To: Kornel Dulęba
Cc: linux-gpio, linux-kernel, Basavaraj Natikar, Shyam Sundar S K,
upstream, rad, mattedavis, Gong Richard, Mario Limonciello
On Tue, Apr 11, 2023 at 3:49 PM Kornel Dulęba <korneld@chromium.org> wrote:
> This reverts commit b26cd9325be4c1fcd331b77f10acb627c560d4d7.
>
> This patch introduces a regression on Lenovo Z13, which can't wake
> from the lid with it applied; and some unspecified AMD based Dell
> platforms are unable to wake from hitting the power button
>
> Signed-off-by: Kornel Dulęba <korneld@chromium.org>
Patch applied for fixes, pushing for linux-next and will then relay
this to Torvalds.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-11 20:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-11 13:49 [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on resume" Kornel Dulęba
2023-04-11 13:51 ` Limonciello, Mario
2023-04-11 20:46 ` Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).