sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch: risc-v: Introduce g_percpu_spin in riscv_percpu.c

Browse Source 
Summary:
- This commit introduces g_percpu_spin to avoid deadlock
  in riscv_percpu.c instead of using the global spinlock.

Impact:
- None

Testing:
- Tested with rv-virt:knsh64 and rv-virt:ksmp64 (will be added later)

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2022-10-05 07:16:01 +09:00 committed by Petro Karashchenko
parent d8e329231f
commit c4901d6f4b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/risc-v/src/common/riscv_percpu.c
View File

@ -55,6 +55,7 @@ static_assert(RISCV_PERCPU_IRQSTACK == offsetof(riscv_percpu_t, irq_stack),
static riscv_percpu_t g_percpu[HART_CNT];
static sq_queue_t g_freelist;
static uintptr_t g_initialized;
static spinlock_t g_percpu_spin;
/****************************************************************************
* Private Functions
@ -76,7 +77,7 @@ static void riscv_percpu_init(void)
/* Need to lock access during configuration */
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_percpu_spin);
/* Initialize if not done so already */
@ -102,7 +103,7 @@ static void riscv_percpu_init(void)
}
out_with_lock:
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_percpu_spin, flags);
}
/****************************************************************************
@ -131,9 +132,9 @@ void riscv_percpu_add_hart(uintptr_t hartid)
/* Get free entry for this hart, this must not fail */
flags = spin_lock_irqsave(NULL);
flags = spin_lock_irqsave(&g_percpu_spin);
percpu = (riscv_percpu_t *)sq_remfirst(&g_freelist);
spin_unlock_irqrestore(NULL, flags);
spin_unlock_irqrestore(&g_percpu_spin, flags);
DEBUGASSERT(percpu);
/* Assign hartid, stack has already been assigned */