From nobody Sun Jan 16 23:20:55 2022 X-Original-To: dev-commits-src-all@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 EF3EC19678D8; Sun, 16 Jan 2022 23:20:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JcWHX2bwHz3mDq; Sun, 16 Jan 2022 23:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642375256; 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=PYwn0Gch/aabmFcOLWbyWJ7/+Ahndq/73/ig7ZsjnuA=; b=AdjgZEzCzrRwvf9RHe8ggUGeqFea86uIg1tI97yy3hkzUHeBhoZf79g6oGh4+g+M+xiUG8 16BAxiGIU9B4VIUdNI5SDRiYN2dSmYsa9CgKcSJyI7SY02Gmyf4cox+lChq777vUpaVGiI 6HXup1jD/IQp3cv2OstLuZzS9yrF6pjQV6Xxvk0MrUaTOBPNx2Q6+k6lwBDmmgdc7fWdTe Io3A+IbxE4APfIMY2gSLyZeHS/tZ+DKBBjSybnLqRgEo1IXR4TcMUs4tgl0pLexJkQSH+Q 9pGEhcVtk9B92W5VPSlDLB+qx/RouamyMEILW8hmhe1qJfKPuE/yl3mqoEbkBw== 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 247AB22FE7; Sun, 16 Jan 2022 23:20:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20GNKuoW052718; Sun, 16 Jan 2022 23:20:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GNKt9K052717; Sun, 16 Jan 2022 23:20:55 GMT (envelope-from git) Date: Sun, 16 Jan 2022 23:20:55 GMT Message-Id: <202201162320.20GNKt9K052717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2f6e37eded5e - stable/13 - LinuxKPI: bitfields add more *replace_bits() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2f6e37eded5e869c54330a748ae9a66459837444 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642375256; 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=PYwn0Gch/aabmFcOLWbyWJ7/+Ahndq/73/ig7ZsjnuA=; b=aarUt8B8GXyt6y7qful3X73xMK+VtTvx5dzydO4VjDODqeJix6hyUmmLIQRXzMNfQbA40P bR5W5jZl+lA/ornxuu1+3QaeR2nZL4WN38PbIyIm1guVdJjnOYNRTljEwhHQe/YjMEv7wS JizpZc0WTijQJRda44Wvh2kqL4WV2qRVHMdoo7qiFR+EoaRfymW6HSkqzA8v2e5q8UEe0X la7Tcwd/58omavSl8+O5DrPMq7kD4bs9FcQaiKXSzdz+hrg2sflKmrdif4nSe5mXKvJJcD mMHa2v6kIABVtgmNORAhs3s13mJK0gg3a7EPMmUCeeZCEi7OP6fPaaU+9s7dxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642375256; a=rsa-sha256; cv=none; b=Fch2uCzUSgSvdXydI8B/bptPdlRSkyndPHTtf0Ul9g2asE+RNUixRFmhDgmeTLa07HnTSn x0vX19otu51JC1pNqQHkLOxhHl6O2eCQJnRH1Fp4Vra/Ok06a6tNJCU0G2oWia0UWIzD/7 gCcSQGqbNcKLvJEUvF+4ZICR1GsIzWsL+e/nDrDxWuX7tF3GKpSv4djaRkIROep5y8CsMD jYLZPXP7OjoQwYuoHCBV79teUnYGl8AB22E+ElqKnE9eicvmYfKKE2eckor/+dXpP3Fbwb l/zzD/usd+lE15Bm1cXVMa4vijmrgZvutexy/1n/jmGbHl9vMPh+MRHooal95w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2f6e37eded5e869c54330a748ae9a66459837444 commit 2f6e37eded5e869c54330a748ae9a66459837444 Author: Bjoern A. Zeeb AuthorDate: 2022-01-09 01:12:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-01-16 22:38:57 +0000 LinuxKPI: bitfields add more *replace_bits() Add or extend the already existing *_replace_bits() implementations using macros as we do for the other parts in the file for lep_replace_bits(), up_replace_bits(), and _u_replace_bits(). Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D33799 (cherry picked from commit 2fb0569f1ff58209420ed9c5500476ad7d93e702) --- .../linuxkpi/common/include/linux/bitfield.h | 42 +++++++++++++++++++--- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitfield.h b/sys/compat/linuxkpi/common/include/linux/bitfield.h index a805c1bca5a1..14278a557809 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitfield.h +++ b/sys/compat/linuxkpi/common/include/linux/bitfield.h @@ -86,12 +86,44 @@ _leX_encode_bits(64) _leX_encode_bits(32) _leX_encode_bits(16) -static __inline void -le32p_replace_bits(uint32_t *p, uint32_t v, uint32_t f) -{ +#define _leXp_replace_bits(_n) \ + static __inline void \ + le ## _n ## p_replace_bits(uint ## _n ## _t *p, \ + uint ## _n ## _t v, uint ## _n ## _t f) \ + { \ + *p = (*p & ~(cpu_to_le ## _n(f))) | \ + le ## _n ## _encode_bits(v, f); \ + } + +_leXp_replace_bits(64) +_leXp_replace_bits(32) +_leXp_replace_bits(16) + +#define _uXp_replace_bits(_n) \ + static __inline void \ + u ## _n ## p_replace_bits(uint ## _n ## _t *p, \ + uint ## _n ## _t v, uint ## _n ## _t f) \ + { \ + *p = (*p & ~f) | u ## _n ## _encode_bits(v, f); \ + } + +_uXp_replace_bits(64) +_uXp_replace_bits(32) +_uXp_replace_bits(16) +_uXp_replace_bits(8) + +#define _uX_replace_bits(_n) \ + static __inline uint ## _n ## _t \ + u ## _n ## _replace_bits(uint ## _n ## _t p, \ + uint ## _n ## _t v, uint ## _n ## _t f) \ + { \ + return ((p & ~f) | u ## _n ## _encode_bits(v, f)); \ + } - *p = (*p & ~(cpu_to_le32(f))) | le32_encode_bits(v, f); -} +_uX_replace_bits(64) +_uX_replace_bits(32) +_uX_replace_bits(16) +_uX_replace_bits(8) #define __bf_shf(x) (__builtin_ffsll(x) - 1)