mikisama/FreeRTOS-Kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RP2040 Updates: (#1193)

Browse Source 
* Standardize on configNUMBER_OF_CORES != 1 to select SMP functionality
* Fix SDK pico_sync interoperability (configSUPPORT_PICO_SYNC_INTEROP == 1)

Co-authored-by: graham sanderson <graham.sanderson@raspeberryi.com>
This commit is contained in:
Graham Sanderson
2024-11-13 22:17:50 -06:00
committed by GitHub
parent f239da06ec
commit 73f6e3a1b4
2 changed files with 99 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
portable/ThirdParty/GCC/RP2040/include/portmacro.h vendored
View File

@ -151,11 +151,12 @@ extern void vPortYield( void );
void vYieldCore( int xCoreID ); void vYieldCore( int xCoreID );
#define portYIELD_CORE( a ) vYieldCore( a ) #define portYIELD_CORE( a ) vYieldCore( a )
#define portRESTORE_INTERRUPTS( ulState ) __asm volatile ( "msr PRIMASK,%0" ::"r" ( ulState ) : )
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* Critical nesting count management. */ /* Critical nesting count management. */
#define portCRITICAL_NESTING_IN_TCB 0
extern UBaseType_t uxCriticalNestings[ configNUMBER_OF_CORES ]; extern UBaseType_t uxCriticalNestings[ configNUMBER_OF_CORES ];
#define portGET_CRITICAL_NESTING_COUNT() ( uxCriticalNestings[ portGET_CORE_ID() ] ) #define portGET_CRITICAL_NESTING_COUNT() ( uxCriticalNestings[ portGET_CORE_ID() ] )
#define portSET_CRITICAL_NESTING_COUNT( x ) ( uxCriticalNestings[ portGET_CORE_ID() ] = ( x ) ) #define portSET_CRITICAL_NESTING_COUNT( x ) ( uxCriticalNestings[ portGET_CORE_ID() ] = ( x ) )
@ -181,9 +182,7 @@ extern void vClearInterruptMaskFromISR( uint32_t ulMask ) __attribute__( ( nake
#define portCLEAR_INTERRUPT_MASK_FROM_ISR( x ) vClearInterruptMaskFromISR( x ) #define portCLEAR_INTERRUPT_MASK_FROM_ISR( x ) vClearInterruptMaskFromISR( x )
#define portDISABLE_INTERRUPTS() __asm volatile ( " cpsid i " ::: "memory" ) #define portDISABLE_INTERRUPTS() __asm volatile ( " cpsid i " ::: "memory" )
#define portENABLE_INTERRUPTS() __asm volatile ( " cpsie i " ::: "memory" )
extern void vPortEnableInterrupts();
#define portENABLE_INTERRUPTS() vPortEnableInterrupts()
#if ( configNUMBER_OF_CORES == 1 ) #if ( configNUMBER_OF_CORES == 1 )
extern void vPortEnterCritical( void ); extern void vPortEnterCritical( void );
@ -203,6 +202,12 @@ extern void vPortEnableInterrupts();
#define portRTOS_SPINLOCK_COUNT 2 #define portRTOS_SPINLOCK_COUNT 2
#if PICO_SDK_VERSION_MAJOR < 2
__force_inline static bool spin_try_lock_unsafe(spin_lock_t *lock) {
return *lock;
}
#endif
/* Note this is a single method with uxAcquire parameter since we have /* Note this is a single method with uxAcquire parameter since we have
* static vars, the method is always called with a compile time constant for * static vars, the method is always called with a compile time constant for
* uxAcquire, and the compiler should dothe right thing! */ * uxAcquire, and the compiler should dothe right thing! */
@ -210,45 +215,36 @@ static inline void vPortRecursiveLock( uint32_t ulLockNum,
spin_lock_t * pxSpinLock, spin_lock_t * pxSpinLock,
BaseType_t uxAcquire ) BaseType_t uxAcquire )
{ {
static uint8_t ucOwnedByCore[ portMAX_CORE_COUNT ]; static volatile uint8_t ucOwnedByCore[ portMAX_CORE_COUNT ][portRTOS_SPINLOCK_COUNT];
static uint8_t ucRecursionCountByLock[ portRTOS_SPINLOCK_COUNT ]; static volatile uint8_t ucRecursionCountByLock[ portRTOS_SPINLOCK_COUNT ];
configASSERT( ulLockNum < portRTOS_SPINLOCK_COUNT ); configASSERT( ulLockNum < portRTOS_SPINLOCK_COUNT );
uint32_t ulCoreNum = get_core_num(); uint32_t ulCoreNum = get_core_num();
uint32_t ulLockBit = 1u << ulLockNum;
configASSERT( ulLockBit < 256u );
if( uxAcquire ) if( uxAcquire )
{ {
if( __builtin_expect( !*pxSpinLock, 0 ) ) if (!spin_try_lock_unsafe(pxSpinLock)) {
{ if( ucOwnedByCore[ ulCoreNum ][ ulLockNum ] )
if( ucOwnedByCore[ ulCoreNum ] & ulLockBit )
{ {
configASSERT( ucRecursionCountByLock[ ulLockNum ] != 255u ); configASSERT( ucRecursionCountByLock[ ulLockNum ] != 255u );
ucRecursionCountByLock[ ulLockNum ]++; ucRecursionCountByLock[ ulLockNum ]++;
return; return;
} }
spin_lock_unsafe_blocking(pxSpinLock);
while( __builtin_expect( !*pxSpinLock, 0 ) )
{
} }
}
__mem_fence_acquire();
configASSERT( ucRecursionCountByLock[ ulLockNum ] == 0 ); configASSERT( ucRecursionCountByLock[ ulLockNum ] == 0 );
ucRecursionCountByLock[ ulLockNum ] = 1; ucRecursionCountByLock[ ulLockNum ] = 1;
ucOwnedByCore[ ulCoreNum ] |= ulLockBit; ucOwnedByCore[ ulCoreNum ][ ulLockNum ] = 1;
} }
else else
{ {
configASSERT( ( ucOwnedByCore[ ulCoreNum ] & ulLockBit ) != 0 ); configASSERT( ( ucOwnedByCore[ ulCoreNum ] [ulLockNum ] ) != 0 );
configASSERT( ucRecursionCountByLock[ ulLockNum ] != 0 ); configASSERT( ucRecursionCountByLock[ ulLockNum ] != 0 );
if( !--ucRecursionCountByLock[ ulLockNum ] ) if( !--ucRecursionCountByLock[ ulLockNum ] )
{ {
ucOwnedByCore[ ulCoreNum ] &= ~ulLockBit; ucOwnedByCore[ ulCoreNum ] [ ulLockNum ] = 0;
__mem_fence_release(); spin_unlock_unsafe(pxSpinLock);
*pxSpinLock = 1;
} }
} }
} }

155
portable/ThirdParty/GCC/RP2040/port.c vendored
View File

File diff suppressed because it is too large Load Diff