1a7f64fc76
- espresso is now upstream, so drop patches adding it - renumber remaining patches - replace omap4 CFI patch with upstream version - migrate config and pass kconfig checks - add new required makedepends Signed-off-By: Sicelo A. Mhlongo <absicsz@gmail.com> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/9024>
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 4a7b197ad28d71f9fac873f283b4408df3fdb287 Mon Sep 17 00:00:00 2001
|
|
From: Mithil Bavishi <bavishimithil@gmail.com>
|
|
Date: Wed, 3 Jun 2026 22:40:48 -0700
|
|
Subject: ARM: OMAP2+: Add CFI type for omap4_finish_suspend
|
|
|
|
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 <bavishimithil@gmail.com>
|
|
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
|
|
Reviewed-by: Andreas Kemnade <andreas@kemnade.info>
|
|
Link: https://patch.msgid.link/20260604054048.18980-1-bavishimithil@gmail.com
|
|
Signed-off-by: Kevin Hilman (TI) <khilman@baylibre.com>
|
|
---
|
|
arch/arm/mach-omap2/sleep44xx.S | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S
|
|
index f09c9197808b1..8b515f30072b0 100644
|
|
--- a/arch/arm/mach-omap2/sleep44xx.S
|
|
+++ b/arch/arm/mach-omap2/sleep44xx.S
|
|
@@ -6,6 +6,7 @@
|
|
* Santosh Shilimkar <santosh.shilimkar@ti.com>
|
|
*/
|
|
|
|
+#include <linux/cfi_types.h>
|
|
#include <linux/linkage.h>
|
|
#include <asm/assembler.h>
|
|
#include <asm/smp_scu.h>
|
|
@@ -58,7 +59,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 +224,7 @@ skip_scu_gp_clear:
|
|
isb
|
|
dsb
|
|
ldmfd sp!, {r4-r12, pc}
|
|
-ENDPROC(omap4_finish_suspend)
|
|
+SYM_FUNC_END(omap4_finish_suspend)
|
|
|
|
/*
|
|
* ============================
|
|
--
|
|
cgit 1.3-korg
|
|
|