Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35b7ebda authored by Michael Zoran's avatar Michael Zoran Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichael Zoran <mzoran@crowfest.net>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7c88e99

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ remote_event_signal(REMOTE_EVENT_T *event) 




	event->fired = 1;

	event->fired = 1;





	dsb();         /* data barrier operation */

	dsb(sy);         /* data barrier operation */





	if (event->armed)

	if (event->armed)

		writel(0, g_regs + BELL2); /* trigger vc interrupt */

		writel(0, g_regs + BELL2); /* trigger vc interrupt */

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -419,7 +419,7 @@ remote_event_wait(REMOTE_EVENT_T *event) 
{

{

	if (!event->fired) {

	if (!event->fired) {

		event->armed = 1;

		event->armed = 1;

		dsb();

		dsb(sy);

		if (!event->fired) {

		if (!event->fired) {

			if (down_interruptible(event->event) != 0) {

			if (down_interruptible(event->event) != 0) {

				event->armed = 0;

				event->armed = 0;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -184,11 +184,11 @@ enum { 




#define DEBUG_INITIALISE(local) int *debug_ptr = (local)->debug;

#define DEBUG_INITIALISE(local) int *debug_ptr = (local)->debug;

#define DEBUG_TRACE(d) \

#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) \

#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) \

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

#else /* VCHIQ_ENABLE_DEBUG */