From patchwork Sat Sep 8 09:39:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 967592 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oa+DWQqV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 426q6m62pYz9s1x for ; Sat, 8 Sep 2018 19:40:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8AFDEC21E34; Sat, 8 Sep 2018 09:40:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8B370C21E16; Sat, 8 Sep 2018 09:39:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D33F2C21E29; Sat, 8 Sep 2018 09:39:33 +0000 (UTC) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by lists.denx.de (Postfix) with ESMTPS id 41D29C21DFB for ; Sat, 8 Sep 2018 09:39:28 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id p5-v6so168583plk.3 for ; Sat, 08 Sep 2018 02:39:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ohSvOmGG1fCxDZegobR2tipfoJg4IlIXyv+stuSeeso=; b=oa+DWQqVRKgxnHxNS2Mg8uvgAGUaTAI1l0RxWJ/6vbqH099mZ08/YCnsiFAgkHoygE 3NXRB6wFAk5TQ3n7gLkv1Wpf6O0TffWgclNZgJlxJHyD/qNxB480KnD0TIXrMP3057bB Iklqy+TKysqmmzDKPs5WQoT38dr/OtW366nDQvfIG0ZFEYGuZe5hjqlNQa2af0K/j0CT QMkAqCZLYon/pLDve5GoBNGQf/L3/2IL7f7REzXts2G6tN5uEF3/S0mMGQyWe3mc++A0 ztErFeVxhZ1oPmC3TZrCE/jSbV4yvLM0WBEvvF56YNz/KB6OTus1osEpecGOlFVzZpl2 wDDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ohSvOmGG1fCxDZegobR2tipfoJg4IlIXyv+stuSeeso=; b=ToeTfLXJvh2w18K22DIgBXU8SokSlsP12SjoZaMkBQxWhsHZd+HqaJl4Lwi8RBZ4og XO9Hg3lv3M+CSYQY/G7Q2ktN7AfMQt8fKcU6NkFSGAPTZmho8/9w0flnnOL1KrXEeU9Z I+dfeRQKIGJkbUfJGNcai7dYTr7CCANDGNltjc8qWX7osBKHQXdfnl0e9k61E5pKPgTj 0qieKvuECzY/cCXk1bRbf/BAsNqO8ofj7D4Y7J3mmHsumabbyAGdszl9YqOk2R/KlGJ6 dq3Nnt4o0Q358g9xH1sVhDWGVXeaPlkcruD4cZRwZJwREGBUhPnznMYWPzkINygUOsxW FxOg== X-Gm-Message-State: APzg51CK5PnPYC1bFbyrc7ge7g1RSI8DEeJOZWlWvRMabRwWpV9Hlyjh VUe1qUQEofOv1/0mZ3Kg1t/5jsIRPH0= X-Google-Smtp-Source: ANB0VdacjM4i/FVV8NO/t0mzlzLyrrWlPWrKlFxoUXDpn76a8PG1l5pqjDpQpwNZzH9m9UK6QkwXbg== X-Received: by 2002:a17:902:e20b:: with SMTP id ce11-v6mr12319491plb.136.1536399566556; Sat, 08 Sep 2018 02:39:26 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id b3-v6sm21072792pgm.74.2018.09.08.02.39.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Sep 2018 02:39:26 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Sat, 8 Sep 2018 21:39:05 +1200 Message-Id: <20180908093907.11757-3-judge.packham@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180908093907.11757-1-judge.packham@gmail.com> References: <20180908093907.11757-1-judge.packham@gmail.com> Cc: Tom Rini , Stefan , Chris Packham Subject: [U-Boot] [PATCH 2/4] ARM: use asm-generic/atomic.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Make use of asm-generic/atomic.h retaining the smp_mb_... definitions. Signed-off-by: Chris Packham Reviewed-by: Tom Rini --- arch/arm/include/asm/atomic.h | 147 +--------------------------------- 1 file changed, 1 insertion(+), 146 deletions(-) diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index 171f4d979281..5822b0a52c0e 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h @@ -20,152 +20,8 @@ #error SMP not supported #endif -typedef struct { volatile int counter; } atomic_t; -#if BITS_PER_LONG == 32 -typedef struct { volatile long long counter; } atomic64_t; -#else /* BIT_PER_LONG == 32 */ -typedef struct { volatile long counter; } atomic64_t; -#endif - -#define ATOMIC_INIT(i) { (i) } - -#ifdef __KERNEL__ #include - -#define atomic_read(v) ((v)->counter) -#define atomic_set(v, i) (((v)->counter) = (i)) -#define atomic64_read(v) atomic_read(v) -#define atomic64_set(v, i) atomic_set(v, i) - -static inline void atomic_add(int i, volatile atomic_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter += i; - local_irq_restore(flags); -} - -static inline void atomic_sub(int i, volatile atomic_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter -= i; - local_irq_restore(flags); -} - -static inline void atomic_inc(volatile atomic_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter += 1; - local_irq_restore(flags); -} - -static inline void atomic_dec(volatile atomic_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter -= 1; - local_irq_restore(flags); -} - -static inline int atomic_dec_and_test(volatile atomic_t *v) -{ - unsigned long flags = 0; - int val; - - local_irq_save(flags); - val = v->counter; - v->counter = val -= 1; - local_irq_restore(flags); - - return val == 0; -} - -static inline int atomic_add_negative(int i, volatile atomic_t *v) -{ - unsigned long flags = 0; - int val; - - local_irq_save(flags); - val = v->counter; - v->counter = val += i; - local_irq_restore(flags); - - return val < 0; -} - -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) -{ - unsigned long flags = 0; - - local_irq_save(flags); - *addr &= ~mask; - local_irq_restore(flags); -} - -#if BITS_PER_LONG == 32 - -static inline void atomic64_add(long long i, volatile atomic64_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter += i; - local_irq_restore(flags); -} - -static inline void atomic64_sub(long long i, volatile atomic64_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter -= i; - local_irq_restore(flags); -} - -#else /* BIT_PER_LONG == 32 */ - -static inline void atomic64_add(long i, volatile atomic64_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter += i; - local_irq_restore(flags); -} - -static inline void atomic64_sub(long i, volatile atomic64_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter -= i; - local_irq_restore(flags); -} -#endif - -static inline void atomic64_inc(volatile atomic64_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter += 1; - local_irq_restore(flags); -} - -static inline void atomic64_dec(volatile atomic64_t *v) -{ - unsigned long flags = 0; - - local_irq_save(flags); - v->counter -= 1; - local_irq_restore(flags); -} +#include /* Atomic operations are already serializing on ARM */ #define smp_mb__before_atomic_dec() barrier() @@ -174,4 +30,3 @@ static inline void atomic64_dec(volatile atomic64_t *v) #define smp_mb__after_atomic_inc() barrier() #endif -#endif