linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
	Arnd Bergmann <arnd@arndb.de>,
	linux-arch@vger.kernel.org,
	Andrew Cooper <andrew.cooper3@citrix.com>,
	virtualization@lists.linux-foundation.org,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>, Ingo Molnar <mingo@kernel.org>,
	Andre Przywara <andre.przywara@arm.com>,
	Andrey Konovalov <andreyknvl@google.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/34] arm64: reuse asm-generic/barrier.h
Date: Wed, 30 Dec 2015 15:24:56 +0200	[thread overview]
Message-ID: <1451473761-30019-11-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1451473761-30019-1-git-send-email-mst@redhat.com>

On arm64 nop, read_barrier_depends, smp_read_barrier_depends
smp_store_mb(), smp_mb__before_atomic and smp_mb__after_atomic match the
asm-generic variants exactly. Drop the local definitions and pull in
asm-generic/barrier.h instead.

This is in preparation to refactoring this code area.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 arch/arm64/include/asm/barrier.h | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
index 9622eb4..91a43f4 100644
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
@@ -91,14 +91,7 @@ do {									\
 	__u.__val;							\
 })
 
-#define read_barrier_depends()		do { } while(0)
-#define smp_read_barrier_depends()	do { } while(0)
-
-#define smp_store_mb(var, value)	do { WRITE_ONCE(var, value); smp_mb(); } while (0)
-#define nop()		asm volatile("nop");
-
-#define smp_mb__before_atomic()	smp_mb()
-#define smp_mb__after_atomic()	smp_mb()
+#include <asm-generic/barrier.h>
 
 #endif	/* __ASSEMBLY__ */
 
-- 
MST

  parent reply	other threads:[~2015-12-30 13:24 UTC|newest]

Thread overview: 90+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-30 13:24 [PATCH 00/34] arch: barrier cleanup + __smp_XXX barriers for virt Michael S. Tsirkin
2015-12-30 12:58 ` [PATCH 00/34] arch: barrier cleanup + __smp_xxx " Michael S. Tsirkin
2015-12-30 13:24 ` [PATCH 01/34] Documentation/memory-barriers.txt: document __smb_mb() Michael S. Tsirkin
2016-01-04 11:08   ` Stefano Stabellini
2016-01-04 11:27     ` Michael S. Tsirkin
2015-12-30 13:24 ` [PATCH 02/34] asm-generic: guard smp_store_release/load_acquire Michael S. Tsirkin
2015-12-30 13:24 ` [PATCH 03/34] ia64: rename nop->iosapic_nop Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 16:39   ` Luck, Tony
2015-12-30 16:39     ` Luck, Tony
2015-12-30 13:24 ` [PATCH 04/34] ia64: reuse asm-generic/barrier.h Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 16:41   ` Luck, Tony
2015-12-30 16:41     ` Luck, Tony
2015-12-30 13:24 ` [PATCH 05/34] powerpc: " Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24 ` [PATCH 06/34] s390: " Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24 ` [PATCH 07/34] sparc: " Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 17:56   ` David Miller
2015-12-30 19:55     ` Michael S. Tsirkin
2015-12-30 19:55       ` Michael S. Tsirkin
2015-12-30 20:47       ` David Miller
2015-12-30 20:47         ` David Miller
2015-12-30 13:24 ` [PATCH 08/34] asm-generic: smp_store_mb should use smp_mb Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:44   ` Arnd Bergmann
2015-12-30 20:30     ` Michael S. Tsirkin
2015-12-30 22:43       ` Arnd Bergmann
2015-12-30 13:24 ` [PATCH 09/34] arm: reuse asm-generic/barrier.h Michael S. Tsirkin
2015-12-30 13:24   ` Michael S. Tsirkin
2015-12-30 13:24 ` Michael S. Tsirkin [this message]
2015-12-30 13:24   ` [PATCH 10/34] arm64: " Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 11/34] metag: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 12/34] mips: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 13/34] x86/um: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 14/34] x86: " Michael S. Tsirkin
2015-12-30 13:25   ` Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 15/34] asm-generic: add __smp_XXX wrappers Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 15/34] asm-generic: add __smp_xxx wrappers Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 16/34] powerpc: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 16/34] powerpc: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 17/34] arm64: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 17/34] arm64: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 18/34] arm: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 18/34] arm: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 19/34] blackfin: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 19/34] blackfin: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 20/34] ia64: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 20/34] ia64: define __smp_xxx Michael S. Tsirkin
2015-12-30 16:43   ` [PATCH 20/34] ia64: define __smp_XXX Luck, Tony
2015-12-30 13:25 ` [PATCH 21/34] metag: " Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 21/34] metag: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 22/34] mips: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 22/34] mips: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 23/34] s390: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 23/34] s390: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:25 ` [PATCH 24/34] sh: define __smp_XXX, fix smp_store_mb for !SMP Michael S. Tsirkin
2015-12-30 13:25   ` [PATCH 24/34] sh: define __smp_xxx, " Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 25/34] sparc: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 25/34] sparc: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 26/34] tile: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 26/34] tile: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 27/34] xtensa: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 27/34] xtensa: define __smp_xxx Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 28/34] x86: define __smp_XXX Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 28/34] x86: define __smp_xxX Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 29/34] Revert "virtio_ring: Update weak barriers to use dma_wmb/rmb" Michael S. Tsirkin
2015-12-30 13:26   ` Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 30/34] virtio_ring: update weak barriers to use __smp_XXX Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 31/34] xenbus: use __smp_XXX barriers Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 31/34] xenbus: use __smp_xxx barriers Michael S. Tsirkin
2016-01-04 11:58   ` [PATCH 31/34] xenbus: use __smp_XXX barriers Stefano Stabellini
2015-12-30 13:26 ` [PATCH 32/34] xen/io: " Michael S. Tsirkin
2015-12-30 13:26   ` [PATCH 32/34] xen/io: use __smp_xxx barriers Michael S. Tsirkin
2016-01-04 11:59   ` [PATCH 32/34] xen/io: use __smp_XXX barriers Stefano Stabellini
2015-12-30 13:26 ` [PATCH 33/34] virtio: use __smp_load_acquire/__smp_store_release Michael S. Tsirkin
2015-12-30 13:26 ` [PATCH 34/34] virtio_ring: use __smp_store_mb Michael S. Tsirkin
2015-12-30 13:49 ` [PATCH 00/34] arch: barrier cleanup + __smp_XXX barriers for virt Arnd Bergmann
2015-12-30 21:45   ` [PATCH 00/34] arch: barrier cleanup + __smp_xxx " Michael S. Tsirkin
2015-12-30 22:45     ` Arnd Bergmann
2015-12-30 20:46 ` David Miller
2015-12-30 20:46   ` David Miller
2015-12-30 21:36   ` Michael S. Tsirkin
2015-12-30 21:59     ` David Miller
2015-12-30 21:59       ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1451473761-30019-11-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=andre.przywara@arm.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=andreyknvl@google.com \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).