From patchwork Tue May 29 15:43:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 137185 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp4212724lji; Tue, 29 May 2018 08:44:39 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr5LZfMZqKAlGCmAj3MsMYf9UqXP+tUIWdFURABx3k/pVoBUuIKuSYKqMluQi6i01urr50+ X-Received: by 2002:a65:498e:: with SMTP id r14-v6mr13907131pgs.78.1527608679667; Tue, 29 May 2018 08:44:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527608679; cv=none; d=google.com; s=arc-20160816; b=x4XJNHAIsLCpZS8llJf0k8S1zVpDfGBOx1y2yW4I1d05E7f6lzYT+HaEq81v9lsGxR Vg8wtRr7F5kld8O0r89ASEZK9P2qGC61OyrGgJ3FFzzDBRzDqi8aMZaDMFIzI6Ult4eo Zf/MlOcg7rkoqFlORPM6qncFAEmwqkJbxecfVpTVeFezEDMaESP2/NqV5crWRMC1uysC zfd4Pevh0ACBAr7BeQc7/w9xgUQuQaQ0pOP+b3Zkn4PXhbaiAosVoukqU+v3uz5M66je bVjpKPXB+NAaHTVnzhIoKFuJvftcjbGc9f/9sCzGCVa+ztNzs9iVAZ05UCHNuHzpJHkM a/4w== 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=MCVD6hQ/VNDrT8n9a2YGOo4Qd4xoBzGI3ErzZMpx9zE=; b=UTt2ARiGR8XP0ErjAtJBAdNRJQKNWBy7u8SC1hRFhU9AjUpz2fhX/sqRjbCiWEV8l3 TqcwYVxbOpEPbIpsPCAIbpNaE0oqGVjpXLYbKtMZfiigz7RSdfvaSbIA4lUR7rNTyIof 7EdQzq08XR4Rj7a3dXPjxtSv7XvpVBbBoUYWFvlLm/GCU1xbX2Nq0HZT0ZK7zkkzq/dl z0cBvxgzYkTOl8M1lAvSfeZnalZVbCQWO7bej6MJs9sMKj0YlKki9haBMPPzvY8IvwyD N2wBBaeDoqEp2Q73sBDC108Cp2qLuQgbPQF5hxllExhbH4UAbB53nCTsNxZv2myww3PY SZNA== 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 ay5-v6si31673104plb.459.2018.05.29.08.44.39; Tue, 29 May 2018 08:44:39 -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 S964878AbeE2Poh (ORCPT + 30 others); Tue, 29 May 2018 11:44:37 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:43476 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964815AbeE2PoX (ORCPT ); Tue, 29 May 2018 11:44:23 -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 CBC4A15BF; Tue, 29 May 2018 08:44:22 -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 9B0AF3F25D; Tue, 29 May 2018 08:44:21 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: Mark Rutland , Boqun Feng , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras Subject: [PATCHv2 10/16] atomics/powerpc: define atomic64_fetch_add_unless() Date: Tue, 29 May 2018 16:43:40 +0100 Message-Id: <20180529154346.3168-11-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180529154346.3168-1-mark.rutland@arm.com> References: <20180529154346.3168-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 Cc: Boqun Feng Cc: Will Deacon 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