From patchwork Wed May 23 13:35:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 136661 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp909293lji; Wed, 23 May 2018 06:38:07 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrwBxIe4x/kQugM4iXrdWnVzR9/10grbO0rwQlvuhU0vd4HxygOtfw4+hue0L8EgkeEDHic X-Received: by 2002:a62:9fca:: with SMTP id v71-v6mr2956069pfk.233.1527082687458; Wed, 23 May 2018 06:38:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527082687; cv=none; d=google.com; s=arc-20160816; b=ZeWXNL7RQLmZpg1dsiXGPtWI7B0Co1nRpsQCIxLioem4LSrU051zZUGVfdpdvDMALF Q3URwRAjXk5TfZIJaa+iWMgJuHXQnvBW9+7pqWRl6kuj/OL3uduDbPW7dbIORVj8hfh8 aL+ropOLCH+GeawhbBhnpjEt5zfO1l9jMljDvHTuzukH8b3Zwlr9LOR+5N9jeXJq1MaB CwDDE5fTYsLbDu6fz/8Mj+xXl+Me/DKwftZIwq5YVqwEwfFIn8PIQVng2Ozqk3OFgnOe m+W3nA9XEzm3wm8KGMbiFZk9zceRt6Tq7jskpp5HQhdiQSpRTKqHY5MU2LF0hBs/mD7a BSEg== 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=Sbj6z7+ovlUW7lMlvD2hjbbUTy6YChIBtnfTZ8Vsy6c=; b=iw9L1SLHKxJ9WlK2eCUOLZNxpmIz1i3lnfuz0WL0mK5+Yc6LLTASFSHsO+VasthESj PxuRTjZTEdNeMIDMKhFIkoYWBYJ2Qhkg1wBcoaIC0+7447qXd+D0HH7UnSYbqbCEGtmN x4XoVBpCzvhCTjZBUsblVCeACHsk9UyGow6wpLCqdBJ4XNbnNvegYEM4Rcqe6PqefxG0 CsSiJlkqP1Eh/s2oJ61TjPu7BfSFQx3aPR3l1V0IQhlKSLogm2y/7sc9lYnV4wRLPKrC gx/yzTRIyPj68XsxRPMCGQ0kLGHMxdQacP9+d5PveRPkXkgRnh9ivZBQWw0iuyveerg+ 8ugw== 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 x14-v6si18325861pfn.41.2018.05.23.06.38.07; Wed, 23 May 2018 06:38:07 -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 S933242AbeEWNiE (ORCPT + 30 others); Wed, 23 May 2018 09:38:04 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:55418 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933156AbeEWNg2 (ORCPT ); Wed, 23 May 2018 09:36:28 -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 9071980D; Wed, 23 May 2018 06:36:27 -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 197383F24A; Wed, 23 May 2018 06:36:25 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: Mark Rutland , Boqun Feng , Peter Zijlstra , Will Deacon , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH 10/13] atomics/powerpc: define atomic64_fetch_add_unless() Date: Wed, 23 May 2018 14:35:30 +0100 Message-Id: <20180523133533.1076-11-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180523133533.1076-1-mark.rutland@arm.com> References: <20180523133533.1076-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 Cc: Boqun Feng Cc: Peter Zijlstra Cc: Will Deacon Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman --- arch/powerpc/include/asm/atomic.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.11.0 Acked-by: Michael Ellerman 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