From patchwork Tue Jun 6 08:26:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 103671 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3253656vqr; Tue, 6 Jun 2023 02:11:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7V/Mx9pdXmmqVGPyI4CuVhmF3Bt5Jkqh/6KPJOMFdsz2U7eZBrr8oDjFEzrJy8DDLU+PmZ X-Received: by 2002:a05:6a20:840c:b0:114:9bbc:c325 with SMTP id c12-20020a056a20840c00b001149bbcc325mr2494885pzd.11.1686042669296; Tue, 06 Jun 2023 02:11:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686042669; cv=none; d=google.com; s=arc-20160816; b=VIrI3+6yp7jtERJtxSVlM4Q1CPfu6us+n7EGQUf39IgmAm6E3cPWNpnevD1P8Vm5MQ jT+oaKxA1Us+BoKmj1stpbkPdkdfdZaoQ4SSXBRGQE9VvsVlsecKkEf0MiG23624ZNo+ jb7pZYZwwtFgZgyKfQNS6J4iZnyTjE1OmkYFbg8jRj4QKrvwYdfyedmmAvBDA5QC7ggj gotdsi1I5KQcy9PKZJ/kuWvwcHkvkm9wQbgpyN7ION7lA/xGgoBVnvE3ZV+TNXP4E0bG Gf/0ln26CwHpnGUrc9RVca74ZbESnT6jgGVZf1N+rlPjbfXLPqNEN2hYuW/EHz7L8S17 7qjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=MAVGDg6SAPhX//KaQQfqWqsT/V97QwEj108aI0HPC10=; b=FanXBGk3uFz/74USBZZbd7qZJR7TF4I1EpsBndGxlH16vTZFE8GISAX2i4HD4OfsM7 fuuBcj2pi8DpGAG/xJ0/fGpHPj7Aww7UGfBpWOA/4Q1VgRBFBgJzbpUlLmCCQCRsqQTq ieoj7odAv4EFPcV7cwho0Et0UqQUo9hs0fE66bveN1Fzxqbngnh5K04p73QyKo1Zm5E9 Bpg0lAkWnflYjV0S3LItHFarmKcd6zi1dRgAzOvdnplDuXz7ndUcAOgF3lAv455GPW1S /79pZurzbLDrpu+9SrU26gH8k8MJL15bKQXun4/JIwMChLiLEkHkLd/s1Av6Z7hdml5U wDjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=1TDFtIBF; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q2-20020a638c42000000b00534e310d0d3si7284806pgn.588.2023.06.06.02.10.54; Tue, 06 Jun 2023 02:11:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=1TDFtIBF; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237034AbjFFI1s (ORCPT + 99 others); Tue, 6 Jun 2023 04:27:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236788AbjFFI0h (ORCPT ); Tue, 6 Jun 2023 04:26:37 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBC96E6E; Tue, 6 Jun 2023 01:26:27 -0700 (PDT) Date: Tue, 06 Jun 2023 08:26:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1686039984; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MAVGDg6SAPhX//KaQQfqWqsT/V97QwEj108aI0HPC10=; b=1TDFtIBF+z69REZIrnSsI2esQ1TkjvvtcrDYhJMBBuixMiWuSfLiHaP4S28DmH6GqQS3ej ebdvmNoZQrCAV3iA1EL1LepnyRJlKIpXZyLS/0KwpmHlE9FD8DJ9TcY7Ihl2Lfya8GyfeU 0WtvWb/FcP+knKT4c/c/C567MzsczL3fuUcYHPLxhwC3kBFjL413KVDB3gJ2rbKa0/0fuY v4snH9J9ou6RkCXRVj4RPriZvzkonI2+cPdyyzbJExRWRAt4AyZwoi3/f4r8Y94cvbe8Lg JFTjHEZ9Q6sgZBNDSc4oa9MRrAlI7Dj+pdLPOvByMSEMQQVyQhURR9p5H6w1uw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1686039984; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MAVGDg6SAPhX//KaQQfqWqsT/V97QwEj108aI0HPC10=; b=yZkHfUl9+V8caF9IKaQl1tNPnQTmwqhfzYyeJMrrSwy7Zs4cSihJ6kd2onSCqA7g5P2F8h QpqNb44k/g6hSrDQ== From: "tip-bot2 for Mark Rutland" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/core] locking/atomic: hexagon: add preprocessor symbols Cc: Mark Rutland , "Peter Zijlstra (Intel)" , Kees Cook , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230605070124.3741859-8-mark.rutland@arm.com> References: <20230605070124.3741859-8-mark.rutland@arm.com> MIME-Version: 1.0 Message-ID: <168603998369.404.1163390053424911788.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767845837054559947?= X-GMAIL-MSGID: =?utf-8?q?1767943878058976895?= The following commit has been merged into the locking/core branch of tip: Commit-ID: 8ad17f2183fd7e37ceafddbdff334a3e2608cc84 Gitweb: https://git.kernel.org/tip/8ad17f2183fd7e37ceafddbdff334a3e2608cc84 Author: Mark Rutland AuthorDate: Mon, 05 Jun 2023 08:01:04 +01:00 Committer: Peter Zijlstra CommitterDate: Mon, 05 Jun 2023 09:57:15 +02:00 locking/atomic: hexagon: add preprocessor symbols Some atomics can be implemented in several different ways, e.g. FULL/ACQUIRE/RELEASE ordered atomics can be implemented in terms of RELAXED atomics, and ACQUIRE/RELEASE/RELAXED can be implemented in terms of FULL ordered atomics. Other atomics are optional, and don't exist in some configurations (e.g. not all architectures implement the 128-bit cmpxchg ops). Subsequent patches will require that architectures define a preprocessor symbol for any atomic (or ordering variant) which is optional. This will make the fallback ifdeffery more robust, and simplify future changes. Add the required definitions to arch/hexagon. Signed-off-by: Mark Rutland Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Kees Cook Link: https://lore.kernel.org/r/20230605070124.3741859-8-mark.rutland@arm.com --- arch/hexagon/include/asm/atomic.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/hexagon/include/asm/atomic.h b/arch/hexagon/include/asm/atomic.h index ad6c111..5c84400 100644 --- a/arch/hexagon/include/asm/atomic.h +++ b/arch/hexagon/include/asm/atomic.h @@ -91,6 +91,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ ATOMIC_OPS(add) ATOMIC_OPS(sub) +#define arch_atomic_add_return arch_atomic_add_return +#define arch_atomic_sub_return arch_atomic_sub_return +#define arch_atomic_fetch_add arch_atomic_fetch_add +#define arch_atomic_fetch_sub arch_atomic_fetch_sub + #undef ATOMIC_OPS #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op) @@ -98,6 +103,10 @@ ATOMIC_OPS(and) ATOMIC_OPS(or) ATOMIC_OPS(xor) +#define arch_atomic_fetch_and arch_atomic_fetch_and +#define arch_atomic_fetch_or arch_atomic_fetch_or +#define arch_atomic_fetch_xor arch_atomic_fetch_xor + #undef ATOMIC_OPS #undef ATOMIC_FETCH_OP #undef ATOMIC_OP_RETURN