Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 23:03:27 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Reapply "sched/spinlock: remove nesting spinlock support"

Browse Source 
This reverts commit 9e81f5efac.

Signed-off-by: hujun5 <hujun5@xiaomi.com>
This commit is contained in:
hujun5
2024-10-13 16:09:09 +08:00
committed by Xiang Xiao
parent 223088d847
commit b964eeee18
2 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/spinlock.h
+4 -27
View File
@@ -151,10 +151,6 @@ void sched_note_spinlock_unlock(FAR volatile spinlock_t *spinlock);
extern volatile spinlock_t g_irq_spin; extern volatile spinlock_t g_irq_spin;
/* Handles nested calls to spin_lock_irqsave and spin_unlock_irqrestore */
extern volatile uint8_t g_irq_spin_count[CONFIG_SMP_NCPUS];
/**************************************************************************** /****************************************************************************
* Name: up_testset * Name: up_testset
* *
@@ -530,16 +526,9 @@ irqstate_t spin_lock_irqsave_wo_note(FAR volatile spinlock_t *lock)
ret = up_irq_save(); ret = up_irq_save();
if (NULL == lock) if (NULL == lock)
{
int me = this_cpu();
if (0 == g_irq_spin_count[me])
{ {
spin_lock_wo_note(&g_irq_spin); spin_lock_wo_note(&g_irq_spin);
} }
g_irq_spin_count[me]++;
DEBUGASSERT(0 != g_irq_spin_count[me]);
}
else else
{ {
spin_lock_wo_note(lock); spin_lock_wo_note(lock);
@@ -557,10 +546,7 @@ irqstate_t spin_lock_irqsave_wo_note(FAR volatile spinlock_t *lock)
* Description: * Description:
* If SMP is enabled: * If SMP is enabled:
* If the argument lock is not specified (i.e. NULL), * If the argument lock is not specified (i.e. NULL),
* disable local interrupts and take the global spinlock (g_irq_spin) * disable local interrupts and take the global spinlock (g_irq_spin).
* if the call counter (g_irq_spin_count[cpu]) equals to 0. Then the
* counter on the CPU is incremented to allow nested calls and return
* the interrupt state.
* *
* If the argument lock is specified, * If the argument lock is specified,
* disable local interrupts and take the lock spinlock and return * disable local interrupts and take the lock spinlock and return
@@ -697,16 +683,9 @@ void spin_unlock_irqrestore_wo_note(FAR volatile spinlock_t *lock,
irqstate_t flags) irqstate_t flags)
{ {
if (NULL == lock) if (NULL == lock)
{
int me = this_cpu();
DEBUGASSERT(0 < g_irq_spin_count[me]);
g_irq_spin_count[me]--;
if (0 == g_irq_spin_count[me])
{ {
spin_unlock_wo_note(&g_irq_spin); spin_unlock_wo_note(&g_irq_spin);
} }
}
else else
{ {
spin_unlock_wo_note(lock); spin_unlock_wo_note(lock);
@@ -723,11 +702,9 @@ void spin_unlock_irqrestore_wo_note(FAR volatile spinlock_t *lock,
* *
* Description: * Description:
* If SMP is enabled: * If SMP is enabled:
* If the argument lock is not specified (i.e. NULL), * If the argument lock is not specified (i.e. NULL), release the
* decrement the call counter (g_irq_spin_count[cpu]) and if it * spinlock (g_irq_spin) and restore the interrupt state as it was
* decrements to zero then release the spinlock (g_irq_spin) and * prior to the previous call to spin_lock_irqsave(NULL).
* restore the interrupt state as it was prior to the previous call to
* spin_lock_irqsave(NULL).
* *
* If the argument lock is specified, release the lock and * If the argument lock is specified, release the lock and
* restore the interrupt state as it was prior to the previous call to * restore the interrupt state as it was prior to the previous call to
sched/irq/irq_spinlock.c
-4
View File
@@ -43,10 +43,6 @@
volatile spinlock_t g_irq_spin = SP_UNLOCKED; volatile spinlock_t g_irq_spin = SP_UNLOCKED;
/* Handles nested calls to spin_lock_irqsave and spin_unlock_irqrestore */
volatile uint8_t g_irq_spin_count[CONFIG_SMP_NCPUS];
#ifdef CONFIG_RW_SPINLOCK #ifdef CONFIG_RW_SPINLOCK
/* Used for access control */ /* Used for access control */