Fix RP2040 task lock acquire ordering

aineoae86-sys · aineoae86-sys · commit 84e705e221fb · 2026-06-29T23:43:01.000+08:00
diff --git a/portable/ThirdParty/GCC/RP2040/include/portmacro.h b/portable/ThirdParty/GCC/RP2040/include/portmacro.h
@@ -237,6 +237,11 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,
             }
             spin_lock_unsafe_blocking(pxSpinLock);
         }
+        else
+        {
+            /* spin_try_lock_unsafe() does not provide acquire ordering on the fast path. */
+            __mem_fence_acquire();
+        }
         configASSERT( ucRecursionCountByLock[ ulLockNum ] == 0 );
         ucRecursionCountByLock[ ulLockNum ] = 1;
         ucOwnedByCore[ xCoreID ][ ulLockNum ] = 1;

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,11 @@ static inline void vPortRecursiveLock( BaseType_t xCoreID,`
`237`	`237`	`}`
`238`	`238`	`spin_lock_unsafe_blocking(pxSpinLock);`
`239`	`239`	`}`
	`240`	`+ else`
	`241`	`+ {`
	`242`	`+ /* spin_try_lock_unsafe() does not provide acquire ordering on the fast path. */`
	`243`	`+ __mem_fence_acquire();`
	`244`	`+ }`
`240`	`245`	`configASSERT( ucRecursionCountByLock[ ulLockNum ] == 0 );`
`241`	`246`	`ucRecursionCountByLock[ ulLockNum ] = 1;`
`242`	`247`	`ucOwnedByCore[ xCoreID ][ ulLockNum ] = 1;`