From nobody Sun Sep 28 00:51:42 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cZ5PB2Jb0z690HV; Sun, 28 Sep 2025 00:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cZ5PB1Zz7z46WN; Sun, 28 Sep 2025 00:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759020702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxjzPjqje+BjuwD3PJdaX54y7UPmm/Z3n/SuVNnkY4U=; b=VrPetVxvdBQBIr7JLXqPV94o7lmU/s1EDB96vuiI2C4YsnjXpJ4T7TtIq3fNt/JJo8y9g8 qv8yeSfDNNGrAw+hOXP7JUfFiotv2F2NG4YVnkZKl7ukzo24R/oB6GNWTIZwlXnnaasefs qR40RbJjFudr4fqCukDfhTpAaZeNJkZRRbPy0PYfrwVmkjJbWKLWcbKl+FFXcxElGvlmo6 hgCErit7420r3WDyM/73iqHARbeEFQF7dk63Q8cgvDmx+IlmS38X6sXZrG8tweJHT/Wvxf j32vGXYKXYxbStrLvdaZypl7oqRdC9NNKqN7VFugKB5lboA+k+zxWUT1C/irHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759020702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CxjzPjqje+BjuwD3PJdaX54y7UPmm/Z3n/SuVNnkY4U=; b=LUV/eqZS7t2CO8i6WcnLV/XsVxTE6fVpg1GG0nOrO2cQylbuTkiWQG8J6F/cekXCIHspWe Cwui9uv8eUSsEtNeKj+D17o79ehddTy1mT53v6rC9pD2YIxzZi/kFPm1bwZHy84XtKq4Pw SVoNwWFMkvN0H6PaGckObrl+GE2f/Xu/xCr0nnNO7J4LhWBuo9rPIf5qqzo4StxDAsunhz EtrEjMirSCioIOAxhC1sisO/xikjIEfFEK9LHQwPTTJL1IU5F09rdCBYD/cDnTN7Osqyyj A8fagNMGvwaLodlNfLHUz0GHfvZ/pJqrKQXXG8tJvJUYybfBbzxk1wiDEwBjlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759020702; a=rsa-sha256; cv=none; b=gWA220hxp9Necvpi9i9QuUw5ce2WkP2Z0kw9kisU7jHROAMFCdpbkdLp1kz77l4SeT+hni p4xX7EG55mjqa/kNEcJQ7biGzfLh2UfQKK0L+80f9XhYuKFVLEH5eoBuoBjAiEoomVJIKM 5YCyROTp4OuVoZPplZ6R1xclXkDgX+RLjKvPGdU7cSrF8EwMoX/1gOlipdcXmHPcPlMzqV llrvOqg1Xv8rri3aeANM/uFUTFQFDGVGDzOhaWStzQr19x57QnsYxLiY98HkFRE9AuC56K RH21hAmFt6+zb7wgzrm6qwAvWbqaRXyzSXIX8/SlOe9znT9n2wthsW6qos70HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cZ5PB1042zwdw; Sun, 28 Sep 2025 00:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58S0pg7W064178; Sun, 28 Sep 2025 00:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58S0pg0X064175; Sun, 28 Sep 2025 00:51:42 GMT (envelope-from git) Date: Sun, 28 Sep 2025 00:51:42 GMT Message-Id: <202509280051.58S0pg0X064175@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 715f597eb2ea - stable/14 - arm, powerpc, riscv: implement atomic_set/clear_16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 715f597eb2eadbf666a22a48e8431ce2f21447ce Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=715f597eb2eadbf666a22a48e8431ce2f21447ce commit 715f597eb2eadbf666a22a48e8431ce2f21447ce Author: Konstantin Belousov AuthorDate: 2025-09-19 18:01:47 +0000 Commit: Konstantin Belousov CommitDate: 2025-09-28 00:47:23 +0000 arm, powerpc, riscv: implement atomic_set/clear_16 (cherry picked from commit b31abc95eb730d566891e134ba14af852645f772) --- sys/arm/include/atomic.h | 3 +++ sys/powerpc/include/atomic.h | 33 ++++++++++++++++++++++++++++++++- sys/riscv/include/atomic.h | 3 +++ sys/sys/_atomic_subword.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h index a7b5ed76c0ad..c1a7ce527329 100644 --- a/sys/arm/include/atomic.h +++ b/sys/arm/include/atomic.h @@ -1116,4 +1116,7 @@ atomic_thread_fence_seq_cst(void) */ #include +#define atomic_set_short atomic_set_16 +#define atomic_clear_short atomic_clear_16 + #endif /* _MACHINE_ATOMIC_H_ */ diff --git a/sys/powerpc/include/atomic.h b/sys/powerpc/include/atomic.h index 015a283e2de7..b2d7549e5bd0 100644 --- a/sys/powerpc/include/atomic.h +++ b/sys/powerpc/include/atomic.h @@ -1137,7 +1137,38 @@ atomic_thread_fence_seq_cst(void) #define atomic_cmpset_short atomic_cmpset_16 #define atomic_fcmpset_char atomic_fcmpset_8 #define atomic_fcmpset_short atomic_fcmpset_16 -#endif +#define atomic_set_short atomic_set_16 +#define atomic_clear_short atomic_clear_16 +#else + +static __inline void +atomic_set_short(volatile u_short *p, u_short bit) +{ + u_short v; + + v = atomic_load_short(p); + for (;;) { + if (atomic_fcmpset_16(p, &v, v | bit)) + break; + } +} + +static __inline void +atomic_clear_short(volatile u_short *p, u_short bit) +{ + u_short v; + + v = atomic_load_short(p); + for (;;) { + if (atomic_fcmpset_16(p, &v, v & ~bit)) + break; + } +} + +#define atomic_set_16 atomic_set_short +#define atomic_clear_16 atomic_clear_short + +#endif /* ISA_206_ATOMICS */ /* These need sys/_atomic_subword.h on non-ISA-2.06-atomic platforms. */ ATOMIC_CMPSET_ACQ_REL(char); diff --git a/sys/riscv/include/atomic.h b/sys/riscv/include/atomic.h index 74ffc171b028..c90cb02c482c 100644 --- a/sys/riscv/include/atomic.h +++ b/sys/riscv/include/atomic.h @@ -656,4 +656,7 @@ atomic_thread_fence_seq_cst(void) #include +#define atomic_set_short atomic_set_16 +#define atomic_clear_short atomic_clear_16 + #endif /* _MACHINE_ATOMIC_H_ */ diff --git a/sys/sys/_atomic_subword.h b/sys/sys/_atomic_subword.h index dee5a3bed871..284e2bfa340f 100644 --- a/sys/sys/_atomic_subword.h +++ b/sys/sys/_atomic_subword.h @@ -205,4 +205,32 @@ atomic_load_acq_16(const volatile uint16_t *p) #undef _ATOMIC_BYTE_SHIFT #undef _ATOMIC_HWORD_SHIFT +#ifndef atomic_set_16 +static __inline void +atomic_set_16(volatile uint16_t *p, uint16_t bit) +{ + uint16_t v; + + v = atomic_load_16(p); + for (;;) { + if (atomic_fcmpset_16(p, &v, v | bit)) + break; + } +} +#endif + +#ifndef atomic_clear_16 +static __inline void +atomic_clear_16(volatile uint16_t *p, uint16_t bit) +{ + uint16_t v; + + v = atomic_load_16(p); + for (;;) { + if (atomic_fcmpset_16(p, &v, v & ~bit)) + break; + } +} +#endif + #endif /* _SYS__ATOMIC_SUBWORD_H_ */