[incubator-nuttx] 03/06: arch: lc823450: Fix the pause handler for SMP

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

masayuki pushed a commit to branch releases/10.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 6f03cf488677721b8054792474efa590e89f482b
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Fri Nov 20 13:36:17 2020 +0900

    arch: lc823450: Fix the pause handler for SMP
    
    Summary:
    - Apply the same logic added to cxd56_cpupause.c
    
    Impact:
    - SMP only
    
    Testing:
    - Tested with lc823450-xgevk:rndis
    - Run smp and ostest
    
    Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
 arch/arm/src/lc823450/lc823450_cpupause.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/arm/src/lc823450/lc823450_cpupause.c b/arch/arm/src/lc823450/lc823450_cpupause.c
index 2714fc3..b172df1 100644
--- a/arch/arm/src/lc823450/lc823450_cpupause.c
+++ b/arch/arm/src/lc823450/lc823450_cpupause.c
@@ -190,6 +190,7 @@ int up_cpu_paused(int cpu)
 int lc823450_pause_handler(int irq, void *c, FAR void *arg)
 {
   int cpu = up_cpu_index();
+  int ret = OK;
 
   /* Clear : Pause IRQ */
 
@@ -211,10 +212,21 @@ int lc823450_pause_handler(int irq, void *c, 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;
 }
 
 /****************************************************************************