]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
authorOleksij Rempel <o.rempel@pengutronix.de>
Tue, 28 Sep 2021 13:49:40 +0000 (15:49 +0200)
committerShawn Guo <shawnguo@kernel.org>
Tue, 5 Oct 2021 05:58:25 +0000 (13:58 +0800)
Any pending interrupt can prevent entering standby based power off state.
To avoid it, disable the GIC CPU interface.

Fixes: 8148d2136002 ("ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/mach-imx/pm-imx6.c

index 9244437cb1b9b5345e248ee542af658b4bea8a72..f2ecca339910a0e7b3cf339dd250b4be2b10b434 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/genalloc.h>
+#include <linux/irqchip/arm-gic.h>
 #include <linux/mfd/syscon.h>
 #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
 #include <linux/of.h>
@@ -619,6 +620,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
 
 static void imx6_pm_stby_poweroff(void)
 {
+       gic_cpu_if_down(0);
        imx6_set_lpm(STOP_POWER_OFF);
        imx6q_suspend_finish(0);