len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Microblaze port: Place critical section around XIntc_Enable() to protect read/modify/write operation performed inside the library.

Browse source
This commit is contained in:
Richard Barry 2018-01-30 17:42:12 +00:00
parent 208cc18a90
commit 7ddb8b342d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
FreeRTOS/Demo/MicroBlaze_Kintex7_EthernetLite/RTOSDemo/src/serial.c
View file

@ -210,7 +210,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
static void prvTxHandler( void *pvUnused, unsigned portBASE_TYPE uxUnused ) static void prvTxHandler( void *pvUnused, unsigned portBASE_TYPE uxUnused )
{ {
BaseType_t xHigherPriorityTaskWoken = NULL; BaseType_t xHigherPriorityTaskWoken = ( BaseType_t ) NULL;
( void ) pvUnused; ( void ) pvUnused;
( void ) uxUnused; ( void ) uxUnused;

12
FreeRTOS/Source/portable/GCC/MicroBlazeV9/port.c
View file

@ -47,7 +47,7 @@ the scheduler being commenced interrupts should not be enabled, so the critical
nesting variable is initialised to a non-zero value. */ nesting variable is initialised to a non-zero value. */
#define portINITIAL_NESTING_VALUE ( 0xff ) #define portINITIAL_NESTING_VALUE ( 0xff )
/* The bit within the MSR register that enabled/disables interrupts and /* The bit within the MSR register that enabled/disables interrupts and
exceptions respectively. */ exceptions respectively. */
#define portMSR_IE ( 0x02U ) #define portMSR_IE ( 0x02U )
#define portMSR_EE ( 0x100U ) #define portMSR_EE ( 0x100U )
@ -131,7 +131,7 @@ extern void _start1( void );
disabled. Each task will enable interrupts automatically when it enters disabled. Each task will enable interrupts automatically when it enters
the running state for the first time. */ the running state for the first time. */
*pxTopOfStack = mfmsr() & ~portMSR_IE; *pxTopOfStack = mfmsr() & ~portMSR_IE;
#if( MICROBLAZE_EXCEPTIONS_ENABLED == 1 ) #if( MICROBLAZE_EXCEPTIONS_ENABLED == 1 )
{ {
/* Ensure exceptions are enabled for the task. */ /* Ensure exceptions are enabled for the task. */
@ -305,7 +305,13 @@ int32_t lReturn;
lReturn = prvEnsureInterruptControllerIsInitialised(); lReturn = prvEnsureInterruptControllerIsInitialised();
if( lReturn == pdPASS ) if( lReturn == pdPASS )
{ {
XIntc_Enable( &xInterruptControllerInstance, ucInterruptID ); /* Critical section protects read/modify/writer operation inside
XIntc_Enable(). */
portENTER_CRITICAL();
{
XIntc_Enable( &xInterruptControllerInstance, ucInterruptID );
}
portEXIT_CRITICAL();
} }
configASSERT( lReturn ); configASSERT( lReturn );