From nobody Tue May 21 23:28:02 2024 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 4VkVwf4h3Zz5L4cg; Tue, 21 May 2024 23:28: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 4VkVwf4BYBz4dnH; Tue, 21 May 2024 23:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716334082; 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=vc0dX5r4NYGHzNjbWaiL/sUAv1sXExeyalTwU7B/wHQ=; b=siu3RGaXqXwZz2AmInNhT3gwyhuKyXykkoJGHHl1f700Dt7WL7xHWjDSHT4HFgeE3XY8zW TudaZNqCrmpP/v8oWtr1Rw4UzBgvgA2edHqNnOc7tZr2vOXEYTn3fd2W47Wn3fKJlt13FR JZVz/X5CFyT1Rx9lp5B442H91lsnYCgDYzWyzPy+wu1fW4uld88SolQt4gNK1sRVuw12c5 Sufoq7M5oVTAUgrd5Z+eXGtS40YfhQvX5PNuhEJLUAm8b18SmVA54VP0yIydoe6MZmC+SR vJeZ/8PC698M0mdvhlhf078uaHqzfbulqCWjXSuogmSSEgHVXerzHdS083dZFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716334082; a=rsa-sha256; cv=none; b=ZJ7l0fJDDMUIngSHtfT79EMgeTrkiEyegPC39i/L0iO+taOVelk7v7NS6fGtr8a4eI0GrJ 5uYppGsUgKm0B+BkdMbjyzXeHO/Zf7XDGrr/7npEjQSmv68oAsXSVMguNnXrcyd9unnc/z RFte0pQloTjT4353MR4RwB/XoDEevt0Perlc2pbEU68zfR0+cgmniAo7E87Wi9mhxa+e3u ON1n61z4eruESrfVLkUay3cn6xjtpw8xYGCOABGsjsTN8b2Iq34AAlU/csdUU1RD/e5+bi 98ykZog7v9rjeCTsxYpYMJtxcf/CGO1Ge0XPa64uU+O+q5GLSU6vRtJnLGTojQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716334082; 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=vc0dX5r4NYGHzNjbWaiL/sUAv1sXExeyalTwU7B/wHQ=; b=dEwIy0vidws9K3YmG4TJSvNIYSqGLzkzlnNYEEiGW/HYg1LEXl6BTsfTa63eg+wF7ntVhk ZhIkztjA2O6Fq3YgbnGnmHeUNOieCsE0CuLWZRrRF09BX03R2r2IQf/lLP9yvyqtZ73aya W6QLy8tZ9ySBXCp+zC6b7JJK6VYOjsxulML/gEQxwBkiO9bRgE20ALrbsnXEgiGYg8TXvJ 6J1x2H7WlmKXX4SZPczNd9S/UNtxDqblV8SpiePbc4zvbngfXGrMNYDLz/IAIBD5Y8n4HP /dZkz/R63R+jM6JzrjUFs6zgUMwr5PcAlrh1zPhnWDLxbtVaqbbXUFOPoNUAPA== 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 4VkVwf3mQXzhKp; Tue, 21 May 2024 23:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44LNS2Uh081416; Tue, 21 May 2024 23:28:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44LNS2rl081413; Tue, 21 May 2024 23:28:02 GMT (envelope-from git) Date: Tue, 21 May 2024 23:28:02 GMT Message-Id: <202405212328.44LNS2rl081413@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: bb025df25738 - main - LinuxKPI: add FIELD_PREP_CONST() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: bb025df257386c5d1087b652e8ed951bceb89862 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bb025df257386c5d1087b652e8ed951bceb89862 commit bb025df257386c5d1087b652e8ed951bceb89862 Author: Bjoern A. Zeeb AuthorDate: 2024-05-13 17:40:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-05-21 23:27:10 +0000 LinuxKPI: add FIELD_PREP_CONST() Add FIELD_PREP_CONST() like FIELD_PREP() without any extra checks likely expected on this version in Linux. This is called by an updated wireless driver. Sposnored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D45180 --- sys/compat/linuxkpi/common/include/linux/bitfield.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/bitfield.h b/sys/compat/linuxkpi/common/include/linux/bitfield.h index a2020d247489..8a91b0663f37 100644 --- a/sys/compat/linuxkpi/common/include/linux/bitfield.h +++ b/sys/compat/linuxkpi/common/include/linux/bitfield.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2020 The FreeBSD Foundation + * Copyright (c) 2020-2024 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -131,6 +131,10 @@ _uX_replace_bits(8) #define FIELD_PREP(_mask, _value) \ (((typeof(_mask))(_value) << __bf_shf(_mask)) & (_mask)) +/* Likely would need extra sanity checks compared to FIELD_PREP()? */ +#define FIELD_PREP_CONST(_mask, _value) \ + (((typeof(_mask))(_value) << __bf_shf(_mask)) & (_mask)) + #define FIELD_GET(_mask, _value) \ ((typeof(_mask))(((_value) & (_mask)) >> __bf_shf(_mask)))