Re: [PATCH v2] ARM: OMAP2+: Add CFI type for omap4_finish_suspend
Nathan Chancellor <[email protected]>
| Newsgroups | org.kernel.vger.linux-omap,dev.linux.lists.llvm,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <20260523011741.GC520407@ax162> |
On Fri, May 22, 2026 at 04:30:36PM -0700, Mithil Bavishi wrote: > With CONFIG_CFI enabled, OMAP4 can trap in omap4_enter_lowpower() > because omap_pm_ops.finish_suspend points directly to the assembly > routine omap4_finish_suspend, which lacks the expected KCFI type > metadata. > > Annotate omap4_finish_suspend with SYM_TYPED_FUNC_START so the assembly > routine carries the KCFI type metadata. > > Signed-off-by: Mithil Bavishi <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]> > --- > arch/arm/mach-omap2/sleep44xx.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S > index f09c91978..0b48df6fc 100644 > --- a/arch/arm/mach-omap2/sleep44xx.S > +++ b/arch/arm/mach-omap2/sleep44xx.S > @@ -58,7 +58,7 @@ > * stack frame and it expects the caller to take care of it. Hence the entire > * stack frame is saved to avoid possible stack corruption. > */ > -ENTRY(omap4_finish_suspend) > +SYM_TYPED_FUNC_START(omap4_finish_suspend) > stmfd sp!, {r4-r12, lr} > cmp r0, #0x0 > beq do_WFI @ No lowpower state, jump to WFI > @@ -223,7 +223,7 @@ skip_scu_gp_clear: > isb > dsb > ldmfd sp!, {r4-r12, pc} > -ENDPROC(omap4_finish_suspend) > +SYM_FUNC_END(omap4_finish_suspend) > > /* > * ============================ > -- > 2.43.0 > -- Cheers, Nathan