From patchwork Wed May 23 13:35:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 136656 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp907491lji; Wed, 23 May 2018 06:36:35 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoaYyUr+no5BgGYshreW5HfSXENu4FRTHe0jK6WTutcZKrk/3RrYvKKv+DhGT9lUfkubnzk X-Received: by 2002:a17:902:7c95:: with SMTP id y21-v6mr3050267pll.76.1527082594903; Wed, 23 May 2018 06:36:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527082594; cv=none; d=google.com; s=arc-20160816; b=quHal6FAY8AgFEiDnxEHyyFyV3wCkCyPa7gaXVL5Kfge3FbOwvtECNX+iQL/pXqfLW TNwkvJfqQN9YdeZgYYsUmuM8tYwdjbojtrBXTZKevKcKgkHa2ta9VjcoRfkoKnqSUqxs 4A3FQO6aSMjb19tM+J6felCnPjhABItyPSb2X+lsoz1Zi/tf6sP2Hsm2KxcBIWLOnbN3 LbbYK7YILKXfJQowLGqrthMhS3x1M3m7WYnr73HNgoyvffWqSQtr0iQsDwCoCqlals/w YP9J8/P2eV1+2K/lNwUlw2DxplIhYAL/ZX0lfuV636pN393dCA7jn0W/7YQTN5k3YWpv XMIg== 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=l9bmMzdC5XyuLQ0s7t4fAmLNxxW3rEmEgXV+K3AMPJM=; b=YBprxUbtdeA1I5xCBA8eqxU3lws/yayeneYAbihw7Hu4M20dTAUfI+EEfVcuV6E7CU usyc3c/Z4j4GnoIyDcbsguPDiEAmxPL2DR702LpONioHcVrPVtWFX/uKmWLd+kBjMONh bafcpaQZoZ2RHUZLiw65XH0Chnyw7lBAtZU3bIR5PgtUL/vDYJXGMkqruHh2ik+/ooZE vcarLaF9Cbl8xpCoqlekx/hkkq0a8XgKWStSrgiG+oZ3Ay8xgW/BljkXc/qMHPHJpMQe +Mz1+KdXSlo+ox+BvQpqHsnnvyiC+jRga6vMdXYp1pwg5TPD7wvXU0ghMjLGcO5reF4+ r0bA== 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 z64-v6si14897235pgb.471.2018.05.23.06.36.34; Wed, 23 May 2018 06:36:34 -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 S933171AbeEWNgb (ORCPT + 30 others); Wed, 23 May 2018 09:36:31 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:55390 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933039AbeEWNgU (ORCPT ); Wed, 23 May 2018 09:36:20 -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 830CB1684; Wed, 23 May 2018 06:36:20 -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 0BCC13F24A; Wed, 23 May 2018 06:36:18 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org Cc: Mark Rutland , Boqun Feng , Peter Zijlstra , Will Deacon , Richard Henderson , Ivan Kokshaysky , Matt Turner Subject: [PATCH 07/13] atomics/alpha: define atomic64_fetch_add_unless() Date: Wed, 23 May 2018 14:35:27 +0100 Message-Id: <20180523133533.1076-8-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/alpha 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: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner --- arch/alpha/include/asm/atomic.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -- 2.11.0 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h index 4a800a3424a3..dcb7bbeeae02 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h @@ -238,35 +238,36 @@ static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) #define atomic_fetch_add_unless atomic_fetch_add_unless /** - * 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. * * Atomically adds @a to @v, so long as it was not @u. - * Returns true iff @v was not @u. + * Returns the old value of @v. */ -static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) +static __inline__ int atomic64_fetch_add_unless(atomic64_t *v, long a, long u) { - long c, tmp; + long c, new, old; smp_mb(); __asm__ __volatile__( - "1: ldq_l %[tmp],%[mem]\n" - " cmpeq %[tmp],%[u],%[c]\n" - " addq %[tmp],%[a],%[tmp]\n" + "1: ldq_l %[old],%[mem]\n" + " cmpeq %[old],%[u],%[c]\n" + " addq %[old],%[a],%[new]\n" " bne %[c],2f\n" - " stq_c %[tmp],%[mem]\n" - " beq %[tmp],3f\n" + " stq_c %[new],%[mem]\n" + " beq %[new],3f\n" "2:\n" ".subsection 2\n" "3: br 1b\n" ".previous" - : [tmp] "=&r"(tmp), [c] "=&r"(c) + : [old] "=&r"(old), [new] "=&r"(new), [c] "=&r"(c) : [mem] "m"(*v), [a] "rI"(a), [u] "rI"(u) : "memory"); smp_mb(); - return !c; + return old; } +#define atomic64_fetch_add_unless atomic64_fetch_add_unless /* * atomic64_dec_if_positive - decrement by 1 if old value positive