From: Kevin Wang <kevin.wang@arm.com>
Date: Fri, 8 Dec 2017 05:43:27 +0000 (+0800)
Subject: implement clib_smp_pause() for arm and aarch64 platform
X-Git-Tag: v18.04-rc0~38
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=6390df300e6795e557f824e55b138837dabcf74b;p=vpp.git

implement clib_smp_pause() for arm and aarch64 platform

Change-Id: Ic9c1c70e06b953538ed43fc91ed26b6be82ce812
Signed-off-by: Kevin Wang <kevin.wang@arm.com>
---

diff --git a/src/vppinfra/smp.h b/src/vppinfra/smp.h
index 7e703b3d6aa..e4ab66ad5c3 100644
--- a/src/vppinfra/smp.h
+++ b/src/vppinfra/smp.h
@@ -47,6 +47,8 @@
 
 #if defined (i386) || defined (__x86_64__)
 #define clib_smp_pause() do { asm volatile ("pause"); } while (0)
+#elif defined (__aarch64__) || defined (__arm__)
+#define clib_smp_pause() do { asm volatile ("isb" ::: "memory"); } while (0)
 #endif
 
 #ifndef clib_smp_pause
diff --git a/src/vppinfra/timer.c b/src/vppinfra/timer.c
index 0221cb749a1..85149dc6b00 100644
--- a/src/vppinfra/timer.c
+++ b/src/vppinfra/timer.c
@@ -41,6 +41,7 @@
 #include <sys/param.h>
 
 #include <vppinfra/vec.h>
+#include <vppinfra/smp.h>
 #include <vppinfra/time.h>
 #include <vppinfra/timer.h>
 #include <vppinfra/error.h>
@@ -283,7 +284,7 @@ bar_t b = { limit:10 };
     timer_call (bar, (any) & b, random_f64 ());
 
   while (vec_len (timers) > 0)
-    sched_yield ();
+    os_sched_yield ();
 
   if (vec_len (foos) > 0)
     {