Skip to content

Commit

Permalink
ARM: imx: build suspend-imx6.S with arm instruction set
Browse files Browse the repository at this point in the history 
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: df59574 ("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>
  • Loading branch information
Max Krummenacher authored and Shawn Guo committed Jan 18, 2021
1 parent eb363ed commit a88afa4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mach-imx/suspend-imx6.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
#define MX6Q_CCM_CCR 0x0

.align 3
.arm

.macro sync_l2_cache

Expand Down

0 comments on commit a88afa4

Please sign in to comment.