From: Ian Campbell Date: Mon, 17 Mar 2014 14:53:30 +0000 (+0000) Subject: xen: arm: use more specific barriers for read and write barriers. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5392 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=652302e12e7f189274eae0193527a039808a524c;p=xen.git xen: arm: use more specific barriers for read and write barriers. Note that 32-bit does not provide a load variant of the inner shareable barrier, so that remains a full any-any barrier. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Tim Deegan --- diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 32ed277be7..7aaaf50162 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -17,12 +17,21 @@ #define dmb(scope) asm volatile("dmb " #scope : : : "memory") #define mb() dsb(sy) -#define rmb() dsb(sy) -#define wmb() dsb(sy) +#ifdef CONFIG_ARM_64 +#define rmb() dsb(ld) +#else +#define rmb() dsb(sy) /* 32-bit has no ld variant. */ +#endif +#define wmb() dsb(st) #define smp_mb() dmb(ish) -#define smp_rmb() dmb(ish) -#define smp_wmb() dmb(ish) +#ifdef CONFIG_ARM_64 +#define smp_rmb() dmb(ishld) +#else +#define smp_rmb() dmb(ish) /* 32-bit has no ishld variant. */ +#endif + +#define smp_wmb() dmb(ishst) #define xchg(ptr,x) \ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))