| From a88afa46b86ff461c89cc33fc3a45267fff053e8 Mon Sep 17 00:00:00 2001 |
| From: Max Krummenacher <max.oss.09@gmail.com> |
| Date: Mon, 11 Jan 2021 16:17:04 +0100 |
| Subject: ARM: imx: build suspend-imx6.S with arm instruction set |
| |
| From: Max Krummenacher <max.oss.09@gmail.com> |
| |
| commit a88afa46b86ff461c89cc33fc3a45267fff053e8 upstream. |
| |
| When the kernel is configured to use the Thumb-2 instruction set |
| "suspend-to-memory" fails to resume. Observed on a Colibri iMX6ULL |
| (i.MX 6ULL) and Apalis iMX6 (i.MX 6Q). |
| |
| It looks like the CPU resumes unconditionally in ARM instruction mode |
| and then chokes on the presented Thumb-2 code it should execute. |
| |
| Fix this by using the arm instruction set for all code in |
| suspend-imx6.S. |
| |
| Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> |
| Fixes: df595746fa69 ("ARM: imx: add suspend in ocram support for i.mx6q") |
| Acked-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/mach-imx/suspend-imx6.S | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/arch/arm/mach-imx/suspend-imx6.S |
| +++ b/arch/arm/mach-imx/suspend-imx6.S |
| @@ -73,6 +73,7 @@ |
| #define MX6Q_CCM_CCR 0x0 |
| |
| .align 3 |
| + .arm |
| |
| .macro sync_l2_cache |
| |
