openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Zoran 2016-10-19 15:58:09 -07:00 committed by Greg Kroah-Hartman
parent c7c88e998a
commit 35b7ebda57
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
View File

@ -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 */

2
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
View File

@ -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;

6
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
View File

@ -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 */