From patchwork Mon Jun 18 10:19:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 138881 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3770315lji; Mon, 18 Jun 2018 03:20:03 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLW63xFuCOmfCMZ1WoctE8sPtHbcl7Q8Ikkx6gA5op3bRvjcP8niesgWeVUVLveMc+LECUh X-Received: by 2002:a17:902:b60c:: with SMTP id b12-v6mr13463931pls.44.1529317203270; Mon, 18 Jun 2018 03:20:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529317203; cv=none; d=google.com; s=arc-20160816; b=gkmcdUcoZ8WtQGHSzYwMdHpIh5w0aRhkJnLLrjew7gzuelQ4XrrTQdQnLQAF59cCuF DABOdA7QQtYDB9qXqh+Okj1S2vEZ+BIRss2w/FfZqFAq6LGNCyQFJvFoicBMWvlLIgnL KcV9aHZ3t6NB8p+k9SzvSrA8Jq4KRVTfJ40Diws2mj8rryp+DpbiTkMdS0GnWJvuIL4v fJVCfROHkhNyL31NXDsiYs/2s/PKxR+IFm7yuM507QmNEeFDkKFl4FwRIo9ND2bf5YxC FMRAspU0w0exIp9FK4hJrrG3u5+I3LOHG060QZUUyWLsNCNzCSi9D9xcld8QdXxrjmSG V9PA== 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=WAHVHCtDk42uCAQzKq124FMQwYTX6GnNu8cdFoVbrmd8H0znZm6lzUEZB+ri1Ns/YA +pwkXg76YYmdZ/GuTqz7SNIf7PmejYHZihByIiXwqVOhz6eCsGHJQVFhGhUZ7NhHYmCh 0MYaWiHiJ2vbRMCWRAfxxEpJTHAfRlgqgnpheuXpkBYMzUlx8JEWJTs+fkZ5dR86QWb9 /Jn1rZGwLidY6pv5i5d5+FGHV1D2waS6q8g1+jQtrgPZkjoaTMjn7H0RNv7MlY1MIcic 8TZDgfP7toVPRTOZMjXPAQGcCipoc4c9dck5p0UwFOZ32Je7eMPfIHan5eBjDs5hG4Xd 9sbw== 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 z14-v6si12039047pgc.313.2018.06.18.03.20.03; Mon, 18 Jun 2018 03:20: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 S937022AbeFRKUB (ORCPT + 30 others); Mon, 18 Jun 2018 06:20:01 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:59480 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933946AbeFRKT5 (ORCPT ); Mon, 18 Jun 2018 06:19:57 -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 B276A1596; Mon, 18 Jun 2018 03:19:57 -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 3AFA73F25D; Mon, 18 Jun 2018 03:19:56 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org, will.deacon@arm.com, peterz@infradead.org, boqun.feng@gmail.com Cc: mingo@kernel.org, Mark Rutland , Benjamin Herrenschmidt , Paul Mackerras Subject: [PATCHv3 12/18] atomics/powerpc: define atomic64_fetch_add_unless() Date: Mon, 18 Jun 2018 11:19:13 +0100 Message-Id: <20180618101919.51973-13-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180618101919.51973-1-mark.rutland@arm.com> References: <20180618101919.51973-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