From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH 10/10] xen: arm: use more specific barriers for read and write barriers. Date: Fri, 28 Jun 2013 17:10:56 +0100 Message-ID: <1372435856-14040-10-git-send-email-ian.campbell@citrix.com> References: <1372435809.8976.169.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1372435809.8976.169.camel@zakaz.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: julien.grall@citrix.com, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org 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 --- xen/include/asm-arm/system.h | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index 7c3e42d..efaf645 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -17,12 +17,17 @@ #define dmb(scope) asm volatile("dmb " scope : : : "memory") #define mb() dsb("sy") -#define rmb() dsb("sy") -#define wmb() dsb("sy") +#define rmb() dsb("ld") +#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)))) -- 1.7.2.5