From patchwork Thu Jun 21 12:13:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Rutland X-Patchwork-Id: 139533 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1991734lji; Thu, 21 Jun 2018 05:14:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKICsPptsFVULpCOglcmpZY46+sX0u3f5zQ7hNxFbZa3WwNqs50Z+mewBacXgL2lF3IwAoXZ X-Received: by 2002:a17:902:9a95:: with SMTP id w21-v6mr28269650plp.168.1529583244305; Thu, 21 Jun 2018 05:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529583244; cv=none; d=google.com; s=arc-20160816; b=tN/YnmX1HjInTf/pnzZQyp4HxLS7B/INfFSDrCQOBz88QeeNjEK2ooyk5UKRrpxmox IUwhoUjc9zY5UWofDExkKR+6yiQItcoRUFyGIepYoy5A2jcNVpfK4cs1kUUKYCn6+7jD Zd6A8zuQB6+0i/P3nTTbeXdFJqeSIlMfBaFVralMtHNQCi3Vh3vwjqihKFmMw7uPo5PY Q37TQVCHpd+YMFvpNJ3xAz6qG/WyaRRNDbAwR86qfCt52LmBM8Fcr2YLf4s4VhvvLJkq Caakdp5wkOJ8WRhMQ2nOiNsEwo4SHzgAEQwk7YRC80lT3bPcz7GJYN61qo6Y/8rzGV8s 4pZQ== 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=Uhqd2fPfbUjo78JJs8Z3kGtTVhqdKOjfFtIr8FmtSaw=; b=uvNX5qEF2vo+felzTZCZPDIg4nvoH1mwF+scoQk7Vgg7P/Q9fwRJ3UAFNKqiVVUtHt toyUPhiVzVaKmZJIeB8cNtbaFJzaytEy7gq9MxL4x1+cLTIjuDZK9Q8z+2caSzEOjG17 7uUTllCB74XmoHU5wGoB1o7to3ZfjmF0Jr9sjVVO4cF2O3Se42M/GK6Hy+5U7yNJLK1s pWJBgTDUd3zfkqIh8zcBRJZbAMLgOofXJOHM541OiTSyEnUSPDmdPNHdRUUrEmI64fiB yC5fdlVFrOV9jnRooN7sW4t5aREOZM9HkgUIj1yFYXaV+wIcasAUZHQX3jz/bp61r1RN ldbA== 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.04; Thu, 21 Jun 2018 05:14:04 -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 S933748AbeFUMOC (ORCPT + 30 others); Thu, 21 Jun 2018 08:14:02 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:49410 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933714AbeFUMOA (ORCPT ); Thu, 21 Jun 2018 08:14:00 -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 69E9015BE; Thu, 21 Jun 2018 05:14:00 -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 E68843F578; Thu, 21 Jun 2018 05:13:58 -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 , Palmer Dabbelt , Albert Ou Subject: [PATCHv4 13/18] atomics/riscv: define atomic64_fetch_add_unless() Date: Thu, 21 Jun 2018 13:13:16 +0100 Message-Id: <20180621121321.4761-14-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/riscv 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 Palmer Dabbelt Reviewed-by: Will Deacon Cc: Boqun Feng Cc: Palmer Dabbelt Cc: Albert Ou --- arch/riscv/include/asm/atomic.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.11.0 diff --git a/arch/riscv/include/asm/atomic.h b/arch/riscv/include/asm/atomic.h index 5f161daefcd2..d959bbaaad41 100644 --- a/arch/riscv/include/asm/atomic.h +++ b/arch/riscv/include/asm/atomic.h @@ -352,7 +352,7 @@ static __always_inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) #define atomic_fetch_add_unless atomic_fetch_add_unless #ifndef CONFIG_GENERIC_ATOMIC64 -static __always_inline long __atomic64_add_unless(atomic64_t *v, long a, long u) +static __always_inline long atomic64_fetch_add_unless(atomic64_t *v, long a, long u) { long prev, rc; @@ -369,11 +369,7 @@ static __always_inline long __atomic64_add_unless(atomic64_t *v, long a, long u) : "memory"); return prev; } - -static __always_inline int atomic64_add_unless(atomic64_t *v, long a, long u) -{ - return __atomic64_add_unless(v, a, u) != u; -} +#define atomic64_fetch_add_unless atomic64_fetch_add_unless #endif /*