core: riscv: Support fault mitigations in non-threaded code

The commit ce56605 ("core: support fault mitigations in non-threaded code) supports fault mitigations in non-threaded code for ARM architecture. This commit adds the related modification for RISC-V architecture to support it too. Also the indentation in __ftmn_get_tsd_func_arg_pp() is fixed. Signed-off-by: Alvin Chang <alvinga@andestech.com>
gagachang · Oct 7, 2023 · cbdfff9 · cbdfff9
1 parent 3afba46
commit cbdfff9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/arch/riscv/include/kernel/thread_arch.h b/core/arch/riscv/include/kernel/thread_arch.h
@@ -32,6 +32,9 @@ struct thread_core_local {
 #ifdef CFG_CORE_DEBUG_CHECK_STACKS
 	bool stackcheck_recursion;
 #endif
+#ifdef CFG_FAULT_MITIGATION
+	struct ftmn_func_arg *ftmn_arg;
+#endif
 } THREAD_CORE_LOCAL_ALIGNED;
 
 struct thread_user_vfp_state {

diff --git a/lib/libutils/ext/include/fault_mitigation.h b/lib/libutils/ext/include/fault_mitigation.h
@@ -250,7 +250,7 @@ extern struct ftmn_func_arg *__ftmn_global_func_arg;
 static inline struct ftmn_func_arg **__ftmn_get_tsd_func_arg_pp(void)
 {
 #if defined(CFG_FAULT_MITIGATION) && defined(__KERNEL__)
-    if (thread_get_id_may_fail() >= 0)
+	if (thread_get_id_may_fail() >= 0)
 		return &thread_get_tsd()->ftmn_arg;
 	else
 		return &thread_get_core_local()->ftmn_arg;