staging: vc04_services: Convert dsb() to dsb(sy)

The dsb() macro for 32 arm compiles to dsb(sy) in the binary file.
This macro is no longer supported on arm64, so instead use dsb(sy)
which is completely binary compatible.

Signed-off-by: Michael Zoran <mzoran@crowfest.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 285fa9408a9abff8a6da39a547ce5b20b124e773..606dacb1586d91e43c540cdf1e8924ba7fd4c779 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -210,7 +210,7 @@ remote_event_signal(REMOTE_EVENT_T *event)
 
        event->fired = 1;
 
-       dsb();         /* data barrier operation */
+       dsb(sy);         /* data barrier operation */
 
        if (event->armed)
                writel(0, g_regs + BELL2); /* trigger vc interrupt */

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 1254975a57bc62d210adb7f728ec35d1f1b4ded5..05954f983125f135c463668784d0854528d28417 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -419,7 +419,7 @@ remote_event_wait(REMOTE_EVENT_T *event)
 {
        if (!event->fired) {
                event->armed = 1;
-               dsb();
+               dsb(sy);
                if (!event->fired) {
                        if (down_interruptible(event->event) != 0) {
                                event->armed = 0;

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 9be484c776d044a51bb3904c6a1e2cd11a852e35..9013bdbf242cc33da3a52b26bad9a0c906eba06f 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -184,11 +184,11 @@ enum {
 
 #define DEBUG_INITIALISE(local) int *debug_ptr = (local)->debug;
 #define DEBUG_TRACE(d) \
-       do { debug_ptr[DEBUG_ ## d] = __LINE__; dsb(); } while (0)
+       do { debug_ptr[DEBUG_ ## d] = __LINE__; dsb(sy); } while (0)
 #define DEBUG_VALUE(d, v) \
-       do { debug_ptr[DEBUG_ ## d] = (v); dsb(); } while (0)
+       do { debug_ptr[DEBUG_ ## d] = (v); dsb(sy); } while (0)
 #define DEBUG_COUNT(d) \
-       do { debug_ptr[DEBUG_ ## d]++; dsb(); } while (0)
+       do { debug_ptr[DEBUG_ ## d]++; dsb(sy); } while (0)
 
 #else /* VCHIQ_ENABLE_DEBUG */