From patchwork Thu Jun 21 12:13:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 139532 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1991710lji; Thu, 21 Jun 2018 05:14:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKDLFc+7aOwEVYjX1oxbmToUjOgC2ayrZJXYAGK1eia9qZFPWQHyblXOX+qldrYxQO+kOb3 X-Received: by 2002:aa7:860e:: with SMTP id p14-v6mr27158751pfn.155.1529583243216; Thu, 21 Jun 2018 05:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529583243; cv=none; d=google.com; s=arc-20160816; b=UvfGkE+i3+xoCIDtqYNdJHJWslsf3DEsSaxk2S2a8GXJW0Lje+jF6K+adGRZxQ+DkA XjH/xKej/PjSdfiiFFRKgO7w7n8rU84kO4vxsbXhTT5lRvHq3xtEQ1d4UHxU3a7UhymP mVe3Cg2V9zqBkQJh9Nhnm+2ynJsxsD/U/59tpGA+a0uBCadi2s+USpZ1+Mm2QBBA+b3U IF9vjxrqBG3k4sj3XmPdrQDS3qciYGagasDu7uG9nxlHCjZHcZ/Ecq4fPdgCUGNRVVI4 7kVgoG2mt42pw2Nbn24ig3YszrtyQ0zU7k5Q18dOmPa5t4SJlyJ0lI5aprylMHAovYUp SEug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=kHrGGO8/Ip4/VQlFeB84/OLXhZ3nsValNJhLkFxlaTA=; b=yF/5pHfI3y3SLvru3QM4KDXK6JWgjpLUqECfi/A1DDnEzl/gJ0zi7cIpwlSefB7lAa SVBA1u9Rme4Ni3zWMJTnlVdMfUmXGL1NMG73lHMAs515ITC+3OkEe6ioZRl+t1T8TfaG byq+RWfSXkRzkNw9bX8fQOT7yp4CNg8Jv/Qz+CVLRIA43P0pJX0+cTJ4YIL3dlKD8Ki4 qFFczUft52KCJRYsPCoxZdRfRpPee2V5evDUZPHgVDo/w7JdVPMJWfbt7reSZ9jKsRZv DGSwUwDassNc67H5G0BArPGLdJIUgCFTDqg/zkYJHNSyiv1OhKmiSpM4WesDdQNgzXZC Rohg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f90-v6si4668924pfe.291.2018.06.21.05.14.02; Thu, 21 Jun 2018 05:14:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933716AbeFUMOA (ORCPT + 30 others); Thu, 21 Jun 2018 08:14:00 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:49394 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933258AbeFUMN6 (ORCPT ); Thu, 21 Jun 2018 08:13:58 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 300991435; Thu, 21 Jun 2018 05:13:58 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id ABF783F578; Thu, 21 Jun 2018 05:13:56 -0700 (PDT) From: Mark Rutland To: mingo@kernel.org, will.deacon@arm.com, peterz@infradead.org, linux-kernel@vger.kernel.org Cc: Mark Rutland , Boqun Feng , Benjamin Herrenschmidt , Paul Mackerras Subject: [PATCHv4 12/18] atomics/powerpc: define atomic64_fetch_add_unless() Date: Thu, 21 Jun 2018 13:13:15 +0100 Message-Id: <20180621121321.4761-13-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180621121321.4761-1-mark.rutland@arm.com> References: <20180621121321.4761-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As a step towards unifying the atomic/atomic64/atomic_long APIs, this patch converts the arch/powerpc implementation of atomic64_add_unless() into an implementation of atomic64_fetch_add_unless(). A wrapper in will build atomic_add_unless() atop of this, provided it is given a preprocessor definition. No functional change is intended as a result of this patch. Signed-off-by: Mark Rutland Acked-by: Peter Zijlstra (Intel) Acked-by: Michael Ellerman Reviewed-by: Will Deacon Cc: Boqun Feng Cc: Benjamin Herrenschmidt Cc: Paul Mackerras --- arch/powerpc/include/asm/atomic.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h index b5646c079c16..233dbf31911c 100644 --- a/arch/powerpc/include/asm/atomic.h +++ b/arch/powerpc/include/asm/atomic.h @@ -525,7 +525,7 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v) #define atomic64_xchg_relaxed(v, new) xchg_relaxed(&((v)->counter), (new)) /** - * atomic64_add_unless - add unless the number is a given value + * atomic64_fetch_add_unless - add unless the number is a given value * @v: pointer of type atomic64_t * @a: the amount to add to v... * @u: ...unless v is equal to u. @@ -533,13 +533,13 @@ static __inline__ long atomic64_dec_if_positive(atomic64_t *v) * Atomically adds @a to @v, so long as it was not @u. * Returns the old value of @v. */ -static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) +static __inline__ long atomic64_fetch_add_unless(atomic64_t *v, long a, long u) { long t; __asm__ __volatile__ ( PPC_ATOMIC_ENTRY_BARRIER -"1: ldarx %0,0,%1 # atomic_fetch_add_unless\n\ +"1: ldarx %0,0,%1 # atomic64_fetch_add_unless\n\ cmpd 0,%0,%3 \n\ beq 2f \n\ add %0,%2,%0 \n" @@ -552,8 +552,9 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) : "r" (&v->counter), "r" (a), "r" (u) : "cc", "memory"); - return t != u; + return t; } +#define atomic64_fetch_add_unless atomic64_fetch_add_unless /** * atomic_inc64_not_zero - increment unless the number is zero