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

arch: armv7-a: Fix the pause handler for SMP

Browse Source 
Summary:
- Apply the same logic added to cxd56_cpupause.c

Impact:
- SMP only

Testing:
- Tested with sabre-6quad:smp (QEMU and dev board)
- Run smp and ostest

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2020-11-20 13:33:43 +09:00 committed by Xiang Xiao
parent 55c00ad3d9
commit 1978dcc9a9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/src/armv7-a/arm_cpupause.c
View File

@ -205,6 +205,7 @@ int up_cpu_paused(int cpu)
int arm_pause_handler(int irq, FAR void *context, FAR void *arg)
{
int cpu = this_cpu();
int ret = OK;
/* Check for false alarms. Such false could occur as a consequence of
* some deadlock breaking logic that might have already serviced the SG2
@ -214,10 +215,21 @@ int arm_pause_handler(int irq, FAR void *context, FAR void *arg)
if (spin_islocked(&g_cpu_paused[cpu]))
{
return up_cpu_paused(cpu);
/* NOTE: up_cpu_paused() needs to be executed in a critical section
* to ensure that this CPU holds g_cpu_irqlock. However, adding
* a critical section in up_cpu_paused() is not a good idea,
* because it is also called in enter_critical_section() to break
* a deadlock
*/
irqstate_t flags = enter_critical_section();
ret = up_cpu_paused(cpu);
leave_critical_section(flags);
}
return OK;
return ret;
}
/****************************************************************************