auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/cortex_m: introduce security manipulation routines

Browse Source 
Running target algorithms on ARMv8M may require core in secure
mode with SAU and MPU off (as set after reset).

cortex_m_set_secure() forces this mode with optional save of
the previous state.

cortex_m_security_restore() restores previously saved state.

Change-Id: Ia71826db47ee7b0557eaffd55244ce13eacbcb4b
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: https://review.openocd.org/c/openocd/+/8959
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Tomas Vanek
2025-06-17 16:23:12 +02:00
committed by Antonio Borneo
parent ce3bf664c8
commit f547e55076
2 changed files with 133 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/target/cortex_m.h
View File

@@ -167,6 +167,8 @@ struct cortex_m_part_info {
#define NVIC_DFSR 0xE000ED30
#define NVIC_MMFAR 0xE000ED34
#define NVIC_BFAR 0xE000ED38
#define MPU_CTRL 0xE000ED94
#define SAU_CTRL 0xE000EDD0
#define NVIC_SFSR 0xE000EDE4
#define NVIC_SFAR 0xE000EDE8
@@ -184,6 +186,9 @@ struct cortex_m_part_info {
#define DFSR_VCATCH 8
#define DFSR_EXTERNAL 16
#define MPU_CTRL_ENABLE BIT(0)
#define SAU_CTRL_ENABLE BIT(0)
#define FPCR_CODE 0
#define FPCR_LITERAL 1
#define FPCR_REPLACE_REMAP (0ul << 30)
@@ -264,6 +269,15 @@ struct cortex_m_common {
bool incorrect_halt_erratum;
};
struct cortex_m_saved_security {
bool dscsr_dirty;
uint32_t dscsr;
bool sau_ctrl_dirty;
uint32_t sau_ctrl;
bool mpu_ctrl_dirty;
uint32_t mpu_ctrl;
};
static inline bool is_cortex_m_or_hla(const struct cortex_m_common *cortex_m)
{
return cortex_m->common_magic == CORTEX_M_COMMON_MAGIC;
@@ -341,4 +355,17 @@ void cortex_m_deinit_target(struct target *target);
int cortex_m_profiling(struct target *target, uint32_t *samples,
uint32_t max_num_samples, uint32_t *num_samples, uint32_t seconds);
/**
* Forces Cortex-M core to the basic secure context with SAU and MPU off
* @param ssec pointer to save previous security state or NULL
* @returns error code or ERROR_OK if secure mode was set or is not applicable
* (not ARMv8M with security extension)
*/
int cortex_m_set_secure(struct target *target, struct cortex_m_saved_security *ssec);
/**
* Restores saved security context to MPU_CTRL, SAU_CTRL and DSCSR
*/
int cortex_m_security_restore(struct target *target, struct cortex_m_saved_security *ssec);
#endif /* OPENOCD_TARGET_CORTEX_M_H */