Skip to content

arch: arm: cortex_m: Update APIs to save and restore FPU context #93057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 19, 2025
Merged

arch: arm: cortex_m: Update APIs to save and restore FPU context #93057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df48ea2
arch: arm: coterx_m: Added some #include in fpu.h
msmttchr Jul 12, 2025
cc12f0f
arch: arm: cortex_m: Modifed FPU save and restore helpers
msmttchr Jul 14, 2025
4dd3bd6
modules: trusted-firmware-m: Update in interface implementation
msmttchr Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arch/arm/core/cortex_m/fpu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

void z_arm_save_fp_context(struct fpu_ctx_full *buffer)
{
#if defined(CONFIG_FPU_SHARING)
#if defined(CONFIG_FPU)
__ASSERT_NO_MSG(buffer != NULL);

uint32_t CONTROL = __get_CONTROL();
Expand Down Expand Up @@ -44,7 +44,7 @@ void z_arm_save_fp_context(struct fpu_ctx_full *buffer)

void z_arm_restore_fp_context(const struct fpu_ctx_full *buffer)
{
#if defined(CONFIG_FPU_SHARING)
#if defined(CONFIG_FPU)
if (buffer->ctx_saved) {
/* Set FPCA first so it is set even if an interrupt happens
* during restoration.
Expand Down
3 changes: 3 additions & 0 deletions include/zephyr/arch/arm/cortex_m/fpu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_FPU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_FPU_H_

#include <stdint.h>
#include <stdbool.h>

struct fpu_ctx_full {
uint32_t caller_saved[16];
uint32_t callee_saved[16];
Expand Down
4 changes: 4 additions & 0 deletions modules/trusted-firmware-m/interface/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,17 @@ int32_t tfm_ns_interface_dispatch(veneer_fn fn,
#endif
}

#if defined(CONFIG_FPU_SHARING)
struct fpu_ctx_full context_buffer;

z_arm_save_fp_context(&context_buffer);
#endif

result = fn(arg0, arg1, arg2, arg3);

#if defined(CONFIG_FPU_SHARING)
z_arm_restore_fp_context(&context_buffer);
#endif

if (!isr_mode) {
#if !defined(CONFIG_ARM_NONSECURE_PREEMPTIBLE_SECURE_CALLS)
Expand Down