lkml.org 
[lkml]   [2022]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 095/365] pinctrl: amd: Dont save/restore interrupt status and wake status bits
    Date
    From: Basavaraj Natikar <Basavaraj.Natikar@amd.com>

    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: 79d2c8bede2c ("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>
    ---
    drivers/pinctrl/pinctrl-amd.c | 11 +++++++++--
    1 file changed, 9 insertions(+), 2 deletions(-)

    --- a/drivers/pinctrl/pinctrl-amd.c
    +++ b/drivers/pinctrl/pinctrl-amd.c
    @@ -917,6 +917,7 @@ static int amd_gpio_suspend(struct devic
    {
    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++) {
    @@ -925,7 +926,9 @@ static int amd_gpio_suspend(struct devic
    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;
    @@ -935,6 +938,7 @@ static int amd_gpio_resume(struct device
    {
    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++) {
    @@ -943,7 +947,10 @@ static int amd_gpio_resume(struct device
    if (!amd_gpio_should_save(gpio_dev, pin))
    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;

    \
     
     \ /
      Last update: 2022-08-23 10:35    [W:4.020 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site