Skip to content

Fix MPU wrapper macro mapping for ARMv8M ports #1419

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
rawalexe merged 2 commits into from
May 30, 2026
Merged

Fix MPU wrapper macro mapping for ARMv8M ports #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b85018
Fix MPU wrapper macro mapping for ARMv8M ports
aggarg May 23, 2026
a890428
Merge branch 'main' into armv8m_mpu
aggarg May 27, 2026
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
5 changes: 5 additions & 0 deletions portable/ARMv8M/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/ARMv8M/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM23/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM23/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM23_NTZ/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM23_NTZ/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM33/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM33/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM33_NTZ/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM33_NTZ/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM35P/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM35P/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM35P_NTZ/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM35P_NTZ/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM52/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM52/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM52_NTZ/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM52_NTZ/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM55/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM55/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM55_NTZ/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM55_NTZ/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
5 changes: 5 additions & 0 deletions portable/GCC/ARM_CM85/non_secure/port.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,11 @@ portDONT_DISCARD void vPortSVCHandler_C( uint32_t * pulCallerStackAddress ) PRIV
extern BaseType_t configWAKE_SECONDARY_CORES( void );

#endif /* #if ( configNUMBER_OF_CORES > 1 ) */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
Expand Down
7 changes: 0 additions & 7 deletions portable/GCC/ARM_CM85/non_secure/portmacrocommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#ifndef PORTMACROCOMMON_H
#define PORTMACROCOMMON_H

#include "mpu_wrappers.h"

/* *INDENT-OFF* */
#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -153,11 +151,6 @@ extern void vClearInterruptMask( uint32_t ulMask ) /* __attribute__(( naked )) P
void vApplicationGenerateTaskRandomPacKey( uint32_t * pulTaskPacKey );

#endif /* configENABLE_PAC */

/**
* @brief Configures interrupt priorities.
*/
void vPortConfigureInterruptPriorities( void ) PRIVILEGED_FUNCTION;
/*-----------------------------------------------------------*/

/**
Expand Down
Loading
Loading