]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
mailbox: imx: fix wakeup failure from freeze mode
authorRobin Gong <yibin.gong@nxp.com>
Mon, 7 Feb 2022 01:52:06 +0000 (09:52 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:40:14 +0000 (14:40 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969110
commit 892cb524ae8a27bf5e42f711318371acd9a9f74a upstream.

Since IRQF_NO_SUSPEND used for imx mailbox driver, that means this irq
can't be used for wakeup source so that can't wakeup from freeze mode.
Add pm_system_wakeup() to wakeup from freeze mode.

Fixes: b7b2796b9b31e("mailbox: imx: ONLY IPC MU needs IRQF_NO_SUSPEND flag")
Reviewed-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c78d23ea7506dbf7b02c04977307331a62653380)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
drivers/mailbox/imx-mailbox.c

index 2aeef0bc69308eb01a689cde47a6966076746fa9..850d4004c50e0319b2f1264d6ac20855a93c6033 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/suspend.h>
 #include <linux/slab.h>
 
 #define IMX_MU_CHANS           16
@@ -67,6 +68,7 @@ struct imx_mu_priv {
        const struct imx_mu_dcfg        *dcfg;
        struct clk              *clk;
        int                     irq;
+       bool                    suspend;
 
        u32 xcr[4];
 
@@ -307,6 +309,9 @@ static irqreturn_t imx_mu_isr(int irq, void *p)
                return IRQ_NONE;
        }
 
+       if (priv->suspend)
+               pm_system_wakeup();
+
        return IRQ_HANDLED;
 }
 
@@ -652,6 +657,8 @@ static int __maybe_unused imx_mu_suspend_noirq(struct device *dev)
                        priv->xcr[i] = imx_mu_read(priv, priv->dcfg->xCR[i]);
        }
 
+       priv->suspend = true;
+
        return 0;
 }
 
@@ -673,6 +680,8 @@ static int __maybe_unused imx_mu_resume_noirq(struct device *dev)
                        imx_mu_write(priv, priv->xcr[i], priv->dcfg->xCR[i]);
        }
 
+       priv->suspend = false;
+
        return 0;
 }