From nobody Sun Jan 09 14:40:01 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 712491934EE4; Sun, 9 Jan 2022 14:40:02 +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 4JX03k15xYz3mY2; Sun, 9 Jan 2022 14:40:02 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 05D7C13D63; Sun, 9 Jan 2022 14:40:02 +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 209Ee1L3059794; Sun, 9 Jan 2022 14:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 209Ee126059791; Sun, 9 Jan 2022 14:40:01 GMT (envelope-from git) Date: Sun, 9 Jan 2022 14:40:01 GMT Message-Id: <202201091440.209Ee126059791@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 2fb0569f1ff5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2fb0569f1ff58209420ed9c5500476ad7d93e702 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641739202; 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=r25CdrZUmUjIJjLybHV1E1Sf7BxsLK5HAR0YSMMa6zg=; b=SqkqpdiaZLQr5szyqJAXDHm15SFYX7W4aOol3I9zTCwomq5yEM0AnkTJrQD5Qcccils4t7 ofcPHRYII/754ROuA+0ZgoFRp/s3QTzPxDnz4lWKkr4dWvu6VS7CavnI4+CrbFIAFrs6d0 2aWSFWVnTY5+FSy/ZE5ZAWGsfgqXi7LCb3LUNENp8Z9XhuEfVgGHLxwejOaEikYvJLcA0U Z3Zcfda7VBA3EvLsJAe0PoS/pH0wnhlEE8Bf5Z9GH49EhgF1hAEzzoWcgUusd/r4upCuTI B9wjHjXKs3TVda1HC4QwfvhcnIzUwwiVufqPPDUimDOk+yieDI+XndHWsw2JGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641739202; a=rsa-sha256; cv=none; b=XwZb9uhNPf8s3he/skf+nHs3qaawxahumt3sI631joXGWRSHPExX8WvjrpZg91E8TgwCYE jJ8NfySjYO8woVCGm/0afwUbAHnDzbqHuL1N+AbCFgT5ph1C8r8X8TRoo9wu42Xi6SNFMf 4hfma4SRfdwYWSA7Kl6UoGKKd8Jrir6b9/wgNxIbQExzmy7o3pCMbpgtzQGCFZN0CxAow/ W9NZ4TbPxhlfac+aWXgFsLneDqDimXDs8zSVaGdPclHM2Rk+PC7wb9GmApg3NO2+8tZV8K hnrnyR9KxQneGCqWQtgAJ0hTr+h61jNwHHML2JwvNiSOTxuapdU/pOAMTdetrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb0569f1ff58209420ed9c5500476ad7d93e702 commit 2fb0569f1ff58209420ed9c5500476ad7d93e702 Author: Bjoern A. Zeeb AuthorDate: 2022-01-09 01:12:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-01-09 14:39:19 +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(). MFC after: 3 days Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D33799 --- .../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)