OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arm/armv8-r: fix unable to switch context in ISR context 

Regression by:
| commit 35c8c80a00
| Author: ligd <liguiding1@xiaomi.com>
| Date:   Fri Jul 26 23:14:13 2024 +0800
|
| arch: change nxsched_suspend/resume_scheduler() called position

Signed-off-by: chao an <anchao@lixiang.com>
This commit is contained in:
chao an 2024-10-24 19:43:16 +08:00 committed by Xiang Xiao
parent 517c66daf8
commit ea4c4ef36a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/src/armv8-r/arm_doirq.c
View File

@ -58,7 +58,9 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
* and we will use this_task(). Therefore, it cannot be overridden. * and we will use this_task(). Therefore, it cannot be overridden.
*/ */
#ifdef CONFIG_SMP
if (irq != GIC_SMP_CPUSTART) if (irq != GIC_SMP_CPUSTART)
#endif
{ {
tcb->xcp.regs = regs; tcb->xcp.regs = regs;
} }
@ -72,11 +74,10 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
/* Deliver the IRQ */ /* Deliver the IRQ */
irq_dispatch(irq, regs); irq_dispatch(irq, regs);
tcb = this_task();
if (regs != tcb->xcp.regs) if (regs != tcb->xcp.regs)
{ {
tcb = this_task();
/* Update scheduler parameters */ /* Update scheduler parameters */
nxsched_suspend_scheduler(g_running_tasks[this_cpu()]); nxsched_suspend_scheduler(g_running_tasks[this_cpu()]);
@ -87,7 +88,7 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
* crashes. * crashes.
*/ */
g_running_tasks[this_cpu()] = this_task(); g_running_tasks[this_cpu()] = tcb;
regs = tcb->xcp.regs; regs = tcb->xcp.regs;
} }