aboutsummaryrefslogtreecommitdiff
path: root/core/arch/arm/plat-imx/pm/psci-suspend-imx7.S
diff options
context:
space:
mode:
authorJerome Forissier <jerome@forissier.org>2020-09-03 14:37:31 +0200
committerJérôme Forissier <jerome@forissier.org>2020-09-04 14:25:44 +0200
commit3513f961cda064f90d10f7de72af6330427a2013 (patch)
treed034d13b91a2e19cfe1954618e26629426f5721d /core/arch/arm/plat-imx/pm/psci-suspend-imx7.S
parent827be46c173f31c57006af70ca3a15a5b1a7fba3 (diff)
arm32: fold UNWIND(.fnstart/.fnend) into the FUNC macros
This change applies to arm32 assembler sources. Instead of using UNWIND(.fnstart) after FUNC or LOCAL_FUNC and UNWIND(.fnend) before END_FUNC, let's fold these statements into the FUNC macros. The .fnstart/.fnend directives mark the start and end of a function with an unwind table entry (.ARM.exidx) and therefore a function without them has no entry and cannot be unwound. This means that a stack dump (on abort or panic) would stop when reaching such a function. As a result of this patch, a small number of functions now have an entry in the unwind table when they had none before (the functions which were using FUNC or LOCAL_FUNC but had no .fnstart/.fnend). It was almost always a bug and this pacth only increases the size of the .ARM.exidx section by a few bytes (tested on QEMU). Signed-off-by: Jerome Forissier <jerome@forissier.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org> Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Diffstat (limited to 'core/arch/arm/plat-imx/pm/psci-suspend-imx7.S')
-rw-r--r--core/arch/arm/plat-imx/pm/psci-suspend-imx7.S4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/arch/arm/plat-imx/pm/psci-suspend-imx7.S b/core/arch/arm/plat-imx/pm/psci-suspend-imx7.S
index 200241fb..06910127 100644
--- a/core/arch/arm/plat-imx/pm/psci-suspend-imx7.S
+++ b/core/arch/arm/plat-imx/pm/psci-suspend-imx7.S
@@ -455,7 +455,6 @@
.endm
FUNC imx7_suspend, :
-UNWIND( .fnstart)
UNWIND( .cantunwind)
push {r4-r12}
@@ -656,11 +655,9 @@ dsm_ddr_self_refresh_out:
dsm_ddr_retention_out:
bx lr
-UNWIND( .fnend)
END_FUNC imx7_suspend
FUNC ca7_cpu_resume, :
-UNWIND( .fnstart)
UNWIND( .cantunwind)
mov r0, #0 @ ; write the cache size selection register to be
write_csselr r0 @ ; sure we address the data cache
@@ -692,5 +689,4 @@ _inv_nextline:
blx plat_cpu_reset_early
b sm_pm_cpu_resume
-UNWIND( .fnend)
END_FUNC ca7_cpu_resume