From nobody Mon Feb 9 01:03:37 2026 X-Original-To: dev-commits-src-main@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 4f8RKQ1cm6z6S1W0; Mon, 09 Feb 2026 01:03:54 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8RKN4tBYz3Z0L; Mon, 09 Feb 2026 01:03:52 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61913bYX089193; Mon, 9 Feb 2026 03:03:41 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61913bYX089193 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61913b2q089192; Mon, 9 Feb 2026 03:03:37 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 9 Feb 2026 03:03:37 +0200 From: Konstantin Belousov To: Guido Falsi Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4548149a8102 - main - netinet6: Fix my style issues Message-ID: References: <698734f0.3791d.631908c8@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <698734f0.3791d.631908c8@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; ARC_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; HAS_XAW(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4f8RKN4tBYz3Z0L X-Spamd-Bar: -- On Sat, Feb 07, 2026 at 12:49:52PM +0000, Guido Falsi wrote: > The branch main has been updated by madpilot: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4548149a81026ad9b1706b2b7e7ad47a4c1358b6 > > commit 4548149a81026ad9b1706b2b7e7ad47a4c1358b6 > Author: Guido Falsi > AuthorDate: 2026-02-07 12:46:05 +0000 > Commit: Guido Falsi > CommitDate: 2026-02-07 12:46:05 +0000 > > netinet6: Fix my style issues > > Reported by: pouria > Reviewed by: pouria, ziaee, glebius > Approved by: glebius > Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 > Differential Revision: https://reviews.freebsd.org/D55136 > --- > sbin/ifconfig/ifconfig.8 | 19 +++++++++++-------- > sys/netinet6/in6_ifattach.c | 22 +++++++++------------- > 2 files changed, 20 insertions(+), 21 deletions(-) > > diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 > index 627b7cd3f9e3..e1d153aa7493 100644 > --- a/sbin/ifconfig/ifconfig.8 > +++ b/sbin/ifconfig/ifconfig.8 > @@ -1008,24 +1008,28 @@ Set a flag to disable Duplicate Address Detection. > Clear a flag > .Cm no_dad . > .It Cm stableaddr > -Set a flag to create SLAAC addresses using a stable algorithm according to RFC 7217 > -The > +Set a flag to create SLAAC addresses using a stable algorithm > +according to RFC 7217. The New sentence should start at a new line. > .Xr sysctl 8 > variable From nobody Mon Feb 9 02:59:21 2026 X-Original-To: dev-commits-src-main@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 4f8Ttf0xdjz6S7vg for ; Mon, 09 Feb 2026 02:59:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8Ttd6kFbz3lWX for ; Mon, 09 Feb 2026 02:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770605961; h=from:from: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; bh=mI6cjgJP4f/4qwDW6gnIV5+EPmXy/rzWNH3fpjB0tuc=; b=jgAJqXxwJZq/5P5gL8Ns9JZwafsEkWO+abTUYB8FpIFNvzhJeQ/k1SrDbC2G2D8kE4D+DR uprKQvXFHYzcnTJYtLXqf2zpi3PmT24IJuweK5RuEyzWLEtj7HRCa2IGVwE8fxkhzsf1My NJA6u3b+cOIjhQ3jF+XVbBX+voEaPPT5vuzP9ZfVGZvhyiGAHuU4g+hCFZxi6XzkEX7LGH ZcTP0YoKMKaQN9hWfcrVpHiIbWd6ds9GVp2DlDihNDKEnZ71tasYh1yFkW78E4gMRq8wuS 0wBi8IXqi/cO9/dP0mfGf3ALrCEfwEf8+sR7yGh8Azl9DeZudlTYAHLoZyhCkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770605962; a=rsa-sha256; cv=none; b=jTACMNCAO3HkY9tDkDvZ+0g9CaJVWDHden8YjdGyvrWyG/3yN2cS66raTJoBzRh6ZxrvWX mlE5FXX7rvgicGtz6Ae4YfAioEIgrQmswIardsM/p1mYWWdho+A0oj8ND/XVGUKJuKDEWV hLPBtMreCyG9rcXmIUvSrYnstOKm+QEBN30is0eGXUoDO0EUuwg+nIAFpqXHvivCKQcmfg tkehzrZpEZTxOPyn72voIXx39OSr6bR4F66F4LnUDG/tvwHDe5laRb35LX0VknM7caIwTg RiL+YLUYBdGp5Ux2AHkqk/scyIVCdSmluSGm/X4Q/esxVpY6cIRVbmf0Akw4Cw== 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=1770605961; h=from:from: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; bh=mI6cjgJP4f/4qwDW6gnIV5+EPmXy/rzWNH3fpjB0tuc=; b=d78FXT5pDgRaHoFJJPc9/g+C2YNI471kbUx75RKKE0YJiwiDMKiqCt2G8XMLb98N5m9LPr 0bLzfDEm8MUg+W1Ua2dbshXJv04AZC+sLpg6lWsEgvYetW5fhqZSVuqxfmZ+1tA1lxl8vG jzn+qZE1o7EHyTZgKLak5scZNIocd8FTA1DJLybiVuiB1IWV2k4pm6zJ8NboEA1FP5p7yS Ut7vW/2llj63VC4UTCyRCwOARuZ+wEoxH0Nw7MBjX9uH90wdOcE48m7DIWd4ivJIyI/tQy v9gJ3vQT6gkeljJVUdxOjOGyjkHUciu6q6ZJaboBrBgvE31OgQUgbh5a1AWKNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8Ttd5WrkzYM for ; Mon, 09 Feb 2026 02:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f4a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 02:59:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Konstantin Belousov Subject: git: 2088e742013b - main - x86: Note that trapframe is used by kernel debuggers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2088e742013bb1b9ca237a79767362efe92d9da8 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 02:59:21 +0000 Message-Id: <69894d89.3f4a1.3481247f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2088e742013bb1b9ca237a79767362efe92d9da8 commit 2088e742013bb1b9ca237a79767362efe92d9da8 Author: Minsoo Choo AuthorDate: 2026-02-09 01:21:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 02:58:31 +0000 x86: Note that trapframe is used by kernel debuggers Signed-off-by: Minsoo Choo Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55189 --- sys/x86/include/frame.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h index 994e19b979fc..feef41ac7bfe 100644 --- a/sys/x86/include/frame.h +++ b/sys/x86/include/frame.h @@ -38,6 +38,7 @@ /* * System stack frames. + * struct trapframe is known to and used by kernel debuggers. */ #ifdef __i386__ From nobody Mon Feb 9 04:18:47 2026 X-Original-To: dev-commits-src-main@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 4f8WfJ2Yz8z6SDLW for ; Mon, 09 Feb 2026 04:18:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8WfH6dJWz3vQx for ; Mon, 09 Feb 2026 04:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770610728; h=from:from: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; bh=1mAnnrCg21qmErCaDoj+k/L5ESrcbzH5iolLVBhPxHs=; b=RvlZzh9X5KJKv00Q8NIi23aQm9U1+yGWf60rBHLO0hBQmEszNalNVmWEQJFRoS2fu2uMA7 8mA5I3qiU3uaB4OPbKCCfaiwGC8svzE9A5cIwXo2ngVJ5YpSjH/mFUma3HgS+mV98i4Brg TI17Ob2FC/oWj/2c4UgTRFHIT4q0ns72bPbq2SuktTmRNlu5/+EIOxp0UVR0IJuBhPsjqj dM3JFvXG4nbc9GIrzBOqNn5Yte4K2LQiTtvX9S8lEikW5Yd9jPqBbnnbeJSXjNVym92l6s TNL5rt57QiSRkepEWL3BgQynTppFvfCYbIW5yIPmwfhIJJcPDZeosCJRIf8skA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770610728; a=rsa-sha256; cv=none; b=sPHuXL0xmkPQP23Ixkvz9Y9mOFAfOVKFPh41Vg/Znn2r4tLFz2iYCSE4WslgfqL0JZqeWq jl/b/2W6LE5kErVXOFbO97kRsaxeOsjZU0puW8/tYQrjZ9PHm61o4Y94s6PI3SpWPEsUCE Qb7yK07uErtZWiMTxBM9VIg5W59tKDLLdKfM27r1yHRldh3+ubrEb7KgEGLqEVQQ71QnH6 vc66QvtBUcSjdUVNL9nnBq4t4MeBvLy56NIfo8nlgERrsXU4gHlanX8lV2wXRJgjnAX8X3 3Ijy8b+OuCr0ujhslYzrxoadFirwh2ngPkumCPWije8ftJ5GZVYl8pt4tbBZAg== 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=1770610728; h=from:from: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; bh=1mAnnrCg21qmErCaDoj+k/L5ESrcbzH5iolLVBhPxHs=; b=AqOW4at13bu9BMbWUy1ma6EVP2WvhftKe3Cx4vE2DspOMMp5GvPgTIiO1Ek7bat6rsPTpi lPWwfITzVlCCtnJuGVlS0NbZQef+XHYmKm6jCofMpgX69P0ifNei+FQcH8N3ytXMD3ljms UVeOjpmBICjRBw5SFl4KXV/x+bgJ05Dq15ZkLr5/R5yVwy9Hhwe5M7AoJr+/oJcjppSlse yn15FT3UFlk1YSmwquptoHCGyEpCLdhSVwNEUQDaXoF1Cj8wUoufCNsYFSp7knpHtb2KqN G8Auq6fmyG7mPBM9NA7jYd8nKOT/SsxxgN69h7D8AxIQsLisZ0QQZCIRSAU3iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8WfH5NxWz2S2 for ; Mon, 09 Feb 2026 04:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2112e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 04:18:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Konstantin Belousov Subject: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 04:18:47 +0000 Message-Id: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 Author: Minsoo Choo AuthorDate: 2026-02-06 20:03:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 04:17:16 +0000 pcb.h: mark struct pcb to be preserved There are programs that depend on this structure (e.g. kernel debuggers) that breaks when the ABI changes. Signed-off-by: Minsoo Choo Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55149 --- sys/amd64/include/pcb.h | 21 +++++++++++---------- sys/arm/include/pcb.h | 4 ++++ sys/arm64/include/pcb.h | 5 +++++ sys/i386/include/pcb.h | 17 +++++++++-------- sys/powerpc/include/pcb.h | 5 +++++ sys/riscv/include/pcb.h | 5 +++++ 6 files changed, 39 insertions(+), 18 deletions(-) diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index 27e1dce08ee1..5a1e8529ad8b 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -44,18 +44,19 @@ #ifdef __amd64__ /* - * NB: The fields marked with (*) are used by kernel debuggers. Their - * ABI should be preserved. + * struct pcb is known to and used by kernel debuggers. Its layout must be kept + * stable. When adding extra fields that are accessed by kernel debuggers, + * debuggers should be backward compatible by using osreldate. */ struct pcb { - register_t pcb_r15; /* (*) */ - register_t pcb_r14; /* (*) */ - register_t pcb_r13; /* (*) */ - register_t pcb_r12; /* (*) */ - register_t pcb_rbp; /* (*) */ - register_t pcb_rsp; /* (*) */ - register_t pcb_rbx; /* (*) */ - register_t pcb_rip; /* (*) */ + register_t pcb_r15; + register_t pcb_r14; + register_t pcb_r13; + register_t pcb_r12; + register_t pcb_rbp; + register_t pcb_rsp; + register_t pcb_rbx; + register_t pcb_rip; register_t pcb_fsbase; register_t pcb_gsbase; register_t pcb_kgsbase; diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h index fd77544c22c1..810b1e665b19 100644 --- a/sys/arm/include/pcb.h +++ b/sys/arm/include/pcb.h @@ -42,6 +42,10 @@ #include /* + * struct pcb is known to and used by kernel debuggers. Its layout must be kept + * stable. When adding extra fields that are accessed by kernel debuggers, + * debuggers should be backward compatible by using osreldate. + * * WARNING! * Keep pcb_regs first for faster access in switch.S */ diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index c0feb1149cf5..9955f5b22714 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -46,6 +46,11 @@ struct trapframe; #define PCB_FP 10 #define PCB_LR 11 +/* + * struct pcb is known to and used by kernel debuggers. Its layout must be kept + * stable. When adding extra fields that are accessed by kernel debuggers, + * debuggers should be backward compatible by using osreldate. + */ struct pcb { uint64_t pcb_x[12]; /* These two need to be in order as we access them together */ diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index 1b14efa425b5..1385bfeeef31 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -44,16 +44,17 @@ #include /* - * NB: The fields marked with (*) are used by kernel debuggers. Their - * ABI should be preserved. + * struct pcb is known to and used by kernel debuggers. Its layout must be kept + * stable. When adding extra fields that are accessed by kernel debuggers, + * debuggers should be backward compatible by using osreldate. */ struct pcb { - int pcb_edi; /* (*) */ - int pcb_esi; /* (*) */ - int pcb_ebp; /* (*) */ - int pcb_esp; /* (*) */ - int pcb_ebx; /* (*) */ - int pcb_eip; /* (*) */ + int pcb_edi; + int pcb_esi; + int pcb_ebp; + int pcb_esp; + int pcb_ebx; + int pcb_eip; struct segment_descriptor pcb_fsd; struct segment_descriptor pcb_gsd; int pcb_ds; diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h index 0230cf78aba7..7ebd13dd0ed1 100644 --- a/sys/powerpc/include/pcb.h +++ b/sys/powerpc/include/pcb.h @@ -41,6 +41,11 @@ #include #ifndef _STANDALONE +/* + * struct pcb is known to and used by kernel debuggers. Its layout must be kept + * stable. When adding extra fields that are accessed by kernel debuggers, + * debuggers should be backward compatible by using osreldate. + */ struct pcb { register_t pcb_context[20]; /* non-volatile r12-r31 */ register_t pcb_cr; /* Condition register */ diff --git a/sys/riscv/include/pcb.h b/sys/riscv/include/pcb.h index bb88516a1385..bcec4c3fd478 100644 --- a/sys/riscv/include/pcb.h +++ b/sys/riscv/include/pcb.h @@ -39,6 +39,11 @@ struct trapframe; +/* + * struct pcb is known to and used by kernel debuggers. Its layout must be kept + * stable. When adding extra fields that are accessed by kernel debuggers, + * debuggers should be backward compatible by using osreldate. + */ struct pcb { uint64_t pcb_ra; /* Return address */ uint64_t pcb_sp; /* Stack pointer */ From nobody Mon Feb 9 04:33:55 2026 X-Original-To: dev-commits-src-main@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 4f8Wzt4DVMz6SDpJ; Mon, 09 Feb 2026 04:34:02 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) (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 "protonmail.com", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8Wzt0rPQz3wZx; Mon, 09 Feb 2026 04:34:02 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1770611639; x=1770870839; bh=lNEk2itume4Ug1Mny9A9qo1g5iFxUx3U4T9GtT84bAQ=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=c/FEb712U51nj+u0XAOwGPWtsH5W+BlGA/lhYOZG2El7ZSjkQQ3hozvgDlxRVxN20 sonbLzY2CFPmUTGsZrK40/JJ0qskJ1ud3mH4dlBJSHLB6RT6nVRriYd1OI7csh2iID gmqX8rVoWJUuDck3djvDmkLXrVrd55MzExzW+F+t/6vNYTj+kW9EFAEBrCHF/ilrnR fKYvNl5XsnmHb2Yc7FtSzI/Y62XyMmbtglbJ70Ib/ilpeZ4l9q769+/kiHt6IgVlBQ 9bUwojbppE5wJKY7P+/FJMRUloDE0I2XtYmFCOivfrVMbTc57WEWtfz0Kcaq/ifVea dP9eq8BF0j0fA== Date: Mon, 09 Feb 2026 04:33:55 +0000 To: Konstantin Belousov From: Minsoo Choo Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: In-Reply-To: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> Feedback-ID: 45891198:user:proton X-Pm-Message-ID: 09a16f76d1a6abe5f8e2c31de0b5e64ee6b11f56 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1=_VOEJZjtcnhxdeNUIfVrd5CjZB5vY9oF22GXFHApyQuI" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH] X-Rspamd-Queue-Id: 4f8Wzt0rPQz3wZx X-Spamd-Bar: ---- --b1=_VOEJZjtcnhxdeNUIfVrd5CjZB5vY9oF22GXFHApyQuI Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ideally this should be applied to sys/mips/include/pcb.h when MFCed to stab= le/13. However, considering that stable/13 EOL is two months away and there= wouldn't be breaking change to mips's pcb.h, it should be fine to ignore i= t. > On Feb 8, 2026, at 23:18, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8f23665fed2fbaf4481359b4d2= fcdd7b9feb40e3 >=20 > commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > Author: Minsoo Choo > AuthorDate: 2026-02-06 20:03:53 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-02-09 04:17:16 +0000 >=20 > pcb.h: mark struct pcb to be preserved >=20 > There are programs that depend on this structure (e.g. kernel debugger= s) > that breaks when the ABI changes. >=20 > Signed-off-by: Minsoo Choo > Reviewed by: kib > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D55149 > --- > sys/amd64/include/pcb.h | 21 +++++++++++---------- > sys/arm/include/pcb.h | 4 ++++ > sys/arm64/include/pcb.h | 5 +++++ > sys/i386/include/pcb.h | 17 +++++++++-------- > sys/powerpc/include/pcb.h | 5 +++++ > sys/riscv/include/pcb.h | 5 +++++ > 6 files changed, 39 insertions(+), 18 deletions(-) >=20 > diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h > index 27e1dce08ee1..5a1e8529ad8b 100644 > --- a/sys/amd64/include/pcb.h > +++ b/sys/amd64/include/pcb.h > @@ -44,18 +44,19 @@ >=20 > #ifdef __amd64__ > /* > - * NB: The fields marked with (*) are used by kernel debuggers. Their > - * ABI should be preserved. > + * struct pcb is known to and used by kernel debuggers. Its layout must = be kept > + * stable. When adding extra fields that are accessed by kernel debugger= s, > + * debuggers should be backward compatible by using osreldate. > */ > struct pcb { > -=09register_t=09pcb_r15;=09/* (*) */ > -=09register_t=09pcb_r14;=09/* (*) */ > -=09register_t=09pcb_r13;=09/* (*) */ > -=09register_t=09pcb_r12;=09/* (*) */ > -=09register_t=09pcb_rbp;=09/* (*) */ > -=09register_t=09pcb_rsp;=09/* (*) */ > -=09register_t=09pcb_rbx;=09/* (*) */ > -=09register_t=09pcb_rip;=09/* (*) */ > +=09register_t=09pcb_r15; > +=09register_t=09pcb_r14; > +=09register_t=09pcb_r13; > +=09register_t=09pcb_r12; > +=09register_t=09pcb_rbp; > +=09register_t=09pcb_rsp; > +=09register_t=09pcb_rbx; > +=09register_t=09pcb_rip; > =09register_t=09pcb_fsbase; > =09register_t=09pcb_gsbase; > =09register_t=09pcb_kgsbase; > diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h > index fd77544c22c1..810b1e665b19 100644 > --- a/sys/arm/include/pcb.h > +++ b/sys/arm/include/pcb.h > @@ -42,6 +42,10 @@ > #include >=20 > /* > + * struct pcb is known to and used by kernel debuggers. Its layout must = be kept > + * stable. When adding extra fields that are accessed by kernel debugger= s, > + * debuggers should be backward compatible by using osreldate. > + * > * WARNING! > * Keep pcb_regs first for faster access in switch.S > */ > diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h > index c0feb1149cf5..9955f5b22714 100644 > --- a/sys/arm64/include/pcb.h > +++ b/sys/arm64/include/pcb.h > @@ -46,6 +46,11 @@ struct trapframe; > #define=09PCB_FP=09=0910 > #define=09PCB_LR=09=0911 >=20 > +/* > + * struct pcb is known to and used by kernel debuggers. Its layout must = be kept > + * stable. When adding extra fields that are accessed by kernel debugger= s, > + * debuggers should be backward compatible by using osreldate. > + */ > struct pcb { > =09uint64_t=09pcb_x[12]; > =09/* These two need to be in order as we access them together */ > diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h > index 1b14efa425b5..1385bfeeef31 100644 > --- a/sys/i386/include/pcb.h > +++ b/sys/i386/include/pcb.h > @@ -44,16 +44,17 @@ > #include >=20 > /* > - * NB: The fields marked with (*) are used by kernel debuggers. Their > - * ABI should be preserved. > + * struct pcb is known to and used by kernel debuggers. Its layout must = be kept > + * stable. When adding extra fields that are accessed by kernel debugger= s, > + * debuggers should be backward compatible by using osreldate. > */ > struct pcb { > -=09int=09pcb_edi;=09/* (*) */ > -=09int=09pcb_esi;=09/* (*) */ > -=09int=09pcb_ebp;=09/* (*) */ > -=09int=09pcb_esp;=09/* (*) */ > -=09int=09pcb_ebx;=09/* (*) */ > -=09int=09pcb_eip;=09/* (*) */ > +=09int=09pcb_edi; > +=09int=09pcb_esi; > +=09int=09pcb_ebp; > +=09int=09pcb_esp; > +=09int=09pcb_ebx; > +=09int=09pcb_eip; > =09struct segment_descriptor pcb_fsd; > =09struct segment_descriptor pcb_gsd; > =09int=09pcb_ds; > diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h > index 0230cf78aba7..7ebd13dd0ed1 100644 > --- a/sys/powerpc/include/pcb.h > +++ b/sys/powerpc/include/pcb.h > @@ -41,6 +41,11 @@ > #include >=20 > #ifndef _STANDALONE > +/* > + * struct pcb is known to and used by kernel debuggers. Its layout must = be kept > + * stable. When adding extra fields that are accessed by kernel debugger= s, > + * debuggers should be backward compatible by using osreldate. > + */ > struct pcb { > =09register_t=09pcb_context[20];=09/* non-volatile r12-r31 */ > =09register_t=09pcb_cr;=09=09=09/* Condition register */ > diff --git a/sys/riscv/include/pcb.h b/sys/riscv/include/pcb.h > index bb88516a1385..bcec4c3fd478 100644 > --- a/sys/riscv/include/pcb.h > +++ b/sys/riscv/include/pcb.h > @@ -39,6 +39,11 @@ >=20 > struct trapframe; >=20 > +/* > + * struct pcb is known to and used by kernel debuggers. Its layout must = be kept > + * stable. When adding extra fields that are accessed by kernel debugger= s, > + * debuggers should be backward compatible by using osreldate. > + */ > struct pcb { > =09uint64_t=09pcb_ra;=09=09/* Return address */ > =09uint64_t=09pcb_sp;=09=09/* Stack pointer */ --b1=_VOEJZjtcnhxdeNUIfVrd5CjZB5vY9oF22GXFHApyQuI Content-Type: application/pgp-signature; name=signature.asc Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=signature.asc LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0KaUhVRUFSWUlBQjBXSVFTT09OMUhzcTJE dmFpUGE5d0RCcFYwUWw4enVBVUNhWWxqbVFBS0NSQURCcFYwUWw4eg0KdUJpdEFRRFA5eWFKbGNz MzJPbmFTdkl3b1pOaGorZnA0c0Y2ZVhvN3VzTGVQTUJJVWdEOUVyZ2k0ZjQzZzYzdQ0KYjRDM0U5 MUJzajlucVZldEdtZ3QyZDNpQkxmNm5BWT0NCj1WR0FJDQotLS0tLUVORCBQR1AgU0lHTkFUVVJF LS0tLS0NCg== --b1=_VOEJZjtcnhxdeNUIfVrd5CjZB5vY9oF22GXFHApyQuI-- From nobody Mon Feb 9 07:34:25 2026 X-Original-To: dev-commits-src-main@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 4f8c0209rjz6QkG7 for ; Mon, 09 Feb 2026 07:34:26 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8c016lJYz49jY for ; Mon, 09 Feb 2026 07:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770622465; h=from:from: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; bh=3UVcfEN+yr0tsCgsgi9kwh9pHBOwtDvHRu1JAI/bGT8=; b=PIYUL2J++4k2+FFVoTcRyo/xrMsvzbftls/KbFXnjxMA1TWc6zY9SMwS/oiZ8V0motEVaZ 3UJYZC9o37UOekqLW6okaGXoCyD5VFCaAXbSeSKSdORhTbfepIDjNfoBqpdIH5onfDvuhb eAIZlP2gXpqgbN8F4zg5Ua8LrgTUiuTErF2vFOu1wSOCbGuVxwFFarXNfF27pp1wVrvuOh onc2yEXcO3XxojQ92PPKZLALB6e+ydNPKG4+6QiDgbeH5nBgmv/6bQsEHKyKakgiqh62pa iW3QjGMkYvTo/i6ibjqtabAI/fWrvV+wpH7x/nGUSjjvvTmHBtar61ht2YZz4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770622465; a=rsa-sha256; cv=none; b=DhLoqY1+HmjNgzuFns3649r/AkbZYKQYbDKewaYcMkSLoOlRvG7oLdHJb0PfQvvG0MRJqC /kqx57iiwBzSGsnjWBgGdbpvLRsiC6UXt1pqY4vQYZAOwoDsdMIkya7cNalUDATR3pgzkp KGojdYLxK1IpDRnSkLb1yulLqfFXTpyrecBlC2w/1w9O7Nr8P87OGoDkBzb2MZdil7g127 T4woaAtFl8+QO+XIkW3FPexYFKPx5ZO/u4D0SAW2f9NFb/NUWiZx2PLwfSAQUUWyU+eM8O h50XXdvIAs4Iw+k12uTasNjgLWZFef+Nl7M7q2/f2mokRRZANTDJZViaPQYr8A== 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=1770622465; h=from:from: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; bh=3UVcfEN+yr0tsCgsgi9kwh9pHBOwtDvHRu1JAI/bGT8=; b=k0tvIanjT9kLNyADHumFe9gIext4k0hVTDcigM8lkSWwAuIXV/rBAQ7aMSX8Vs65sR6Hfz 2J3bNqFmLh49lYCSxFm8BVxtp+ZkIRVd3+LVzry2haAvINeCMVfTSOPGhwFk/kq6Jh5mgZ S0q9fiW1UdQk4Hr+jWXyamH3xHkglv4W86uqzaFYIYdDke5sry4H8wUzJiaD5zXqC7YcNf OQx7jJ8iHNQF9eo/dmGa1+D9R80b9LWrCYi/8bJGEvjse+UfF7cstQRfL5zfwWxmCa8d6o R8gawpKnOTmqMXKuVZPm4WwtEVFtTfE88WFwvRiQhMy3VsOIjSWVqW78Hg8EBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8c015xxMz81V for ; Mon, 09 Feb 2026 07:34:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d897 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 07:34:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Li-Wen Hsu Subject: git: dac3b99e8d8c - main - CONTRIBUTING.md: Fix links to section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dac3b99e8d8cac2f19e3812c1e126801bdef8088 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 07:34:25 +0000 Message-Id: <69898e01.3d897.3f487f66@gitrepo.freebsd.org> The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=dac3b99e8d8cac2f19e3812c1e126801bdef8088 commit dac3b99e8d8cac2f19e3812c1e126801bdef8088 Author: Minsoo Choo AuthorDate: 2026-02-09 05:33:48 +0000 Commit: Li-Wen Hsu CommitDate: 2026-02-09 07:32:30 +0000 CONTRIBUTING.md: Fix links to section Signed-off-by: Minsoo Choo Sponsored by: The FreeBSD Foundation Pull Request: https://github.com/freebsd/freebsd-src/pull/2010 --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d80163fcd104..3dd764a64c7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,10 +39,10 @@ A pull request will be considered if: * You can respond to feedback quickly. If feedback is requested and one month passes without a response we may close the pull request. * It touches fewer than about 10 files and the changes are less than about 200 lines. Changes larger than this may be OK, or you may be asked to submit multiple pull requests of a more manageable size. * Each logical change is a separate commit within the pull request. Commit messages for each change should follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message). -* All commits have, as the git author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email][#author-name-and-email] for details. +* All commits have, as the git author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email](#author-name-and-email) for details. * The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request. * Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. -* Commit messages should include one or more `Signed-off-by:` trailer lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email][#author-name-and-email] for details. +* Commit messages should include one or more `Signed-off-by:` trailer lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email](#author-name-and-email) for details. * The commits follow FreeBSD's style guide. See [Style](#Style). * Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors, or provide an explanation for exceptions. The tool sometimes makes mistakes, and providing an explanation shows you have examined the output. * The commits do not introduce trailing white space. From nobody Mon Feb 9 10:00:14 2026 X-Original-To: dev-commits-src-main@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 4f8gDG5lnfz6R8rc for ; Mon, 09 Feb 2026 10:00:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8gDG3pVzz3MN6 for ; Mon, 09 Feb 2026 10:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770631214; 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=WRNkFmxIMR+EEL89L3OSzF28SMsCykG7/oNxU85u5JQ=; b=iVALvcogDe7fEBnzXajoi2xSPH4d3y2UWbawlC8A789UGBG3rBP6v6PEDtpkRXFtlZfk1R dBNMZ5FDA9ME0EjCeJdUieCktm+USMCaSA6el2sWjV2USbKHebU6dAPBUpgRX4iJ9TtSHO VS+Ywzh1jbBLe3da+cWMg4kIphajngCRQi/pPK/hGimeoDO8LU3AfC5WNajFl2Onjo5dtO gak1Swf6Fi3o91INGxrUHjqdtkhVdvubrbf7FrPvA0YdyXswsBxZG0/bKQE7H1G1LBGCZq LB5y/SDYvMzU+eVih//SfKa8MnqhwOJLAufKpb87bvbMUjQJrmHFNnfp7kzqHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770631214; a=rsa-sha256; cv=none; b=U0pNRExq6soexuDYYHW4x9omfrG5i7MfU9Z3SJmScvXRzurZ5cSFWQa6K1masS2mETPtcW 7SMJ3S6Qs/ZJ2UAwClixyXl0MzQOx/AJqz9qdQ/FmV8CaDYNp2T3WbwqaTxVIvurtFKzHk SzfNxUfFtIWARmfGU0/xMtnQnaQu9wKe1lL2SQC2/zXCO748RXDuhIY/aqVBGkUjKvvMF/ /n6ZTSpvvXh/BKY3UNbjsfk7XBnzy1TnO+ESwPIeYQPHl5PSqC+Q6Wf6W/fTd7tAitlrXU W6NfoxFe9uzYDCgOvVDJLUh+6zo13rfVMkSEUloabiQLViLlOB+zbuxED0J5tg== 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=1770631214; 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=WRNkFmxIMR+EEL89L3OSzF28SMsCykG7/oNxU85u5JQ=; b=uGw0YA1YKRtp36aFuAP/2OLsvvmIdJ5NSAqTYgb3BCVnqO2mJHYJndEH5cfsrXPo1Y6mz7 ow8teFIxULMkXfdnKK2UAiWlPx6KBULOQgjfPAJNzlHQPm6Gnzd9vGAN71OdWs8ee5/cX8 XhUnDeHeiYe4hcAtpiQGWbDaDLUQF+czjfTIhiiT/U2wk5MJ0PPxC+7oLfCr6C1eqemXEd iKO0UECoXlYgHd6fwOLi5fo8VaTItHcMXwLs6mgUnQRtaTZCiGVKG0F2BCTDmosR8kqFFu q0Ip+8rPnj7IyCOxTwmDm+JEZpBMRnNhrQFtzvYFU3BijceP6cYuyHpkd8i7dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8gDG2brJzCGC for ; Mon, 09 Feb 2026 10:00:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c92d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:00:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 60a6ebaf7371 - main - traceroute: graceful recover after networking errors with as_server List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60a6ebaf73719ef7aa15768c3906626fb106b2b3 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:00:14 +0000 Message-Id: <6989b02e.1c92d.ca70ad2@gitrepo.freebsd.org> The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=60a6ebaf73719ef7aa15768c3906626fb106b2b3 commit 60a6ebaf73719ef7aa15768c3906626fb106b2b3 Author: Eugene Grosbein AuthorDate: 2026-02-09 09:47:01 +0000 Commit: Eugene Grosbein CommitDate: 2026-02-09 10:00:10 +0000 traceroute: graceful recover after networking errors with as_server Currentlu, the traceroute[6] utility does not check for possible networking errors while talking to as_server in case of "traceroute -a". Meantime, there is a common case when trace is long and it has many non-responding hops (shown as '* * *'), so as_server aborts our connection, hence no AS numbers shown for the rest of trace. Somewhat artifical way to reproduce the problem: traceroute to 57.144.244.1 (57.144.244.1), 80 hops max, 48 byte packets 5 [AS174] be2950.ccr42.fra05.atlas.cogentco.com (154.54.72.42) 74.277 ms 9.605 ms 9.599 ms 6 [AS174] 149.11.228.19 (149.11.228.19) 9.506 ms 9.466 ms 9.420 ms 7 [AS33182] po172.asw02.fra5.tfbnw.net (129.134.108.146) 9.725 ms 9.874 ms 9.696 ms 8 [AS32934] psw04.fra5.tfbnw.net (157.240.59.85) 8.718 ms 8.691 ms 8.618 ms 9 * * * 10 [AS0] edge-star-mini-shv-01-fra5.facebook.com (57.144.244.1) 9.747 ms 9.815 ms 9.699 ms Note what due to increased timeout (-w10) we get [AS0] for 10th hop because as_server closed our connection. Same problem occurs with default -w3 when there are lots of '* * *' hops in a trace. Fix it with some additional error checking and a reconnection. This patch was in my use for many years and after traceroute(8) moved from contrib/ to usr.sbin/ it's nice to have it in the tree. MFC after: 2 weeks --- usr.sbin/traceroute/as.c | 24 ++++++++++++++++++++---- usr.sbin/traceroute/as.h | 2 +- usr.sbin/traceroute/traceroute.c | 21 +++++++++++++++++++-- usr.sbin/traceroute6/traceroute6.c | 23 +++++++++++++++++++++-- 4 files changed, 61 insertions(+), 9 deletions(-) diff --git a/usr.sbin/traceroute/as.c b/usr.sbin/traceroute/as.c index 7fb952ed3da1..512f1dd6f14c 100644 --- a/usr.sbin/traceroute/as.c +++ b/usr.sbin/traceroute/as.c @@ -118,7 +118,7 @@ as_setup(const char *server) } unsigned int -as_lookup(void *_asn, char *addr, sa_family_t family) +as_lookup(void *_asn, char *addr, sa_family_t family, int *status) { struct aslookup *asn = _asn; char buf[1024]; @@ -128,8 +128,17 @@ as_lookup(void *_asn, char *addr, sa_family_t family) as = 0; rc = dlen = 0; plen = (family == AF_INET6) ? 128 : 32; - (void)fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen); - (void)fflush(asn->as_f); + *status = fprintf(asn->as_f, "!r%s/%d,l\n", addr, plen); + if (*status < 0) { + *status = errno; + return 0; + } + *status = fflush(asn->as_f); + if (*status == EOF) { + *status = errno; + return 0; + } + *status = 0; #ifdef AS_DEBUG_FILE if (asn->as_debug) { @@ -138,7 +147,14 @@ as_lookup(void *_asn, char *addr, sa_family_t family) } #endif /* AS_DEBUG_FILE */ - while (fgets(buf, sizeof(buf), asn->as_f) != NULL) { + while (1) { + if (fgets(buf, sizeof(buf), asn->as_f) == NULL) { + if(feof(asn->as_f) || ferror(asn->as_f)) { + *status = EIO; + return 0; + } + break; + } buf[sizeof(buf) - 1] = '\0'; #ifdef AS_DEBUG_FILE diff --git a/usr.sbin/traceroute/as.h b/usr.sbin/traceroute/as.h index f5a5dae2acec..ac61bbab4786 100644 --- a/usr.sbin/traceroute/as.h +++ b/usr.sbin/traceroute/as.h @@ -30,5 +30,5 @@ */ void *as_setup(const char *); -unsigned int as_lookup(void *, char *, sa_family_t); +unsigned int as_lookup(void *, char *, sa_family_t, int *); void as_shutdown(void *); diff --git a/usr.sbin/traceroute/traceroute.c b/usr.sbin/traceroute/traceroute.c index 1297d3402ebd..be14c40b8d7b 100644 --- a/usr.sbin/traceroute/traceroute.c +++ b/usr.sbin/traceroute/traceroute.c @@ -1653,6 +1653,7 @@ print(register u_char *buf, register int cc, register struct sockaddr_in *from) { register struct ip *ip; register int hlen; + int as, status; char addr[INET_ADDRSTRLEN]; ip = (struct ip *) buf; @@ -1661,8 +1662,24 @@ print(register u_char *buf, register int cc, register struct sockaddr_in *from) strlcpy(addr, inet_ntoa(from->sin_addr), sizeof(addr)); - if (as_path) - Printf(" [AS%u]", as_lookup(asn, addr, AF_INET)); + while(as_path) { + as = as_lookup(asn, addr, AF_INET, &status); + if (status) { + as_shutdown(asn); + asn = as_setup(as_server); + if (asn == NULL) { + Fprintf(stderr, "%s: as_setup failed, AS# lookups" + " disabled\n", prog); + (void)fflush(stderr); + as_path = 0; + break; + } + else + continue; + } + Printf(" [AS%u]", as); + break; + } if (nflag) Printf(" %s", addr); diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 173e97c13bb3..eb6086706f9f 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -894,6 +894,8 @@ main(int argc, char *argv[]) as_path = 0; } } + if (as_path) + signal(SIGPIPE, SIG_IGN); /* * Message to users @@ -1577,13 +1579,30 @@ void print(struct msghdr *mhdr, int cc) { struct sockaddr_in6 *from = (struct sockaddr_in6 *)mhdr->msg_name; + int as, status; char hbuf[NI_MAXHOST]; if (cap_getnameinfo(capdns, (struct sockaddr *)from, from->sin6_len, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0) strlcpy(hbuf, "invalid", sizeof(hbuf)); - if (as_path) - printf(" [AS%u]", as_lookup(asn, hbuf, AF_INET6)); + while (as_path) { + as = as_lookup(asn, hbuf, AF_INET6, &status); + if (status) { + as_shutdown(asn); + asn = as_setup(as_server); + if (asn == NULL) { + fprintf(stderr, "traceroute6: as_setup failed, AS# lookups" + " disabled\n"); + (void)fflush(stderr); + as_path = 0; + break; + } + else + continue; + } + printf(" [AS%u]", as); + break; + } if (nflag) printf(" %s", hbuf); else From nobody Mon Feb 9 10:23:32 2026 X-Original-To: dev-commits-src-main@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 4f8gl83x22z6RCBb for ; Mon, 09 Feb 2026 10:23:32 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8gl83B4bz3PkL for ; Mon, 09 Feb 2026 10:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632612; 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=Oddx2P2zZ9sGsUg8jNB0QzFje31JglEz/koA33ZtIbY=; b=FvA8d/SPs5DDamB4hR+kwRzOVUCMnYiDCrXLGgXRjdbjw8ISpBDYXgndHroDxY3oyqLypa TPBoJOtGa3QNZhuH7+4mRnqlEVNvnOUMUqasJ7smba7uVqtrf8JihIqhzPe3T8xjNyux2s c1yvMQI7z+oy041VYsZqbS+bQRzNoRX50Z0c90TchESb8tqbiLIXMMlgEAgg4ee2Ef8sTZ 1oASlldBfvkwe2kwbQ16AXqrhfOlmJ/QAz9r0IG/0kzDvPBbTg9PtPSbDAXMeCN+LmIK3m FtKgkhR15i6A/vKax7g0QNrKJnP0B2pQOjYb7hcVyV4JSCrElfnXRhclKzeZ8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632612; a=rsa-sha256; cv=none; b=OqBDGpoqhuMzQKtBoXpGd6g+dFTz75TLbFopxBbLwu3/4r/ZWd5O5FstiVLRUqguhLnL6w y+XWNErKLPRlaJBjMsyB0fOeJJ8xxVgUy8Of4dhRQKuPZi7+c/Prc0KAkGkG4WXFeRnDj2 G3uZnidMr2raZM3oPLoKrFJ02rXJrLYjuw34fWZ0HhHdSGwDnvE4XsQLXJO9u5upxTzpHS Np3eZWS/bI37QQP+dIOV1dSWaDmkZSIXVK+rfV2vmBKkPDTLL0fpYXpHvdGOexFUDeXhOj mh2h/5eqSDimpGkZSfcAgDFBBeLL5NZQ1KGZnk/ILGoR/bZ6dSRaLgz2WF2gDw== 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=1770632612; 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=Oddx2P2zZ9sGsUg8jNB0QzFje31JglEz/koA33ZtIbY=; b=bwBUtUIbbwgKvcy58vtOHAoO+UNH195pQC9YqgeeM7995cKlaT0vkOlYzOD8Yn3f0Z0CPp WrNtu7RnYzn4J1kZG05d8ub/oJWioYEdEggipTO8OtgdNwFFCOJEOQvXTlVHghVyQyc75a sG/1bOtVw7MjpfxEtpSbCWiK0SqMZBGVU65Er7s3SeXKySNR9xus+lefgZcdjJppu88SVQ DiNIb8MSxI4HD0asNP9gL5m5JO/Qjg5lgNCjvkTT/84fojwU26RuTFp/giPsAIXfpmtWwo AWr4WcXXcH/hV7SNNscRWzGBJufp3fCuyJIiStoBPxSStyoCgrnfsqVIiG+24A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8gl82lfHzCwF for ; Mon, 09 Feb 2026 10:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f766 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 063244ff95a2 - main - aw_rtc: Add H616 compat string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 063244ff95a2fd62054725d59f3856645f539dea Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:32 +0000 Message-Id: <6989b5a4.1f766.226b796f@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=063244ff95a2fd62054725d59f3856645f539dea commit 063244ff95a2fd62054725d59f3856645f539dea Author: Tom Jones AuthorDate: 2026-02-09 10:04:38 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:18 +0000 aw_rtc: Add H616 compat string Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54908 --- sys/arm/allwinner/aw_rtc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c index d3a73d98d86a..4c3efa3315b1 100644 --- a/sys/arm/allwinner/aw_rtc.c +++ b/sys/arm/allwinner/aw_rtc.c @@ -137,6 +137,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun20i-d1-rtc", (uintptr_t) &h3_conf }, { "allwinner,sun50i-h5-rtc", (uintptr_t) &h3_conf }, { "allwinner,sun50i-h6-rtc", (uintptr_t) &h3_conf }, + { "allwinner,sun50i-h616-rtc", (uintptr_t) &h3_conf }, { NULL, 0 } }; From nobody Mon Feb 9 10:23:33 2026 X-Original-To: dev-commits-src-main@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 4f8gl95lH2z6RCDm for ; Mon, 09 Feb 2026 10:23:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8gl93qMbz3Pdh for ; Mon, 09 Feb 2026 10:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632613; 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=JOnSV2attPJ3xWUmixI0SDunIGKN8q+/iOZrrY8oo4s=; b=l6pMFGgndl4mIWRmTU2RrTq1BVsFRnnT9nnrzO3l5gBasfq4capWwL19V/Sc+G3MoKCjXc fDRIzTY73OivxiQYyllZYGQiLAaMN1zWSQy1kgaEDnBrClb18fQTc6t2wvtWVhcCB1SKGS tpnSpAt0qdjcLECYrmj9Pd8RjUX2FmAXmoEV47KBFMBjn/lnqnt5BRGbVk/5O8psBvnjkX GIVdEWltJtTtgJdZ+BoGsrNMHpk/f7QusAa2C8Rq1FVwvx1npH+q18hYnxlC3x6o9NwrHK 2JAf1VSyQ/889XFcObV1kSumQMrDBVnq7bAe5Zl5I9PFvX64nq8SYU2Wrti64Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632613; a=rsa-sha256; cv=none; b=KNc6BHR5qxkqLKsOXNESyYxG08i3pb22C5THwc+ODMQ/oqbRynTAbJHgwprmpYnIzHMMbB 8ZEz5DmvPTXoSAhYw91nsO6BshRphYKztdUVEszFx1oV8ZAeCtepSJCaERMaqjqd6xMM4n HuGfIjPbt+vhuUNeVTf/1GKeu0q152gtQGVo2EigLlcZ5Xb+k9E4qz7iZfmzOmxe01iqhp GMpsZA8+vUEjXHCo+kuLEJMHgiB8JwLgPaNcR8mFEotgabb2ODpw9TpxF4q4o8j9uhd6G7 +aTPALV8Pt4TiU4OtVbJnSpbFGE5QExKPjaU3iKkTwSGkQ7SMlLrSPt3wAiTaw== 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=1770632613; 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=JOnSV2attPJ3xWUmixI0SDunIGKN8q+/iOZrrY8oo4s=; b=YTbbxD3yTPt+yJVzKcOk7TJbxC9gT5IKXmFIazFAlAqZCSJmL6OS5rhw7Ms0xXSnHY5MoK iKylNv9q7Uv0NWExnyuHcuqlDORGBhlNvQcu6u2c7ncNKF1J3Rid2nW7xzJZdxk+9FRt+t cYR4xm7OoHgPRk17JIxQKMAjrA6WtkmEIWY7PjPaZE30IXuFP+ZHxUpmY897fclybHqPYZ x4L9Qt4GuU4doQLy/dN0zFzJka+aGE+Veydq1KQpM0hib+vdziXGIPxmUzhMJpVhABKy7n wZCB5RAcYohMLMwAibWHVaGQ4AKO+WfeO+5dmkW3vzZX4adbkGkQDDai9ZSIgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8gl9366ZzDDs for ; Mon, 09 Feb 2026 10:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f688 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 998c46ac2afb - main - aw_mmc: Add H616 mmc and emmc config List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 998c46ac2afb99bb17d9399bb8e897e8d621d6d4 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:33 +0000 Message-Id: <6989b5a5.1f688.7b9da4af@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=998c46ac2afb99bb17d9399bb8e897e8d621d6d4 commit 998c46ac2afb99bb17d9399bb8e897e8d621d6d4 Author: Tom Jones AuthorDate: 2026-02-09 10:05:10 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:19 +0000 aw_mmc: Add H616 mmc and emmc config Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54909 --- sys/arm/allwinner/aw_mmc.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index a8add957dc74..e10e98aea261 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -115,6 +115,18 @@ static const struct aw_mmc_conf a64_emmc_conf = { .can_calibrate = true, }; +static const struct aw_mmc_conf h616_mmc_conf = { + .dma_xferlen = 0x10000, + .mask_data0 = true, + .can_calibrate = true, + .new_timing = true, +}; + +static const struct aw_mmc_conf h616_emmc_conf = { + .dma_xferlen = 0x10000, + .can_calibrate = true, +}; + static const struct aw_mmc_conf d1_mmc_conf = { .dma_xferlen = 0x1000, .dma_desc_shift = 2, @@ -131,6 +143,8 @@ static struct ofw_compat_data compat_data[] = { {"allwinner,sun20i-d1-mmc", (uintptr_t)&d1_mmc_conf}, {"allwinner,sun50i-a64-mmc", (uintptr_t)&a64_mmc_conf}, {"allwinner,sun50i-a64-emmc", (uintptr_t)&a64_emmc_conf}, + {"allwinner,sun50i-h616-mmc", (uintptr_t)&h616_mmc_conf}, + {"allwinner,sun50i-h616-emmc", (uintptr_t)&h616_emmc_conf}, {NULL, 0} }; From nobody Mon Feb 9 10:23:34 2026 X-Original-To: dev-commits-src-main@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 4f8glC0SJgz6RBrn for ; Mon, 09 Feb 2026 10:23:35 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glB4Cssz3PPZ for ; Mon, 09 Feb 2026 10:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632614; 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=RSevxMzmMrJRPu7Eeq4s+ATAdIy6ktFitTvPvvs3CJc=; b=ZMCft7veVKWrZHN7V1mb3eJino3t3VmCgKdL0A0eEvYoWOzxOPBRHrbuoualHXkTxxIZSN uDTH4s3ifgJ44jgd9kvJiZFxdF7awPgYkMiVWLtHo1ptvt6bBf8OzqvRPiow9IfOlwsO6m yUegx0mZ2CS8wT67d98mhnQbA2Ka1emVKHuPjZyhC42xBaxWRz7Kd0ges+25yEQM7Z3Lnb xZfGwIr4SHZJK/PMzdq+MJmYYdhpn4dafIJ7ndMBu35sCiavoV0Ku81FHVnD2ya1N/3Q4L QK6hn6tmLRMq+nv3GtgIn3EJxV2dhellzV3eYWKIkqtPxCnqGoKMMZmsQ5JjQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632614; a=rsa-sha256; cv=none; b=GfM29PedUvG6FOclgJ5PdGMU9ulUg54gthfmA1/3Okrk5ZGfGx34tgdQmnOOL3sHtvMkGy 7P8c05DcqrACOTTo9fs4G4gCF6C3n0K0mY1YIR8z6Wgyky2h1iut0neSW/r6Rn6qQBE5OG 9aoU0YQDoRO93uMuQw+3Pb4LBrAOGmPcO+kNZvxzeaT+e5xg1N0AA4wcIdk+lwY7+c3ge/ u7I34wBE+pScVB5eseoMBqLbdhaET/QmxZNUfhJr9qsB7fhsYFtNqsiGpTDbGXdbRosSJo Q5M9BhJRNsu4Y4sNS7Wh6zwQv6EueJKhfPXMzHPPWNWyRc15f7V2uBD2UQAdSQ== 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=1770632614; 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=RSevxMzmMrJRPu7Eeq4s+ATAdIy6ktFitTvPvvs3CJc=; b=PnohqGJgVZG5LBQS7hUJjX8/KghaJQhkN7RBCT1L3AQaq0CMG4/BaPkUH94rMDiDrBSkRu QdDK2PQ4w5KujIrZZfwotKT2PuRq4McSQMSA+ipSFl9SAbTj9/aZE24dg30B/xdyaYxf0R asIvro4DyeaP8LzsVVJTo6suJi/PzCzr97BNsgGZcBdftJTRDNLP1OKTw1Wf8B6dJQBduA HQdFL9QR+vvvFWiKUjI1vzTU0irX32Zv8uLChUjhtpvfTu2leA1DbjKhv1CP/jqMn3ktqk 2In+QDEVbPKyVvaqzwCDx7cv7tWg5esQr4zdT5VV8FO3RE0bXkZHQVP84eZrRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glB3YpPzD1V for ; Mon, 09 Feb 2026 10:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eadc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 5e51e670cc3b - main - aw_cir: Add H616 compat string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e51e670cc3bf670240a0d9b919b92f9bccb955e Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:34 +0000 Message-Id: <6989b5a6.1eadc.7cc678c5@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=5e51e670cc3bf670240a0d9b919b92f9bccb955e commit 5e51e670cc3bf670240a0d9b919b92f9bccb955e Author: Tom Jones AuthorDate: 2026-02-09 10:05:19 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:19 +0000 aw_cir: Add H616 compat string Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54910 --- sys/arm/allwinner/aw_cir.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm/allwinner/aw_cir.c b/sys/arm/allwinner/aw_cir.c index 5ebb57f48040..4d5ad004a7c3 100644 --- a/sys/arm/allwinner/aw_cir.c +++ b/sys/arm/allwinner/aw_cir.c @@ -137,6 +137,7 @@ enum { A10_IR = 1, A13_IR, A31_IR, + H616_IR, }; #define AW_IR_RAW_BUF_SIZE 128 @@ -168,6 +169,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun4i-a10-ir", A10_IR }, { "allwinner,sun5i-a13-ir", A13_IR }, { "allwinner,sun6i-a31-ir", A31_IR }, + { "allwinner,sun6i-h616-ir", H616_IR }, { NULL, 0 } }; @@ -427,6 +429,7 @@ aw_ir_attach(device_t dev) break; case A13_IR: case A31_IR: + case H616_IR: sc->fifo_size = 64; break; } From nobody Mon Feb 9 10:23:35 2026 X-Original-To: dev-commits-src-main@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 4f8glD4kbvz6RC8m for ; Mon, 09 Feb 2026 10:23:36 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glC4vXPz3PPh for ; Mon, 09 Feb 2026 10:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632615; 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=BM05xoBKxDzQC7VlEmCjODQf0dkrE08qSvKOXZEsVNI=; b=Uu+H/Wvq8lXqFh2IsD+IiYWC6P8Ab1FQZCCcd5Oerx/5QdCOMwtR9LuLUQMC+epAw1yLx7 qEH1rpPkBQFI91qCSuAKa/EYbpaD+H33wVsgpzjHpW7mMhUMbSzWBTR8vwj3Vqi8QASpO9 YnKUkiIMkDvH7IfYZ1S9ARuWzWllCCo9peT4+LkUMdZfW4Ygn3qKJquu3zuJWsXQxYQ2A3 Sw6x6JgXOZP+5FLUohr+B3IoYZGjGdAvHQJxqbGmTAVoQNK0pmdftVJ3osdbQ13u/QL3v8 YOaqTau1T/hXzKdwm/SymH083oG9x5zWZPx7cTX85UcSGq/QZQf9/vzWxQj+wQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632615; a=rsa-sha256; cv=none; b=B9/XOYrAYa0IQs9jKby94ojDTWKz8PeyGThtOo63YGS1LjTno+AFN7WHsZ3DaiYt5h7DDE gSyvRHTJEwdSSH9XALzaQihxkN6/O+BNge4KlqBBYiVqVtP+hsHHdi+sbhqr6jHcGP/SqW jhJ+Usy6R2kSuq6L1w+OOFTINeEq8EqGkL78xckuYLhebuN9gF5qa6+gLX0Rgh9s4vmQ96 178a4upKFYTg4Z4LgW5ca26QbwfMc2Xvsz8mI5VLK91cFzpsKKo4Uc0HQ3SvLZw78meTN3 Ksagz5G5kVYCTAjTYV+uWNfcL6kTfro4Iw2D/fBizvGW6BHQhFIkTHp/RjX5xg== 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=1770632615; 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=BM05xoBKxDzQC7VlEmCjODQf0dkrE08qSvKOXZEsVNI=; b=dXQruyKC8Z1cKoaxMbZnl0Olckee29a5gn2HBepnGVxVOGoehNmpSi9MJQN53FbJZEGaIT RiDUbVihcn/exrjQ3I29T5/Yr9lTrAZZJuO5nmeZsy+6rIwDVPIYeubxHo3LFvsPSun8lw WZgYXC416WVnyGAzzyYM/KtF5F4YJ6RqyOhK8U60wtt3AdUBXUCn6zO1XyTC3IzN0S7fUR CIWRuSZC7FEW1fn19+k1qzpvG557tNYzIp3ZAv2pMqlW3kbt0MPwx12XCLF+gqEmH6qi89 Mbdg4BkWtUzPnuEWoAgoZ744gnvD/3pBnDSUcAMHn1E+f8Lfsnubm6mowyImgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glC4HDwzD3B for ; Mon, 09 Feb 2026 10:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d77b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: c5c183a97dc1 - main - aw_rsb: Add H616 compat string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5c183a97dc18951a90af79ee0e7e4a1f8662d06 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:35 +0000 Message-Id: <6989b5a7.1d77b.199bdd7a@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=c5c183a97dc18951a90af79ee0e7e4a1f8662d06 commit c5c183a97dc18951a90af79ee0e7e4a1f8662d06 Author: Tom Jones AuthorDate: 2026-02-09 10:05:26 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:19 +0000 aw_rsb: Add H616 compat string Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54911 --- sys/arm/allwinner/aw_rsb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm/allwinner/aw_rsb.c b/sys/arm/allwinner/aw_rsb.c index 773b88d01d84..7ff4d754127b 100644 --- a/sys/arm/allwinner/aw_rsb.c +++ b/sys/arm/allwinner/aw_rsb.c @@ -98,10 +98,12 @@ #define A31_P2WI 1 #define A23_RSB 2 +#define H616_P2WI 3 static struct ofw_compat_data compat_data[] = { { "allwinner,sun6i-a31-p2wi", A31_P2WI }, { "allwinner,sun8i-a23-rsb", A23_RSB }, + { "allwinner,sun50i-h616-rsb", H616_P2WI }, { NULL, 0 } }; @@ -398,6 +400,7 @@ rsb_probe(device_t dev) device_set_desc(dev, "Allwinner RSB"); break; case A31_P2WI: + case H616_P2WI: device_set_desc(dev, "Allwinner P2WI"); break; default: From nobody Mon Feb 9 10:23:36 2026 X-Original-To: dev-commits-src-main@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 4f8glF2Tqjz6RCDw for ; Mon, 09 Feb 2026 10:23:37 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glD61P7z3PfG for ; Mon, 09 Feb 2026 10:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632616; 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=o3HZQfkKAIo03YMdyoiOKI9FI4GeWrEdLVpuS3dbZjk=; b=nhrkxtX4ZsOcTgSMNBPf3lB08c+Q1+IY/e0n9Wx3Ha5EDSO/ei4G5MA9Gf+sqQUaZbOnOP F01rHSOOy2mmQJX9afO0hHdwZeDs1mmMpKONsT0fuvV0VZ94X7z33yCDNE1CZbvuvhHI5U dPqHTaGorPWB/hH/txIPSQGEpsf+CqWV/2XptzCZxYGXEweEaBviNLPeWStm5DzqSxbCCX b7my83B/m5lI22JotKbUClh6lzWfSmckvHLJnvBnX4+a3Eph808VI0W7pZeBLuD81IFfYO UiadFjj59nAd6SUZO8XxZuJUu+9A85xmUK19f3P2Vnl789vFMxjlC2ur0qERXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632616; a=rsa-sha256; cv=none; b=PBwPPJJvQvqir60B5lBGqTQlEr+Vz6gEx/1EZyM1h+q3YfyfmV9zPK7fyaB/B/HQV9uKzb wAIh6n1RFOzE7SF9t+KORNTRXkCOMhT5PzsqVH1iI44uto/WPol6nHoquLWzZK+s/DQUDO H/6q4Erm8htAVQz+ArH1rUE7wLASlfsx/0AGNwPsPv972Nez8LK1wWp3cgPeiG5RXT38p7 J2OAzSj/h+ptIImDYo4YRNCEii6p6uD0/Gkpu7QWEVNk6FTZLV63a6qYXVKDCAIH0rnLKL 6AqtAYFG2GwxrvedoTZMsnoq6U8l/ssQv9uUI3NIOzc8iKatJuRvRvQfTjKBNA== 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=1770632616; 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=o3HZQfkKAIo03YMdyoiOKI9FI4GeWrEdLVpuS3dbZjk=; b=Izhyz4seC668uRmY2IMpYQlxs9YvenSQFZnZ0G1SoAf0fD/BSRsnTSOjGgRwwkFHEbTgzI bAiM4zerAc6FvgPAZoLbvoW0d6iU5irIpee/zBxlBSEriaz5g/9J0s+/oA2XAFy+eIvEbf r1GwmV5w6JE0N/dsWnxojYY3NbGT6BDR1HDqwPz43m6g4qcKIbBkcZ387SAr9Jk9SymwAb 0AAWZyRpG5O8+eRW2vtx7FwbPYeSPq8t2HMCLPSFDDV5tEVMyIPSX1Gb8kKuzkHvSUILoj O008qUo1TlA6zQKcEr7MhgAUgTdd6TYbruh0JwOItSi3JPHjxzVXFbH81jq51Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glD54DBzD3D for ; Mon, 09 Feb 2026 10:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 84bc16a587fe - main - aw_usbphy: Add H616 compat string and configuration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84bc16a587fe69eaf50b6b012c5781f99a14c449 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:36 +0000 Message-Id: <6989b5a8.1d6dd.63a081@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=84bc16a587fe69eaf50b6b012c5781f99a14c449 commit 84bc16a587fe69eaf50b6b012c5781f99a14c449 Author: Tom Jones AuthorDate: 2026-02-09 10:05:41 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:19 +0000 aw_usbphy: Add H616 compat string and configuration Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54912 --- sys/arm/allwinner/aw_usbphy.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/arm/allwinner/aw_usbphy.c b/sys/arm/allwinner/aw_usbphy.c index 97c3d2207773..2082d2edfc90 100644 --- a/sys/arm/allwinner/aw_usbphy.c +++ b/sys/arm/allwinner/aw_usbphy.c @@ -56,6 +56,7 @@ enum awusbphy_type { AWUSBPHY_TYPE_A64, AWUSBPHY_TYPE_A83T, AWUSBPHY_TYPE_H6, + AWUSBPHY_TYPE_H616, AWUSBPHY_TYPE_D1, }; @@ -122,6 +123,13 @@ static const struct aw_usbphy_conf h6_usbphy_conf = { .phy0_route = true, }; +static const struct aw_usbphy_conf h616_usbphy_conf = { + .num_phys = 4, + .phy_type = AWUSBPHY_TYPE_H616, + .pmu_unk1 = false, + .phy0_route = true, +}; + static const struct aw_usbphy_conf d1_usbphy_conf = { .num_phys = 2, .phy_type = AWUSBPHY_TYPE_D1, @@ -138,6 +146,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun50i-a64-usb-phy", (uintptr_t)&a64_usbphy_conf }, { "allwinner,sun8i-a83t-usb-phy", (uintptr_t)&a83t_usbphy_conf }, { "allwinner,sun50i-h6-usb-phy", (uintptr_t)&h6_usbphy_conf }, + { "allwinner,sun50i-h616-usb-phy", (uintptr_t)&h616_usbphy_conf }, { "allwinner,sun20i-d1-usb-phy", (uintptr_t)&d1_usbphy_conf }, { NULL, 0 } }; From nobody Mon Feb 9 10:23:37 2026 X-Original-To: dev-commits-src-main@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 4f8glG10xNz6RC9J for ; Mon, 09 Feb 2026 10:23:38 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glF6y6xz3PlF for ; Mon, 09 Feb 2026 10:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632618; 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=REuhWBNAWvSv9SG0Jucy6MTdQ4aGdEkfi3+FE8afAlI=; b=H/uEPvhS3D7XY+thOD8v8Qu+qoHb/8RyegDebPa/oRyMzbsU+T7ntapgZcGOwxMVURgAoy i5XJHBVjJ1pVIEbBMzOr0bSOa4Dd6IpSOrUGkIQQt409uWGNpNomw9J6MFnzBWiIVVHtn8 zMWyC+2CKVDI5OS+0Qlaio6jh+C1pz6qDCc6+MoolPQW0hP6aKchFzNRLDMDB9nmcLp+G/ GE2Ubd/H0hNBpj3J/7Xk2p7h58EsDR2v0cCplxhA68ylX8h2XojDkXfcfDVEi5KkNsqa+Z lgPb1AcZAEsK77u5vKwASPbbYzicTrBy68uBZ0tFwZcMvxC94OhoK773IEcgVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632618; a=rsa-sha256; cv=none; b=QKCozEyp4FdIUB8FVNS7F9R3PnLKTZUtAyH5lcmPm8J8id6Hb+pTvlyOgnpY9nxxwKB8IU YXMD1piCTKShgOZ+5tIkbSe1JB0+yobX8DehLJDIQTmOQthmmbs2qMZHVXHhYt3EFF1RI0 XAxgHs3+tl+qgixD25Rgrg4m91grlEbdJetCyUHnqjPoSy85nsvGZcIk10PUblcRv8FKEi 1/W4WxgPgaxPxVMNlcQbUGQxYyy3Gz3yooR3W3I7ktcZkf0x98SntWB+L2wIjEKVvUHGQZ 2rnrL565QwtpSucpyNs+mXZ/CeW0yGvX1ClPs8XgrmxcMEgcFb53zvhYVmueBw== 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=1770632618; 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=REuhWBNAWvSv9SG0Jucy6MTdQ4aGdEkfi3+FE8afAlI=; b=X9FXYGxEQVXASMwznbYfHxpbPXNOjda1r05Z+JXA63Ky61H1vdJsrGVYaswhFdJMDd5ivw s3/tnXaGgUJXR7S9YaKle8G59bs28Kb64HLPnG62H44yzOb/pViLv1WB+KY8CsaYZwvbRC 9NrZjqMW+QOf/fzlpx2Rh2h955m4nPtyq7FRaEGt7ABdX1pVM33aCQSlVKruC6dU8nQEp5 a9EfaFwLk7x/kJF95NOwnf2XERNgtGypt3hPAlce6v1mDWRMnfg9mVAs1HSAFDPrjUp2lm hEwpz1KMKaB4sLriefjy6LiI55AFvOVbeet/gVEcXT7hj7idEGferjgS+G9L5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glF5ndbzD3G for ; Mon, 09 Feb 2026 10:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f68c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: ccb0e6e15f3d - main - aw_wdog: Add support for H616 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccb0e6e15f3dd00288d1823ffaf6920916ae457c Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:37 +0000 Message-Id: <6989b5a9.1f68c.51672a09@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb0e6e15f3dd00288d1823ffaf6920916ae457c commit ccb0e6e15f3dd00288d1823ffaf6920916ae457c Author: Tom Jones AuthorDate: 2026-02-09 10:05:46 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:19 +0000 aw_wdog: Add support for H616 Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54913 --- sys/arm/allwinner/aw_wdog.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/sys/arm/allwinner/aw_wdog.c b/sys/arm/allwinner/aw_wdog.c index acfbdd8fe6d0..b6b2749f0cda 100644 --- a/sys/arm/allwinner/aw_wdog.c +++ b/sys/arm/allwinner/aw_wdog.c @@ -52,25 +52,32 @@ #define A10_WDOG_CTRL 0x00 #define A31_WDOG_CTRL 0x10 #define D1_WDOG_CTRL 0x10 +#define H616_WDOG_CTRL 0xB0 #define WDOG_CTRL_RESTART (1 << 0) #define A31_WDOG_CTRL_KEY (0xa57 << 1) #define D1_WDOG_CTRL_KEY (0xa57 << 1) +#define H616_WDOG_CTRL_KEY (0xa57 << 1) #define A10_WDOG_MODE 0x04 #define A31_WDOG_MODE 0x18 #define D1_WDOG_MODE 0x18 +#define H616_WDOG_MODE 0xB8 #define D1_WDOG_MODE_KEY (0x16AA << 16) #define A10_WDOG_MODE_INTVL_SHIFT 3 #define A31_WDOG_MODE_INTVL_SHIFT 4 #define D1_WDOG_MODE_INTVL_SHIFT 4 +#define H616_WDOG_MODE_INTVL_SHIFT 4 #define A10_WDOG_MODE_RST_EN (1 << 1) #define WDOG_MODE_EN (1 << 0) #define A31_WDOG_CONFIG 0x14 #define D1_WDOG_CONFIG 0x14 +#define H616_WDOG_CONFIG 0xB4 #define A31_WDOG_CONFIG_RST_EN_SYSTEM (1 << 0) #define A31_WDOG_CONFIG_RST_EN_INT (2 << 0) #define D1_WDOG_CONFIG_KEY (0x16AA << 16) #define D1_WDOG_CONFIG_RST_EN_SYSTEM (1 << 0) #define D1_WDOG_CONFIG_RST_EN_INT (2 << 0) +#define H616_WDOG_CONFIG_RST_EN_SYSTEM (1 << 0) +#define H616_WDOG_CONFIG_RST_EN_INT (2 << 0) struct aw_wdog_interval { uint64_t milliseconds; @@ -109,14 +116,18 @@ struct aw_wdog_softc { uint32_t wdog_config_value; }; -#define A10_WATCHDOG 1 -#define A31_WATCHDOG 2 -#define D1_WATCHDOG 3 +enum wdog_type { + A10_WATCHDOG = 1, + A31_WATCHDOG, + D1_WATCHDOG, + H616_WATCHDOG, +}; static struct ofw_compat_data compat_data[] = { {"allwinner,sun4i-a10-wdt", A10_WATCHDOG}, {"allwinner,sun6i-a31-wdt", A31_WATCHDOG}, {"allwinner,sun20i-d1-wdt", D1_WATCHDOG}, + {"allwinner,sun50i-h616-wdt", H616_WATCHDOG}, {NULL, 0} }; @@ -139,6 +150,9 @@ aw_wdog_probe(device_t dev) case D1_WATCHDOG: device_set_desc(dev, "Allwinner D1 Watchdog"); return (BUS_PROBE_DEFAULT); + case H616_WATCHDOG: + device_set_desc(dev, "Allwinner H616 Watchdog"); + return (BUS_PROBE_DEFAULT); } return (ENXIO); } @@ -192,6 +206,16 @@ aw_wdog_attach(device_t dev) sc->wdog_config = D1_WDOG_CONFIG; sc->wdog_config_value = D1_WDOG_CONFIG_KEY | D1_WDOG_CONFIG_RST_EN_SYSTEM; break; + case H616_WATCHDOG: + sc->wdog_ctrl = H616_WDOG_CTRL; + sc->wdog_ctrl_key = H616_WDOG_CTRL_KEY; + sc->wdog_mode = H616_WDOG_MODE; + sc->wdog_mode_key = 0; + sc->wdog_mode_intvl_shift = H616_WDOG_MODE_INTVL_SHIFT; + sc->wdog_mode_en = WDOG_MODE_EN; + sc->wdog_config = H616_WDOG_CONFIG; + sc->wdog_config_value = H616_WDOG_CONFIG_RST_EN_SYSTEM; + break; default: bus_release_resource(dev, SYS_RES_MEMORY, rid, sc->res); return (ENXIO); From nobody Mon Feb 9 10:23:38 2026 X-Original-To: dev-commits-src-main@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 4f8glH3kLZz6RBmS for ; Mon, 09 Feb 2026 10:23:39 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glG73qnz3Pc4 for ; Mon, 09 Feb 2026 10:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632619; 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=/UDk2m6hXifVYSuF+wetdG6tVtRPgnLjj34/XUtO7v8=; b=KMi0FmMCVXenAyeCP5vdJdh4AKpPC+nFsoL56p2lZAalPaJCnbvVFNrN8/sAdEPfRebL/7 syyJUZI71N3bkW8SJXu2UdGcqfNSWUcbOVxPc76tzaKSDgl5qV7Y5VY2pSMMjUVYuiDLx1 zWOa5M2Dq6lPiD107p1k7aU1qHxu6z2k5FK9GC5kJN6aD7dW2n6F2W1vSSUWiNYDYlEUzs 1WSJWYdfDjF+V3Fk5PnAV81qGb05sncSEc3PC8aSGTF3i02Kbn2zKmtH788QxxR5IlTBxI 6xzX36wi/LKt7ZxQz1jY8jEmFng9WPdDWYEv8ZFpfQaLDoLAcjUxQX1vseR9gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632619; a=rsa-sha256; cv=none; b=RxYgFFyotYxDgdwnpJH31e/h16ee8voXrayxx1wrOynqCzcYDiZr+rZqv0nZDjyIiclYZW MEJEFj7Gxwr6kr2xjtm+pisK3N6n1ln1Zb9LAqT0SEqUy8XHnYwZcjciwAJK2RuCAbtfh8 JVI0Z5hWb7fgveOzUZZci5CB752ryE4bnEeX/HLdnwtCw+SH+0dhUkWKF5bAnagdCSqpVi IEnC2dKnMmP1wDXWIiKPfnouzA9UgBMcG56e+SLTS9Mr1Qlz1v0mQjI9Q35ZlmSIGZfXoI 0Pr25AMZoWLou2N6wVYfnNW9eZsmQLkklPwqzXlVmg6tEf7fgTSr4XW1Z/RZHw== 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=1770632619; 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=/UDk2m6hXifVYSuF+wetdG6tVtRPgnLjj34/XUtO7v8=; b=RQksYq+fT8o3HNT6VT9BolLe2OgbkiMU0UxrrO7PlgwEBpdE56iQ8njZQ/Lr+QfHeZ6Aq+ oMPPVCoKUhj0st5IBI9gXKngdkxzDv83EwVq3SI8N1RHMp55nYYjp65GdkxuTlLNebqV+r NtROQsD1PU7kWTyBO0tBOmTPrOaNDmFwKaRLYNSup3Rgo7phghaMydKoOCwn6WLMaoUEqg TfQY5bZvzvmOPxKvHyex5n1m0xJD6ZQ3KwjO1L+IKXkPttk+lo01+CPiXgNELk8xbQgu1Y 5UT6etUpC+bbGI6cgplZl/O4I2KaCsSHgwEhIHJk+vSzBQBYJC9WfiNydA8rDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glG6VbTzD3H for ; Mon, 09 Feb 2026 10:23:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e77e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 20615f714b50 - main - a10_twsi: Add H616 compat string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20615f714b5095a212dba63b803ffbdb13f90d7a Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:38 +0000 Message-Id: <6989b5aa.1e77e.f9349eb@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=20615f714b5095a212dba63b803ffbdb13f90d7a commit 20615f714b5095a212dba63b803ffbdb13f90d7a Author: Tom Jones AuthorDate: 2026-02-09 10:06:03 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:19 +0000 a10_twsi: Add H616 compat string Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54914 --- sys/dev/iicbus/controller/twsi/a10_twsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/iicbus/controller/twsi/a10_twsi.c b/sys/dev/iicbus/controller/twsi/a10_twsi.c index 4d370674fee3..a82eabff12fb 100644 --- a/sys/dev/iicbus/controller/twsi/a10_twsi.c +++ b/sys/dev/iicbus/controller/twsi/a10_twsi.c @@ -63,6 +63,7 @@ static struct ofw_compat_data compat_data[] = { {"allwinner,sun4i-a10-i2c", 1}, {"allwinner,sun6i-a31-i2c", 1}, {"allwinner,sun8i-a83t-i2c", 1}, + {"allwinner,sun50i-h616-i2c", 1}, {NULL, 0}, }; From nobody Mon Feb 9 10:23:39 2026 X-Original-To: dev-commits-src-main@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 4f8glJ2TdZz6RBmT for ; Mon, 09 Feb 2026 10:23:40 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glJ0Xxtz3Plg for ; Mon, 09 Feb 2026 10:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632620; 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=0r1cluRC0x98PV0KXHDXcMlcVZv0Rug/IYF4P8f8cvE=; b=apJU4CXvJQSZeVXjSDbOcy1qYoi4iN8jSHKAaj1cdyGfXCNp68uVHU2ulLWl5SVIc0mLDg iDaDssd3cos3nQkGkMvMUltCaxmZnMcx75yhOlB1gcupHoZULg1iDeD1uyRMZYITKL1dAY nBoZTM4WCTLR1k5Z0rZhIxEGydXUSrl0VF1345hubtAaVzBvjbhq9zeSVXccHNbm5v9j8k +j/gYH5Hunw4+2mr7k5gNZ8YeZ/yx1+JeaMxLHnNK2Hwv0zg7n5LfRlsZlnTuJ+SGdITIh 3m6T5gm+tHzFfvY3qkert/pu8gzvKDwibWRtI4LLKzR4ZDjZa8qR+kw47GJxTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632620; a=rsa-sha256; cv=none; b=gcNYj12XN5hzXjvz13VS0DGI8TwxMwXQRittjJ72H85vd//fYuJ329ZJHA55o6ihfm1XuJ EMlzNNbWWlbvvWzGgs5fOsGbtKBEPUM/Zs14Y380TUdscrIdmSZQBkTc0RkqZ17UPmcN5c SJgukdz35ydsKuQ2UhVSRHc34+Tph5+vmOMmzkq/hAwmZ/okaqwppwo6pfh7sFXYNZxrbb HuEbxNlO743IEtvXOQh1IZHIm1aYtwQ80KGrdTMA4JdPthvOLJDrGa29+OK9Ty9G3gJo8P R1Od5lNaT6ax3F1rtA24aI9qPO4f7DxM0x50NIGLxC1H8wQA6GHgpyFhGbYmQA== 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=1770632620; 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=0r1cluRC0x98PV0KXHDXcMlcVZv0Rug/IYF4P8f8cvE=; b=XWxdpAYhIK1wZAZojRR5xt/Gow1qx+MCpwn2cThTiuTONGHOiruAD7cXaqV1lPqxRfhSIh JPajr2TaoDM8sz9/d2OAEpm4nSRpNtybygctQeSfXB73K+YDJ6LrVGAG8yU7md2N+Yr/7C BowUNpRxFTsPyC7vrOCy9dOoZ5tkjRxmuQ5hmVh/GTkA7HmkVCh9eX5qHmn+58+SWKOZzb QN3vGp9KqaZX/P89fgBCpAjMRE/EP+jRCg+r5rIQTnRYG9CtRl96VDB9Gs+c8jtZ9NUfrv YP1ZQ/GhL72ZxF7O71w7J0HZ9b48qdmaNOdaJmp1r25KLacIRTWaC7hktf5+bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glJ008xzCWR for ; Mon, 09 Feb 2026 10:23:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f690 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: e506af08bb52 - main - aw_gpio: Add support for H616 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e506af08bb52bcf02553a35a385b7ef0b8692589 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:39 +0000 Message-Id: <6989b5ab.1f690.4d4f6b5c@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=e506af08bb52bcf02553a35a385b7ef0b8692589 commit e506af08bb52bcf02553a35a385b7ef0b8692589 Author: Tom Jones AuthorDate: 2026-02-09 10:06:33 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:20 +0000 aw_gpio: Add support for H616 This adds padconf files for the two gpio ranges on the H616 SOC and adds the SOC include. Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54915 --- sys/arm/allwinner/aw_gpio.c | 24 ++++++++ sys/arm/allwinner/h616/h616_padconf.c | 104 ++++++++++++++++++++++++++++++++ sys/arm/allwinner/h616/h616_r_padconf.c | 30 +++++++++ sys/arm64/conf/NOTES | 1 + sys/arm64/conf/std.allwinner | 1 + sys/conf/files.arm64 | 2 + sys/conf/options.arm64 | 1 + 7 files changed, 163 insertions(+) diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index c90d61f7b45e..4f5d676c1f56 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -272,6 +272,26 @@ struct aw_gpio_conf h6_r_gpio_conf = { }; #endif +/* Defined in h616_padconf.c */ +#ifdef SOC_ALLWINNER_H616 +extern struct allwinner_padconf h616_padconf; +extern struct allwinner_padconf h616_r_padconf; +struct aw_gpio_conf h616_gpio_conf = { + .padconf = &h616_padconf, + .banks = "cfghi", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, +}; +struct aw_gpio_conf h616_r_gpio_conf = { + .padconf = &h616_r_padconf, + .banks = "l", + .bank_size = 0x24, + .drv_pin_shift = 1, + .pul_offset = 0x1C, +}; +#endif + static struct ofw_compat_data compat_data[] = { #ifdef SOC_ALLWINNER_A10 {"allwinner,sun4i-a10-pinctrl", (uintptr_t)&a10_gpio_conf}, @@ -313,6 +333,10 @@ static struct ofw_compat_data compat_data[] = { #ifdef SOC_ALLWINNER_H6 {"allwinner,sun50i-h6-pinctrl", (uintptr_t)&h6_gpio_conf}, {"allwinner,sun50i-h6-r-pinctrl", (uintptr_t)&h6_r_gpio_conf}, +#endif +#ifdef SOC_ALLWINNER_H616 + {"allwinner,sun50i-h616-pinctrl", (uintptr_t)&h616_gpio_conf}, + {"allwinner,sun50i-h6-r-pinctrl", (uintptr_t)&h616_r_gpio_conf}, #endif {NULL, 0} }; diff --git a/sys/arm/allwinner/h616/h616_padconf.c b/sys/arm/allwinner/h616/h616_padconf.c new file mode 100644 index 000000000000..03a616875e59 --- /dev/null +++ b/sys/arm/allwinner/h616/h616_padconf.c @@ -0,0 +1,104 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019 Emmanuel Vadot + * + * Copyright (c) 2026 The FreeBSD Foundation. + * + * Portions of this file were written by Tom Jones under + * sponsorship from The FreeBSD Foundation. + * + */ + +#include +#include +#include +#include + +#include + +#include "opt_soc.h" + +static const struct allwinner_pins h616_pins[] = { + { "PC0", 2, 0, { "gpio-in", "gpio_out", "nand", "mmc2", "spi0", NULL, "pc_eint0" }, 6, 0, 2 }, + { "PC1", 2, 1, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint1" }, 6, 1, 2 }, + { "PC2", 2, 2, { "gpio-in", "gpio_out", "nand", NULL, "spi0", NULL, "pc_eint2" }, 6, 2, 2 }, + { "PC3", 2, 3, { "gpio-in", "gpio_out", "nand", NULL, "spi0", "boot", "pc_eint3" }, 6, 3, 2 }, + { "PC4", 2, 4, { "gpio-in", "gpio_out", "nand", NULL, "spi0", "boot", "pc_eint4" }, 6, 4, 2 }, + { "PC5", 2, 5, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, "boot", "pc_eint5" }, 6, 5, 2 }, + { "PC6", 2, 6, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, "boot", "pc_eint6" }, 6, 6, 2 }, + { "PC7", 2, 7, { "gpio-in", "gpio_out", "nand", NULL, "spi0", NULL, "pc_eint7" }, 6, 7, 2 }, + { "PC8", 2, 8, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint8" }, 6, 8, 2 }, + { "PC9", 2, 9, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint9" }, 6, 9, 2 }, + { "PC10", 2, 10, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint10" }, 6, 10, 2 }, + { "PC11", 2, 11, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint11" }, 6, 11, 2 }, + { "PC12", 2, 12, { "gpio-in", "gpio_out", "nand", NULL, NULL, NULL, "pc_eint12" }, 6, 12, 2 }, + { "PC13", 2, 13, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint13" }, 6, 13, 2 }, + { "PC14", 2, 14, { "gpio-in", "gpio_out", "nand", "mmc2", NULL, NULL, "pc_eint14" }, 6, 14, 2 }, + { "PC15", 2, 15, { "gpio-in", "gpio_out", "nand", "mmc2", "spi0", NULL, "pc_eint15" }, 6, 15, 2 }, + { "PC16", 2, 16, { "gpio-in", "gpio_out", "nand", "mmc2", "spi0", NULL, "pc_eint16" }, 6, 16, 2 }, + + { "PF0", 5, 0, { "gpio-in", "gpio_out", "mmc0", "jtag", NULL, NULL, "pf_eint0" }, 6, 0, 5 }, + { "PF1", 5, 1, { "gpio-in", "gpio_out", "mmc0", "jtag", NULL, NULL, "pf_eint1" }, 6, 1, 5 }, + { "PF2", 5, 2, { "gpio-in", "gpio_out", "mmc0", "uart0", NULL, NULL, "pf_eint2" }, 6, 2, 5 }, + { "PF3", 5, 3, { "gpio-in", "gpio_out", "mmc0", "jtag", NULL, NULL, "pf_eint3" } ,6, 3, 5 }, + { "PF4", 5, 4, { "gpio-in", "gpio_out", "mmc0", "uart0", NULL, NULL, "pf_eint4" }, 6, 4, 5 }, + { "PF5", 5, 5, { "gpio-in", "gpio_out", "mmc0", "jtag", NULL, NULL, "pf_eint5" }, 6, 5, 5 }, + { "PF6", 5, 6, { "gpio-in", "gpio_out", NULL, NULL, NULL, NULL, "pf_eint6" }, 6, 6, 5 }, + + { "PG0", 6, 0, { "gpio-in", "gpio_out", "mmc1", NULL, NULL, NULL, "pg_eint0" }, 6, 0, 6 }, + { "PG1", 6, 1, { "gpio-in", "gpio_out", "mmc1", NULL, NULL, NULL, "pg_eint1" }, 6, 1, 6 }, + { "PG2", 6, 2, { "gpio-in", "gpio_out", "mmc1", NULL, NULL, NULL, "pg_eint2" }, 6, 2, 6 }, + { "PG3", 6, 3, { "gpio-in", "gpio_out", "mmc1", NULL, NULL, NULL, "pg_eint3" }, 6, 3, 6 }, + { "PG4", 6, 4, { "gpio-in", "gpio_out", "mmc1", NULL, NULL, NULL, "pg_eint4" }, 6, 4, 6 }, + { "PG5", 6, 5, { "gpio-in", "gpio_out", "mmc1", NULL, NULL, NULL, "pg_eint5" }, 6, 5, 6 }, + { "PG6", 6, 6, { "gpio-in", "gpio_out", "uart1", NULL, "jtag", NULL, "pg_eint6" }, 6, 6, 6 }, + { "PG7", 6, 7, { "gpio-in", "gpio_out", "uart1", NULL, "jtag", NULL, "pg_eint7" }, 6, 7, 6 }, + { "PG8", 6, 8, { "gpio-in", "gpio_out", "uart1", "pll_lock_dbg", "jtag", NULL, "pg_eint8" }, 6, 8, 6 }, + { "PG9", 6, 9, { "gpio-in", "gpio_out", "uart1", NULL, "jtag", "ac_adcy", "pg_eint9" }, 6, 9, 6 }, + { "PG10", 6, 10, { "gpio-in", "gpio_out", "i2s2", "x32kfout", NULL, "ac_mclk", "pg_eint10" }, 6, 10, 6 }, + { "PG11", 6, 11, { "gpio-in", "gpio_out", "i2s2", NULL, "bist", "ac_sync", "pg_eint11" }, 6, 11, 6 }, + { "PG12", 6, 12, { "gpio-in", "gpio_out", "i2s2", NULL, "bist", "ac_adcl", "pg_eint12" }, 6, 12, 6 }, + { "PG13", 6, 13, { "gpio-in", "gpio_out", "i2s2", "i2s2", "bist", "ac_adcr", "pg_eint13" }, 6, 13, 6 }, + { "PG14", 6, 14, { "gpio-in", "gpio_out", "i2s2", "i2s2", "bist", "ac_adcx", "pg_eint14" }, 6, 14, 6 }, + { "PG15", 6, 15, { "gpio-in", "gpio_out", "uart2", NULL, NULL, "spi4", "pg_eint15" }, 6, 15, 6 }, + { "PG16", 6, 16, { "gpio-in", "gpio_out", "uart2", NULL, NULL, "spi4", "pg_eint16" }, 6, 16, 6 }, + { "PG17", 6, 17, { "gpio-in", "gpio_out", "uart2", NULL, NULL, "spi3", "pg_eint17" }, 6, 17, 6 }, + { "PG18", 6, 18, { "gpio-in", "gpio_out", "uart2", NULL, NULL, "spi3", "pg_eint18" }, 6, 18, 6 }, + { "PG19", 6, 19, { "gpio-in", "gpio_out", NULL, NULL, "pwm1", NULL, "pg_eint19" }, 6, 19, 6 }, + + { "PH0", 7, 0, { "gpio-in", "gpio_out", "uart0", NULL, "pwm3", "spi1", "ph_eint0" }, 6, 0, 7 }, + { "PH1", 7, 1, { "gpio-in", "gpio_out", "uart0", NULL, "pwm4", "spi1", "ph_eint1" }, 6, 1, 7 }, + { "PH2", 7, 2, { "gpio-in", "gpio_out", "uart5", "owa", "pwm2", "spi2", "ph_eint2" }, 6, 2, 7 }, + { "PH3", 7, 3, { "gpio-in", "gpio_out", "uart5", NULL, "pwm1", "spi2", "ph_eint3" }, 6, 3, 7 }, + { "PH4", 7, 4, { "gpio-in", "gpio_out", NULL, "owa", NULL, "spi3", "ph_eint4" }, 6, 4, 7 }, + { "PH5", 7, 5, { "gpio-in", "gpio_out", "uart2", "i2s3", "spi1", "spi3", "ph_eint5" }, 6, 5, 7 }, + { "PH6", 7, 6, { "gpio-in", "gpio_out", "uart2", "i2s3", "spi1", "spi4", "ph_eint6" }, 6, 6, 7 }, + { "PH7", 7, 7, { "gpio-in", "gpio_out", "uart2", "i2s3", "spi1", "spi4", "ph_eint7" }, 6, 7, 7 }, + { "PH8", 7, 8, { "gpio-in", "gpio_out", "uart2", "i2s3", "spi1", "i2s3", "ph_eint8" }, 6, 8, 7 }, + { "PH9", 7, 9, { "gpio-in", "gpio_out", NULL, "i2s3", "spi1", "i2s3", "ph_eint9" }, 6, 9, 7 }, + { "PH10", 7, 10, { "gpio-in", "gpio_out", NULL, "cir_rx", "tcon_trig1", NULL, "ph_eint10" }, 6, 10, 7 }, + + { "PI0", 9, 0, { "gpio-in", "gpio_out", "rgmii", "dmic_clk", "i2s0", "hdmi" , "pi_eint0" }, 6, 0, 9 }, + { "PI1", 9, 1, { "gpio-in", "gpio_out", "rgmii", "dmic_data0", "i2s0", "hdmi" , "pi_eint1" }, 6, 1, 9 }, + { "PI2", 9, 2, { "gpio-in", "gpio_out", "rgmii", "dmic_data1", "i2s0", "hdmi" , "pi_eint2" }, 6, 2, 9 }, + { "PI3", 9, 3, { "gpio-in", "gpio_out", "rgmii", "dmic_data2", "i2s0", "i2s0" , "pi_eint3" }, 6, 3, 9 }, + { "PI4", 9, 4, { "gpio-in", "gpio_out", "rgmii", "dmic_data3", "i2s0", "i2s0" , "pi_eint4" }, 6, 4, 9 }, + { "PI5", 9, 5, { "gpio-in", "gpio_out", "rgmii", "uart2", "ts0", "spi0" , "pi_eint5" }, 6, 5, 9 }, + { "PI6", 9, 6, { "gpio-in", "gpio_out", "rgmii", "uart2", "ts0", "spi0" , "pi_eint6" }, 6, 6, 9 }, + { "PI7", 9, 7, { "gpio-in", "gpio_out", "rgmii", "uart2", "ts0", "spi1" , "pi_eint7" }, 6, 7, 9 }, + { "PI8", 9, 8, { "gpio-in", "gpio_out", "rgmii", "uart2", "ts0", "spi1" , "pi_eint8" }, 6, 8, 9 }, + { "PI9", 9, 9, { "gpio-in", "gpio_out", "rgmii", "uart3", "ts0", "spi2" , "pi_eint9" }, 6, 9, 9 }, + { "PI10", 9, 10, { "gpio-in", "gpio_out", "rgmii", "uart3", "ts0", "spi2" , "pi_eint10" }, 6, 10, 9 }, + { "PI11", 9, 11, { "gpio-in", "gpio_out", "rgmii", "uart3", "ts0", "pwm1" , "pi_eint11" }, 6, 11, 9 }, + { "PI12", 9, 12, { "gpio-in", "gpio_out", "rgmii", "uart3", "ts0", "pwm2" , "pi_eint12" }, 6, 12, 9 }, + { "PI13", 9, 13, { "gpio-in", "gpio_out", "rgmii", "uart4", "ts0", "pwm3" , "pi_eint13" }, 6, 13, 9 }, + { "PI14", 9, 14, { "gpio-in", "gpio_out", "mdc", "uart4", "ts0", "pwm4" , "pi_eint14" }, 6, 14, 9 }, + { "PI15", 9, 15, { "gpio-in", "gpio_out", "mdio", "uart4", "ts0", "clk_fanout0" , "pi_eint15" }, 6, 15, 9 }, + { "PI16", 9, 16, { "gpio-in", "gpio_out", "ephy_25m", "uart4", "ts0", "clk_fanout1" , "pi_eint16" }, 6, 16, 9 }, +}; + +const struct allwinner_padconf h616_padconf = { + .npins = nitems(h616_pins), + .pins = h616_pins, +}; diff --git a/sys/arm/allwinner/h616/h616_r_padconf.c b/sys/arm/allwinner/h616/h616_r_padconf.c new file mode 100644 index 000000000000..ab199b69bebe --- /dev/null +++ b/sys/arm/allwinner/h616/h616_r_padconf.c @@ -0,0 +1,30 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019 Emmanuel Vadot + * + * Copyright (c) 2026 The FreeBSD Foundation. + * + * Portions of this file were written by Tom Jones under + * sponsorship from The FreeBSD Foundation. + * + */ + +#include +#include +#include +#include + +#include + +#include "opt_soc.h" + +static const struct allwinner_pins h616_r_pins[] = { + { "PL0" , 0, 0, { "gpio-in", "gpio_out", NULL, "spi0", NULL, NULL, NULL }, 0, 0, 0 }, + { "PL1" , 0, 1, { "gpio-in", "gpio_out", NULL, "spi0", NULL, NULL, NULL }, 0, 0, 0 }, +}; + +const struct allwinner_padconf h616_r_padconf = { + .npins = nitems(h616_r_pins), + .pins = h616_r_pins, +}; diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 102066025e8f..c0dac0a746f1 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -34,6 +34,7 @@ options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default options SOC_ALLWINNER_A64 options SOC_ALLWINNER_H5 options SOC_ALLWINNER_H6 +options SOC_ALLWINNER_H616 options SOC_BRCM_BCM2837 options SOC_BRCM_BCM2838 options SOC_BRCM_NS2 diff --git a/sys/arm64/conf/std.allwinner b/sys/arm64/conf/std.allwinner index 345322cebb0f..360f2269c59b 100644 --- a/sys/arm64/conf/std.allwinner +++ b/sys/arm64/conf/std.allwinner @@ -6,6 +6,7 @@ options SOC_ALLWINNER_A64 options SOC_ALLWINNER_H5 options SOC_ALLWINNER_H6 +options SOC_ALLWINNER_H616 # Timer drivers device aw_timer diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 2efdb21f66ad..405916c5eaec 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -575,6 +575,8 @@ arm/allwinner/h3/h3_padconf.c optional soc_allwinner_h5 fdt arm/allwinner/h3/h3_r_padconf.c optional soc_allwinner_h5 fdt arm/allwinner/h6/h6_padconf.c optional soc_allwinner_h6 fdt arm/allwinner/h6/h6_r_padconf.c optional soc_allwinner_h6 fdt +arm/allwinner/h616/h616_padconf.c optional soc_allwinner_h616 fdt +arm/allwinner/h616/h616_r_padconf.c optional soc_allwinner_h616 fdt # Altera/Intel arm64/intel/stratix10-soc-fpga-mgr.c optional soc_intel_stratix10 fdt diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64 index 5e6f25cd8db8..1428edba2fbe 100644 --- a/sys/conf/options.arm64 +++ b/sys/conf/options.arm64 @@ -29,6 +29,7 @@ VMM opt_global.h SOC_ALLWINNER_A64 opt_soc.h SOC_ALLWINNER_H5 opt_soc.h SOC_ALLWINNER_H6 opt_soc.h +SOC_ALLWINNER_H616 opt_soc.h SOC_APPLE_T8103 opt_soc.h SOC_BRCM_BCM2837 opt_soc.h SOC_BRCM_BCM2838 opt_soc.h From nobody Mon Feb 9 10:23:41 2026 X-Original-To: dev-commits-src-main@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 4f8glK3b9zz6RCJ6 for ; Mon, 09 Feb 2026 10:23:41 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glK18yTz3Pcf for ; Mon, 09 Feb 2026 10:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632621; 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=L/OrwTnsVPxevwsj1rZHEQ8q36kk/h7fvuHhXI3H6LI=; b=aqos/3cox9RLlDhk0BIjLQ+97F1aVcTOuLptu9KBvgUWCwjcLvXgT56ClOFhyaCsdZxHnq aV3ej3dJAbOkxnXcgdj4zbw/TlpYdcBcRgGXSkJZ02IIRYe5SuvMSKkRFs3PcQxDEpS05V I4KYPo8qXsrAoCd5q+WZxplciy3iipa/2ov9smUhietqcZ4JenP6EYa5XRVvbPl5EfURQk i0fnyNbKGKSkUdQXTjAhZCjccvK9NldRt6AuvOlM6BEqclbL4tfO+NkwKAeeWmqqx/JlXG rzgWnfAvbooZ88ku0BOqrf2YNoCSToLU6d++zJ3+TWSFw+ZyNUEiC+lq6StKIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632621; a=rsa-sha256; cv=none; b=qPR99H3I+OL+0jdG9/CcxgXScc0CQO7RHdYdtihwnlaoEURDGTD7LI67lQz0V1uZQEW6FT VeM+Whqzp/knjY7UaF3bbsSBcKpEudbrZvTKbAizrowYNOYqhGnPE33Y5WviqCEsafHhaR ZQtfVwWTVzs1EuZQd8nYglW/jXibjLRCxuqBF186umEiWQ5rm7La9R5bfEe7Y2Si5y9gDS MIUPv8P0OMh5XfwSliMgSYk2M4QiZyEsjRJ0E5SD7VvQURADigFkb59K12sSSVkz0fQvTu xzGW+GvLJSsWDUBDI5u5qF668wSr2sbDWy1aMd7rjgRAk2znZ5RpzQ+Z6ylUVA== 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=1770632621; 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=L/OrwTnsVPxevwsj1rZHEQ8q36kk/h7fvuHhXI3H6LI=; b=hj9w5fg5XxVlHHqksHPNNCx93Mvgmq4H/3LRoONbNcet44yx0XIjeZaVmBqZya2vkczVra nW8JPrEoN+XABlUcpKgzAmBBOwbI6k29ip7mHUPZ383z2cglXAYMkKEjm3HARhg6AnQUjY s0wVDU5bxp15xxPD86/0RNzS1dXavBsJRlMqqLQkjY1GV0XhmMceGJ6t5TpSx3VVPMHBj8 S0TTL9CQmgedxfp3dNAx/gXy8/3mfd/RtlRiUeOvdcbPOs925bx0lWHZnJoPSlLagUl9Pj MCgZD/xTzLVHUSNAoML30o048io0JlcchAOwvdyBhcpEiNUaszHnXZrcEUm4sA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glK0lLyzD3J for ; Mon, 09 Feb 2026 10:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1eae0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 8923d1c9e25c - main - aw_sid: Add H616 configuration and compat string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8923d1c9e25c5bc29d13edf8a55ae6b6b8bd9f6e Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:41 +0000 Message-Id: <6989b5ad.1eae0.49b3c7d3@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=8923d1c9e25c5bc29d13edf8a55ae6b6b8bd9f6e commit 8923d1c9e25c5bc29d13edf8a55ae6b6b8bd9f6e Author: Tom Jones AuthorDate: 2026-02-09 10:06:37 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:20 +0000 aw_sid: Add H616 configuration and compat string Reviewed by: manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54916 --- sys/arm/allwinner/aw_sid.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sys/arm/allwinner/aw_sid.c b/sys/arm/allwinner/aw_sid.c index 932c2f189e51..c100ac2e9941 100644 --- a/sys/arm/allwinner/aw_sid.c +++ b/sys/arm/allwinner/aw_sid.c @@ -169,6 +169,27 @@ static struct aw_sid_efuse h5_efuses[] = { }, }; +static struct aw_sid_efuse h616_efuses[] = { + { + .name = "rootkey", + .desc = "Root Key or ChipID", + .base = EFUSE_OFFSET, + .offset = 0x00, + .size = 16, + .id = AW_SID_FUSE_ROOTKEY, + .public = true, + }, + { + .name = "calibration", + .desc = "Thermal Sensor Calibration Data", + .base = EFUSE_OFFSET, + .offset = 0x34, + .size = 4, + .id = AW_SID_FUSE_THSSENSOR, + .public = true, + }, +}; + static struct aw_sid_efuse d1_efuses[] = { { .name = "rootkey", @@ -225,6 +246,11 @@ static const struct aw_sid_conf h5_conf = { .nfuses = nitems(h5_efuses), }; +static const struct aw_sid_conf h616_conf = { + .efuses = h616_efuses, + .nfuses = nitems(h616_efuses), +}; + static const struct aw_sid_conf d1_conf = { .efuses = d1_efuses, .nfuses = nitems(d1_efuses), @@ -237,6 +263,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun8i-a83t-sid", (uintptr_t)&a83t_conf}, { "allwinner,sun8i-h3-sid", (uintptr_t)&h3_conf}, { "allwinner,sun50i-h5-sid", (uintptr_t)&h5_conf}, + { "allwinner,sun50i-h616-sid", (uintptr_t)&h616_conf}, { "allwinner,sun20i-d1-sid", (uintptr_t)&d1_conf}, { NULL, 0 } }; From nobody Mon Feb 9 10:23:42 2026 X-Original-To: dev-commits-src-main@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 4f8glL3Jknz6RCKg for ; Mon, 09 Feb 2026 10:23: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8glL2HKNz3Pm8 for ; Mon, 09 Feb 2026 10:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770632622; 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=4jagEi1Fk0NaURD13Tv89UzevwBwxpeAVqrpV3AcE/k=; b=MP3Bt3a1TkV4gGceroMq3WtQQBEcF+SB4I5/IPDBgXSO3tQnRGCd1I/0KGCaxrf46cQmsZ 7eHKzr/Pfqjqphv1yC4aektfwG1Ugd2WhrYDJYKHVy3Knrb9qGr/A8QG2fAJ9C8wc3wOzA cihEWXohcHcEv9U2EF1eju9NE9XpqvZhJ+v+ni7QiWfiVpmowoBgn3QxaHNbvyRsOy8P8L x+pcnQFr6WMcJilqEoLPw4Jg33JkAqh4lxhVpMzAkKp3SWiSx3Gch/YIweEdrzWsPTNF8V aH2brxajlVIXNHacmW6MX03p0rBm5+mnPQy5MAy0SiNy8SiDro7SQiix+4Gp9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770632622; a=rsa-sha256; cv=none; b=MYQ+XvD5Q7/hcWYxy5ZpaKCTKZCA9oOR8jEH1br/PY/uOvCIkpyzG4Nl6GpHtDqO+a5ZQe aOB2xZzd3YUGipPU+H18V93OUoIIWZatlPG6Huo2sYhBxtJ/TeRAEwjEr/2uTGJzqLfprW i34p71aRhxTOVucm+zcCjZY14/4jju4RR2xjR5YTlGPUPWb6HqF3HAIIZCrSqQQlGV9yNZ QLrYoxRgJ5h7DcaxOtzn3JiiSBU8qB8qO2yHQF80+CqCJs3ZlwiYoVr/rND7txsXz1/kcY rLBx0odnq6o2pLvcrCYsuWzaf6VRN5LraAM9kia3070OZ3axVowObhse5/gcWg== 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=1770632622; 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=4jagEi1Fk0NaURD13Tv89UzevwBwxpeAVqrpV3AcE/k=; b=maxSEACTH/1GhuFnBrkegQzyabmvw1kJ+7+2tu0NTMdEG44dSmJF7f6ql58SoI/9FtCeIJ xhLobLKAZi/qEW6Gcp/xk2e/ShWP/6YQ4k8ivN2V/ATGM/CC4nlOfvm9Ck/esU+wIhVQiq zrJ2cBhspO2LH+XkHqFfVbh99y2Ch+5uukBcEZThL8J6Tn0ZA5eIVRcgLQvWwYY7ttscPe Fpi2y8fyy04ujw5/sDC5XsUrXlvia9XqP00m8JdtbopIwBboEb0XFwYIhZB4iDyI4Y0/ca GFZl5wnf2WkT6DLEg5R1ZHPDbGwySMjyN8vFOQUpaectI/HaGS33fRr2hSOt5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8glL1g2LzCwH for ; Mon, 09 Feb 2026 10:23:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d6e1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:23:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 245cdec79249 - main - aw_ccu: Add clocks for H616 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 245cdec79249957e318dac21f9208a9117a98f31 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:23:42 +0000 Message-Id: <6989b5ae.1d6e1.2a3afcab@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=245cdec79249957e318dac21f9208a9117a98f31 commit 245cdec79249957e318dac21f9208a9117a98f31 Author: Tom Jones AuthorDate: 2026-02-09 10:06:53 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:22:20 +0000 aw_ccu: Add clocks for H616 Reviewed by: manu, adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54927 --- sys/conf/files.arm64 | 1 + sys/dev/clk/allwinner/ccu_h616.c | 493 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 494 insertions(+) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 405916c5eaec..5439cc5edde0 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -565,6 +565,7 @@ dev/clk/allwinner/ccu_a64.c optional soc_allwinner_a64 aw_ccu fdt dev/clk/allwinner/ccu_h3.c optional soc_allwinner_h5 aw_ccu fdt dev/clk/allwinner/ccu_h6.c optional soc_allwinner_h6 aw_ccu fdt dev/clk/allwinner/ccu_h6_r.c optional soc_allwinner_h6 aw_ccu fdt +dev/clk/allwinner/ccu_h616.c optional soc_allwinner_h616 aw_ccu fdt dev/clk/allwinner/ccu_sun8i_r.c optional aw_ccu fdt dev/clk/allwinner/ccu_de2.c optional aw_ccu fdt diff --git a/sys/dev/clk/allwinner/ccu_h616.c b/sys/dev/clk/allwinner/ccu_h616.c new file mode 100644 index 000000000000..ea112fbf8ea4 --- /dev/null +++ b/sys/dev/clk/allwinner/ccu_h616.c @@ -0,0 +1,493 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2019 Emmanuel Vadot + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this file were written by Tom Jones under + * sponsorship from The FreeBSD Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include + +#include + +#include +#include + +/* Non-exported clocks */ +#define CLK_OSC_24M 0 +#define CLK_PLL_CPUX 1 +#define CLK_PLL_AUDIO 2 +#define CLK_PLL_PERIPH0_2X 4 +#define CLK_PLL_PERIPH1_2X 5 +#define CLK_PLL_PERIPH1 6 +#define CLK_PLL_VIDEO0_4X 8 +#define CLK_PLL_VIDEO1_4X 9 +#define CLK_PLL_VIDEO0 10 +#define CLK_PLL_VIDEO1 12 +#define CLK_PLL_VIDEO2 12 +#define CLK_PLL_VE 14 +#define CLK_PLL_DDR0 9 +#define CLK_PLL_DDR1 9 +#define CLK_PLL_DE 14 +#define CLK_PLL_GPU 16 + +#define CLK_PSI_AHB1_AHB2 24 +#define CLK_AHB3 25 +#define CLK_APB2 27 + +static struct aw_ccung_reset h616_ccu_resets[] = { + /* PSI_BGR_REG */ + CCU_RESET(RST_BUS_PSI, 0x79c, 16) + + /* SMHC_BGR_REG */ + CCU_RESET(RST_BUS_MMC0, 0x84c, 16) + CCU_RESET(RST_BUS_MMC1, 0x84c, 17) + CCU_RESET(RST_BUS_MMC2, 0x84c, 18) + + /* UART_BGR_REG */ + CCU_RESET(RST_BUS_UART0, 0x90c, 16) + CCU_RESET(RST_BUS_UART1, 0x90c, 17) + CCU_RESET(RST_BUS_UART2, 0x90c, 18) + CCU_RESET(RST_BUS_UART3, 0x90c, 19) + CCU_RESET(RST_BUS_UART4, 0x90c, 20) + CCU_RESET(RST_BUS_UART5, 0x90c, 21) + + /* TWI_BGR_REG */ + CCU_RESET(RST_BUS_I2C0, 0x91c, 16) + CCU_RESET(RST_BUS_I2C1, 0x91c, 17) + CCU_RESET(RST_BUS_I2C2, 0x91c, 18) + CCU_RESET(RST_BUS_I2C3, 0x91c, 19) + CCU_RESET(RST_BUS_I2C4, 0x91c, 20) + + /* EMAC_BGR_REG */ + CCU_RESET(RST_BUS_EMAC0, 0x97c, 16) + CCU_RESET(RST_BUS_EMAC1, 0x97c, 17) + + /* USB0_CLK_REG */ + CCU_RESET(RST_USB_PHY0, 0xa70, 30) + + /* USB1_CLK_REG */ + CCU_RESET(RST_USB_PHY1, 0xa74, 30) + + /* USB2_CLK_REG */ + CCU_RESET(RST_USB_PHY2, 0xa78, 30) + + /* USB2_CLK_REG */ + CCU_RESET(RST_USB_PHY3, 0xa7c, 30) + + /* USB_BGR_REG */ + CCU_RESET(RST_BUS_OHCI0, 0xa8c, 16) + CCU_RESET(RST_BUS_OHCI1, 0xa8c, 17) + CCU_RESET(RST_BUS_OHCI2, 0xa8c, 18) + CCU_RESET(RST_BUS_OHCI3, 0xa8c, 19) + CCU_RESET(RST_BUS_EHCI0, 0xa8c, 20) + CCU_RESET(RST_BUS_EHCI1, 0xa8c, 21) + CCU_RESET(RST_BUS_EHCI2, 0xa8c, 22) + CCU_RESET(RST_BUS_EHCI3, 0xa8c, 23) + CCU_RESET(RST_BUS_OTG, 0xa8c, 24) +}; + +static struct aw_ccung_gate h616_ccu_gates[] = { + /* PSI_BGR_REG */ + CCU_GATE(CLK_BUS_PSI, "bus-psi", "psi_ahb1_ahb2", 0x79c, 0) + + /* SMHC_BGR_REG */ + CCU_GATE(CLK_BUS_MMC0, "bus-mmc0", "ahb3", 0x84c, 0) + CCU_GATE(CLK_BUS_MMC1, "bus-mmc1", "ahb3", 0x84c, 1) + CCU_GATE(CLK_BUS_MMC2, "bus-mmc2", "ahb3", 0x84c, 2) + + /* + * XXX-THJ: Inheritied comment from H6: + * UART_BGR_REG Enabling the gate enable weird behavior ... + */ + /* CCU_GATE(CLK_BUS_UART0, "bus-uart0", "apb2", 0x90c, 0) */ + /* CCU_GATE(CLK_BUS_UART1, "bus-uart1", "apb2", 0x90c, 1) */ + /* CCU_GATE(CLK_BUS_UART2, "bus-uart2", "apb2", 0x90c, 2) */ + /* CCU_GATE(CLK_BUS_UART3, "bus-uart3", "apb2", 0x90c, 3) */ + /* CCU_GATE(CLK_BUS_UART4, "bus-uart4", "apb2", 0x90c, 4) */ + /* CCU_GATE(CLK_BUS_UART5, "bus-uart5", "apb2", 0x90c, 5) */ + + /* TWI_BGR_REG */ + CCU_GATE(CLK_BUS_I2C0, "bus-i2c0", "apb2", 0x91c, 0) + CCU_GATE(CLK_BUS_I2C1, "bus-i2c1", "apb2", 0x91c, 1) + CCU_GATE(CLK_BUS_I2C2, "bus-i2c2", "apb2", 0x91c, 2) + CCU_GATE(CLK_BUS_I2C3, "bus-i2c3", "apb2", 0x91c, 3) + + /* EMAC_BGR_REG */ + CCU_GATE(CLK_BUS_EMAC0, "bus-emac0", "ahb3", 0x97c, 0) + CCU_GATE(CLK_BUS_EMAC1, "bus-emac1", "ahb3", 0x97c, 1) + + /* USB0_CLK_REG */ + CCU_GATE(CLK_USB_PHY0, "usb-phy0", "ahb3", 0xa70, 29) + CCU_GATE(CLK_USB_OHCI0, "usb-ohci0", "ahb3", 0xa70, 31) + + /* USB1_CLK_REG */ + CCU_GATE(CLK_USB_PHY1, "usb-phy1", "ahb3", 0xa74, 29) + CCU_GATE(CLK_USB_OHCI1, "usb-ohci1", "ahb3", 0xa74, 31) + + /* USB2_CLK_REG */ + CCU_GATE(CLK_USB_PHY2, "usb-phy2", "ahb3", 0xa78, 29) + CCU_GATE(CLK_USB_OHCI2, "usb-ohci2", "ahb3", 0xa78, 31) + + /* USB3_CLK_REG */ + CCU_GATE(CLK_USB_PHY3, "usb-phy3", "ahb3", 0xa7c, 29) + CCU_GATE(CLK_USB_OHCI3, "usb-ohci3", "ahb3", 0xa7c, 31) + + /* USB_BGR_REG */ + CCU_GATE(CLK_BUS_OHCI0, "bus-ohchi0", "ahb3", 0xa8c, 0) + CCU_GATE(CLK_BUS_OHCI1, "bus-ohchi1", "ahb3", 0xa8c, 1) + CCU_GATE(CLK_BUS_OHCI2, "bus-ohchi2", "ahb3", 0xa8c, 2) + CCU_GATE(CLK_BUS_OHCI3, "bus-ohchi3", "ahb3", 0xa8c, 3) + CCU_GATE(CLK_BUS_EHCI0, "bus-ehchi0", "ahb3", 0xa8c, 4) + CCU_GATE(CLK_BUS_EHCI1, "bus-ehchi1", "ahb3", 0xa8c, 5) + CCU_GATE(CLK_BUS_EHCI2, "bus-ehchi2", "ahb3", 0xa8c, 6) + CCU_GATE(CLK_BUS_EHCI3, "bus-ehchi3", "ahb3", 0xa8c, 7) + CCU_GATE(CLK_BUS_OTG, "bus-otg", "ahb3", 0xa8c, 8) +}; + +static const char *pll_cpux_parents[] = {"osc24M"}; +NP_CLK(pll_cpux_clk, + CLK_PLL_CPUX, /* id */ + "pll_cpux", pll_cpux_parents, /* name, parents */ + 0x00, /* offset */ + 8, 8, 0, 0, /* n factor */ + 16, 2, 0, 0, /* p factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_ddr0_parents[] = {"osc24M"}; +NMM_CLK(pll_ddr0_clk, + CLK_PLL_DDR0, /* id */ + "pll_ddr0", pll_ddr0_parents, /* name, parents */ + 0x10, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_ddr1_parents[] = {"osc24M"}; +NMM_CLK(pll_ddr1_clk, + CLK_PLL_DDR1, /* id */ + "pll_ddr1", pll_ddr1_parents, /* name, parents */ + 0x18, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_peri0_2x_parents[] = {"osc24M"}; +NMM_CLK(pll_peri0_2x_clk, + CLK_PLL_PERIPH0_2X, /* id */ + "pll_periph0_2x", pll_peri0_2x_parents, /* name, parents */ + 0x20, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ +static const char *pll_peri0_parents[] = {"pll_periph0_2x"}; +FIXED_CLK(pll_peri0_clk, + CLK_PLL_PERIPH0, /* id */ + "pll_periph0", /* name */ + pll_peri0_parents, /* parent */ + 0, /* freq */ + 1, /* mult */ + 2, /* div */ + 0); /* flags */ + +static const char *pll_peri1_2x_parents[] = {"osc24M"}; +NMM_CLK(pll_peri1_2x_clk, + CLK_PLL_PERIPH1_2X, /* id */ + "pll_periph1_2x", pll_peri1_2x_parents, /* name, parents */ + 0x28, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ +static const char *pll_peri1_parents[] = {"pll_periph1_2x"}; +FIXED_CLK(pll_peri1_clk, + CLK_PLL_PERIPH1, /* id */ + "pll_periph1", /* name */ + pll_peri1_parents, /* parent */ + 0, /* freq */ + 1, /* mult */ + 2, /* div */ + 0); /* flags */ + +static const char *pll_gpu_parents[] = {"osc24M"}; +NMM_CLK(pll_gpu_clk, + CLK_PLL_GPU, /* id */ + "pll_gpu", pll_gpu_parents, /* name, parents */ + 0x30, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_video0_4x_parents[] = {"osc24M"}; +NMM_CLK(pll_video0_4x_clk, + CLK_PLL_VIDEO0_4X, /* id */ + "pll_video0_4x", pll_video0_4x_parents, /* name, parents */ + 0x40, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ +static const char *pll_video0_parents[] = {"pll_video0_4x"}; +FIXED_CLK(pll_video0_clk, + CLK_PLL_VIDEO0, /* id */ + "pll_video0", /* name */ + pll_video0_parents, /* parent */ + 0, /* freq */ + 1, /* mult */ + 4, /* div */ + 0); /* flags */ + +static const char *pll_video1_4x_parents[] = {"osc24M"}; +NMM_CLK(pll_video1_4x_clk, + CLK_PLL_VIDEO1_4X, /* id */ + "pll_video1_4x", pll_video1_4x_parents, /* name, parents */ + 0x48, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ +static const char *pll_video1_parents[] = {"pll_video1_4x"}; +FIXED_CLK(pll_video1_clk, + CLK_PLL_VIDEO1, /* id */ + "pll_video1", /* name */ + pll_video1_parents, /* parent */ + 0, /* freq */ + 1, /* mult */ + 4, /* div */ + 0); /* flags */ + +static const char *pll_video2_4x_parents[] = {"osc24M"}; +NMM_CLK(pll_video2_4x_clk, + CLK_PLL_VIDEO1_4X, /* id */ + "pll_video2_4x", pll_video2_4x_parents, /* name, parents */ + 0x50, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ +static const char *pll_video2_parents[] = {"pll_video2_4x"}; +FIXED_CLK(pll_video2_clk, + CLK_PLL_VIDEO1, /* id */ + "pll_video2", /* name */ + pll_video2_parents, /* parent */ + 0, /* freq */ + 1, /* mult */ + 4, /* div */ + 0); /* flags */ + +static const char *pll_ve_parents[] = {"osc24M"}; +NMM_CLK(pll_ve_clk, + CLK_PLL_VE, /* id */ + "pll_ve", pll_ve_parents, /* name, parents */ + 0x58, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +static const char *pll_de_parents[] = {"osc24M"}; +NMM_CLK(pll_de_clk, + CLK_PLL_DE, /* id */ + "pll_de", pll_de_parents, /* name, parents */ + 0x60, /* offset */ + 8, 8, 0, 0, /* n factor */ + 0, 1, 0, 0, /* m0 factor */ + 1, 1, 0, 0, /* m1 factor */ + 31, /* gate */ + 28, 1000, /* lock */ + AW_CLK_HAS_GATE | AW_CLK_HAS_LOCK); /* flags */ + +/* PLL_AUDIO missing */ +// in h616 datasheet + +/* CPUX_AXI missing */ +// in h616 datasheet + +static const char *psi_ahb1_ahb2_parents[] = {"osc24M", "osc32k", "iosc", "pll_periph0"}; +NM_CLK(psi_ahb1_ahb2_clk, + CLK_PSI_AHB1_AHB2, "psi_ahb1_ahb2", psi_ahb1_ahb2_parents, /* id, name, parents */ + 0x510, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 2, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_REPARENT); /* flags */ + +static const char *ahb3_parents[] = {"osc24M", "osc32k", "psi_ahb1_ahb2", "pll_periph0"}; +NM_CLK(ahb3_clk, + CLK_AHB3, "ahb3", ahb3_parents, /* id, name, parents */ + 0x51C, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 2, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_REPARENT); /* flags */ + +static const char *apb1_parents[] = {"osc24M", "osc32k", "psi_ahb1_ahb2", "pll_periph0"}; +NM_CLK(apb1_clk, + CLK_APB1, "apb1", apb1_parents, /* id, name, parents */ + 0x520, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 2, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_REPARENT); /* flags */ + +static const char *apb2_parents[] = {"osc24M", "osc32k", "psi_ahb1_ahb2", "pll_periph0"}; +NM_CLK(apb2_clk, + CLK_APB2, "apb2", apb2_parents, /* id, name, parents */ + 0x524, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 2, 0, 0, /* m factor */ + 24, 2, /* mux */ + 0, /* gate */ + AW_CLK_HAS_MUX | AW_CLK_REPARENT); /* flags */ + +/* Missing MBUS clock */ + +static const char *mod_parents[] = {"osc24M", "pll_periph0_2x", "pll_periph1_2x"}; +NM_CLK(mmc0_clk, + CLK_MMC0, "mmc0", mod_parents, /* id, name, parents */ + 0x830, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc1_clk, + CLK_MMC1, "mmc1", mod_parents, /* id, name, parents */ + 0x834, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +NM_CLK(mmc2_clk, + CLK_MMC2, "mmc2", mod_parents, /* id, name, parents */ + 0x838, /* offset */ + 8, 2, 0, AW_CLK_FACTOR_POWER_OF_TWO, /* n factor */ + 0, 4, 0, 0, /* m factor */ + 24, 2, /* mux */ + 31, /* gate */ + AW_CLK_HAS_GATE | AW_CLK_HAS_MUX | + AW_CLK_REPARENT); /* flags */ + +static struct aw_ccung_clk h616_ccu_clks[] = { + { .type = AW_CLK_NP, .clk.np = &pll_cpux_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_ddr0_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_ddr1_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_peri0_2x_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_peri1_2x_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_gpu_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_video0_4x_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_video1_4x_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_video2_4x_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_ve_clk}, + { .type = AW_CLK_NMM, .clk.nmm = &pll_de_clk}, + + { .type = AW_CLK_NM, .clk.nm = &psi_ahb1_ahb2_clk}, + { .type = AW_CLK_NM, .clk.nm = &ahb3_clk}, + { .type = AW_CLK_NM, .clk.nm = &apb1_clk}, + { .type = AW_CLK_NM, .clk.nm = &apb2_clk}, + + { .type = AW_CLK_NM, .clk.nm = &mmc0_clk}, + { .type = AW_CLK_NM, .clk.nm = &mmc1_clk}, + { .type = AW_CLK_NM, .clk.nm = &mmc2_clk}, + + { .type = AW_CLK_FIXED, .clk.fixed = &pll_peri0_clk}, + { .type = AW_CLK_FIXED, .clk.fixed = &pll_peri1_clk}, + { .type = AW_CLK_FIXED, .clk.fixed = &pll_video0_clk}, + { .type = AW_CLK_FIXED, .clk.fixed = &pll_video1_clk}, + { .type = AW_CLK_FIXED, .clk.fixed = &pll_video2_clk}, +}; + +static int +ccu_h616_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "allwinner,sun50i-h616-ccu")) + return (ENXIO); + + device_set_desc(dev, "Allwinner H616 Clock Control Unit"); + return (BUS_PROBE_DEFAULT); +} + +static int +ccu_h616_attach(device_t dev) +{ + struct aw_ccung_softc *sc; + + sc = device_get_softc(dev); + + sc->resets = h616_ccu_resets; + sc->nresets = nitems(h616_ccu_resets); + sc->gates = h616_ccu_gates; + sc->ngates = nitems(h616_ccu_gates); + sc->clks = h616_ccu_clks; + sc->nclks = nitems(h616_ccu_clks); + + return (aw_ccung_attach(dev)); +} + +static device_method_t ccu_h616ng_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, ccu_h616_probe), + DEVMETHOD(device_attach, ccu_h616_attach), + + DEVMETHOD_END +}; + +DEFINE_CLASS_1(ccu_h616ng, ccu_h616ng_driver, ccu_h616ng_methods, + sizeof(struct aw_ccung_softc), aw_ccung_driver); + +EARLY_DRIVER_MODULE(ccu_h616ng, simplebus, ccu_h616ng_driver, 0, 0, + BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE); From nobody Mon Feb 9 10:37:21 2026 X-Original-To: dev-commits-src-main@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 4f8h360rPkz6RDCH for ; Mon, 09 Feb 2026 10:37:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8h3575cbz3Tbq for ; Mon, 09 Feb 2026 10:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770633442; 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=gqFQIKJ60f4nsX6AKwiit6r649RKsCFQ+OMymNp7fE0=; b=ng8Tk6f3djSqUq2bHbZuRSnBnYXxWOujFaVIfp55xzX8QZC36GaWwKsEquKS8mIISxHLup SRO4ubqUggla+J6SL3wIlOma9i43aF2JPlXnANLEFaJ39Ypbgjaqon4gZrIH8m+ZZAyseB 1/Ad1UJO+K9PH0LPaoFi63UX9jZ7RkYDQn8fOIhiLT3cdw3s8y6E5e2pgFKjh9KIn2fEZz dizXNnThj+N11lYRbRl9o59eryVY3lUJ2I1QBS+tayKmaKBtyds6QSMfGrEVIG8GK+U+pX Q+U6M4F//LPV+z8hWSKLBOGBLtwJu0RRZCZ0XycmUo9AAjPGlmvxbmHUFI8d0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770633442; a=rsa-sha256; cv=none; b=b52oDGzqFQmHF7ZLFINLk1Yjn5uJfjZOqLhg8w+rTfActKr7ZbS+3TKDXx8mrNhWHzJXhX uZVLgNFe0JpTdXXAFKUx2nJSCUJOv1MJ0ZMT/PYlS1SLrQnmIcBtA3pHb97pKUNBcx47ga gd4Qx0Zxf1FVyoZ+7rxJ+LPg6MYW80ZFTWR/wRj164cNs+j/x8RXKKA7+Y/9G3GRf9cfXn HEkrw30yP9WrtsoeABmNBX+Hc98hEkZw9Vryuderzcmr8If+W+sfNeR0h547UWMfmpcKUd oeYMuYzjbDlY9NUsN63SYyDHUCGIYHjbO6Fh2v1zC9KhN8cEeF8MyK5LB9uVJA== 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=1770633442; 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=gqFQIKJ60f4nsX6AKwiit6r649RKsCFQ+OMymNp7fE0=; b=K7T7PjL0G5nsK/R+7hYLLpgCSnnGB2qzreK42UjIeRlkdPGrR10Gd8w+tc3r0UEj17gOwy 1XwMgrY7elMnqYmB3qpaMVlOtvLsvrZHXD9q21J+VnTqbDDHLOvORQkbphJgPewStr1sLc veS4H9vdqJLz2Zspk4BxKLxLpacby+tSR9NaTYCU11W+WNsej8KZlbf3FuiJff4l6Dhbr0 aGGGKbuG8TPD9/CXlinaXbjRN/I06gXNpIK9z75KFBoL1KtiJQ/B0BktGOCO8XiFYloeWK /4GSfyGfi37MnN1f6jOl9FktTO55XcAvj1jAZj7lelnKW4YMO1c4DW1yoJ//9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8h356gLNzD03 for ; Mon, 09 Feb 2026 10:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20525 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 10:37:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: f8a3876e90d0 - main - if_awg: Add H616 compat string List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8a3876e90d0bd7250664ccce36b485a91f4c51c Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 10:37:21 +0000 Message-Id: <6989b8e1.20525.f07f4fd@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=f8a3876e90d0bd7250664ccce36b485a91f4c51c commit f8a3876e90d0bd7250664ccce36b485a91f4c51c Author: Tom Jones AuthorDate: 2026-02-09 10:28:18 +0000 Commit: Tom Jones CommitDate: 2026-02-09 10:28:25 +0000 if_awg: Add H616 compat string Reviewed by: manu Sposored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54907 --- sys/arm/allwinner/if_awg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm/allwinner/if_awg.c b/sys/arm/allwinner/if_awg.c index 98e879d22d3d..c66aab9422b8 100644 --- a/sys/arm/allwinner/if_awg.c +++ b/sys/arm/allwinner/if_awg.c @@ -144,6 +144,7 @@ enum awg_type { EMAC_H3, EMAC_A64, EMAC_D1, + EMAC_H616, }; static struct ofw_compat_data compat_data[] = { @@ -151,6 +152,7 @@ static struct ofw_compat_data compat_data[] = { { "allwinner,sun8i-h3-emac", EMAC_H3 }, { "allwinner,sun50i-a64-emac", EMAC_A64 }, { "allwinner,sun20i-d1-emac", EMAC_D1 }, + { "allwinner,sun50i-h616-emac", EMAC_H616 }, { NULL, 0 } }; From nobody Mon Feb 9 13:24:56 2026 X-Original-To: dev-commits-src-main@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 4f8lnl6Zpdz6RRV0; Mon, 09 Feb 2026 13:26:03 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fout-b6-smtp.messagingengine.com (fout-b6-smtp.messagingengine.com [202.12.124.149]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8lnj4zmkz3mJj; Mon, 09 Feb 2026 13:26:01 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=WQ8PZ6U6; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=VDLyY+A5; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.149 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-01.internal (phl-compute-01.internal [10.202.2.41]) by mailfout.stl.internal (Postfix) with ESMTP id 65CF61D0011C; Mon, 9 Feb 2026 08:26:00 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Mon, 09 Feb 2026 08:26:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770643560; x=1770729960; bh=86FtCyny+a alehjJYci1eEtz+rRh2L41xCQLCVKAFZM=; b=WQ8PZ6U6cdjVupYrreK5VgpUrV SiHHc+hEZVjtXV8gbtZ3sZMiAM40+kcZClkrxhxIpVLUa8FasxMgjHNh1oGDu6aM L7MCfJFJOhzSghyAigNAaL4WAZETkSbrg9KaWDLT5ZZD4iUmuuQ0TL5Yro2Z18xs 1n5AjsbfosFcEXhGWbL0VZHBtUFf7p5g3TdBYNOq+JprhzVOHoMfbFKD2r9P34Wr O+mOAXEdNXfDZIm4jrpZaCx5Twp5Rcik0QiwnbPqJygoao3dWsymrjAUonTzXcfl fM55knkBxLiPgkpC/3IlhwiT7u2ucLDaqMZVxrti2hiPCVKt43RWdWZM7PSw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770643560; x=1770729960; bh=86FtCyny+aalehjJYci1eEtz+rRh2L41xCQ LCVKAFZM=; b=VDLyY+A58r6QIxXrxYMJ5wJqlrSJtF3Dc9zGvluiGAGrIt5Pg3i LZNqYcr2qNWo94qnXe8kvLzRsGFytAgv7FjhiVPREgZQsAyH3J8MpcgYZ4fGrx3d TS/Jk0rWKvjupiZzxhEfQ8gf59v0A1aOxO6w3xTtmvz2q0L+WlVJNHbBj79mB/cU 638FL9s31MF4hNH+XYGfDaMtNlf1+3oKX6B0zJPr65FdQ8zUT+CqzPHX2R3NpeLl JQZu/d//JvA24SvruE3yuN9KhI9Yjwyn1m6wGdBH19YUzOSPhML6laZ54dKGawmi XtskMhXyI1RrjKk7fnd3xgf9SiZMsKY1Isg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleeiledvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpeffkffhvfevufgjfhgfgggtsehttdertd dtredvnecuhfhrohhmpedfjfgvrhgsvghrthculfdrucfukhhuhhhrrgdfuceohhgvrhgs vghrthesghhojhhirhgrrdgrtheqnecuggftrfgrthhtvghrnhepfefhheffgedvheeutd eugfekfeeiffeijefhgeegkeegveejgeefffeggeelhfdtnecuffhomhgrihhnpehfrhgv vggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhephhgvrhgsvghrthesghhojhhirhgrrdgrthdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmhgrnhhusehfrhgvvggsshgurdhorh hgpdhrtghpthhtohepshhrtgdqtghomhhmihhtthgvrhhssehfrhgvvggsshgurdhorhhg pdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqrghllhesfhhrvggvsghsug drohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdhmrghinhesfhhr vggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Feb 2026 08:25:58 -0500 (EST) Date: Mon, 09 Feb 2026 14:24:56 +0100 Message-ID: <87ikc6rqvr.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Emmanuel Vadot Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 15d781b53233 - main - lib: Gate libfigpar under MK_DIALOG In-Reply-To: <202208161916.27GJG7vj001566@gitrepo.freebsd.org> References: <202208161916.27GJG7vj001566@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.58 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.984]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.149:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; DMARC_NA(0.00)[gojira.at]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f8lnj4zmkz3mJj X-Spamd-Bar: -- On Tue, 16 Aug 2022 21:16:07 +0200, Emmanuel Vadot wrote: > > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=15d781b5323315afaed06fb2f2499f9164e1ef86 > > commit 15d781b5323315afaed06fb2f2499f9164e1ef86 > Author: Emmanuel Vadot > AuthorDate: 2022-07-21 14:52:24 +0000 > Commit: Emmanuel Vadot > CommitDate: 2022-08-16 19:15:12 +0000 > > lib: Gate libfigpar under MK_DIALOG > > libfigpar is only used by dpv and dpv isn't built if WITHOUT_DIALOG > is set. > --- > lib/Makefile | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/lib/Makefile b/lib/Makefile > index 482e4d603f4b..3f94cbc1f073 100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@ -57,7 +57,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ > libexecinfo \ > libexpat \ > libfetch \ > - libfigpar \ > libgcc_eh \ > libgcc_s \ > libgeom \ > @@ -170,7 +169,7 @@ SUBDIR+= clang > SUBDIR.${MK_CUSE}+= libcuse > SUBDIR.${MK_CXX}+= libdevdctl > SUBDIR.${MK_TOOLCHAIN}+=libpe > -SUBDIR.${MK_DIALOG}+= libdpv > +SUBDIR.${MK_DIALOG}+= libdpv libfigpar > SUBDIR.${MK_FILE}+= libmagic > SUBDIR.${MK_GPIO}+= libgpio > SUBDIR.${MK_GSSAPI}+= libgssapi librpcsec_gss Should this be added to main and 15? diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index aae83a44e53e..1c584cb02881 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1479,10 +1479,14 @@ OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_LIBS+=usr/lib/libdpv.so.3 OLD_FILES+=usr/lib/libdpv_p.a +OLD_FILES+=usr/lib/libfigpar.a +OLD_FILES+=usr/lib/libfigpar.so +OLD_LIBS+=usr/lib/libfigpar.so.0 OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/figpar.3.gz .endif .if ${MK_DICT} == no After updating my Raspberry Pi 4 from 14.3-STABLE to 15.0-STABLE today I have the following leftovers: $ ls -l /usr/lib/libfigpar.* -r--r--r-- 1 root wheel 11704 Jul 29 2025 /usr/lib/libfigpar.a lrwxr-xr-x 1 root wheel 14 Jul 29 2025 /usr/lib/libfigpar.so -> libfigpar.so.0 -r--r--r-- 1 root wheel 11416 Jul 29 2025 /usr/lib/libfigpar.so.0 I can find libfigpar only in /usr/obj. From nobody Mon Feb 9 13:52:10 2026 X-Original-To: dev-commits-src-main@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 4f8mMt4nfPz6RTQ1 for ; Mon, 09 Feb 2026 13:52:10 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8mMt3djGz3rCT for ; Mon, 09 Feb 2026 13:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770645130; h=from:from: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; bh=G9oycxQgYYVQVhzQfJ14GGif985CN8VHJI3S+ML0QSc=; b=jDVZ/h+BoSHz/kBcCj+MmTvXXMsQk6yPX0/IhqPdVl+WlPne8cRD/GXIZ2vPBy7wy3aRnx Uc1mJTthWWEMZj86ei7KgHIY+a6K4SGxxn33/OCTRczDx93816NZMX7DGpkAgBI9CE4/HL xEl4NVhiN/5VqVdzG9JcjL3gN+qaxF3ixKMB3F/b11ljCUodm2rTmqs7J8FAQsxsLnhrHb eRdjDilFx6Hf4k/AaTdicI47LDoZcF/WpTA/B8A8e/EumPtCvWKDEKNSjVo8v7Ipv+kDwy rpwjkXuEpdCun/XveKq3/FDMR+RuardO9oeibAtjFstT0QBSEFi4gdgHEC/nrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770645130; a=rsa-sha256; cv=none; b=mbjjEeLgQ7A1Lg0VvpTQkcnO+uZ5CEUdyjLXdbLT1OWOghO24ogr4sVm9W2+toBMa5AMmh Ezq6Fo17Uc3R5Yl8X2Y7NdECC/kMxZIn2GmXdASw7qgLI576wSUkMOxTr0meBxLSIWAz1W mFfpsc9Qa4yO1lLkbNDFJmg3kcQFvolbHuYXx+Tz9ySJdpACaSs6Kx2tXhWHfO2yqt2kAr +W81EbHa4h1mooUQjx7QdtInlUXP/wysKCo/ZDe8/oDhTESC97J0ERITuu1bX7Du+2roW9 8U4k3V0Euw1nZgJDSN73JcUHw9gkthCWLo/k/wrVfr2j40P46pfWf5CmQReUMg== 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=1770645130; h=from:from: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; bh=G9oycxQgYYVQVhzQfJ14GGif985CN8VHJI3S+ML0QSc=; b=fC61alj7yDdKt3B4Mg2BPsmZWuNDJsbqbhQqkDxSrV6sxB2nLO2EWZ8Pn8HJIloprwxmre KbYbWb3ZWPGatfzGhZSWSfc2y0k/XWD6XcJVoYDBaQZLtCnzvVO0th+MKXUxw5Ya2T/RlN 5ML75KQF42/VRHSD2bi68beWtaHJAYNQW0FmUuSVRLfSLwf7pwtqa5f/siTlkBLGVhhg+n dIi4B2EtyaFf4ywg9EE2jbjRDr47lNR/iaMkp6sCI41n8ScRz9UYX8jBsnORTuzEpabC5a yCJ86CzJUZOEOnPOX7efT7KL39WIkKdb0/cysupOBu7rMVwFlMSfK/3WBJcBVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8mMt38ZHzbVM for ; Mon, 09 Feb 2026 13:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dd05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 13:52:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Tuukka Pasanen From: Ed Maste Subject: git: b6824fe48e41 - main - chio: Add SPDX-License-Identifier tags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6824fe48e4197877f472268859ffe80d7fd946b Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 13:52:10 +0000 Message-Id: <6989e68a.3dd05.796d0d1c@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b6824fe48e4197877f472268859ffe80d7fd946b commit b6824fe48e4197877f472268859ffe80d7fd946b Author: Tuukka Pasanen AuthorDate: 2026-02-09 07:47:08 +0000 Commit: Ed Maste CommitDate: 2026-02-09 13:51:58 +0000 chio: Add SPDX-License-Identifier tags Some BSD-4-Clause files under bin/chio were missing the SPDX-License-Identifier-tag. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55193 --- bin/chio/chio.c | 2 ++ bin/chio/defs.h | 2 ++ bin/chio/pathnames.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/bin/chio/chio.c b/bin/chio/chio.c index 07def55ee88f..10468406800e 100644 --- a/bin/chio/chio.c +++ b/bin/chio/chio.c @@ -1,5 +1,7 @@ /* $NetBSD: chio.c,v 1.6 1998/01/04 23:53:58 thorpej Exp $ */ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 6b4381a3d447..4dbe69629a81 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,5 +1,7 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h index a8308ed7b0ac..6c5ee3c63cd0 100644 --- a/bin/chio/pathnames.h +++ b/bin/chio/pathnames.h @@ -1,5 +1,7 @@ /*- + * SPDX-License-Identifier: BSD-4-Clause + * * Copyright (c) 1996 Jason R. Thorpe * All rights reserved. * From nobody Mon Feb 9 14:14:03 2026 X-Original-To: dev-commits-src-main@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 4f8ms742LTz6RVyy for ; Mon, 09 Feb 2026 14:14:03 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8ms72sbSz3syP for ; Mon, 09 Feb 2026 14:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770646443; h=from:from: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; bh=3h5e2YGkb6gc1/hmM8cFl0UXO+Iq6/1pvStmtPjAadg=; b=Fv1nCOTTgmhop/rkKxFnyxh0k2VQ2+kJpG6J/hN/4PJ64jgHZUhYKSN3/E7Rx3djQysK4V /VEdGfr5sGNk+Id1dsP5PMIm4L1t5KEA3wDONMOlRyAL2jKyUbGpN8po2bT1XJmB3zW3EV L0qhjnEIN48FP8wnFpSrtqr3p9ZcoaLsWb6FiZZa00/u+4695KNKmJn3g6Fm9lBCX1sESA m6FN0s6T0ysU56levw1/GmBjNuJT7tsJlf2mkzdu6//mj2vV+owblTFm09+IrfUGi6b3HF eVp3W2UStghkWsDPJ1sQZ3WvtPPhH0a0uH2vtgu3PwXLe5rkCxaE7oa91RbdNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770646443; a=rsa-sha256; cv=none; b=rvvlf/iQp/sE0kXAr35XmRA6wLIAN4a9mDEnbBAEEkeU3aitqguHtcmyXpzD44N+pmvSN3 2e19oi5UkHiBXHhhyhROVAsaR8bQu71+lj8m22r7rhDHhGcos/o7OE5n41xbUkn9CbyPFi DAoIgDvEFGCxXpQpYf6stQdgiVS+ACyyNKtixdqyUPc4C4scsYh7P+CEk1tMjG1D4IZ62m r/gIk01XNg1APeigXPHfRy8n85DVeQpFFRa87TpXZDnS3PC6ebdGkCpSKl7YBMI8x7MEhS 9J9aEax9XyBHr+O6g94iho3cyZ4/evhA2W1MbDqtzd59v+vGrpq9N5HBFWREGw== 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=1770646443; h=from:from: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; bh=3h5e2YGkb6gc1/hmM8cFl0UXO+Iq6/1pvStmtPjAadg=; b=dsmw/M4gPR/LuTPBe+Iv672435wdPDmQv7bnsC8i+YcpxMROb/ZzM31mfsgdrgOeSmv2Sf bKGOg6OlSvDoPIcLvp3+SaOvlVKfUOkUnsvJLLTBi05ZZbITyGcndTddYVpPchFyC7fYg4 pqd/2RaSvWjKYg1Y2oc+r2+c8RKsfQLdqHJ4stEVniEfw9PG9py7NNMBxymc3zyfeqXE2p f7vj00LO9H3IdqDdV+zVQoSYST5g9CcMJhXHfoYMR1XZrNin/O9p4BsP5Oz9hE2wVafQA9 m2n5ZUuWU2hVCo1A2WhS6uZf55c24qtTXwdNHeqXJx3Rd4nGkw3q3ltBXPJIGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8ms72Mtnzcjh for ; Mon, 09 Feb 2026 14:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fb12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 14:14:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Quent=?utf-8?Q?in Th=C3=A9?=bault From: Ed Maste Subject: git: 6a0ab05eb5ee - main - tools: fix WITHOUT_LOADER_GELI typo in universe.sh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a0ab05eb5eeb701ce71630154f903668d750786 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 14:14:03 +0000 Message-Id: <6989ebab.3fb12.70ca9381@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0ab05eb5eeb701ce71630154f903668d750786 commit 6a0ab05eb5eeb701ce71630154f903668d750786 Author: Quentin Thébault AuthorDate: 2026-02-09 12:27:06 +0000 Commit: Ed Maste CommitDate: 2026-02-09 14:13:05 +0000 tools: fix WITHOUT_LOADER_GELI typo in universe.sh Signed-off-by: Quentin Thébault Reviewed by: emaste Sponsored by: Defenso Pull Request: https://github.com/freebsd/freebsd-src/pull/2011 --- tools/boot/universe.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boot/universe.sh b/tools/boot/universe.sh index fc47ac52fed4..4218aa4784c8 100755 --- a/tools/boot/universe.sh +++ b/tools/boot/universe.sh @@ -63,7 +63,7 @@ for i in \ i386/i386 \ ; do ta=${i##*/} - dobuild $ta _.boot.${ta}.no_geli.log "WITHOUT_LOADER_GEIL=yes" + dobuild $ta _.boot.${ta}.no_geli.log "WITHOUT_LOADER_GELI=yes" done # Default build for a almost all architectures From nobody Mon Feb 9 14:34:38 2026 X-Original-To: dev-commits-src-main@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 4f8nL72qgGz6RWqd; Mon, 09 Feb 2026 14:35:43 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fout-b7-smtp.messagingengine.com (fout-b7-smtp.messagingengine.com [202.12.124.150]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8nL614Rdz3w8n; Mon, 09 Feb 2026 14:35:42 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=IxwI65VV; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=KbWPqkPs; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.150 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfout.stl.internal (Postfix) with ESMTP id 92E5A1D00114; Mon, 9 Feb 2026 09:35:40 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Mon, 09 Feb 2026 09:35:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770647740; x=1770734140; bh=GAmqy60map YD3RYREanO2gP9AEoawjVek6Z4oIm8H+Q=; b=IxwI65VVR3+Dw8N9IZl3ViSeHZ dAHfcQDcKvnYQyCeSP64zaZ8pLjNUdvN4sumMJMYy4ddXa5+2Fzo0FAHEmfJKVY2 gmHKOtSKj7P6f5Iiybs5bJr1Mesyh2xMeGrqvKp1AnvTiSGqAUdeTRgV1xxSlXpB 3OwRwajMSr3DUgak/Jw/mnoxHE0rjK89W2BP4vLdnASaqAjFcnhC1yT0Cl229TB4 iSAuMj/L2KAGZCWVywfFZGJQVmLLSlgetLJFtE5QSIB+PoSNACeP2vRdLcgAcb2m EPoqD5z+Wmx7sq34pV3ECNaRy8jVuWum0xI1PhRERoj1Bx5I7yQA8Bi2RxqA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770647740; x=1770734140; bh=GAmqy60mapYD3RYREanO2gP9AEoawjVek6Z 4oIm8H+Q=; b=KbWPqkPsGjNxVdvz4ENEggYNKiS3XPN5sfPXmows4m87jwtdXd6 y0s5kokhTUKOw1zsQxxWDscAQQu8uNVGzchZDLYpoYO3nAGFxn44ILaVzIs/S+b4 zTRj/6kybPo3tmWS8icAQ4GTMMxyuiSXDzOYjSPAI38NKvSme225JfLY0+8xdT1O QJW1tJL+l3Tb3rQGoIK9mXjk8RUMPIVLbtyZ65ACrpSlcEVCuRGFa1QHT/M2v5Vb sUt1RWoCOF6UQbpSMbT5otA2U5v1P9aFfau8ih03wg/8nYDXJ0PeAk7l1xV/sCkz owgrFRkVjSQMcLZNNiZYt2LivddQKDNvWhA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleejtdeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpeffkffhvfevufgjfhgfgggtsehttdertd dtredvnecuhfhrohhmpedfjfgvrhgsvghrthculfdrucfukhhuhhhrrgdfuceohhgvrhgs vghrthesghhojhhirhgrrdgrtheqnecuggftrfgrthhtvghrnhepfefhheffgedvheeutd eugfekfeeiffeijefhgeegkeegveejgeefffeggeelhfdtnecuffhomhgrihhnpehfrhgv vggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhephhgvrhgsvghrthesghhojhhirhgrrdgrthdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmhgrnhhusehfrhgvvggsshgurdhorh hgpdhrtghpthhtohepshhrtgdqtghomhhmihhtthgvrhhssehfrhgvvggsshgurdhorhhg pdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqrghllhesfhhrvggvsghsug drohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdhmrghinhesfhhr vggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Feb 2026 09:35:39 -0500 (EST) Date: Mon, 09 Feb 2026 15:34:38 +0100 Message-ID: <87h5rqrnnl.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Emmanuel Vadot Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 15d781b53233 - main - lib: Gate libfigpar under MK_DIALOG In-Reply-To: <87ikc6rqvr.wl-herbert@gojira.at> References: <202208161916.27GJG7vj001566@gitrepo.freebsd.org> <87ikc6rqvr.wl-herbert@gojira.at> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.57 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.971]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.150:from]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[gojira.at]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f8nL614Rdz3w8n X-Spamd-Bar: -- On Mon, 09 Feb 2026 14:24:56 +0100, "Herbert J. Skuhra" wrote: > > On Tue, 16 Aug 2022 21:16:07 +0200, Emmanuel Vadot wrote: > > > > The branch main has been updated by manu: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=15d781b5323315afaed06fb2f2499f9164e1ef86 > > > > commit 15d781b5323315afaed06fb2f2499f9164e1ef86 > > Author: Emmanuel Vadot > > AuthorDate: 2022-07-21 14:52:24 +0000 > > Commit: Emmanuel Vadot > > CommitDate: 2022-08-16 19:15:12 +0000 > > > > lib: Gate libfigpar under MK_DIALOG > > > > libfigpar is only used by dpv and dpv isn't built if WITHOUT_DIALOG > > is set. > > --- > > lib/Makefile | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/lib/Makefile b/lib/Makefile > > index 482e4d603f4b..3f94cbc1f073 100644 > > --- a/lib/Makefile > > +++ b/lib/Makefile > > @@ -57,7 +57,6 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ > > libexecinfo \ > > libexpat \ > > libfetch \ > > - libfigpar \ > > libgcc_eh \ > > libgcc_s \ > > libgeom \ > > @@ -170,7 +169,7 @@ SUBDIR+= clang > > SUBDIR.${MK_CUSE}+= libcuse > > SUBDIR.${MK_CXX}+= libdevdctl > > SUBDIR.${MK_TOOLCHAIN}+=libpe > > -SUBDIR.${MK_DIALOG}+= libdpv > > +SUBDIR.${MK_DIALOG}+= libdpv libfigpar > > SUBDIR.${MK_FILE}+= libmagic > > SUBDIR.${MK_GPIO}+= libgpio > > SUBDIR.${MK_GSSAPI}+= libgssapi librpcsec_gss > > Should this be added to main and 15? > > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc > index aae83a44e53e..1c584cb02881 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -1479,10 +1479,14 @@ OLD_FILES+=usr/lib/libdpv.a > OLD_FILES+=usr/lib/libdpv.so > OLD_LIBS+=usr/lib/libdpv.so.3 > OLD_FILES+=usr/lib/libdpv_p.a > +OLD_FILES+=usr/lib/libfigpar.a > +OLD_FILES+=usr/lib/libfigpar.so > +OLD_LIBS+=usr/lib/libfigpar.so.0 > OLD_FILES+=usr/share/man/man1/dialog.1.gz > OLD_FILES+=usr/share/man/man1/dpv.1.gz > OLD_FILES+=usr/share/man/man3/dialog.3.gz > OLD_FILES+=usr/share/man/man3/dpv.3.gz > +OLD_FILES+=usr/share/man/man3/figpar.3.gz > .endif > > .if ${MK_DICT} == no > > > After updating my Raspberry Pi 4 from 14.3-STABLE to 15.0-STABLE today > I have the following leftovers: > > $ ls -l /usr/lib/libfigpar.* > -r--r--r-- 1 root wheel 11704 Jul 29 2025 /usr/lib/libfigpar.a > lrwxr-xr-x 1 root wheel 14 Jul 29 2025 /usr/lib/libfigpar.so -> libfigpar.so.0 > -r--r--r-- 1 root wheel 11416 Jul 29 2025 /usr/lib/libfigpar.so.0 > > > I can find libfigpar only in /usr/obj. Sorry, more files. Updated patch below. diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index aae83a44e53e..eaa89b7679e8 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1479,10 +1479,22 @@ OLD_FILES+=usr/lib/libdpv.a OLD_FILES+=usr/lib/libdpv.so OLD_LIBS+=usr/lib/libdpv.so.3 OLD_FILES+=usr/lib/libdpv_p.a +OLD_FILES+=usr/lib/libfigpar.a +OLD_FILES+=usr/lib/libfigpar.so +OLD_LIBS+=usr/lib/libfigpar.so.0 OLD_FILES+=usr/share/man/man1/dialog.1.gz OLD_FILES+=usr/share/man/man1/dpv.1.gz OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz +OLD_FILES+=usr/share/man/man3/dpv_free.3.gz +OLD_FILES+=usr/share/man/man3/figpar.3.gz +OLD_FILES+=usr/share/man/man3/get_config_option.3.gz +OLD_FILES+=usr/share/man/man3/parse_config.3.gz +OLD_FILES+=usr/share/man/man3/replaceall.3.gz +OLD_FILES+=usr/share/man/man3/strcount.3.gz +OLD_FILES+=usr/share/man/man3/strexpand.3.gz +OLD_FILES+=usr/share/man/man3/strexpandnl.3.gz +OLD_FILES+=usr/share/man/man3/strtolower.3.gz .endif .if ${MK_DICT} == no From nobody Mon Feb 9 14:45:20 2026 X-Original-To: dev-commits-src-main@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 4f8nZR20Cvz6RXjC; Mon, 09 Feb 2026 14:46:23 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-b6-smtp.messagingengine.com (fhigh-b6-smtp.messagingengine.com [202.12.124.157]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8nZQ2MDfz3xqv; Mon, 09 Feb 2026 14:46:22 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=SwJ2h3rc; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=Tm+0WUho; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.157 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-04.internal (phl-compute-04.internal [10.202.2.44]) by mailfhigh.stl.internal (Postfix) with ESMTP id 97A687A009F; Mon, 9 Feb 2026 09:46:21 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Mon, 09 Feb 2026 09:46:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770648381; x=1770734781; bh=3RFAupLdG+ d8CMjIkdskRqkVjqJvK25JSwdw5IOrlKU=; b=SwJ2h3rcEnU7zEz2RynbbnWEtt +8oXY15MvfkWEotC9zdku8CuXLN4ixN+PIqRA0+MwIXcJr5euErkoXNCuiIgPCkg IVT4kK0n0bBGVQp9roRTun/QBxMdASUL4g0AoXd7uN9r7GwGmbtwWw42Nn4o6HsC wy49dCgtRTBEfRMw2LionE3Vqe95nfkq13Gzc++w4Uv6gZxI416XnMKdMF8wRXzn 1Sr+5rJ49YYzDgRKk6UjFt/Y9/kUm7Pl32CTmmT8hAqKF/9WDVTBuNmhXFL0OTRD MFNSWhrZCyffVZDRiUCcYV6bvbxTbQ9k9uW/GwnTXuKp8NetybMLaTZqKdIw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770648381; x=1770734781; bh=3RFAupLdG+d8CMjIkdskRqkVjqJvK25JSwd w5IOrlKU=; b=Tm+0WUhoGgW0w/4wQ6i8JvoTsphCz5qg27/GCfmTyPcoFbOedUW aocCmCwaK29yWSkNBgZkGfQHM4eIQEGPPpAsYB1lU++7toU3h64MyONMidlhQ00a qK+o9ViGA2HZowd301J2JKtMmWN3uMV4sGS9YotW7BAHNlA2E6s0VJ5VyYW3xvn4 PAvLqyUU2XT2GopCOarjuyIXfkiBw0mhIlbHUYnvFpJkH7S4IVdWRrjF3nxDy8O5 kjQGlAoah9kfttsax4/aiY8Tl8igzOqjnkmxAG3hFzKbYm6Z/NAPFeOsI7uORCUs xjXDBiiUvEEFUKhWPQVQ8LurzoP5Zp62Zyw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleejtdelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffkhffvvefujghffgggtgesthdtredttdervdenucfhrhhomhepfdfjvghrsggv rhhtucflrdcuufhkuhhhrhgrfdcuoehhvghrsggvrhhtsehgohhjihhrrgdrrghtqeenuc ggtffrrghtthgvrhhnpeefhfehffegvdehuedtuefgkeefieffieejhfeggeekgeevjeeg feffgeeglefhtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghrsggvrhhtsehgohhj ihhrrgdrrghtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtph htthhopehkvghvrghnshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgt ohhmmhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtoh hmmhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggv vhdqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Feb 2026 09:46:20 -0500 (EST) Date: Mon, 09 Feb 2026 15:45:20 +0100 Message-ID: <87fr7arn5r.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Kyle Evans Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 3fde39073c72 - main - shar: remove from the tree well in advance of the 15.0 release In-Reply-To: <202507101757.56AHvEK6073104@gitrepo.freebsd.org> References: <202507101757.56AHvEK6073104@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.58 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.981]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27:c]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.157:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f8nZQ2MDfz3xqv X-Spamd-Bar: -- On Thu, 10 Jul 2025 19:57:14 +0200, Kyle Evans wrote: > > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3fde39073c722ba5b1d3aa330ec4dc5e0ecd8495 > > commit 3fde39073c722ba5b1d3aa330ec4dc5e0ecd8495 > Author: Kyle Evans > AuthorDate: 2025-01-02 02:20:09 +0000 > Commit: Kyle Evans > CommitDate: 2025-07-10 17:57:03 +0000 > > shar: remove from the tree well in advance of the 15.0 release > > We have had deprecation notice in the manpage for nearly six months, and > it is also present both in 13.5 and 14.3. tar(1) can supply this > functionality for those that truly need it, and cy@ has also created a > sysutils/freebsd-shar port for this version of a frontend to live on in > ports -- this port has been available since December 18, 2024. > > Reviewed by: allanjude, cy, emaste, jrm > Differential Revision: https://reviews.freebsd.org/D50925 > --- > ObsoleteFiles.inc | 3 + > UPDATING | 5 ++ > usr.bin/Makefile | 1 - > usr.bin/shar/Makefile | 4 - > usr.bin/shar/Makefile.depend | 10 --- > usr.bin/shar/shar.1 | 121 ------------------------------- > usr.bin/shar/shar.sh | 78 -------------------- > usr.sbin/crunch/examples/really-big.conf | 2 +- > 8 files changed, 9 insertions(+), 215 deletions(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index d1095b57c342..4031478f1db4 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -51,6 +51,9 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20250710: shar(1) removed > +OLD_FILES+=usr/bin/shar diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b329b26db026..b0ad8ec977b2 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -247,6 +247,7 @@ OLD_DIRS+=usr/share/examples/drivers # 20250710: shar(1) removed OLD_FILES+=usr/bin/shar +OLD_FILES+=usr/share/man/man1/shar.1.gz # 20250708: For 34 days 15.0-CURRENT installed libkadm5clnt symlink without .so OLD_FILES+=usr/lib/libkadm5clnt ? From nobody Mon Feb 9 14:49:18 2026 X-Original-To: dev-commits-src-main@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 4f8ndp4xhgz6RXqb for ; Mon, 09 Feb 2026 14:49:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8ndp4GDHz3ymV for ; Mon, 09 Feb 2026 14:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770648558; h=from:from: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; bh=/PRz2mAHi6bBnogax+YGDPHYfRydIpWMCqU+UhIAhlc=; b=PeA9lpdX8Ctt3/d2iNdOV4CxkmYm1QP6LKzxiI/5D7/9+BXNjBTcDVbj2Y6P8tIjHlDW/g ESppd/eSzFZzObpO3Eym95T3Fmj9Gqg7Rm7DpIkfMCA6tw6lwcVzACsyMELrMh+wlS8mXe QedPEheoDzLGFFQVDHxIx2qBac5vPNd2xqp4JPhyn5eYasebaCoGOf4P/apHm35T1nu56L NqqYRn6Pu4RVB+ZVypwEm1w/TgyZhnwX5lQXm5/A+nydVRxi8tITdO4sL9dQPkT9puybB/ i8bByUcVLovwcJvY7fMNrPtBDjg2RYMl2EhiEiHjpuhP+kQ6mMYMK8tK4v7KIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770648558; a=rsa-sha256; cv=none; b=OPkldpydwws/2eHphT6UkuH3Zbf8nKlXJIzHXxvUZ9qBKoCfrdiD/8nzSKv+N2Brs1HGWA E3ETT4YbkE+BgO5QUlhAJ3xmSVLqUPXBPK1CyIRUUx8YYkRfWhRvZ2mZQRdM//b+xQAmaK 5B8/uOZ5k/YdwQAjQMsMZrrWeeD8b0EN03UWVs0Ni3rOulEe6NW7DfrrolfOAylkMAo84m YakTBMH/ZRBOtWGQ1LL+vNSjr3OmJTBDGi9yP2TgWgMvLvaO8b//IiuqB9XTcCMtuAMvwN uMKp9CToIi8VO8ZRL0giUfpzsb8ZOChxVprJFC5waHAotNzsyIymyy76C1uE2w== 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=1770648558; h=from:from: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; bh=/PRz2mAHi6bBnogax+YGDPHYfRydIpWMCqU+UhIAhlc=; b=os643u0WGXqX6bvXAtcTX1Z7kgh1QFJdqNyn+yl1qxFMF4wo7Wh17QsrRVtA8eS+v+CHLm DlYe4429tzvQOPPrv8XxJ/L35wlWYP5byK8AXDw10kivtCcCmkgyasvHRUpdq2L9u3AaH5 obj6+rXrAPB2QA018f+R+6P6MIeW3ntp8cFBaAOtWMMi4fgZGqYrgnsjdTLAiviCagvTj1 7rjIy40RiTKU+MDWAntCe2VH5TJR6AjJycDlBUDk+XNmJgfoaJTHrETtVsm+kZM+Ber9Hd QORzZxd7mwGyQ/WloXijEIhKbqnrhPYH5LNc6qYP/hDIX7++L8qXft/wH3joJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8ndp3XPPzcp1 for ; Mon, 09 Feb 2026 14:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 422a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 14:49:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Herbert J. Skuhra From: Kyle Evans Subject: git: bb0734cf2446 - main - ObsoleteFiles: remove the shar(1) manpage as well List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb0734cf2446ce2be829edfa421af3aa558d2c70 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 14:49:18 +0000 Message-Id: <6989f3ee.422a8.12e075d9@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bb0734cf2446ce2be829edfa421af3aa558d2c70 commit bb0734cf2446ce2be829edfa421af3aa558d2c70 Author: Herbert J. Skuhra AuthorDate: 2026-02-09 14:47:41 +0000 Commit: Kyle Evans CommitDate: 2026-02-09 14:48:05 +0000 ObsoleteFiles: remove the shar(1) manpage as well Fixes: 3fde39073c ("shar: remove from the tree [...]") --- ObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b329b26db026..b0ad8ec977b2 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -247,6 +247,7 @@ OLD_DIRS+=usr/share/examples/drivers # 20250710: shar(1) removed OLD_FILES+=usr/bin/shar +OLD_FILES+=usr/share/man/man1/shar.1.gz # 20250708: For 34 days 15.0-CURRENT installed libkadm5clnt symlink without .so OLD_FILES+=usr/lib/libkadm5clnt From nobody Mon Feb 9 14:49:55 2026 X-Original-To: dev-commits-src-main@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 4f8nfZ0y7Wz6RXt6; Mon, 09 Feb 2026 14:49:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8nfZ041cz40XJ; Mon, 09 Feb 2026 14:49:58 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770648598; h=from:from: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=4/CFaZmLq6LJXmSGlm5f3uJzklvG23levwyN10UoutU=; b=MzmMTy+Eoh6XmXlVvyQI2MMXs2rVWOs81pibERUwlG99humdmXhXEqZvh+a+uTpKUlWy9Y nlyzoYuSt5QZM8JtgQ2SYhi2yBCGRYgjPZrkRo77SoiKPfwMRVcxR9BTkHC/GEF5bxuLxZ 48OtI3Ht/3picxDYAMCRo+3cRhPaYMg96vSNgXbQFhyCTMWF57ciGXpFkn5HC/BCduD5BW leD0CUuutvkmrnXSA/xgBjzzjwMDUMswElIejqmelXoxqDZp/ziToxICOV4rMNVL6+WYwu 2uSQIcm8qSMGvnN1iFaKAelNg5gR6GaMYmV/uhuamiLq6yoQu+h7VNjkW41SJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770648598; a=rsa-sha256; cv=none; b=xKvbyAd0kzGzH1UoFGtfYZi20luZKIBqp0MGSRXBCoduYzKdzLEeovrY22AdSIIit4N3AO M8NsbBXr/ZaN9ACBN9qtE1qUSHFYn58qaHXqTk5vnQIGnhw+fC1PDutTkjv2uZSjkVljT0 Thm9mEP6O1erzFIDALAfu0aHkXdnDTtmtc8K4E0+9dkqFbG4h19uq8dr6+toivQl0R+JFl 3Ev9fUOj0SDlHLhNgvYCZUHCUglB1pr6480EUiF0iiHCVVdr/eU/UwOVbvoXoqB1IOrZoe t0Kq/KByV1ps4pRZD0do0EMMoBdVofnvCHw23ah+BO282+vbfut0qtHk+o+eSg== 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=1770648598; h=from:from: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=4/CFaZmLq6LJXmSGlm5f3uJzklvG23levwyN10UoutU=; b=HrqACX3dJIY1zqCGkAJvfVF14Il06JbwG/UySUQCEyik3x4m+qR6u/oKBNhTUitYm6AA5Z UM8cYTIZg+whxGkK3IHnOTYEGM2g+J2xdXQcmaHZgicpLTNrlt4lYa3aiXJryZDx8I5M4h VdnZB2oXgH3MjmLOhy+jFW/PaEWdWa2wHfUJK3sB52XgNNw57/MVQ2Peso0gNNhpdEwdP+ P7kdm6hiXlUtjjq3yxM7LTC3QrOiw2Rxv/CuUaTN5wUM+74LQuUY8HkDiZzMn3BaJoWJXc oOq3gbLfwGzoAaiMnB2I2+whitRB9OiLTFIJ78wa53qkTdHy5yoe1hhLPWDoNw== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8nfY3rlzz1Bh4; Mon, 09 Feb 2026 14:49:57 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <0b6e5de9-cac3-43a0-91ec-92228892b8c1@FreeBSD.org> Date: Mon, 9 Feb 2026 08:49:55 -0600 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 3fde39073c72 - main - shar: remove from the tree well in advance of the 15.0 release To: "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202507101757.56AHvEK6073104@gitrepo.freebsd.org> <87fr7arn5r.wl-herbert@gojira.at> Content-Language: en-US From: Kyle Evans In-Reply-To: <87fr7arn5r.wl-herbert@gojira.at> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/9/26 08:45, Herbert J. Skuhra wrote: > On Thu, 10 Jul 2025 19:57:14 +0200, Kyle Evans wrote: >> >> The branch main has been updated by kevans: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3fde39073c722ba5b1d3aa330ec4dc5e0ecd8495 >> >> commit 3fde39073c722ba5b1d3aa330ec4dc5e0ecd8495 >> Author: Kyle Evans >> AuthorDate: 2025-01-02 02:20:09 +0000 >> Commit: Kyle Evans >> CommitDate: 2025-07-10 17:57:03 +0000 >> >> shar: remove from the tree well in advance of the 15.0 release >> >> We have had deprecation notice in the manpage for nearly six months, and >> it is also present both in 13.5 and 14.3. tar(1) can supply this >> functionality for those that truly need it, and cy@ has also created a >> sysutils/freebsd-shar port for this version of a frontend to live on in >> ports -- this port has been available since December 18, 2024. >> >> Reviewed by: allanjude, cy, emaste, jrm >> Differential Revision: https://reviews.freebsd.org/D50925 >> --- >> ObsoleteFiles.inc | 3 + >> UPDATING | 5 ++ >> usr.bin/Makefile | 1 - >> usr.bin/shar/Makefile | 4 - >> usr.bin/shar/Makefile.depend | 10 --- >> usr.bin/shar/shar.1 | 121 ------------------------------- >> usr.bin/shar/shar.sh | 78 -------------------- >> usr.sbin/crunch/examples/really-big.conf | 2 +- >> 8 files changed, 9 insertions(+), 215 deletions(-) >> >> diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc >> index d1095b57c342..4031478f1db4 100644 >> --- a/ObsoleteFiles.inc >> +++ b/ObsoleteFiles.inc >> @@ -51,6 +51,9 @@ >> # xargs -n1 | sort | uniq -d; >> # done >> >> +# 20250710: shar(1) removed >> +OLD_FILES+=usr/bin/shar > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index b329b26db026..b0ad8ec977b2 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -247,6 +247,7 @@ OLD_DIRS+=usr/share/examples/drivers > > # 20250710: shar(1) removed > OLD_FILES+=usr/bin/shar > +OLD_FILES+=usr/share/man/man1/shar.1.gz > > # 20250708: For 34 days 15.0-CURRENT installed libkadm5clnt symlink without .so > OLD_FILES+=usr/lib/libkadm5clnt > > ? Hi, Indeed, your contribution is appreciated: http://cgit.freebsd.org/src/commit/?id=bb0734cf2446 Thanks! Kyle Evans From nobody Mon Feb 9 14:56:40 2026 X-Original-To: dev-commits-src-main@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 4f8npb6gBdz6RYSn for ; Mon, 09 Feb 2026 14:56:55 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8npY5Yfqz41LM for ; Mon, 09 Feb 2026 14:56:53 +0000 (UTC) (envelope-from wschnr@googlemail.com) Authentication-Results: mx1.freebsd.org; dkim=none; arc=pass ("google.com:s=arc-20240605:i=1"); dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of wschnr@googlemail.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=wschnr@googlemail.com Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-43770c94dfaso1105352f8f.2 for ; Mon, 09 Feb 2026 06:56:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1770649012; cv=none; d=google.com; s=arc-20240605; b=XIozzP0RYsTFwz5G5IjygQyAq1g+SDZ0s5IGl6UJfjEg/wu9kNCszaIiPm4jQes1KF goTfh7XUOciEaptHwOswLL4v0ylkunEI2rs2fmdvuc3twSlA6QB/7I7Ib/O0n4asbp4L TAJKxNMfpMYrDMOlT2xgmZnVT7DMYCQmWv2UtSHrm3ciTGIkDWB0gjlFx/aPQvOjC2F5 nmtJsKFY0xaz9yAvaVWVoDFaYqJS5/Z/2ervAaMDUPpzJXNvFKfcGuk362H977AAPjCn YSn3NucZ1lNYCXO9G67BYaT77eNk59vZz57PulSYP3gApZ5/xxEsWyq4TKCLP0yOBC2C u/Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version; bh=MGi5RW7JDmwyiMDQoNvvd4/nVK1IbDkO8I/ZLFVMep8=; fh=P+X5XDiXpaoPteS+fyqcJOueO2CYhd9K/WJ3NT7nsEw=; b=ZnhBeO68sC3S1Fyo7D8CeyFdT9/ZUPet7M+KD/ckkYShdVnmZ1+/u0Y8jzp+3qMNl4 X6Fpzp4Dg6QRr0YT9rT82wONj+tPAPMR3Ky57bxNVv3YHqZB7vXVqGu963m91EW2tyxt A5rBJfflsLMQokdq4MqyVTZAiwpkbfl5zyWBb7ig4b5Akz/IZ/t7P0Q0A3nMV2vOsf07 puMwiaaGRmIFrmbWkZ8bojK+b9hJ52p3OudLhkuLA4iMfAbsdMlbUcNT1OQd8hE9c81j ybIvP4FltTjapahTjtXUHJ/dx3B/arPwmEveBxZ87jRMiQ9Ii5DtcHT7xNzitARPQ8v9 eabA==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770649012; x=1771253812; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=MGi5RW7JDmwyiMDQoNvvd4/nVK1IbDkO8I/ZLFVMep8=; b=wGFb0TsU78yuwgpIZnGXGwB3UJ1GZ+bfmUBt0i5JahjIRdfMfQ6lPKX9djqVhk6XHh 1PgdF4Fw8/OOrMy54i7hwDkjxODJDY/gH7uK7ehrLsKypN2cZgQ+b28IVl3B7SxnmZLg NLqwCHe/0q2lEIMOz4tHkVGVFYrshx0LVRXTSolsqMWbWTFrwoRayB3ONPCkkTaYkw5q PMh8sgeDJyhA3hwIQV5gZsdBGbR3ydhHcraH2+3mzcjEj5ooHM/FFHrH1nim6AgrTiBK tRIjcSDgNs+oPri6+PnATtnBqfHnteniSbBdWnD/OqXPDZSnQ6QhVDgDVnCWW7z+keSw tLEA== X-Forwarded-Encrypted: i=1; AJvYcCUJ29dFV6dIgxMm3CVOWGeVyHIRpmaVJUSmGMFziO59yjyMjOtcsu1Q9cXsVwwyzKoSxW4voq9lyP0vs44O8iNiHUjWsw==@freebsd.org X-Gm-Message-State: AOJu0Yxoun3GI4mS+c/4+2nK+i2MJDGQHs3mpmajRC7xqzksYiutX/KC ydsxGx0DIxgf3oOu8M/TPeWmaCnHwWsiWfrRjrKu46v1ap8s0vwCYwakVRKr9TaYHo4VKXKdDWe f/MlATbcgYuCX144aKqOn1QB3ITVrD54= X-Gm-Gg: AZuq6aLxFCqHSlHlcedkBMZX9d3HBz9XEC9kAjYAO/nhV23Ovh+Qr3HEFAem4YDJY/j 3GeN/NLJdOtv5scF4aJ7IfYDs5iUDY16TipY5LHNYqH+QpEFMyhwk7Wr7XTZYK6P8Ou3vdABRPu crpOKz2u9k+SPfd19X9QoGLjCj9MI6bS0Jcp8zOIuld9dGJIP8DhRJuq5Hm9JwgC6tZGZ7mwx3B 0SxpLw9wZ2rwdapPdyzaiu/kC07YF/tn8Gp9ffjU7zXQf5p65LdbXgxuELCRj9fitHaJgAB+fLq EpCQBDXg4KjTUzo5IZI7ugFlZuuSq7i26eRa7QKxUHQbN2+yLQ== X-Received: by 2002:a05:6000:184f:b0:435:e57a:9082 with SMTP id ffacd0b85a97d-4362938b122mr19078501f8f.46.1770649012028; Mon, 09 Feb 2026 06:56:52 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <69822077.1830f.1b76a7cb@gitrepo.freebsd.org> In-Reply-To: <69822077.1830f.1b76a7cb@gitrepo.freebsd.org> From: Wolfram Schneider Date: Mon, 9 Feb 2026 15:56:40 +0100 X-Gm-Features: AZwV_Qgt6V5Rh0n6oiy5FC_HvIgV82P7JxrvbicBuA14CmpqffPPGkfV8CzVCag Message-ID: Subject: Re: git: 9555d80066c9 - main - sh.1: Fix rendering error due to redundant .El To: Alexander Ziaee Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Artem Bunichev Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-3.81 / 15.00]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_MEDIUM(-0.99)[-0.992]; NEURAL_HAM_SHORT(-0.98)[-0.985]; NEURAL_HAM_LONG(-0.93)[-0.933]; FORGED_SENDER(0.30)[wosch@freebsd.org,wschnr@googlemail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVFROM(0.00)[googlemail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.47:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.47:from]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,bk.ru]; MISSING_XM_UA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[wosch@freebsd.org,wschnr@googlemail.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_FIVE(0.00)[5] X-Rspamd-Queue-Id: 4f8npY5Yfqz41LM X-Spamd-Bar: --- On Tue, 3 Feb 2026 at 17:21, Alexander Ziaee wrote: > > The branch main has been updated by ziaee: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9555d80066c919596e152f923d38d58a740cdb5f > > commit 9555d80066c919596e152f923d38d58a740cdb5f > Author: Artem Bunichev > AuthorDate: 2026-02-03 16:14:09 +0000 > Commit: Alexander Ziaee > CommitDate: 2026-02-03 16:20:26 +0000 > > sh.1: Fix rendering error due to redundant .El > > Due to this all the rest of the items in the Built-in Commands section > were not rendered at all. > > Fixes: 2711852bd9ac ("sh.1: Provide detailed job control documentation") > MFC after: 3 days > Reviewed by: emaste, ziaee > Differential Revision: https://reviews.freebsd.org/D55080 > --- > bin/sh/sh.1 | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) I still get warnings from groff and mandoc about the sh(1) manpage $ nroff -mandoc sh.1 >/dev/null mdoc warning: Using a macro as first argument cancels effect of .Cm (#2553) $ mandoc -T lint sh.1 mandoc: sh.1:2553:5: WARNING: skipping empty macro: Cm -Wolfram -- Wolfram Schneider https://wolfram.schneider.org From nobody Mon Feb 9 15:12:09 2026 X-Original-To: dev-commits-src-main@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 4f8p8B5RDKz6RZTG; Mon, 09 Feb 2026 15:12:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8p8B519Zz42l2; Mon, 09 Feb 2026 15:12:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770649930; h=from:from: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=ETljQKC+gxBBgnd+fJID1DyqNWPKQPAp2HGBXSbU+7M=; b=Ca4RbKmMD0v+eBsjKZlj2Valm2DdG8qVSgb8zjC04U96vKCsQ47aZyArEYDzn817bx2FN1 Wf16BUiPIEys3CPfmL5eLssGWJWas10Ff2PBBUpi0xLiJwH41f3WXvHQsVxU54nYxPzx53 eLxIX5zSBrNrk4wFwpdeZuL/NB7kqY6ZaO4RRYwIy5XQcMOXEU90hgiUpwbSjz3xH3t+vD R4Lzl3GVbPP5xOT4j1G3RyfTrOHWtoRKJGh3dx69non7zMcK2qJ0Lt7rxP9FUhjN1eg3KN PzrTFas+dFXTiIB2MJ9jLnmIwq4rO5UOGOc5xpNpe7tMNcDK2k/K71QSF2//IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770649930; a=rsa-sha256; cv=none; b=foAp+RqXZrX1/rxO6kLvnjJKYU7VKkVyAvsQ4YtdX68xb2QCfo2zQhnmyxnvqMVZ8m2UH9 YN01B8nDYAJhox5H9jnGYOGlhR3o4mZ6OmuO/nIfmH44veMecI6EfwAT71ZZm/HQKrfJQ5 4ZpirVS+W8O+o9f3uBluXusQ9hVebfYLjKLP9XHuTdSeMqvxBWcXsDWm6KlyZIWzXuguxc py3FBb6zTy8ftj1kcBJrazEP1+VlO12e+PgDyPhA7OAVh0sy5U5c2h7W3INhxSOR473u0C +FcQse4er82F0DbE8EsphtTZRGf2bV0XjYesxXBY6UR/hAu0KM6jGFQMsOxGMQ== 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=1770649930; h=from:from: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=ETljQKC+gxBBgnd+fJID1DyqNWPKQPAp2HGBXSbU+7M=; b=yPSpDumt/YtftqncntU9WFC/4nAQIR/smD9xkjpUX6zYZXgfqR/svc/YI7kBqZzHk5b0zs zOiHF5PonD0A+n5LCUHX2QBcBQ97PzS9kU2nxSVo5+mioR9rO6YEStO0L5NVJnIiYpcI6C /yJazMGnxBPpqTI8MHwIjonI2HZQ4Z6HfsYdThxXdoCo9CbIrwtJxIXIDcxo01zNkMOM66 6hOLnPf7aiq3D4NBmxTweQxMhRwxunYifoUdErlpQ1YbJKNJfFrI96kAH05PQB/iYOqtKC OwFNieMRmU5pwZu6XbOSzc5pb3CKDTmBBE2Vqdbwj9V7DMbZ6y4hj5C+Iz7A3w== Received: from [IPV6:2601:5c0:4202:5670:ed0c:b253:7c2f:c8b9] (unknown [IPv6:2601:5c0:4202:5670:ed0c:b253:7c2f:c8b9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8p8B2Qjdz1Bsc; Mon, 09 Feb 2026 15:12:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> Date: Mon, 9 Feb 2026 10:12:09 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Content-Language: en-US To: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/8/26 23:18, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > Author: Minsoo Choo > AuthorDate: 2026-02-06 20:03:53 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-02-09 04:17:16 +0000 > > pcb.h: mark struct pcb to be preserved > > There are programs that depend on this structure (e.g. kernel debuggers) > that breaks when the ABI changes. > > Signed-off-by: Minsoo Choo > Reviewed by: kib > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D55149 Hmmm, I think it is useful to know which fields debuggers use (typically just registers) vs which ones can be safely changed without impacting debuggers. -- John Baldwin From nobody Mon Feb 9 15:24:42 2026 X-Original-To: dev-commits-src-main@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 4f8pRw3VXSz6Rb7K; Mon, 09 Feb 2026 15:25:48 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8pRv54qRz45fY; Mon, 09 Feb 2026 15:25:47 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=X0zCfC1J; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=ak12zudT; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 103.168.172.155 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-02.internal (phl-compute-02.internal [10.202.2.42]) by mailfhigh.phl.internal (Postfix) with ESMTP id 1AA0514000CB; Mon, 9 Feb 2026 10:25:44 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Mon, 09 Feb 2026 10:25:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770650744; x=1770737144; bh=LyjGPCUk6s 2XLDRHqUhG7eZZONaZA6ONtEV00Qwtpds=; b=X0zCfC1Jnx+VJOwIJacDzY8UEc r35+vAxvCOMWw/pPpdb0kw8RZqUFeH8gWk8J8dJDrUfD4hKKZqsKvpIzt0+l/sh6 FBYP6k7f7cNV9bTqGyazJkx0duk2pxxSB2x4Pt1UOdjbaigw8+Mmic1dxCuqnOlF GIEYMtHWZKiadk45Kwx5nIKGMqSSxw3JaG1yrbwwtdukbcpb77oQKcqY5MMEgTUw MQLfD1VTSrM8IXBVjbHoXDUlQi+CZZjykfnLLgGByeJ5s6Q1WwAnMHhOIYotNwwh s56aNrYyyTgPGFVYmyf1sI91v9bINUfTQ9fg2NR+g37DIQXuH06QpS8BVZhQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770650744; x=1770737144; bh=LyjGPCUk6s2XLDRHqUhG7eZZONaZA6ONtEV 00Qwtpds=; b=ak12zudTfYwQOLcrVd3lDOsz0bwXiM/OuPNdgZfi6oQILRSshQH PTsGq4JZtyIIGOd5uXkcuXJztXK69OvXbFOX/feoYE5EHUl940yW2346E4+sG96r PkfURfDwtYX/2AAUuAovXhPAMG6vq5PgvXSK25TNmV6MuYx7RwR+xGXpjvPGUJii pH5g/dDRxPBWcSGV/KfkfLQ0n5niQsjMsMXqcLbDVKPViTYVtlaQzq/UK/i1gOhi lr97RirsDrkrPJKXgZo+5stBRlLhkRuYyeCxj02s5GeaNbQiH9aqAbUucHs4rTmJ a7WFYxV74YlIBi9OToU7LMsS9/rz8y+PuKg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleejudeiucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpeffkffhvfevufgjfhgfgggtsehttdertd dtredvnecuhfhrohhmpedfjfgvrhgsvghrthculfdrucfukhhuhhhrrgdfuceohhgvrhgs vghrthesghhojhhirhgrrdgrtheqnecuggftrfgrthhtvghrnhepfefhheffgedvheeutd eugfekfeeiffeijefhgeegkeegveejgeefffeggeelhfdtnecuffhomhgrihhnpehfrhgv vggsshgurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhephhgvrhgsvghrthesghhojhhirhgrrdgrthdpnhgspghrtghpthhtohepgedp mhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepmhgrnhhusehfrhgvvggsshgurdhorh hgpdhrtghpthhtohepshhrtgdqtghomhhmihhtthgvrhhssehfrhgvvggsshgurdhorhhg pdhrtghpthhtohepuggvvhdqtghomhhmihhtshdqshhrtgdqrghllhesfhhrvggvsghsug drohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqdhsrhgtqdhmrghinhesfhhr vggvsghsugdrohhrgh X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Feb 2026 10:25:42 -0500 (EST) Date: Mon, 09 Feb 2026 16:24:42 +0100 Message-ID: <87ecmurlc5.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Emmanuel Vadot Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 9dcb984251b3 - main - Remove publickey(5) stuff In-Reply-To: <202501221704.50MH4vBJ083327@gitrepo.freebsd.org> References: <202501221704.50MH4vBJ083327@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.58 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.979]; R_SPF_ALLOW(-0.20)[+ip4:103.168.172.128/27:c]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[103.168.172.155:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:151847, ipnet:103.168.172.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f8pRv54qRz45fY X-Spamd-Bar: -- On Wed, 22 Jan 2025 18:04:57 +0100, Emmanuel Vadot wrote: > > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9dcb984251b35ab1959bcaafcb3f129c8ae2f25b > > commit 9dcb984251b35ab1959bcaafcb3f129c8ae2f25b > Author: Emmanuel Vadot > AuthorDate: 2025-01-22 17:00:09 +0000 > Commit: Emmanuel Vadot > CommitDate: 2025-01-22 17:04:26 +0000 > > Remove publickey(5) stuff > > This uses DES and it's likely that nobody uses that in 2025. > If somebody uses this we help them by deprecating and removing this. > > Reviewed by: bapt, emaste > Differential Revision: https://reviews.freebsd.org/D30683 > --- > ObsoleteFiles.inc | 12 + > lib/libc/rpc/Makefile.inc | 2 +- > usr.bin/Makefile | 4 - > usr.bin/chkey/Makefile | 13 - > usr.bin/chkey/Makefile.depend | 16 - > usr.bin/chkey/Makefile.depend.options | 7 - > usr.bin/chkey/chkey.1 | 32 -- > usr.bin/chkey/chkey.c | 267 ------------ > usr.bin/keylogin/Makefile | 5 - > usr.bin/keylogin/Makefile.depend | 18 - > usr.bin/keylogin/keylogin.1 | 37 -- > usr.bin/keylogin/keylogin.c | 81 ---- > usr.bin/keylogout/Makefile | 3 - > usr.bin/keylogout/Makefile.depend | 17 - > usr.bin/keylogout/keylogout.1 | 49 --- > usr.bin/keylogout/keylogout.c | 68 --- > usr.bin/newkey/Makefile | 11 - > usr.bin/newkey/Makefile.depend | 20 - > usr.bin/newkey/extern.h | 45 -- > usr.bin/newkey/generic.c | 124 ------ > usr.bin/newkey/newkey.8 | 66 --- > usr.bin/newkey/newkey.c | 228 ---------- > usr.bin/newkey/update.c | 332 --------------- > usr.sbin/Makefile | 1 - > usr.sbin/keyserv/Makefile | 23 -- > usr.sbin/keyserv/Makefile.depend | 20 - > usr.sbin/keyserv/crypt_server.c | 265 ------------ > usr.sbin/keyserv/keyserv.8 | 86 ---- > usr.sbin/keyserv/keyserv.c | 753 ---------------------------------- > usr.sbin/keyserv/keyserv.h | 16 - > usr.sbin/keyserv/setkey.c | 497 ---------------------- > 31 files changed, 13 insertions(+), 3105 deletions(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index c05a0d37c727..afb71c46a459 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -51,6 +51,18 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20250122: Remove publickey(5) stuff > +OLD_FILES+=usr/bin/chkey > +OLD_FILES+=usr/bin/keylogin > +OLD_FILES+=usr/bin/keylogout > +OLD_FILES+=usr/sbin/keyserv > +OLD_FILES+=usr/bin/newkey > +OLD_FILES+=usr/share/man/man1/chkey.1.gz > +OLD_FILES+=usr/share/man/man1/keylogin.1.gz > +OLD_FILES+=usr/share/man/man1/keylogin.1.gz > +OLD_FILES+=usr/share/man/man5/publickey.5.gz > +OLD_FILES+=usr/share/man/man8/keyserv.1.gz Fix typo and sorting and add newkey.8.gz: diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b0ad8ec977b2..636116421a8a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -327,13 +327,14 @@ OLD_FILES+=usr/share/man/man8/gvinum.8.gz OLD_FILES+=usr/bin/chkey OLD_FILES+=usr/bin/keylogin OLD_FILES+=usr/bin/keylogout -OLD_FILES+=usr/sbin/keyserv OLD_FILES+=usr/bin/newkey +OLD_FILES+=usr/sbin/keyserv OLD_FILES+=usr/share/man/man1/chkey.1.gz OLD_FILES+=usr/share/man/man1/keylogin.1.gz OLD_FILES+=usr/share/man/man1/keylogout.1.gz OLD_FILES+=usr/share/man/man5/publickey.5.gz -OLD_FILES+=usr/share/man/man8/keyserv.1.gz +OLD_FILES+=usr/share/man/man8/keyserv.8.gz +OLD_FILES+=usr/share/man/man8/newkey.8.gz OLD_FILES+=etc/rc.d/keyserv From nobody Mon Feb 9 15:33:44 2026 X-Original-To: dev-commits-src-main@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 4f8pfF5mt1z6RbjL; Mon, 09 Feb 2026 15:34:45 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-b6-smtp.messagingengine.com (fhigh-b6-smtp.messagingengine.com [202.12.124.157]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8pfF0LCQz46dw; Mon, 09 Feb 2026 15:34:45 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=nWQlgcGO; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=v0CHh329; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.157 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-10.internal (phl-compute-10.internal [10.202.2.50]) by mailfhigh.stl.internal (Postfix) with ESMTP id 64F527A01AB; Mon, 9 Feb 2026 10:34:44 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 09 Feb 2026 10:34:44 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770651284; x=1770737684; bh=T8ic6b/s6D djQkiV1SjET4qw99go++X/1aDXde/Jx88=; b=nWQlgcGOuXeJu4idkGUqPpQYgB V4yFgXX37S+OJfKzeq1PkbafbYL8fkbxvSOkoNWjuyAV5kvzFVzeOlRpBDpgJEWE 9M3B3PPFy7RWeGSkp54STIULBVJr57AxGPhogxs/Yy7778VVpdK2UVfFhITkl0O7 iRlkQ4Cp9Ut4Tw+sEW2WK6I1W1OoB+8ZKQ36QJSaPRJoCMbYIRbBq2AYbKKCTDa+ VniGa2Gyl0J5cZlm3JKKYnAMyOiB9Zml2X5gvjt9Jaj11RYMkgyl0BRgecmsJvGP q9kkWJNpAoseIuqqt4Rrdh8mGjZ3wThPakcA5d0FE8buqiyLg37kFv6WQ3dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770651284; x=1770737684; bh=T8ic6b/s6DdjQkiV1SjET4qw99go++X/1aD Xde/Jx88=; b=v0CHh329GWFKnhOoBsIcLu3grxWqYVCS+Wk5rXM6uOI9khr8LDq d4p+BXX+Zc0fOr+/zHnn3h6uW9Uyqz631zJbLF5vlMq2xmDuU4EPq9bzhgz1mNol fRxEct3uYEnXrPxXsbjtB4UJc8+mg1uGIcpdXur0E7rFezmtYtGPFfeH0KFGDlup JfBnkGp7Lo2L1G131E4KR8XCh6QjdVBiG6frb2c0LRkZ+gNMYJxHIMMaz6k/dpao mug2KuWiXTEYqUGlu88x/1AnAaf0l1QnoQIhq0uCSuYcvKn4nKriExd5q35ngw79 w5iU8rBqXdP1aAvryJeUvveeSbiACfGcuiA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleejudekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffkhffvvefujghffgggtgesthdtredttdervdenucfhrhhomhepfdfjvghrsggv rhhtucflrdcuufhkuhhhrhgrfdcuoehhvghrsggvrhhtsehgohhjihhrrgdrrghtqeenuc ggtffrrghtthgvrhhnpeefhfehffegvdehuedtuefgkeefieffieejhfeggeekgeevjeeg feffgeeglefhtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghrsggvrhhtsehgohhj ihhrrgdrrghtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtph htthhopehmhhhorhhnvgesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgt ohhmmhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtoh hmmhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggv vhdqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Feb 2026 10:34:43 -0500 (EST) Date: Mon, 09 Feb 2026 16:33:44 +0100 Message-ID: <87cy2erkx3.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Mitchell Horne Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 2ace05b65a2c - main - pfind(9): follow-up fixes and improvements In-Reply-To: <6931d4e7.cb8d.94fb306@gitrepo.freebsd.org> References: <6931d4e7.cb8d.94fb306@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.59 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27:c]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.157:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f8pfF0LCQz46dw X-Spamd-Bar: -- On Thu, 04 Dec 2025 19:37:27 +0100, Mitchell Horne wrote: > > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ace05b65a2c912888aeec921fc6f990a5c36909 > > commit 2ace05b65a2c912888aeec921fc6f990a5c36909 > Author: Mitchell Horne > AuthorDate: 2023-01-28 18:48:33 +0000 > Commit: Mitchell Horne > CommitDate: 2025-12-04 18:37:18 +0000 > > pfind(9): follow-up fixes and improvements > > (Found on a branch from a year ago.) > > - Adjust NAMEs > - MLINKS: add pfind_any.9, pfind_any_locked.9; remove old zpfind.9 > - Reword the description of pfind_any() so that it doesn't imply only > zombie processes are returned > - Fix a comma > - Use .Dv for the macro PRS_ZOMBIE > - Move the (logically separate) final statement to a new paragraph > - .Xr to pget(9) > > Reviewed by: 0mp > Fixes: 07d78399eb79 ("pfind(9): Update to recent behavior") > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D53548 > --- > ObsoleteFiles.inc | 3 +++ > share/man/man9/Makefile | 3 ++- > share/man/man9/pfind.9 | 34 +++++++++++++++++----------------- > 3 files changed, 22 insertions(+), 18 deletions(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index 51338fea9bf6..e42fcb7d8f84 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -51,6 +51,9 @@ > # xargs -n1 | sort | uniq -d; > # done > > +# 20251204: zpfind.9 alias to pfind.9 removed > +OLD_FILES+=usr/share/man/man9/zpfind.9 OLD_FILES+=usr/share/man/man9/zpfind.9.gz ? From nobody Mon Feb 9 15:47:59 2026 X-Original-To: dev-commits-src-main@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 4f8pxW4QM4z6Rcbn for ; Mon, 09 Feb 2026 15:47:59 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8pxW2Nbdz49Tb for ; Mon, 09 Feb 2026 15:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770652079; 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=vZc+tR/lXvyJGB8Kulvse84EgIOZ+AoJ6BqZkzCIfZ4=; b=wbBhaQZbAzVUtvSNXZJm38RAiyTXKLD+cBDgXQAIUhw/mEY+tHNaKc2rk1xA5GfiAyCYSY +YYDJdZqjeAlm/pMus5k3QgBZ5EZQz4RDLMlvr5Z5mXHoR5QiJcI2jL4FCTKCG55DbvNB1 JSyLWtlArR3tCqlnIpUF2lSSn8b+O8jxJSFBPA7UoCuYiDIlVf8jTOZynTWbo4MHPuja5h 7mSKBiqLnwSgq0kGDQPAdBXignK+Z9HxTbpZ6X0/WzWy1aviWkQhbh+sale0x6OsqzN6yN fcN+IvOqhd6r+DlzYCMgqG02bFCDoZooDZo2xKDxP1KjFi8noIez9Q4evrrKEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770652079; a=rsa-sha256; cv=none; b=hbx4mCWQBdfQvy3hPDoCEIIYyjDO7XZQ0BQ6fxYGPWCcJPgQCqmU+HFApmmjttfvk+NTGx S0f6iHg2IvNYYM3CKpP1tgJ6xJcHNIuUMfXaoHFbDLp+2oC0OwxxobWseQB3d7oFMZwL+i Ad9tieX6QIyg0TGOFbWbf8GdONdHWH1v2zuPLL4cU2Ff+6LdHaIyiFZ3rSF2nM7YkgHu0v z6v9StTgSewtOBbT8ssneyUKRa/P/3sYgS8dN5q+pMeZe5MHtgYPAwqkLDZEt22G3CSCS4 6XJg1DBowSLzAFQoX1/E/65hPuua0M1z6jlu2z6wK2P4/HRfLKUr/qzXSOBJMw== 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=1770652079; 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=vZc+tR/lXvyJGB8Kulvse84EgIOZ+AoJ6BqZkzCIfZ4=; b=BTa7HdtL99G32ucnDnqzxzQiaorYXgTmssWv9UHnjr2+m68FJV3XC1+LzPwPZ4Id1cXJJG IzdlK/2LquFL644mBwV2f3/C+nHD1wCx6DG+wTjPRVh5N2RiCnWuV2kW8r2kP+pJLz6ip/ KeeDNSyDHINyVsiWnomC6Qq7c0qe5YBmSm1qlxO7NT3Z4Un6KCXLMQ4aUCa/s1AUuvoTFR GuWetKf9AnZrYkhtcavpUQucoynu4caDYahn+AlYoww421syRFI/G0/wCFEQxoT8JFiPyo z9/7R017IJizEkCVdt7MN1sSNCFaoowOK/PRzZ4MgmC7z/+lB17TNWlzM1aDLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8pxW1cJ7zfjJ for ; Mon, 09 Feb 2026 15:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18d40 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 15:47:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 97beb0c9116f - main - CONTRIBUTING.md: Clarify GitHub pull requests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97beb0c9116f312c1820adb94455dc3b9a157135 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 15:47:59 +0000 Message-Id: <698a01af.18d40.1e6cc703@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=97beb0c9116f312c1820adb94455dc3b9a157135 commit 97beb0c9116f312c1820adb94455dc3b9a157135 Author: Ed Maste AuthorDate: 2026-02-09 15:44:15 +0000 Commit: Ed Maste CommitDate: 2026-02-09 15:47:08 +0000 CONTRIBUTING.md: Clarify GitHub pull requests Make the guidelines more prescriptive (while remaining clear that Pull Requests are merely one, not-preferred method for submitting changes). Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55089 --- CONTRIBUTING.md | 155 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 93 insertions(+), 62 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3dd764a64c7e..4d33ec6612cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,68 +24,99 @@ open a GitHub pull request and create a Phabricator review for the same change ## GitHub Pull Requests -Presently, GitHub 'freebsd-src' repository is one of the publish-only services -for the FreeBSD 'src' repository the project uses to promote collaboration and -contribution. Pull requests that need little developer time, are generally -small, and have limited scope should be submitted. Do not submit pull requests -that are security-related, problem reports, works in progress, changes that are controversial -and need discussion, or changes that require specialized review. - -A pull request will be considered if: - -* The request is substantive in nature. We generally don't accept minor or cosmetic changes unless they are part of larger work in that area. Pull requests should solve a real, actual problem. -* It is ready or nearly ready to be committed. A committer should be able to land the pull request with less than 10 minutes of additional work. -* It passes all the GitHub CI jobs. -* You can respond to feedback quickly. If feedback is requested and one month passes without a response we may close the pull request. -* It touches fewer than about 10 files and the changes are less than about 200 lines. Changes larger than this may be OK, or you may be asked to submit multiple pull requests of a more manageable size. -* Each logical change is a separate commit within the pull request. Commit messages for each change should follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message). -* All commits have, as the git author, your name and valid email address as you would like to see them in the FreeBSD repository. Fake github.com addresses cannot be used. But see [Author Name and Email](#author-name-and-email) for details. -* The scope of the pull request should not change during review. If the review suggests changes that expand the scope, please create an independent pull request. -* Fixup commits should be squashed with the commit they are fixing. Each commit in your branch should be suitable for FreeBSD's repository. -* Commit messages should include one or more `Signed-off-by:` trailer lines with name and email address certifying [Developer Certificate of Origin](https://developercertificate.org/). But see [Author Name and Email](#author-name-and-email) for details. -* The commits follow FreeBSD's style guide. See [Style](#Style). -* Run tools/build/checkstyle9.pl on your Git branch and eliminate all errors, or provide an explanation for exceptions. The tool sometimes makes mistakes, and providing an explanation shows you have examined the output. -* The commits do not introduce trailing white space. -* If the commit fixes a bug, please add 'PR: \' to the commit message to document the Bugzilla Problem Report number. -* If there's a code review related to this change, please include its URL in the commit message. However, where possible, please do not open both a differential review and a GitHub pull request. -* If you have run FreeBSD's sources through a static analysis tool, please don't submit the raw results. Please also see the chunking up guidelines. Also, please make sure that kyua tests are the same before / after your change. Ideally, you'd also create a test case that shows an actual bug that's being fixed by these changes. -* FreeBSD committers submitting pull requests are responsible for pushing them into the tree (possibly with approval if cross-repo commit bit policy needs it). Pull requests by FreeBSD committers will be closed after a month unless there's a very good reason not to. -* Low quality submimssions will be rejected, especially if they were generated by AI with little to no refinement. -* Submissions by AI chatbots will result in the account being banned. Do not use pull requests interaction to train your LLM or similar AI model. - -When revising your pull request after feedback, please rebase with a forced push -rather than a merge commit. - -More complex changes may be submitted as pull requests, but they may be closed -if they are too large, too unwieldy, become inactive, need further discussion in -the community, or need extensive revision. - -Please avoid creating large, wide-ranging cleanup patches: they often lack the -focus needed for a good review and can be hard to test. Misdirected patches may -be redirected to a more appropriate forum for the patch to be resolved. - -Please make sure that your submissions compile and work before submitting. If -you need feedback, a pull request might not be the right place. A pull request -may be closed if there are too many obvious mistakes, or when a time-consuming -rework is needed. - -If you want to cleanup style or older coding conventions in preparation for some -other commit, please go ahead and prepare those patches. However, please avoid -just cleaning up to make it cleaner, unless there's a clear advantage to doing -so. While the project strives to have a uniform coding style, our style offers a -range of choices making some 'cleanups' ambiguous at best. Also, some files have -their own consistent style that deviates from style(9). Style changes take time -to process, but our volunteers have limited time, so please be respectful of -their time. Trivial spelling changes take this valuable time, but rerturn little -benefit relative to other changes. - -The current theory for pull requests on GitHub is to facilitate inclusion in the -project. The guidelines are streamlined for quick decisions about each pull -request. Unless explicitly stated, rejection here as "not ready" or "too large" -does not mean the project is uninterested in the work, it just means the -submission does not meet the limited scope for pull requests accepted -here. Sometimes it is easier to review a GitHub pull request than to do the -review in Phabricator, so that's also allowed. +The _freebsd-src_ GitHub repository is a **publish-only mirror** of the FreeBSD +_src_ repository. Pull Requests are accepted for **small, low-risk** changes +that require minimal review and integration effort. + +For complex, controversial, security-related, or discussion-heavy changes, use +the normal FreeBSD review and development process (described below) instead. + +Submit a Pull Request if your change: + +* Fixes a real, specific problem. +* Is small in scope and easy to review. +* Can be committed with **less than ~10 minutes** of additional work. +* Passes all GitHub CI jobs. +* Affects roughly **10 or fewer files** and **fewer than 200 lines of changes**. + +### When Not to use a Pull Request + +Do NOT submit a Pull Request for: + +* Security-related changes. +* Works in progress. +* Changes that require design discussion, or are likely to be controversial. + (Start a mailing list thread to discuss the change first.) +* Changes needing specialized or cross-subsystem review. +* Large refactors or mechanical tree-wide changes. +* Changes generated by AI tools without substantial human review and validation. + +### Preparing your Pull Request + +Before submitting, ensure: + +#### Code Quality + +* The changes follow FreeBSD's style guide. See [Style](#Style). +* _tools/build/checkstyle9.pl_ is run and: + * All errors are fixed, **or** + * Exceptions are documented in the PR. +* No trailing whitespace is introduced. +* Changes compile and work before submitting. +* Test results (including Kyua tests) are unchanged, unless intentionally + modified. +* Bug fixes include new test cases, when possible. + +#### Commit Structure + +* Each logical change is a **separate commit**. +* Fixup commits are squashed into the commit they correct. +* Each commit is suitable for direct inclusion in the FreeBSD's repository. +* Pull Request scope must remain stable during review. If feedback expands + scope, create a new Pull Request. +* Rebase your chages (and update with a forced push) when incorporating review + feedback, rather than using a merge commit. + +#### Commit Messages + +Each commit must: + +* Follow the [commit log message guide](https://docs.freebsd.org/en/articles/committers-guide/#commit-log-message). +* Include one ore more `Signed-off-by:` trailers certifying [Developer Certificate of Origin](https://developercertificate.org/). +* Include `PR: \` if fixing a Bugzilla Problem Report. +* Include the URL of a related code review, if applicable. + (Avoid opening both Phabricator/Differential reviews and GitHub Pull Requests + for the same change.) + +#### Author Information + +* Commits use your name and valid email address. +* GitHub-generated `users.noreply.github.com` addresses cannot be used. +* See [Author Name and Email](#author-name-and-email) for details. + +### Contributor Responsibilities + +* Monitor your Pull Request and respond to review feedback promptly. +* Pull Requests may be closed if there is no response for **one month**. + +### Additional Requirements for FreeBSD Committers + +* Committers submitting Pull Requests are for pushing their changes to the tree + (including obtaining any required approvals). +* Pull Requests opened by FreeBSD committers may be closed after one month + unless there is a strong reason to keep them open. + +### Quality Expectations + +Low quality submimssions will be rejected. This includes submissions generated +by AI tools that lack sufficient validation, testing, or understanding by the +submitter. + +A pull request may be closed if there are too many obvious mistakes, or when a +time-consuming rework is needed. + +Automated accounts or chatbots must not submit pull requests or use pull +request interactions to train AI or LLM systems. Finally, if we close a pull request because it's not ready yet, or stalled out, please don't give up. You can resubmit them later once you have time to finish From nobody Mon Feb 9 15:51:23 2026 X-Original-To: dev-commits-src-main@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 4f8q2h0Mv2z6Rchk; Mon, 09 Feb 2026 15:52:28 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fhigh-b7-smtp.messagingengine.com (fhigh-b7-smtp.messagingengine.com [202.12.124.158]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8q2g1swCz3DhH; Mon, 09 Feb 2026 15:52:27 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=YSjA2HWw; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=RziE3fO1; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.158 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-08.internal (phl-compute-08.internal [10.202.2.48]) by mailfhigh.stl.internal (Postfix) with ESMTP id 6805C7A011F; Mon, 9 Feb 2026 10:52:25 -0500 (EST) Received: from phl-frontend-03 ([10.202.2.162]) by phl-compute-08.internal (MEProxy); Mon, 09 Feb 2026 10:52:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770652345; x=1770738745; bh=xESpsvWhiW bE2iOz1+v7HCtsfvcF3l7CFeT4UWrBy/0=; b=YSjA2HWw4xFh5nyiRLyLdTCo2I U0SzNVOY4BPKV0LG0SgGrgdrRRX0Ydl0aMMlXagoQPP4WRnxEect8GgqrgUETSt9 muoL9QQ+VaSiP88AmHxUEK4hZSm/Ep57Z3KFPC0S0v7QB7bgL/XgNTAkeVqPgFqG mUbAULOjhLDXBLbDKIUUwPOmx8uyHwiXqk5ubatJFJwCHpoCE6PEaR90JwZzBVvW PRQHFP9Sq4cX1aZl+CjjFTDauT/QehbfminwaiPimNoj8bwdmyIwJRkQKlQ4Zzn7 zuuMA6OWTfK7PNCREBu0Jk7rRRj4x/uCztFKKY0LiPUXBVEopfdqhwMy1aFA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770652345; x=1770738745; bh=xESpsvWhiWbE2iOz1+v7HCtsfvcF3l7CFeT 4UWrBy/0=; b=RziE3fO1E1QjQ7cLvjOb3WqPsA5wpqUluX7R/QOM5ptCe8VAMnt jGWAO+bsAAF0MMXoFyNv5pmVNrhAzDUhWMcoLR5pTRabe/HgeA5COkeq/hgli7gA vvxQz7Hut9zv+icZMCAjrTfbTL/BLMeWFL0QczLTmvy/wlQ8wqsSIhNyKRTLHPUT zGbUvNcsekVOrU0L9Y7QXrd3YklPAIAfczMvYD1f4foTb6fHWKbs5gBUADTZ3ONB GtGD3Wx9Gy7lSbl0TRNgq8VURV6TScrrQzGP5GAMaa3lzOqvLQoqsC+BdwNq4qu/ dEUzBQDtUht5gWa2hxGE7k5PuH9ZZbdI8Iw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleejvddvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujf gurhepfffkhffvvefujghffgggtgesthdtredttdervdenucfhrhhomhepfdfjvghrsggv rhhtucflrdcuufhkuhhhrhgrfdcuoehhvghrsggvrhhtsehgohhjihhrrgdrrghtqeenuc ggtffrrghtthgvrhhnpeefhfehffegvdehuedtuefgkeefieffieejhfeggeekgeevjeeg feffgeeglefhtdenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhvghrsggvrhhtsehgohhj ihhrrgdrrghtpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtph htthhopehmhhhorhhnvgesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgt ohhmmhhithhtvghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtoh hmmhhithhsqdhsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggv vhdqtghomhhmihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 9 Feb 2026 10:52:24 -0500 (EST) Date: Mon, 09 Feb 2026 16:51:23 +0100 Message-ID: <87bjhxsyo4.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Mitchell Horne Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 15c79c6fa608 - main - man4: move allwinner pages and logic to a standard place In-Reply-To: <202510202342.59KNgKOl091819@gitrepo.freebsd.org> References: <202510202342.59KNgKOl091819@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.59 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.994]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.158:from]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[gojira.at]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f8q2g1swCz3DhH X-Spamd-Bar: -- On Tue, 21 Oct 2025 01:42:20 +0200, Mitchell Horne wrote: > > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=15c79c6fa60809a9dc627e5051704cf2a556c6db > > commit 15c79c6fa60809a9dc627e5051704cf2a556c6db > Author: Mitchell Horne > AuthorDate: 2025-07-11 20:24:42 +0000 > Commit: Mitchell Horne > CommitDate: 2025-10-20 23:37:13 +0000 > > man4: move allwinner pages and logic to a standard place > > They are shared by arm, arm64, and now riscv. Note that they are > always installed by default, where MAN_ARCH=all. > > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D52585 > --- > share/man/man4/Makefile | 12 ++++++++++++ > share/man/man4/{man4.arm => }/aw_gpio.4 | 2 +- > share/man/man4/{man4.arm => }/aw_mmc.4 | 2 +- > share/man/man4/{man4.arm => }/aw_rtc.4 | 2 +- > share/man/man4/{man4.arm => }/aw_sid.4 | 2 +- > share/man/man4/{man4.arm => }/aw_spi.4 | 2 +- > share/man/man4/{man4.arm => }/aw_syscon.4 | 2 +- > share/man/man4/man4.aarch64/Makefile | 6 ------ > share/man/man4/man4.arm/Makefile | 6 ------ > 9 files changed, 18 insertions(+), 18 deletions(-) Should the following be added to ObsoleteFiles.inc ? OLD_FILES+=usr/share/man/man4/arm/aw_gpio.4.gzu OLD_FILES+=usr/share/man/man4/arm/aw_mmc.4.gz OLD_FILES+=usr/share/man/man4/arm/aw_rtc.4.gz OLD_FILES+=usr/share/man/man4/arm/aw_sid.4.gz OLD_FILES+=usr/share/man/man4/arm/aw_spi.4.gz OLD_FILES+=usr/share/man/man4/arm/aw_syscon.4.gz From nobody Mon Feb 9 15:54:33 2026 X-Original-To: dev-commits-src-main@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 4f8q561XY4z6RcsD for ; Mon, 09 Feb 2026 15:54:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8q5602kHz3F9p for ; Mon, 09 Feb 2026 15:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770652474; 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=xNAjPdChFfEjnoWHhujA1sYa91NEzPlo7QF8PY+ZRG8=; b=YhcHQYL8ik4JMMX/NojdnhPBW+bp257tQ1qvf4wQfUWKWkQuFR1/0eBo0Jh0/UQjGADPGl 7AwGFEIes3JmVut3hy0AnNN6uDDH+5sKMPnXrmz+yjt2XfBpVABTD7VDPu0VMD4th40LSd RY6jA/pXuEjxVItHQW526aZ+QxjYlTBxfx+S5uFz33RFBcHiOM5lznuULutfAXcQ+ASTPX N0jNBvdTfBMTXkApQri1KCLfApGffOXoNJWj0zWRyBOVHXu8GWg0GyV8yg0ZcCBhgkIt12 E4IaYZAcnEFI8Q7y0tVsIxE4ryad2Zfxv0bnixTsNnpHbFVDVNX9OjqDgrtAGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770652474; a=rsa-sha256; cv=none; b=HfBeeHDGUJ2BZLn048knKrswgo39rW7syUi0jVhUOut7aGrXH6xfBtG08NwAMT/77N6AzA UWCt3KFx2eDWBNp2SQClQjaT/FcPlVWxiX+XkWfO6SP7ncjWjaGBGGKzeifgpLv4jTeEe5 JvDYw08pQFSu4b4WpnYz2c8p/QVNoKPZR7uBUm1UT7jRCC0rb/i0czqqQM2V1aPfqxSByP l/Gk8D7VJ7VTpP+bdzlthICaqADtNIZ+/LLff9nE89jTxEt45E5MSXU2HM1Mw8tWXFHUmL 2/5ETa4lkYkay34Ccjiu6tncUBnQ5q5O9orSCuhiYiyaRCrAdMFfCo1r+YYvwg== 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=1770652474; 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=xNAjPdChFfEjnoWHhujA1sYa91NEzPlo7QF8PY+ZRG8=; b=PRtlPc588LZu5z1NUosBZgrM/IAXuwKfNpkCmTrtQr98KJvauCd11yfsyy/KMdbfoFyced JyAZSoiQofnwCZHn6yXxWzDF51vzp5LUh02KwivYvd3RT4zxgN5CUs0D5hwjFe0gOiNWyA GDRW91s7USFaNLxmEf+rG7EklcSjuuidOTKHy2mwJmRB6vdub8rY8vWtjSLRGRFov43ThX UW9PehSn8RCzOOUO5dQB1G7WgEHA7po3EIDhiiZls1k8TzAw8p6a9UoDP9fwClejm0sqlW NfO9kPeNWrCp9m84m3NtUEPQbngQ+PiB3GAWRH5HIC08EAhViQ62ftRzqmfUtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8q556QT3zfYl for ; Mon, 09 Feb 2026 15:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18d63 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 15:54:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: ec5d4664915f - main - aw_mmc: Reset card List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec5d4664915f51ae62daec09fa4f9765c969adab Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 15:54:33 +0000 Message-Id: <698a0339.18d63.51e281da@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=ec5d4664915f51ae62daec09fa4f9765c969adab commit ec5d4664915f51ae62daec09fa4f9765c969adab Author: Tom Jones AuthorDate: 2026-02-09 15:48:24 +0000 Commit: Tom Jones CommitDate: 2026-02-09 15:53:29 +0000 aw_mmc: Reset card On H616 (and I think H6, but this isn't verified) we need to reset the card to have a functioning device. With this commit all my pending patches for H616 are in tree. We run well on my test device (Orange Pi Zero3), however there is an uninvestigated issue with ethernet and graphics are an open question. Reviewed by: manu, adrian MFC After: 1 week Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55097 --- sys/arm/allwinner/aw_mmc.c | 8 ++++++++ sys/arm/allwinner/aw_mmc.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/sys/arm/allwinner/aw_mmc.c b/sys/arm/allwinner/aw_mmc.c index e10e98aea261..4d85c62279fc 100644 --- a/sys/arm/allwinner/aw_mmc.c +++ b/sys/arm/allwinner/aw_mmc.c @@ -117,6 +117,7 @@ static const struct aw_mmc_conf a64_emmc_conf = { static const struct aw_mmc_conf h616_mmc_conf = { .dma_xferlen = 0x10000, + .dma_desc_shift = 2, .mask_data0 = true, .can_calibrate = true, .new_timing = true, @@ -737,6 +738,13 @@ aw_mmc_reset(struct aw_mmc_softc *sc) if (timeout == 0) return (ETIMEDOUT); + /* + * Assert hardware reset and have the card move to the pre-idle state. + * This is needed on H616 to get the card into a functional state. + */ + AW_MMC_WRITE_4(sc, AW_MMC_HWRST, AW_MMC_HWRST_ASSERT); + AW_MMC_WRITE_4(sc, AW_MMC_HWRST, AW_MMC_HWRST_DEASSERT); + return (0); } diff --git a/sys/arm/allwinner/aw_mmc.h b/sys/arm/allwinner/aw_mmc.h index de15afd6de22..6974ab3bd327 100644 --- a/sys/arm/allwinner/aw_mmc.h +++ b/sys/arm/allwinner/aw_mmc.h @@ -169,6 +169,10 @@ /* AW_MMC_NTSR */ #define AW_MMC_NTSR_MODE_SELECT (1U << 31) +/* AW_MMC_HWRST */ +#define AW_MMC_HWRST_ASSERT (0U << 0) +#define AW_MMC_HWRST_DEASSERT (1U << 0) + /* IDMA CONTROLLER BUS MOD BIT FIELD */ #define AW_MMC_DMAC_IDMAC_SOFT_RST (1U << 0) #define AW_MMC_DMAC_IDMAC_FIX_BURST (1U << 1) From nobody Mon Feb 9 15:56:37 2026 X-Original-To: dev-commits-src-main@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 4f8q7f3YfBz6RdKh; Mon, 09 Feb 2026 15:56:46 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Received: from mail-10631.protonmail.ch (mail-10631.protonmail.ch [79.135.106.31]) (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 "protonmail.com", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8q7d4KF2z3GNF; Mon, 09 Feb 2026 15:56:45 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=ze6rz3zcsng5bnhollvfzp75le.protonmail; t=1770652602; x=1770911802; bh=RIgf1FX5jWjeNscKadlF7n5om7C3is1VpjlGBItdH4k=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=XmmvL/44jLCzhQp0DbMQVOQh1eatc/q9Ywvn5NhF8PeVy3eKc26ElWg9Ewg+ploOL xQMSELdkTeDs4Y/9GJ6tbXhDGAAPmknXxXqOJqPItT7GelVA/B2yD+NphoUn5WP4PM q5CBJ3HErCYgy1IIfOMjAcsoxRI2PM7p+e9Y4U+4I+5dQjkUUJPm8ea0atnYN8Oj5l uu9HAgu8f5586dP2nw7huPb/exY7n3MKuKhebHd0lUQiT/hNFUQ7goFjGbulB/MJwx jLc9xliNe9UWx8tsU6lWDe9O3gDqhg9uR5+C5KyjGa/rrGTfKWcypInTWLLhxRBZ7r uZBvMyv77SpcQ== Date: Mon, 09 Feb 2026 15:56:37 +0000 To: John Baldwin From: Minsoo Choo Cc: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: In-Reply-To: <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> Feedback-ID: 45891198:user:proton X-Pm-Message-ID: d66f7c3c19672ba3585ddb4e085d2abd5156a13f List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:79.135.106.0/24, country:CH] X-Rspamd-Queue-Id: 4f8q7d4KF2z3GNF X-Spamd-Bar: ---- On Monday, February 9th, 2026 at 10:12 AM, John Baldwin w= rote: > On 2/8/26 23:18, Konstantin Belousov wrote: >=20 > > The branch main has been updated by kib: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8f23665fed2fbaf4481359b4= d2fcdd7b9feb40e3 > >=20 > > commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > Author: Minsoo Choo minsoochoo0122@proton.me > > AuthorDate: 2026-02-06 20:03:53 +0000 > > Commit: Konstantin Belousov kib@FreeBSD.org > > CommitDate: 2026-02-09 04:17:16 +0000 > >=20 > > pcb.h: mark struct pcb to be preserved > >=20 > > There are programs that depend on this structure (e.g. kernel debuggers= ) > > that breaks when the ABI changes. > >=20 > > Signed-off-by: Minsoo Choo minsoochoo0122@proton.me > > Reviewed by: kib > > MFC after: 1 week > > Differential Revision: https://reviews.freebsd.org/D55149 >=20 >=20 > Hmmm, I think it is useful to know which fields debuggers use (typically = just > registers) vs which ones can be safely changed without impacting debugger= s. >=20 > -- > John Baldwin In the review, kib said: > I had to add and preserve the padding fields pcb_pad in the amd64 structu= re to be compatible with kgdb at least. This makes me sure that the whole p= cb layout is fixed by ABI. I can create a patch to mark fields that are used by kernel debuggers. pcb = and trapframe aren't usually used by userland programs, but we have excepti= on for kernel debuggers here. We should have consensus on whether the whole= structure should be stable ABI or not. My preference is that if any of the architectures (e.g. amd64) need the who= le pcb structure to be stable, then we should do the same to the others as = well to avoid confusion. From nobody Mon Feb 9 16:16:07 2026 X-Original-To: dev-commits-src-main@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 4f8qZ80yTJz6Rf3W; Mon, 09 Feb 2026 16:16:16 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp-relay-int.realworks.nl (smtp-relay-int.realworks.nl [31.134.205.98]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8qZ74Y4Nz3LmQ; Mon, 09 Feb 2026 16:16:15 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Authentication-Results: mx1.freebsd.org; none Received: from crmpreview3.colo2.realworks.nl (localhost [127.0.0.1]) by crmpreview3.colo2.realworks.nl (Postfix) with ESMTP id C69C2140150; Mon, 9 Feb 2026 17:16:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=klop.ws; s=rw2; t=1770653768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4HTqLrsoHVBRe5ZNGVD49kp+jqxFHgJuF5SNMxBy0FE=; b=rollBJ9pwx2twT32JBkKFiBHdcDUW/J1G4pxYTypdBwzy0chk5QoDOSKZCjybR9+GEfpzR vTkvi0lBLlJQaxATM3S6p/s+qfmcCNLVbFaEcp40iHuWbM/j/bJkPuZhgYm7RaQ5WDtVHO f3w4u6CTBG5NUgCDnEOi9ob5f4gizGf02JYd/KfQiOW1KR7mFQw8HkVh98yMUcX+LPaYbM XzvWYcD0CpVfGCU3h2j0Em3fwI3V1QXMlR5W4vjuKjleOA9Wlka7ydPROxjKFgjXgeqZRU r52bKuHuqF6H5N4xcq6MRTIAc0dT/MCvf1ciKWJJTsTqESUbH6AOvuI2G6Bkgg== Date: Mon, 9 Feb 2026 17:16:07 +0100 (CET) From: Ronald Klop To: Michael Tuexen Cc: dev-commits-src-all@FreeBSD.org, src-committers@FreeBSD.org, dev-commits-src-main@FreeBSD.org Message-ID: <1315337813.3441.1770653767432@localhost> In-Reply-To: <6988ef21.3e6ef.54b19aac@gitrepo.freebsd.org> References: <6988ef21.3e6ef.54b19aac@gitrepo.freebsd.org> Subject: Re: git: 7266121ce985 - main - ure: improve transmit checksum offloading List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_3440_1109492966.1770653767420" X-Mailer: Realworks (782.55) Importance: Normal X-Priority: 3 (Normal) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:51088, ipnet:31.134.200.0/21, country:NL] X-Rspamd-Queue-Id: 4f8qZ74Y4Nz3LmQ X-Spamd-Bar: ---- ------=_Part_3440_1109492966.1770653767420 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Thanks, I noticed this last week and was still investigating when I saw this commit. TCP/IPv6 works fine now. ure0 on uhub1 ure0: on usbus1 ue0: on ure0 This is plugged into a Raspberry Pi 5. Thanks. Ronald. Van: Michael Tuexen Datum: zondag, 8 februari 2026 21:16 Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Onderwerp: git: 7266121ce985 - main - ure: improve transmit checksum offloading > > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=7266121ce985a1a895441357c20b0e9d56b4e5f5 > > commit 7266121ce985a1a895441357c20b0e9d56b4e5f5 > Author: Michael Tuexen > AuthorDate: 2026-02-08 20:11:18 +0000 > Commit: Michael Tuexen > CommitDate: 2026-02-08 20:16:20 +0000 > > ure: improve transmit checksum offloading > > Apparently, the name of the variable l4off was correct. Providing the > offset to the TCP or UDP header allows the transmit checksum offload to > work for TCP/IPv4, TCP/IPv6, UDP/IPv4, and UDP/IPv6. > > Reported by: vishwin > Reviewed by: vishwin > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D55187 > --- > sys/dev/usb/net/if_ure.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) > > diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c > index 3dea88eb10f1..92160fe9b1d2 100644 > --- a/sys/dev/usb/net/if_ure.c > +++ b/sys/dev/usb/net/if_ure.c > @@ -24,6 +24,8 @@ > * SUCH DAMAGE. > */ > > +#include "opt_inet6.h" > + > #include > #include > #include > @@ -44,6 +46,10 @@ > /* needed for checksum offload */ > #include > #include > +#ifdef INET6 > +#include > +#include > +#endif > > #include > #include > @@ -62,8 +68,6 @@ > > #include "miibus_if.h" > > -#include "opt_inet6.h" > - > #ifdef USB_DEBUG > static int ure_debug = 0; > > @@ -2179,7 +2183,6 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t *regout) > struct ip ip; > struct ether_header *eh; > int flags; > - uint32_t data; > uint32_t reg; > int l3off, l4off; > uint16_t type; > @@ -2214,10 +2217,9 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t *regout) > if (flags & CSUM_IP) > reg |= URE_TXPKT_IPV4_CS; > > - data = m->m_pkthdr.csum_data; > if (flags & (CSUM_IP_TCP | CSUM_IP_UDP)) { > m_copydata(m, l3off, sizeof ip, (caddr_t)&ip); > - l4off = l3off + (ip.ip_hl << 2) + data; > + l4off = l3off + (ip.ip_hl << 2); > if (__predict_false(l4off > URE_L4_OFFSET_MAX)) > return (1); > > @@ -2230,7 +2232,9 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t *regout) > } > #ifdef INET6 > else if (flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) { > - l4off = l3off + data; > + l4off = ip6_lasthdr(m, l3off, IPPROTO_IPV6, NULL); > + if (__predict_false(l4off < 0)) > + return (1); > if (__predict_false(l4off > URE_L4_OFFSET_MAX)) > return (1); > > > > > ------=_Part_3440_1109492966.1770653767420 Content-Type: text/html; charset=us-ascii Content-Transfer-Encoding: 7bit Thanks,

I noticed this last week and was still investigating when I saw this commit. TCP/IPv6 works fine now.

ure0 on uhub1
ure0: <Realtek USB 10/100/1G/2.5G LAN, class 0/0, rev 3.20/31.04, addr 1> on usbus1
ue0: <USB Ethernet> on ure0

This is plugged into a Raspberry Pi 5.

Thanks.

Ronald.

 

Van: Michael Tuexen <tuexen@FreeBSD.org>
Datum: zondag, 8 februari 2026 21:16
Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Onderwerp: git: 7266121ce985 - main - ure: improve transmit checksum offloading

The branch main has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=7266121ce985a1a895441357c20b0e9d56b4e5f5

commit 7266121ce985a1a895441357c20b0e9d56b4e5f5
Author:     Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2026-02-08 20:11:18 +0000
Commit:     Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2026-02-08 20:16:20 +0000

    ure: improve transmit checksum offloading
    
    Apparently, the name of the variable l4off was correct. Providing the
    offset to the TCP or UDP header allows the transmit checksum offload to
    work for TCP/IPv4, TCP/IPv6, UDP/IPv4, and UDP/IPv6.
    
    Reported by:            vishwin
    Reviewed by:            vishwin
    MFC after:              1 week
    Differential Revision:  https://reviews.freebsd.org/D55187
---
 sys/dev/usb/net/if_ure.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c
index 3dea88eb10f1..92160fe9b1d2 100644
--- a/sys/dev/usb/net/if_ure.c
+++ b/sys/dev/usb/net/if_ure.c
@@ -24,6 +24,8 @@
  * SUCH DAMAGE.
  */
 
+#include "opt_inet6.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -44,6 +46,10 @@
 /* needed for checksum offload */
 #include <netinet/in.h>
 #include <netinet/ip.h>
+#ifdef INET6
+#include <netinet/ip6.h>
+#include <netinet6/ip6_var.h>
+#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
@@ -62,8 +68,6 @@
 
 #include "miibus_if.h"
 
-#include "opt_inet6.h"
-
 #ifdef USB_DEBUG
 static int ure_debug = 0;
 
@@ -2179,7 +2183,6 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t *regout)
    struct ip ip;
    struct ether_header *eh;
    int flags;
-   uint32_t data;
    uint32_t reg;
    int l3off, l4off;
    uint16_t type;
@@ -2214,10 +2217,9 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t *regout)
    if (flags & CSUM_IP)
        reg |= URE_TXPKT_IPV4_CS;
 
-   data = m->m_pkthdr.csum_data;
    if (flags & (CSUM_IP_TCP | CSUM_IP_UDP)) {
        m_copydata(m, l3off, sizeof ip, (caddr_t)&ip);
-       l4off = l3off + (ip.ip_hl << 2) + data;
+       l4off = l3off + (ip.ip_hl << 2);
        if (__predict_false(l4off > URE_L4_OFFSET_MAX))
            return (1);
 
@@ -2230,7 +2232,9 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t *regout)
    }
 #ifdef INET6
    else if (flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) {
-       l4off = l3off + data;
+       l4off = ip6_lasthdr(m, l3off, IPPROTO_IPV6, NULL);
+       if (__predict_false(l4off < 0))
+           return (1);
        if (__predict_false(l4off > URE_L4_OFFSET_MAX))
            return (1);
 
 

  ------=_Part_3440_1109492966.1770653767420-- From nobody Mon Feb 9 16:28:13 2026 X-Original-To: dev-commits-src-main@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 4f8qqx3hvCz6Rg98 for ; Mon, 09 Feb 2026 16:28:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8qqx1F17z3NrZ for ; Mon, 09 Feb 2026 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654493; 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=IBA4pVbXpagWQ2p3AqrSF5jEdLJ8TmGH3NBMX6IUCwU=; b=mGpHyUCUklbZzt0ANbT4Pzb2WPbUYxeU5s+M+twxqMLqEOynvgbObtxXVVT1EZKzUSUB5l tKaY3lE6/YgUR3ps1kHu7uB4XCJYFQDU4Ztw2aLC/PM6SszrDeBcBiRpECNQZryVu6LN+i IeGu1hJxspVGv3gCyTrwwDUSUKk/5kcgHB82Kz5ufs9gepAQ8hGniFazyk/VefChaKG2xP w4owOwdJN9RABbhbwLOvB7YOF60PpH+MDwHfWgimC0LtKvvGc696oZBEEZGw0pF1xNES9y ClrLd/zXcArdkv5x6ZbeEqIihaanKtZ8a38pfp7Xgc3+NJiFrs8p0P3BLcld1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654493; a=rsa-sha256; cv=none; b=MRX33NM5MNbRjjS9yF91PZTrwPCBE+qDgWaslI65FV0Qa8dZlNJls8Dw6zvpSqD2FRjkje VPSGfEArUw5oGCmvGxys8OExKlwQU7JGCF8lBqWZ0manYgvyF9bz6OMKJnNtfTvvIAMIvN Ut1A1P+zu4UuZiklTm6U4IwDd76LRduGdo0GxtYlKXPsbQvSrFc0qTQ8Tj4zoDWah0c3fl JCiqOZxmk4icCS5jBKmH9U0JOiSw0dl1wyh9eqWollCju1SxiAgCvIfNXhBeYAjvT+tbtJ E1aY/j9e3lYFrwGVoysHHyvXuZNcd3ulwyjNMPLFPPUiAmGxSTkiQO0k12BVow== 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=1770654493; 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=IBA4pVbXpagWQ2p3AqrSF5jEdLJ8TmGH3NBMX6IUCwU=; b=WLaT9aWmhtbjHgfMHH4yHUmFmBY8z2zK+25eaLqC1u4Epr7/0q58D38QWQ3eUE3FRPh5+r vTidh+Po8k0/W0RISqS8l1UzRYYI0bN+zNBkt3ZTIklqiVlduDbQldxYPAfEda6ZI8xmZ1 rMooUdc8pGNYAMFoPbEjSBnmYFfTh++g5pZ5ZliZjy3IvHu7g5cH2yP9LiOzx/hLICUbBT KD7tv8h+BCeEXEOf+vofSFZ8I1Ju0MuBPq7Mzne40Poz8bD3ftd3JTgDgMdZsX59gcsCN5 SFabqMyK+7+D38H6S+wRELeNzQ+MXxzG4tUlKu2bMLSsC12RzbX+W13lfiokyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qqx0hX0zh25 for ; Mon, 09 Feb 2026 16:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d98f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 244f498074b5 - main - libmd aarch64: Use ands instead of bics to round down the length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 244f498074b5574d18d4518583863580498b8d3b Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:13 +0000 Message-Id: <698a0b1d.1d98f.16719417@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=244f498074b5574d18d4518583863580498b8d3b commit 244f498074b5574d18d4518583863580498b8d3b Author: John Baldwin AuthorDate: 2026-02-09 16:26:29 +0000 Commit: John Baldwin CommitDate: 2026-02-09 16:26:29 +0000 libmd aarch64: Use ands instead of bics to round down the length GNU as does not accept bics with two register operands but instead requires three register operands. However, clang assembles the bics instruction to ands anyway, so just use ands directly. Reviewed by: fuz Differential Revision: https://reviews.freebsd.org/D55155 --- lib/libmd/aarch64/md5block.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libmd/aarch64/md5block.S b/lib/libmd/aarch64/md5block.S index b928c8dd795a..297db7f6bdbd 100644 --- a/lib/libmd/aarch64/md5block.S +++ b/lib/libmd/aarch64/md5block.S @@ -134,7 +134,7 @@ d_ .req m5 stp x23, x24, [sp, #0x20] stp x25, x26, [sp, #0x30] - bics len, len, #63 // length in blocks + ands len, len, #~63 // length in blocks add end, buf, len // end pointer beq .Lend // was len == 0 after BICS? From nobody Mon Feb 9 16:28:14 2026 X-Original-To: dev-commits-src-main@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 4f8qqy3SnXz6RgFf for ; Mon, 09 Feb 2026 16:28:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8qqy2Dwwz3Ncd for ; Mon, 09 Feb 2026 16:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654494; 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=K+Hngr3yYtZW8AuMtSwFL2n4WmtBY+77tIPX5Wad3qA=; b=buZYOcQX5XHdhoAdSl3QDxvMyOvhfAIPUGb2v4idbhZixxEJu6LJLFAZAZimeumLnWjHFW AesV7qEre91iVGN0Wdw6X8m6PIL7MCjiQwwh0a7sRPkTPgLtqrMjhajLuihPzVEBGruEiu 5DlNv+K8gf3b7S73DXQINCYFqV1foIILtAO+620R5CJKlEbfyFx6xcJNFhBs4JhjSDVbtE iwtV0SUaoqGdRYA5HaOFiYIEtgxB94JMWgmm+Gk94VSU9Amdo9B2iZeI0Hrxm9TNbLLHZ+ v2g4vqmvr+DOsKpou5TP/WDF9qBr1rDEqltcbHV088R8JyNJJasNlGMLU97kbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654494; a=rsa-sha256; cv=none; b=an7O/67EmVAVTdM47U3AlzEiasYUHyDzFgSTwpdtG2UrqxqHU3G3vlrIzvBqWydmcMJvHb E+KK0/iqB7XLfr1sO/G6itrXU6BBvsg7Vdyv544XBdTjy7I/H17wkuLoTaCMOZZoUx8VTK Xg1jcaC6n+FO2K6bHPKb1kViWKY0JbToFHG34OjTt9Jg1RgdcQ3Yxa9/+Vkt1EHiPaaW/s +kZ3mLsnoml3onetYIUdXgwtiPxI2H1wW1+exJMTfWnHzFMU0kedgfsGpqZkzMSgShlTFA 5J4rrixBhpOcWDk5Yh54H86FpeDnKYWhkqoUj47pKQThu93UPd3HMUKWqjWJRQ== 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=1770654494; 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=K+Hngr3yYtZW8AuMtSwFL2n4WmtBY+77tIPX5Wad3qA=; b=roso2Cd9KpM5a0+G6lRId6JV+82T4EJiwKmFQNGW2F6Uw7ydVBj2MX63HK9Zl8sxktuf56 L7zdLan1AwZKsrQ9DuZLk8chBA6H3oJ3jLSJzTCxfv01jsYFGCxlRSkuFYtxQsxsF+qWq9 oC/ZTCPxUEkqVFfg5P80ysoF3pKXat3QZnjG5+OVZwMaZKYIsXGORQWgrYqj2Aer7mS7BU PUmuMIaDrM+S3pdxcxa/5jagSmr63IhTWyeqHbB4J/VGolk+0dNc2wg0p+QDTK/d7Obs1A R+ZWy2cSASPKPBIPGuRER+MVdKx1nVLoGBW/OlIVXvF+GyZShWWtj7GFjrp4Zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qqy1XYlzh4Q for ; Mon, 09 Feb 2026 16:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d294 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee73475119ff7aa98bd11828625d524f6ab87f06 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:14 +0000 Message-Id: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ee73475119ff7aa98bd11828625d524f6ab87f06 commit ee73475119ff7aa98bd11828625d524f6ab87f06 Author: John Baldwin AuthorDate: 2026-02-09 16:26:52 +0000 Commit: John Baldwin CommitDate: 2026-02-09 16:26:52 +0000 llvm: Link private LLVM libraries against compiler_rt for aarch64 This is required for GCC which uses libcalls for outlined atomics. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D55157 --- lib/clang/libclang/Makefile | 4 ++++ lib/clang/liblldb/Makefile | 4 ++++ lib/clang/libllvm/Makefile | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 56f6fd374fe5..1b24d5cbf4cf 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -14,6 +14,10 @@ PRIVATELIB= # Work around "relocation R_PPC_GOT16 out of range" errors PICFLAG= -fPIC .endif +.if ${MACHINE_CPUARCH} == "aarch64" +# Only required for GCC +LIBADD+= compiler_rt +.endif .endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index aa9e90b2f6f2..b2da21c2990e 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -10,6 +10,10 @@ PACKAGE= lldb SHLIB_CXX= lldb SHLIB_MAJOR= 19 PRIVATELIB= +.if ${MACHINE_CPUARCH} == "aarch64" +# Only required for GCC +LIBADD+= compiler_rt +.endif .endif SHARED_CXXFLAGS+= -UPIC # To avoid compile errors diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 05128550827a..9b2a272d2c67 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -14,6 +14,10 @@ PRIVATELIB= # Work around "relocation R_PPC_GOT16 out of range" errors PICFLAG= -fPIC .endif +.if ${MACHINE_CPUARCH} == "aarch64" +# Only required for GCC +LIBADD+= compiler_rt +.endif CFLAGS+= -DLLVM_BUILD_LLVM_DYLIB .endif From nobody Mon Feb 9 16:28:15 2026 X-Original-To: dev-commits-src-main@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 4f8qqz3WSGz6Rg76 for ; Mon, 09 Feb 2026 16:28:15 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8qqz2KnNz3NxG for ; Mon, 09 Feb 2026 16:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654495; 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=VlDCFP8nRm20T/jZqJM31508jabnnO9JZp4TMGhf4ug=; b=gdW9jnPgmIQcgjFLTrkHiTk/2gOdmn/8XepfKjyvWdxAMsxtuqi5hZuVLv6ubieZtXFXUZ r2gGyRDMsekBYB6Pjzmi5u8SUtGlD+Yrm36z7bOencMOS2V0zvPBP6DphocTSyJrMXK9Sl B3WR0+9tWTfaIBFgXUNP3QmQnC5FRRUhkE5VV+hUDte0pteRzu2AMsklrNjqBdmnJ+3RbT OCrzQBJR2Kv5Xrf9bnUELOYmosTSXrULTMY4iZHstWfnTukTAeyEfRSG6D3vt1Ih5L7FZ0 bKAY3swp+V4kBvvszHw90V5XmUT8YinXd/UQcOXyL3e9VTVOPcgnVRoMK1vjGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654495; a=rsa-sha256; cv=none; b=sxEKFkBe7xp8UX7+fjGn+5LVGGAc3sygLuELHcIvrE29/QayZUMg4MnLe4r0O2fq6e5HYd 9ekTrHk2R2Kd9B8/mAd5/aWFtT5lVMJ6lWW+9TICI94MTR0boxj/H4X4LdsHDg/zqjrWgE JFsQMRHhDtApJfSeSqr1dfIO5GZ+sRC72Rud9V8Bidy/Cp05UOzyRA6ODZZBDOGUaXZ2Z7 nc1OuVx9aiSpXB4V48pP9ori5TUJ6wCLVSGOPEGPI7bFnbvBtjMUb6eLyTxM0yloj7GCmO hQYY0M/IEHhfRvOYSFZhfbuL99WWKeF+DZTySJdHOxPZwsrNFFomIFsOEpGcqw== 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=1770654495; 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=VlDCFP8nRm20T/jZqJM31508jabnnO9JZp4TMGhf4ug=; b=k4n8YkGzXELmezbE/I6Wi+yRxvFtTCDR6j+fb1i4LZZKc7fo7gBy1ij9Wk42P17Em0mSh1 ecdm0Y9V5szaAMMsLwYe5g6fZsVlaML8L5Uew9gVi0AR42KTBnl2Rnh2/Bf7+wdmFxB9oW i9zLKlYz4+GCseq1MTtIs+qT1VY879I/uh5n6p3VushbPwxu4LAGPThbpHcEEG/BfTZ+it YLf7/dVPaVPTVXxCJAsqEi46i0PEDmTf8latddwpJxxyUkCaRlNBgAQ7uTWZxxFFyELD4W HkX+I8i4egVM1POpIo82UJqs53GLgzl0mW2DUDLo4+xDoMS1SnWpafFdZPUvng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qqz1x0wzgHy for ; Mon, 09 Feb 2026 16:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d81f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: efdd30c94e0a - main - sdhci_fdt_rockchip: Move ofw_bus_status_okay check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efdd30c94e0ac4007b52b6f40afdab52fecf2aa5 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:15 +0000 Message-Id: <698a0b1f.1d81f.7d477ae8@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=efdd30c94e0ac4007b52b6f40afdab52fecf2aa5 commit efdd30c94e0ac4007b52b6f40afdab52fecf2aa5 Author: John Baldwin AuthorDate: 2026-02-09 16:27:04 +0000 Commit: John Baldwin CommitDate: 2026-02-09 16:27:04 +0000 sdhci_fdt_rockchip: Move ofw_bus_status_okay check This fixes a warning from GCC: sys/dev/sdhci/sdhci_fdt_rockchip.c: In function 'sdhci_fdt_rockchip_probe': sys/dev/sdhci/sdhci_fdt_rockchip.c:120:14: error: statement will never be executed [-Werror=switch-unreachable] 120 | if (!ofw_bus_status_okay(dev)) | ^~~~~~~~~~~~~~~~~~~~~~~~ Reviewed by: bnovkov, imp, emaste Differential Revision: https://reviews.freebsd.org/D55158 --- sys/dev/sdhci/sdhci_fdt_rockchip.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/sdhci/sdhci_fdt_rockchip.c b/sys/dev/sdhci/sdhci_fdt_rockchip.c index 44a5e2ffe271..79d299f75fb4 100644 --- a/sys/dev/sdhci/sdhci_fdt_rockchip.c +++ b/sys/dev/sdhci/sdhci_fdt_rockchip.c @@ -116,9 +116,10 @@ sdhci_fdt_rockchip_probe(device_t dev) struct sdhci_fdt_softc *sc = device_get_softc(dev); sc->quirks = 0; - switch (ofw_bus_search_compatible(dev, compat_data)->ocd_data) { if (!ofw_bus_status_okay(dev)) return (ENXIO); + + switch (ofw_bus_search_compatible(dev, compat_data)->ocd_data) { case SDHCI_FDT_RK3399: device_set_desc(dev, "Rockchip RK3399 fdt SDHCI controller"); break; From nobody Mon Feb 9 16:28:16 2026 X-Original-To: dev-commits-src-main@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 4f8qr066Kwz6RgJ9 for ; Mon, 09 Feb 2026 16:28:16 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8qr034p7z3Nd1 for ; Mon, 09 Feb 2026 16:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654496; 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=4lPElbY0ehkcfG9UPqrYG9mgmDJTuZdcb7uhqDBuxPg=; b=C45OKkqV6CFHgjdDHC6zoRPFFIabapSi3/0MhwUH3KH1CULEResK85jK5r6/BrLXgcmFni F4n0yk+GZGgl19qUS24biXN7mAkPLj42N411Bg2+AFeC4T8iBao12pMkmDYQBCr7fqSoR6 BXYUv6TiVj1pd645+9BpvqQ7g42ofgEcu0gLES790y3jfFs/o3TMXlPcKiEgxeH8omJdjm D46p9SQbNEBkHOnXTZBr6yKYwr9Niwno67ZltuOGrxuaPVEY2daDCziWQbfl0klvZq4Z0l R3bMRUcgtWpEXw5AyUWKUeWW6r+z123q0jXKwK482pGsjCtnWNqIF/00oK1DHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654496; a=rsa-sha256; cv=none; b=hxOeC1PFoitDzENswq9upqgoy1BwCLJ3OU4NbeR4iROL1/x+v1+WfLiyAM/r7WQ0PYAz+v 9WAdHs/xWUHHFQng6tHJstVBhJhbbYfMezteIFuo7o1/BFGlStj+d/0xeLm/gHadadQxFg mNI41MuMQ90D8je8Qr4/QoGV9gsIDEIyxre2LlE4y5U9thcysfD/7dP8Ksr1Y4hr9ovES8 bizII9qnupDTOWDz88sMn5ZHjr7steHxL/6uanBu0+qCyxGLWHPBH76AcnYazEubHYxGwI CUhP3hGpf7aQjsTyQeFDUXRyoquIx3jy8MnCxXMNhSKoKFhGo5X8DBlq6KUAOw== 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=1770654496; 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=4lPElbY0ehkcfG9UPqrYG9mgmDJTuZdcb7uhqDBuxPg=; b=nnaVfD7XE49BVocSUUOQt6gZx/odi+UWR/cjsE09C/L+DmlvICE6RVohLrpfmCDU8qQHEZ 6I67CDWwTPyGRG7MOoiBqyNJNreeavHkdMP3JSxAeLlYRyUwaKWlE/zp1xPicECNp9IpQh 9lcv5PVFXouqnHnwa1LBSuDQKxevafKdEO0WpNZcNyp2H1/Ap37g12gxP9sPzPKGm3ndUU 41dF0oWDaFk+OjkG/9XY0beTvK6s4qHPxsg425iuyt2FpLdYYQvLtQFdfbYy3xg5OXKfuJ chCr9snb/jeR0/4sQnQmuotNOzS8tHYqVp2S9qZ7Mt5s1Ne8aOYuegaO/H9l9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qr02hc8zgkt for ; Mon, 09 Feb 2026 16:28:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d298 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3f18463745c9 - main - sdhci_fdt_rockchip: Don't return 0 from probe routine List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f18463745c9c75e1fdcfacc710799838ef5c9d9 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:16 +0000 Message-Id: <698a0b20.1d298.10681036@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3f18463745c9c75e1fdcfacc710799838ef5c9d9 commit 3f18463745c9c75e1fdcfacc710799838ef5c9d9 Author: John Baldwin AuthorDate: 2026-02-09 16:27:23 +0000 Commit: John Baldwin CommitDate: 2026-02-09 16:27:23 +0000 sdhci_fdt_rockchip: Don't return 0 from probe routine The only write to the softc is a no-op (softcs are initialized to all zeroes), so remove that and just use BUS_PROBE_DEFAULT. Reviewed by: bnovkov Differential Revision: https://reviews.freebsd.org/D55159 --- sys/dev/sdhci/sdhci_fdt_rockchip.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/sdhci/sdhci_fdt_rockchip.c b/sys/dev/sdhci/sdhci_fdt_rockchip.c index 79d299f75fb4..2d0ade8055e7 100644 --- a/sys/dev/sdhci/sdhci_fdt_rockchip.c +++ b/sys/dev/sdhci/sdhci_fdt_rockchip.c @@ -113,9 +113,6 @@ static struct ofw_compat_data compat_data[] = { static int sdhci_fdt_rockchip_probe(device_t dev) { - struct sdhci_fdt_softc *sc = device_get_softc(dev); - - sc->quirks = 0; if (!ofw_bus_status_okay(dev)) return (ENXIO); @@ -130,7 +127,7 @@ sdhci_fdt_rockchip_probe(device_t dev) return (ENXIO); } - return (0); + return (BUS_PROBE_DEFAULT); } static int From nobody Mon Feb 9 16:28:17 2026 X-Original-To: dev-commits-src-main@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 4f8qr15hFWz6RgJD for ; Mon, 09 Feb 2026 16:28:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8qr149fJz3Nk5 for ; Mon, 09 Feb 2026 16:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654497; 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=tIXv4036GP4upBUC1WwvGieNqfs1qXryQdnUpuLYmQQ=; b=Obadph6mmTnQDOTZ8FxIeLsJ96s4Jf+ryE2GNChrsZOKBltbk7REgL+tNTkP3LoVQJ4xaf mfVkbXrFGyOcYhObGcMjBR1BGF2wor9XlYSM0gWhunSrKqvB5l/cOHC41Bihd+LXrcgEfd qKMYBvPgc83iyyF/+xQOzjRb8wX3YxVcSuLSZOIpaRZ09FHKefI9LPeXNDT1JFB8an+Npn GPuNigEw1YyrXmyU/ywjVq7s+yUI+Of1GzvwqPAHKSnGMoNSTOJ6xd2lAA8anw6GKLF+5S 9HCO/qu37E9wDrIf1VKNgZBB2j05XmTDklC4m6n5u2b8M4EojwpRDrnaPKYiyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654497; a=rsa-sha256; cv=none; b=K2YjBsR+Xo1cPIdlSato4KdczPSan6oHN2Fn8Rs1cZJwP6tnGSjy+bFU+E8o/rb3SIV2rE 5DsnizXpH4hrJbuUA9xrWz4vfShp0w+2sjuFKNAW5rldKkR+Bkmg/MW6c8bgKxkIJ17yzF bu3lF49w1MwJ2chhPSQ8kBbBpCN6YdSp7i7jQ5QNhpwT3dqyDupBwcSwUMMw4lIn2K/DBa 0lEV/CO9Uo6YFy5FZjd9VIybWUAvGPajWKFIqFxhlzJFEjMJ5VwVSqf8h+UnOSizPyL+04 akCDahtCAG6RRZlDDsMKsQbFg6zWHvm7evRkGyWHiHcNxIsB71LR5mpoZID6qg== 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=1770654497; 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=tIXv4036GP4upBUC1WwvGieNqfs1qXryQdnUpuLYmQQ=; b=n47oJp67PgeStP2vs27FVkIjn7SxyM5hNhXOPksvVynZCELQddvXPJCCtXWDd3cCVWEjgL pP1fRgEJPYDK3YuAkdjPqvbqNkgmTMQHSS7kZLU0hgHcG5XL6kFUFBRXZ/OBAfpOAdiJkU pG4y0bezmvUIllkt+Fu/7HPA7FWyZOx1gjuGi3XQxNBj6E8iFrzqrmMuDp4+d9acAHHo3H PmcKSNxfa+9nKoY5g+HG4WdyMX0Luatbc4slQP55cB2WRmTGaafHnQb/0X4q2dbmTMwHjY qsBFvq+1teE4OKQgyESPZOClgbUI/Q5sF7oxTl9E8HWgl0ieFJkIszO3U6JYeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qr13YH5zgY4 for ; Mon, 09 Feb 2026 16:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d823 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 83e5b79c7c98 - main - ext2fs: Use __sdt_used for variables only used by SDT probes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83e5b79c7c98a7f8c94a99b102bc8a90c195769a Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:17 +0000 Message-Id: <698a0b21.1d823.1947b8e1@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=83e5b79c7c98a7f8c94a99b102bc8a90c195769a commit 83e5b79c7c98a7f8c94a99b102bc8a90c195769a Author: John Baldwin AuthorDate: 2026-02-09 16:27:44 +0000 Commit: John Baldwin CommitDate: 2026-02-09 16:27:44 +0000 ext2fs: Use __sdt_used for variables only used by SDT probes Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D55164 --- sys/fs/ext2fs/ext2_extents.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/fs/ext2fs/ext2_extents.c b/sys/fs/ext2fs/ext2_extents.c index 146aa48f6743..0aa709a8e354 100644 --- a/sys/fs/ext2fs/ext2_extents.c +++ b/sys/fs/ext2fs/ext2_extents.c @@ -447,11 +447,7 @@ static int ext4_ext_check_header(struct inode *ip, struct ext4_extent_header *eh, int depth) { -#ifdef KDTRACE_HOOKS - char *error_msg; -#else - char *error_msg __unused; -#endif + char *error_msg __sdt_used; if (le16toh(eh->eh_magic) != EXT4_EXT_MAGIC) { error_msg = "header: invalid magic"; From nobody Mon Feb 9 16:28:18 2026 X-Original-To: dev-commits-src-main@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 4f8qr30RDmz6RgJH for ; Mon, 09 Feb 2026 16:28:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8qr24XP1z3Nxh for ; Mon, 09 Feb 2026 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770654498; 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=adwFDyvyNcwmpCGpo0SYk71DmyukNX0qb3jMY/jO7zs=; b=gCawIFaB3zUM7MLSlZFiAJusJVpCQxCotA897hvtfbEfblBryUk2cb0ZE8ussaGREZlV8f SELV2KI3fFy0Gqox0oZkfGGTK5bVz4auRKGq4gHQyUvmuXNyi0t4U/obFxCuepXOuXrHlx JbCfz57gGcrFB1MUowdopwDPh9dpcqa4Gus077KenqETs4Rh1MfoTHJwXraNc6l5365N3j CCIVYmOr6FJvSbKEFDVfG7buAqYuDk4/+Lpd3iBsDSPDaCFLKPmD2kK7ugBoS/EFi6s5TX CN9dA0BPfEgFDINZNV3tySFcLYA5qG6UTp90QpuId+lWoM52mSSiyB5m4ae1BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770654498; a=rsa-sha256; cv=none; b=B9xg6ftWddH3zUfhKfL7Qfe+uUSufvjwab4gXbEorpELYuHI2W2MNBME+roIxR+73m6x0O 64uZAQyER1mCQsB9GUBihq/raMocqclRhnhOIG2QuXkV+lzmZJH+lREDdypSw7k3uoU66r x9z7pwa2oRsJKoYVooJKSJC3SaKpkC42wFMpY1P5gtaX/m/JwtL9bmLf+5E3YaPtWwEc/Q /9pNUMhMpCPH5l1oWoCqpKiW7WAESVaR4Bg1V0ofW5TEh99zFsMavg+ZfEnGvPqIKZoJP+ TCHzPzJvDuo5PCwQ7awNPHucrsWGYQ6D+zZE6uFRPEx3DxigKbW6ct6efCzOVA== 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=1770654498; 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=adwFDyvyNcwmpCGpo0SYk71DmyukNX0qb3jMY/jO7zs=; b=EBMBGp9AXBzXI/zpRze8H/MyluRIfKZ+1pVMiooB8ViBY8wXHTiKfcXJXg5ILaEuMdNezP ORG+q5kQOQxqYbvjYXye928nqZC8eG7UQTE+FyBFjPs9zxehohkurZMpxfI7ZcMEAtv4eq okqwYxcZQv+68y/BQ40DAWLkeRxIKhSEu31yCPtKRE/+INwFk/nInTpa+zrVYbUdF8hvCU Mo9tqesnfUoDxVyPw4i8mtwi1xJcRsaMBcsz+qHi+pNe3KdP6w5wAK5dMd6U9MsyaAL2Cj Va63O8CwQMcT1L0UiyblNqfwQBzkJb7HBV6idf+PuceufdTIVsGvHw76s9ZuOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8qr246CfzgJ0 for ; Mon, 09 Feb 2026 16:28:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d690 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 16:28:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d4d735b26537 - main - sctp: Use __sdt_used for variables only used by SDT probes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4d735b26537662565001d86685080256cf95758 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 16:28:18 +0000 Message-Id: <698a0b22.1d690.36c3148f@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d4d735b26537662565001d86685080256cf95758 commit d4d735b26537662565001d86685080256cf95758 Author: John Baldwin AuthorDate: 2026-02-09 16:27:55 +0000 Commit: John Baldwin CommitDate: 2026-02-09 16:27:55 +0000 sctp: Use __sdt_used for variables only used by SDT probes Previously this used a home-rolled version. Reviewed by: tuexen, imp, markj Differential Revision: https://reviews.freebsd.org/D55165 --- sys/netinet/sctp_cc_functions.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 1a252da31b27..db46f5e34195 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -51,12 +51,6 @@ #define SHIFT_MPTCP_MULTI_Z 16 #define SHIFT_MPTCP_MULTI 8 -#ifdef KDTRACE_HOOKS -#define __dtrace -#else -#define __dtrace __unused -#endif - static void sctp_enforce_cwnd_limit(struct sctp_association *assoc, struct sctp_nets *net) { @@ -255,7 +249,7 @@ static int cc_bw_same(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t rtt_offset, uint64_t vtag, uint8_t inst_ind) { - uint64_t oth __dtrace, probepoint __dtrace; + uint64_t oth __sdt_used, probepoint __sdt_used; probepoint = (((uint64_t)net->cwnd) << 32); if (net->rtt > net->cc_mod.rtcc.lbw_rtt + rtt_offset) { @@ -390,7 +384,7 @@ static int cc_bw_decrease(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t rtt_offset, uint64_t vtag, uint8_t inst_ind) { - uint64_t oth __dtrace, probepoint __dtrace; + uint64_t oth __sdt_used, probepoint __sdt_used; /* Bandwidth decreased. */ probepoint = (((uint64_t)net->cwnd) << 32); @@ -530,7 +524,7 @@ out_decision: static int cc_bw_increase(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw, uint64_t vtag) { - uint64_t oth __dtrace, probepoint __dtrace; + uint64_t oth __sdt_used, probepoint __sdt_used; /* * BW increased, so update and return 0, since all actions in our @@ -574,7 +568,7 @@ static int cc_bw_limit(struct sctp_tcb *stcb, struct sctp_nets *net, uint64_t nbw) { uint64_t bw_offset, rtt_offset; - uint64_t probepoint __dtrace, rtt, vtag; + uint64_t probepoint __sdt_used, rtt, vtag; uint64_t bytes_for_this_rtt, inst_bw; uint64_t div, inst_off; int bw_shift; @@ -687,7 +681,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, int accum_moved, int reneged_all SCTP_UNUSED, int will_exit, int use_rtcc) { struct sctp_nets *net; - int old_cwnd __dtrace; + int old_cwnd __sdt_used; uint32_t t_ssthresh, incr; uint64_t t_ucwnd_sbw; uint64_t t_path_mptcp; @@ -800,7 +794,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, continue; } } else { - uint64_t vtag __dtrace, probepoint __dtrace; + uint64_t vtag __sdt_used, probepoint __sdt_used; probepoint = (((uint64_t)net->cwnd) << 32); probepoint |= ((0xa << 16) | 0); @@ -998,7 +992,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, static void sctp_cwnd_update_exit_pf_common(struct sctp_tcb *stcb, struct sctp_nets *net) { - int old_cwnd __dtrace; + int old_cwnd __sdt_used; old_cwnd = net->cwnd; net->cwnd = net->mtu; @@ -1339,7 +1333,7 @@ static void sctp_cwnd_new_rtcc_transmission_begins(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint64_t vtag __dtrace, probepoint __dtrace; + uint64_t vtag __sdt_used, probepoint __sdt_used; if (net->cc_mod.rtcc.lbw) { /* Clear the old bw.. we went to 0 in-flight */ @@ -1402,7 +1396,7 @@ static void sctp_set_rtcc_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net) { - uint64_t vtag __dtrace, probepoint __dtrace; + uint64_t vtag __sdt_used, probepoint __sdt_used; sctp_set_initial_cc_param(stcb, net); stcb->asoc.use_precise_time = 1; From nobody Mon Feb 9 16:40:03 2026 X-Original-To: dev-commits-src-main@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 4f8r5s2nZtz6Rgv6 for ; Mon, 09 Feb 2026 16:40:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8r5r7095z3YLm for ; Mon, 09 Feb 2026 16:40:16 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-482f2599980so54175255e9.0 for ; Mon, 09 Feb 2026 08:40:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770655215; x=1771260015; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=TdAiVe/5jQXy442BD+f3zvoCalQ1juUP12AHFGkEBJE=; b=hJICQZ+CFIvNlgiGoAgaPDfgw7MfMOby5FzXGyeZpqSHhcexcS3zcshtsKzhhZ2nW1 KwCXbV9JcGi91f3p+ozaGKHoSBhJlazHZglhHz93E55ovEamD0RK3Gr6L9M64knEJHZK Q4o72w6e4IjCKD0Yx9xE+6AwsxtcncNPbC6lwbfY0UnfEtjMcvjD2tAw/mvP603M4Eat WAxC8KXNZ5Gb2Q4Xjs0VturU8jqa7ZTN0RBR/SpC4aa5wsBbPVj1+5AH5hrteVuaBhn1 O7qMRmvbIr844THKtnmd/0FlYzvSiVFtO1tni16jE6ocjfNZ7h14v7A2pQwkkkri4anW ucZw== X-Forwarded-Encrypted: i=1; AJvYcCVYeO/l48sldFbjpgsSNjK6Z3ELn5NGglezZoA/f8t/VigMpecn+XOtpi6+aIIuUQz/wV/2lrTfKOfAz2OXHKvokEMkiQ==@freebsd.org X-Gm-Message-State: AOJu0YxWw8tfCDjw4qHzByQcwVG9f8PYKD51KKZqu95cPfq83USp13ws B7xvtnnyTT7u1Na+Ig+If6bgtOLBTYy4Dj3Tg9dGzYXW0POq2MlE59WzchABqQeJJm0= X-Gm-Gg: AZuq6aKD+dCMeke8qk3V06KerG8reFkE3QBwgQV2uLrf7B27KWLuQKTQfkIf4gGYTqO TqI96km8oERhWgwR6hiCdgpap67IGpkKWrS3344q4vPbp1jbTwQWg3dTRhRyfhWvSC3zgxy1nuT s4M53tF1iqpOjNSlR1PYcDaWHoPRNo3uvW2DFjiqJYnGrzmECSe0w9XJMFY9CAC1Ha0twAkBloe tn7fnIzAVtxtyxs3sNzgAE3ayijdEVz4iuTm16WF369G9eRYXLqirOD7zcB8U/qVbrLE6NAOZnV LqkisNSewn1tyTfY/HkE9noIA8ptrd2b01sE3qTfpc9rKGw0SaDJoVOgDHh/p8k/Op3jwsisA5t hUQoOT0oc1fcBE2PLM/kHSiDM5dpy+Wt4ciGeCXPeBQFJEyy48MbvRSTxahgzTIZ5i11SvLBTHg KcBLDR/CPesZfajUHr6b7YdzQSyqPoMBE2w9EW/maNZ53Lo1qmYh0aUw== X-Received: by 2002:a05:600c:6290:b0:483:a21:774a with SMTP id 5b1f17b1804b1-48320225afemr187285115e9.26.1770655215005; Mon, 09 Feb 2026 08:40:15 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4834d5ebd1bsm1041005e9.6.2026.02.09.08.40.13 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Feb 2026 08:40:14 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 From: Jessica Clarke In-Reply-To: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> Date: Mon, 9 Feb 2026 16:40:03 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4f8r5r7095z3YLm X-Spamd-Bar: ---- On 9 Feb 2026, at 16:28, John Baldwin wrote: >=20 > The branch main has been updated by jhb: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dee73475119ff7aa98bd11828625d524f= 6ab87f06 >=20 > commit ee73475119ff7aa98bd11828625d524f6ab87f06 > Author: John Baldwin > AuthorDate: 2026-02-09 16:26:52 +0000 > Commit: John Baldwin > CommitDate: 2026-02-09 16:26:52 +0000 >=20 > llvm: Link private LLVM libraries against compiler_rt for aarch64 >=20 > This is required for GCC which uses libcalls for outlined atomics. This doesn=E2=80=99t seem right, they=E2=80=99re provided by libgcc.a, = so why aren=E2=80=99t they being pulled in? libcompiler_rt.a doesn=E2=80=99t even have the = symbols. Jessica > Reviewed by: dim > Differential Revision: https://reviews.freebsd.org/D55157 > --- > lib/clang/libclang/Makefile | 4 ++++ > lib/clang/liblldb/Makefile | 4 ++++ > lib/clang/libllvm/Makefile | 4 ++++ > 3 files changed, 12 insertions(+) >=20 > diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile > index 56f6fd374fe5..1b24d5cbf4cf 100644 > --- a/lib/clang/libclang/Makefile > +++ b/lib/clang/libclang/Makefile > @@ -14,6 +14,10 @@ PRIVATELIB=3D > # Work around "relocation R_PPC_GOT16 out of range" errors > PICFLAG=3D -fPIC > .endif > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +# Only required for GCC > +LIBADD+=3D compiler_rt > +.endif > .endif >=20 > SHARED_CXXFLAGS+=3D -UPIC # To avoid compile errors > diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile > index aa9e90b2f6f2..b2da21c2990e 100644 > --- a/lib/clang/liblldb/Makefile > +++ b/lib/clang/liblldb/Makefile > @@ -10,6 +10,10 @@ PACKAGE=3D lldb > SHLIB_CXX=3D lldb > SHLIB_MAJOR=3D 19 > PRIVATELIB=3D > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +# Only required for GCC > +LIBADD+=3D compiler_rt > +.endif > .endif >=20 > SHARED_CXXFLAGS+=3D -UPIC # To avoid compile errors > diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile > index 05128550827a..9b2a272d2c67 100644 > --- a/lib/clang/libllvm/Makefile > +++ b/lib/clang/libllvm/Makefile > @@ -14,6 +14,10 @@ PRIVATELIB=3D > # Work around "relocation R_PPC_GOT16 out of range" errors > PICFLAG=3D -fPIC > .endif > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +# Only required for GCC > +LIBADD+=3D compiler_rt > +.endif > CFLAGS+=3D -DLLVM_BUILD_LLVM_DYLIB > .endif >=20 >=20 From nobody Mon Feb 9 16:45:19 2026 X-Original-To: dev-commits-src-main@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 4f8rCl4ssMz6RhQL; Mon, 09 Feb 2026 16:45:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8rCl44LDz3ZY6; Mon, 09 Feb 2026 16:45:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770655523; h=from:from: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=jyagdVnMhIzV1hezhXqDkFN5wMUyb8G6qRlg5bd0lao=; b=CT/LfKhD5HpH/ldjwU0NKy4RzRlRVbhSM51knH0Yfiy2s849xHsYQC9WKSnZsDK6oNUwdg QSfYqtSnRYu1XhOmmAAe39qZfO0SO5ziajjR0kV59IYRquLNDjkHBePnsR9ZzL4t7MY5K5 jE1/5SLlDpp2WfLMYCt0F9CWnyKeGlyaPr3UriWEFmX661QE6BaSjcGxg1qoynJF2+d4SJ qfVQHuSV0vfzwCDOOw9xQWm1x0Y5J3MDvQPpW6fAMUeekv+HxCejac267RVUMQW0B76G8v QMcNg2Ci1kH1gYLmcf8072fWF/L/TH0BUtDlrctjX6w+XWjlWbBqm/6idI5xWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770655523; a=rsa-sha256; cv=none; b=SrvTGF5TO6//ZdWMXysDMesVKuI9Z5gdrCNDs5+zXsanTlGoycxdZhpXqaAUHVrR/FlRUr ZbqYEOkgmWvn3e+OQRh+SLN+DmOXiKRadUJovojablrvr/6o5XcZnUzskORQzI0fz3wuJ9 VdaFnfQE8lopE4wV67SlVqxwbiVr14h7De7jDgJ6Xn0+xOQL5e13nmQEY2WXQtz1TPX+Hx aQWyWPV9lhN87uPSGvujI3z9cH/QkuvwFusM1VbmAJbq0zQEw+hCbQu8xEiP4xk5mcaQ+E 3JCUTeJejQRx/p6Ti8UMdv5uLbNVPo/Ql+xwBxjoWgIxlrV8LpwdgSkR8adwuA== 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=1770655523; h=from:from: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=jyagdVnMhIzV1hezhXqDkFN5wMUyb8G6qRlg5bd0lao=; b=PIRkHBh2z5oXRXxPlH8ayPs4MZrzbVj8e2sAwPxrdbrKUyHaAp9+ojf2aM1TJbg2z+tSc2 0/6Zuyl5F0Vu/C5nNh9PqalfUr3cJuSAaVYwnf4QANsGA4yFe7CZvsdypDIeRRstLb9oR0 x74tWGdGIdf2rc1pPqdbvFXxtWhmt0JlnkMj0UgGBaEoLPI6mO3yyAId+G/hX/wlKSf6Zm 0rrcVGqn8kH+FMmT6oBhAU16WMl2gKZGx0ZTEm6zWsvDl2iZLH3Va0yQ+tTghjbOh4Xt6O +90yKgOGRuzn//AUwD3X3FTROct0xmUBILy1hsIGP65VbIRRLd+715UDSsJq1g== Received: from [IPV6:2601:5c0:4202:5670:ed0c:b253:7c2f:c8b9] (unknown [IPv6:2601:5c0:4202:5670:ed0c:b253:7c2f:c8b9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8rCl1dTbzms; Mon, 09 Feb 2026 16:45:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 9 Feb 2026 11:45:19 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Content-Language: en-US To: Minsoo Choo Cc: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/9/26 10:56, Minsoo Choo wrote: > On Monday, February 9th, 2026 at 10:12 AM, John Baldwin wrote: > >> On 2/8/26 23:18, Konstantin Belousov wrote: >> >>> The branch main has been updated by kib: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 >>> >>> commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 >>> Author: Minsoo Choo minsoochoo0122@proton.me >>> AuthorDate: 2026-02-06 20:03:53 +0000 >>> Commit: Konstantin Belousov kib@FreeBSD.org >>> CommitDate: 2026-02-09 04:17:16 +0000 >>> >>> pcb.h: mark struct pcb to be preserved >>> >>> There are programs that depend on this structure (e.g. kernel debuggers) >>> that breaks when the ABI changes. >>> >>> Signed-off-by: Minsoo Choo minsoochoo0122@proton.me >>> Reviewed by: kib >>> MFC after: 1 week >>> Differential Revision: https://reviews.freebsd.org/D55149 >> >> >> Hmmm, I think it is useful to know which fields debuggers use (typically just >> registers) vs which ones can be safely changed without impacting debuggers. >> >> -- >> John Baldwin > > In the review, kib said: >> I had to add and preserve the padding fields pcb_pad in the amd64 structure to be compatible with kgdb at least. This makes me sure that the whole pcb layout is fixed by ABI. It is no longer needed and hasn't been needed in a decade. Back when the field was first added, kgdb did indeed assume a fixed size for `struct pcb`. However, back in 2015 I added a pcb_size variable that debuggers can use to determine this size (to properly index the stoppcbs[] array) even if debug symbols weren't present: commit 645743ea99829e6d578cca5a580cf0a4102fb7dd Author: John Baldwin Date: Thu Nov 12 22:00:59 2015 +0000 Export various helper variables describing the layout and size of certain kernel structures for use by debuggers. This mostly aids in examining cores from a kernel without debug symbols as a debugger can infer these values if debug symbols are available. One set of variables describes the layout of 'struct linker_file' to walk the list of loaded kernel modules. A second set of variables describes the layout of 'struct proc' and 'struct thread' to walk the list of processes in the kernel and the threads in each process. The 'pcb_size' variable is used to index into the stoppcbs[] array. The 'vm_maxuser_address' is used to distinguish kernel virtual addresses from user addresses. This doesn't have to be perfect, and 'vm_maxuser_address' is a cheap and simple way to differentiate kernel pointers from simple values like TIDs and PIDs. While here, annotate the fields in struct pcb used by kgdb on amd64 and i386 to note that their ABI should be preserved. Annotations for other platforms will be added in the future. This was even the commit that added the annotations just removed, so a simple blame for why the annotations were present would have turned this up. -- John Baldwin From nobody Mon Feb 9 16:47:31 2026 X-Original-To: dev-commits-src-main@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 4f8rGD3WsSz6RhVH; Mon, 09 Feb 2026 16:47:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8rGD2rgNz3bwc; Mon, 09 Feb 2026 16:47:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770655652; h=from:from: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=xPjDYOfe/g9nyFWAPifhpNLhhk0+Z+Ri8Uj+SiSbxJc=; b=YkHx75BsoFEoxCNdyvqIezoKoXZsNDV0OerVRZlTQI/uTcE1FnA0A4yOgdE5c1eqFtCTzm NhoIgxmOF85DBzwKpzwPAdRVFRVOGhRs6twbu7kdAsEA/n7/n2SzIn8kAuJvdOdTMystCU WddWb9r7Hb3rawr3WJfcyvUTMknO/lyRuRfIRw/PPykjZqe+dlrYPppgtQ2IcSs+s9IpcS A05nOLZNttUQEFgMUac8gXU5Yn/p6bkTjyzsxqolmC8lxNk7mOkYU1v6wQZLFUA2hMJO4E E+4JMjNWCkudu/x4CDd3z1+Q8Ak8DLGde7cSq/BMcTDT04F8JyYc6v82gOm9fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770655652; a=rsa-sha256; cv=none; b=HPoByj4enKFOHxPuPUSMnOOOjfjaIIy0oVgBfdOR22Ykwem2V9r/wd2PrSWAkYadOYVKlR 0JDpUD9AVh2ED3yqQJwxtMbds47yUVTM6iZgmQk56x5Qgfd766CmIJbH5AF7lDvbDlXDeo x1Z/kdSxPxaZjNn4Pz8k7L7i9/lquhii3zWkUCeBpCu3rZ6M7sEe6gpS1YDeGaW4dTuYnN RIPR6dF84Vd6iY4RAxv63MJleHdUY4U63VOalhy7HUPs0NJ8MRNa4fmn8qxnqUr7mGLw1Q 9GSBOE67Mpsv9UBekxulnTrbhxigS6o0qYpTqu9xjEM5Puy0yIZ8/kdh/98RuQ== 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=1770655652; h=from:from: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=xPjDYOfe/g9nyFWAPifhpNLhhk0+Z+Ri8Uj+SiSbxJc=; b=v04fLJdfcuRmwSQ8UxxcvmKhaCyGbij24wn9Ps3//oXskUL69SSnH4l88IOuhoS2xGcA9l IAs1KuSZh5F8TkOo+6Rb3oW5iNbaJ3NfzysdW6bcG9uzi0yZGZKrnx2J4kPFC2W3JdidL8 Tak9Mb9LFVtY9anu4KJiEjwuKQMti/GJBraVLO7njf68gzKggxr8rb8qg901GxecHgG7T3 MNj35V+srVekajt7kLwbOA64lWShiikPzFsifTw5xH4Lwxz8tJNlxFA14EiROHgVH0ObwD 2nQTSceME2wA3IvHVYFvOMQrQy8MPCWzchw8TUVQPNtQIS3knVlSPHvN8ds46Q== Received: from [IPV6:2601:5c0:4202:5670:ed0c:b253:7c2f:c8b9] (unknown [IPv6:2601:5c0:4202:5670:ed0c:b253:7c2f:c8b9]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8rGD0hfMz1Jw; Mon, 09 Feb 2026 16:47:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 9 Feb 2026 11:47:31 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 Content-Language: en-US To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/9/26 11:40, Jessica Clarke wrote: > On 9 Feb 2026, at 16:28, John Baldwin wrote: >> >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=ee73475119ff7aa98bd11828625d524f6ab87f06 >> >> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >> Author: John Baldwin >> AuthorDate: 2026-02-09 16:26:52 +0000 >> Commit: John Baldwin >> CommitDate: 2026-02-09 16:26:52 +0000 >> >> llvm: Link private LLVM libraries against compiler_rt for aarch64 >> >> This is required for GCC which uses libcalls for outlined atomics. > > This doesn’t seem right, they’re provided by libgcc.a, so why aren’t > they being pulled in? libcompiler_rt.a doesn’t even have the symbols. My guess is that we don't link libraries against libgcc by default, only binaries (maybe this is a GCC feature/bug vs clang)? I have another review open for a couple of google test libraries which similarly fail to link. -- John Baldwin From nobody Mon Feb 9 16:55:41 2026 X-Original-To: dev-commits-src-main@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 4f8rRn0tsBz6Rhj3 for ; Mon, 09 Feb 2026 16:55:49 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Received: from mail-43102.protonmail.ch (mail-43102.protonmail.ch [185.70.43.102]) (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 "protonmail.com", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8rRm3pXnz3d80 for ; Mon, 09 Feb 2026 16:55:48 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1770656145; x=1770915345; bh=qZa0EDzox0df18CRqdY4ZHVfsKNPuj0LatCtTK8QMw4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=NiEZgzNVIMVQJqfB5BgUNZSQsO5x9YzvRa2sstA6wTArKWusCVR+Zb1AYjwV07Ll+ p0I5h39f62YnTrN6TjoMHID0YXVZOK0/euGzO+CaX3ZC3PBuDhR2ax/m805TkThXjj yqkNPM4VXmfeYn2SAzhCEv1XPfk47iKach5Fm6pbgri0b1YHwbS3ozSz2ofhpxV8+L A3ghtUxJRY6zTdkmdowevapUAun3z9V+hha7oF8n+N3vNg9cB4R/LnyQ3tIqJTxoKS G5vUsk8eTce9ADaN8j6i2sWJ2Yybjywd+esD8pY7vwcmq+IKG9Ck2BMAZarmnCM47U PoMCoFD9r/ODQ== Date: Mon, 09 Feb 2026 16:55:41 +0000 To: John Baldwin From: Minsoo Choo Cc: Konstantin Belousov , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: In-Reply-To: References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> Feedback-ID: 45891198:user:proton X-Pm-Message-ID: ce1b9b742bf4c298561e6b5041c87278be44afe6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH] X-Rspamd-Queue-Id: 4f8rRm3pXnz3d80 X-Spamd-Bar: ---- On Monday, February 9th, 2026 at 11:45 AM, John Baldwin w= rote: > On 2/9/26 10:56, Minsoo Choo wrote: >=20 > > On Monday, February 9th, 2026 at 10:12 AM, John Baldwin jhb@FreeBSD.org= wrote: > >=20 > > > On 2/8/26 23:18, Konstantin Belousov wrote: > > >=20 > > > > The branch main has been updated by kib: > > > >=20 > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D8f23665fed2fbaf44813= 59b4d2fcdd7b9feb40e3 > > > >=20 > > > > commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > > > Author: Minsoo Choo minsoochoo0122@proton.me > > > > AuthorDate: 2026-02-06 20:03:53 +0000 > > > > Commit: Konstantin Belousov kib@FreeBSD.org > > > > CommitDate: 2026-02-09 04:17:16 +0000 > > > >=20 > > > > pcb.h: mark struct pcb to be preserved > > > >=20 > > > > There are programs that depend on this structure (e.g. kernel debug= gers) > > > > that breaks when the ABI changes. > > > >=20 > > > > Signed-off-by: Minsoo Choo minsoochoo0122@proton.me > > > > Reviewed by: kib > > > > MFC after: 1 week > > > > Differential Revision: https://reviews.freebsd.org/D55149 > > >=20 > > > Hmmm, I think it is useful to know which fields debuggers use (typica= lly just > > > registers) vs which ones can be safely changed without impacting debu= ggers. > > >=20 > > > -- > > > John Baldwin > >=20 > > In the review, kib said: > >=20 > > > I had to add and preserve the padding fields pcb_pad in the amd64 str= ucture to be compatible with kgdb at least. This makes me sure that the who= le pcb layout is fixed by ABI. >=20 >=20 > It is no longer needed and hasn't been needed in a decade. Back when the = field was > first added, kgdb did indeed assume a fixed size for `struct pcb`. Howeve= r, back in > 2015 I added a pcb_size variable that debuggers can use to determine this= size > (to properly index the stoppcbs[] array) even if debug symbols weren't pr= esent: >=20 > commit 645743ea99829e6d578cca5a580cf0a4102fb7dd > Author: John Baldwin jhb@FreeBSD.org >=20 > Date: Thu Nov 12 22:00:59 2015 +0000 >=20 > Export various helper variables describing the layout and size of > certain kernel structures for use by debuggers. This mostly aids > in examining cores from a kernel without debug symbols as a debugger > can infer these values if debug symbols are available. >=20 > One set of variables describes the layout of 'struct linker_file' to > walk the list of loaded kernel modules. >=20 > A second set of variables describes the layout of 'struct proc' and > 'struct thread' to walk the list of processes in the kernel and the > threads in each process. >=20 > The 'pcb_size' variable is used to index into the stoppcbs[] array. >=20 > The 'vm_maxuser_address' is used to distinguish kernel virtual addresses > from user addresses. This doesn't have to be perfect, and > 'vm_maxuser_address' is a cheap and simple way to differentiate kernel > pointers from simple values like TIDs and PIDs. >=20 > While here, annotate the fields in struct pcb used by kgdb on amd64 > and i386 to note that their ABI should be preserved. Annotations for > other platforms will be added in the future. >=20 > This was even the commit that added the annotations just removed, so a si= mple > blame for why the annotations were present would have turned this up. >=20 > -- > John Baldwin If this is correct, we should revert this commit. I want to hear kib@ thoug= hts on this and once he confirms someone with commit access can revert this= change. My original patch was marking pcb fields as stable for all architectures (l= ldb aarch64 kernel debugger was broken because of this). I'll create new re= vision with original patch once revert is pushed. From nobody Mon Feb 9 17:04:35 2026 X-Original-To: dev-commits-src-main@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 4f8rf90dWjz6RjpM for ; Mon, 09 Feb 2026 17:04:49 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-55.consmr.mail.gq1.yahoo.com (sonic308-55.consmr.mail.gq1.yahoo.com [98.137.68.31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8rf84WcGz3fhC for ; Mon, 09 Feb 2026 17:04:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1770656681; bh=sAgxLhyWX6CWT7ZVLsAeIibysUOwuWe37SLYHkiQILc=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From:Subject:Reply-To; b=oVzGSp7SW01qbkicX81xx/YiiioGnIBcKdieSA6NFtQgmisfJNdwopQZIgeci9Sv8WKrgMv3KgU5FsDPg5R5Sddv7VkszUfW2217IwhHXTNXaVOegn0+A1toCI6/ybyTxys8DMY9PSCltQZjg99qCUu2GpCDvELVXcwgYvURY64WT9rd4pqT39BrdGWf5KZk0BnQSGmweEzPyzWiQ/qho5tv8NZBVxmOqneS1Agvat6ikqTGdB8cRmzJ0LJxSMvqPh3CdQa3QdDsJmrLMcqua8WZXwBP22yzb5TU4kVzHTnNN1zlFLjjtWc7U/G3aNikgzd7TBqHasUhICjWc/9zEA== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1770656681; bh=b00TWDVhtbx7Ht1m5ceRS1vYUiTtp0zspvPKh2rzZ9u=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=VCuDRaZOsnFW5nQXckMLIth7tiJI5uUh4eHUWAsPJqNS9GxVbiFKHOsflIeTRVH6a+m7M3skcWc08u6TtiGwctj9uqrNXTItMgvl6y6M+YXDRxmxBmpIavqX4z6gmNFGfqj+IN5U9OQSP7MjdLe3/OfiJGVE2MgPszR9NaWP8F92LQSvhptRhI7B7mihczDIWAf/O5rM8z+WBGa8yDxZ6evjo/0r3pLl9KllR7LWcMXiTB8K/S8Y17canG5cC8kKO/HLWwTY+AA9j2HV4gZNG8tqugOLCSUCzu0gO4x2cPAROWQZ3kIl1jxsRdml8E6KWxf7a+799YDdNGQtp23wBQ== X-YMail-OSG: sAODXsYVM1nBzs3105TDxZ9YoBhnjkIg5QQBASfwKv4Ma3t8cNOogZdtURYwiiN NNQkxIPkSWB21oJXYa8yE1Jekt7JoSeEqh6vbNswOcEIgc_sq39DZAYjBE6nqkLGn8wMXFHOPHhY 4i2uItNY6VVo0c8fy2ZPJeWUdb3y6YXH2KHdUro10zJTnYnbB6xFrDxfxd9pjg7M_.P6TaYBUcRI H9lRNJyC2m5uITqDvo7ezfEOPsmnuQep_xjpKE6tMogv6rj0MFFA8vDRpEX7V.2hMMPUP4HJEvYu 1rQtcuh6jP2Eeo6W0elFXznIm3B9HG8vDxufBwGQI26oVqNxKE5uw9ollFJiC6a5VXrf_kSb6bR6 tJK9p68oROstHDxFDMmfH.L3s0qj7KMPFLucGCtQQVlY6BF0gpqpYzUKKU_rHbVnUEkZa2UsJLJX E7UqEE4_9TE9EqbCLt.M.yQW4IhaYD9DYBDix36S_rJyCEjElunzW.oQVFcZaLjL2smJb.s_Prfz WnLPmUGSP3y5ogi3oZGQhhKbGdMGlkO.8hSo67Bw8tPCkOiFof3vxPjfoRpZ3TNNpgCW3C_QL7dl jjEUK5qrXkrXYIBtS_utsqj_6Pfk1W.UWQRqvOaNBJsIweUzZUW655pZI8Z1GrTJP36UQrZQIB5U 1pPgI8nPx9qTuDSGCOVugMX6A0V38.zMTY5q4onJWd3tenXKmPOpXQ.8af8XWXIV5WEqbH2MQuJp WPm2JBiWTt5ap0.MxOKHqQG6nEaUEn8G62dVhv8ilxzsXEW.oYCSFiL0VKmeIw7_bG26_TX.YEQ4 SVLeTAfdVzxQqrNPBAUzRMixWxic0XQzUJcF4IXLYbcsuA7wuBH4Wlin9pwDB0s_2KCGQLDN59ER cO.Nw0aQBmTmY8waS8pwK5g_Aci_SAXNp.uC6JLkjz9LGP_MxShkOGduPlWDg0I32jyW7PcMhGBY 7P.62.NIYiac7DDBASDFubkf.B6JHYRjtfKjQuH0L3D4I7oEZ9MyWGnkdA4w6.sT6QD8Fhxdk7Jf aqHbmnjTGR51sbRBrF4UpsOQ7S5NEaE55ymrBQAoZaRbiG3FvdiRTyaRUDxaIx52_w28iMDsDnTG KvPHazWE.Nr4XrqVxmuG9AV1JCyI7zMDazH36gzfWU1NZ7zsriZNVwI4zIcqskjvbdTxtpoLTrfL uu5jZJzbR1f6iWDVlOEX6ZRyruIOKCqEDSPgKnrpt.LQ_VUZftlxHL6mXDh5bPo1A2fVs7dz6qD8 2JllyC5CEIFKvAenFOJGU7GUrjaI7KnBBN_i2mEmKYYsScuYwaIfU5UUyohkC014XEnS3vLzls_L EZEl6RwmbwlMEgDHezsk5jzb1NkOTJugPiSShccjmyVfzzN5zPqyjjnUdJ01FLqrz0FgMK_MBAw2 xoOfVL15A6J3yuDuFoYyQmo76T.gD6JOXITbpgfXwjjHxkW033WuhL6xIhduugo4IjYXHVi0iP8Y vIFFLW8myXdK6Zvmys2zKetAlCNVtapsqqpecp.m5q3OZZe5m8YSRd3GTzNaMLln663GdYgTo7zX I_Y35HQLswEvomzUh7BrctxLiTr5C9OTQ2APshRbemPcHtD7.p9fTpcBOAcnB7TahSFOTGklG9LZ E1skvX_RGmCMC3cdqhEt7qwLvYlYR5rQK2YlnGKBqPwWeuUfwyPrKFjYPYnF8xJ.Sq.bpIk13diK Apb8PAF3vDc6npC2xLJB7Ue8oSb2zWE64JMQhW3MWU6.cyu1ia9pOaS3k2ueIsFk.oBZFYqlPsKo k_kSpiW0Bh7D.YCttYRPrmCD0jmQRHzTGgRsqfP1FYMiDWELAqPpC8_REHEIXCBwKVNVj0ho34hA EQl3mLu0318g.F.U_CtJ2d06Ky0FRo_x.euB0azTiyDOLdk5J6ELngdALV1ut85pGxnkKLeGsa_d 2srMJ_wIs8U9Oup4jCm8SIVs4R2D2oDPrHvLQDLf8wpytfmiU0r4Fn2k_yDmbw6ZKC8Dcf6hYk5q niSEyGJFAdwsTxPSUUz9GPsLL9x3XuicvnhT6uqD7g5G3bw3tXkvTamf4lZLwNE882KjUx58Grro L5xWz4la6fa5rsFKmHG7TsIkajleS_abvyaO5mbXqsMcWMabGeMbY6zUb_B2OFG7mzPkYGANocZD QnIsSUZIfq9KUJgceZqXGEvkDxf729TDcN1AQXcSF8U2JmBEHXu46e4FEtAv0IJZO5DeHEHoOkG2 4q_w8xJ5otJDGtsgOLD2y4ra_JdjfnkCc_hytmPRlRngZP_ETAWfAYGfIxJjoc8uD.M7cMLofYwW sAY8ay1ugaJfz_9a5O77W.pxJArrhhANSs0cXZye2bb7yFXO9uw-- X-Sonic-MF: X-Sonic-ID: e0a7e693-6193-465d-8be0-b0c88aefb26a Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Mon, 9 Feb 2026 17:04:41 +0000 Received: by hermes--production-gq1-86969b76cd-mjxjj (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID a6c6cdd3da6755d5d4fe3ad5371547e8; Mon, 09 Feb 2026 17:04:36 +0000 (UTC) Message-ID: <41bf645c-b299-4a47-9f20-e7ff9c2de3aa@yahoo.com> Date: Mon, 9 Feb 2026 09:04:35 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: ee73475119ff - main - llvm: Link private LLVM libraries against compiler_rt for aarch64 To: Jessica Clarke , John Baldwin Cc: "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <698a0b1e.1d294.40e36519@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailer: WebService/1.1.25178 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4f8rf84WcGz3fhC X-Spamd-Bar: ---- On 2/9/26 08:40, Jessica Clarke wrote: > On 9 Feb 2026, at 16:28, John Baldwin wrote: >> >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=ee73475119ff7aa98bd11828625d524f6ab87f06 >> >> commit ee73475119ff7aa98bd11828625d524f6ab87f06 >> Author: John Baldwin >> AuthorDate: 2026-02-09 16:26:52 +0000 >> Commit: John Baldwin >> CommitDate: 2026-02-09 16:26:52 +0000 >> >> llvm: Link private LLVM libraries against compiler_rt for aarch64 >> >> This is required for GCC which uses libcalls for outlined atomics. > > This doesn’t seem right, they’re provided by libgcc.a, so why aren’t > they being pulled in? libcompiler_rt.a doesn’t even have the symbols. > > Jessica > . . . > I'm not sure it matters for the specific context but, for aarch64 and armv7, the various libgcc* on freebsd tend to be incomplete as far as covering what the g++* compilers output that is resolved by the lang/gcc* libgcc* files when they are used instead. There are various bugzilla reports based on examples. (For at least aarch64, gcc* compiler outputs may all be covered, I'm not sure.) -- === Mark Millard marklmi at yahoo.com From nobody Mon Feb 9 17:13:28 2026 X-Original-To: dev-commits-src-main@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 4f8rrD6tlfz6RkWr; Mon, 09 Feb 2026 17:13:32 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8rrD6NdPz3gWx; Mon, 09 Feb 2026 17:13:32 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770657212; h=from:from: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=hv6TT6TnMKWXlYdN9S84zwOS2ALfuicsIVTaADJG9BI=; b=FJVzlIunAb2O6e1lKJe0lus65RmTdcnXc3cgCUgcrJ9zsubjVel8Musyn9nhrocuo3d6+U KhgmNczX2j3p3+fw8jj6fxkp4+d3YQA9swcN3YMxh6ydfCvuI3MaNYSfXnXBsvep7otMcn JH0mO5ZhTU5uACI0v49hX4DZ5GY6LHDf58WesoZWFZVmzwZY49laCYcmgwcGjB/Oi2G9Gd Ok1PDx3K67LRxUH7vOXouNMnpwbf7diwClVIixtlrfPbpYNufQ/q7ejdoGkg+5pYa2PHZc tjoDOkR1qhwWox8mEPvluP28YWwbq1hbGcs7JfAE67Ny9i7KjpcvK1sZcXI9tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770657212; a=rsa-sha256; cv=none; b=jV81Nt3fz8A37Is4xoDXM7w+BctPuyWcpGR6DeNxNoLtwYvhPL2zvOoM/Whjov/W4OthYO w/m5thPsKBTW7lSobvxXTcFMJoBXM5sDt+oReA3/HjdPMx4pl31mAIykpG0zuUd03vPzPs FzaIH2bXg2WUE1Mko/fDyq3YvOpaWrHfCAHcVpMZeEAUDCP3PCz/7TG55aPOQW9nO/Y+lc Cd3Wik45KUI5RB2CvIjXLBlf3hPRv1uDeHWsMvtjR2nPm6ehu32gUxSLNczDdh2MNOzHso xFiZDXJExTixVwTYiz2zrtpHYf9VXIy0qmCJlYBLWxRnBFNUcAQrE19MY5mVWQ== 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=1770657212; h=from:from: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=hv6TT6TnMKWXlYdN9S84zwOS2ALfuicsIVTaADJG9BI=; b=p9spj3LkfQwyy6Hb0/9VgmJDRjFyqK0BGzb5yGQY/IeGDnFWaQsoSaHACG5Q54bHXVn4wY CCnWW5mZsWlhP69MsUs/bwx1skwI5y1Ml/dDe2R0igfx08e4r9BflV81PISzkHJzpgpH/V glQydis8GzYUwj/FyWt5F+pqTrDsxvy4McRCC1IYNagAuMwqkqpZ897Ur5PwuBP55N+cTu uGhHStbB5nUxK3irt3vQBB0VarLsPoEZm7+Ej5bcKLV3/5LYE5h3Zj9ydfvz+TKihLEA9d /cBok2+IxS6K6UdHoINmahxePyKT+oF8AL87cNIZF1b8deE7d/VmRv3O6t4clA== Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1101:be00:bdf7:fa79:a76b:fa50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: tuexen) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8rrC4Mkkz1KB; Mon, 09 Feb 2026 17:13:31 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: 7266121ce985 - main - ure: improve transmit checksum offloading From: Michael Tuexen X-Priority: 3 (Normal) In-Reply-To: <1315337813.3441.1770653767432@localhost> Date: Mon, 9 Feb 2026 18:13:28 +0100 Cc: "dev-commits-src-all@freebsd.org" , "src-committers@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <13A22FE6-C164-466B-9417-7B2BB6CEAA30@FreeBSD.org> References: <6988ef21.3e6ef.54b19aac@gitrepo.freebsd.org> <1315337813.3441.1770653767432@localhost> To: Ronald Klop X-Mailer: Apple Mail (2.3864.300.41.1.7) > On 9. Feb 2026, at 17:16, Ronald Klop wrote: >=20 > Thanks, >=20 > I noticed this last week and was still investigating when I saw this = commit. TCP/IPv6 works fine now. Thanks for letting me know! Best regards Michael >=20 > ure0 on uhub1 > ure0: on usbus1 > ue0: on ure0 >=20 > This is plugged into a Raspberry Pi 5. >=20 > Thanks. >=20 > Ronald. >=20 > Van: Michael Tuexen > Datum: zondag, 8 februari 2026 21:16 > Aan: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, = dev-commits-src-main@FreeBSD.org > Onderwerp: git: 7266121ce985 - main - ure: improve transmit checksum = offloading > The branch main has been updated by tuexen: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D7266121ce985a1a895441357c20b0e9d= 56b4e5f5 >=20 > commit 7266121ce985a1a895441357c20b0e9d56b4e5f5 > Author: Michael Tuexen > AuthorDate: 2026-02-08 20:11:18 +0000 > Commit: Michael Tuexen > CommitDate: 2026-02-08 20:16:20 +0000 >=20 > ure: improve transmit checksum offloading > =20 > Apparently, the name of the variable l4off was correct. Providing = the > offset to the TCP or UDP header allows the transmit checksum = offload to > work for TCP/IPv4, TCP/IPv6, UDP/IPv4, and UDP/IPv6. > =20 > Reported by: vishwin > Reviewed by: vishwin > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D55187 > --- > sys/dev/usb/net/if_ure.c | 16 ++++++++++------ > 1 file changed, 10 insertions(+), 6 deletions(-) >=20 > diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c > index 3dea88eb10f1..92160fe9b1d2 100644 > --- a/sys/dev/usb/net/if_ure.c > +++ b/sys/dev/usb/net/if_ure.c > @@ -24,6 +24,8 @@ > * SUCH DAMAGE. > */ > =20 > +#include "opt_inet6.h" > + > #include > #include > #include > @@ -44,6 +46,10 @@ > /* needed for checksum offload */ > #include > #include > +#ifdef INET6 > +#include > +#include > +#endif > =20 > #include > #include > @@ -62,8 +68,6 @@ > =20 > #include "miibus_if.h" > =20 > -#include "opt_inet6.h" > - > #ifdef USB_DEBUG > static int ure_debug =3D 0; > =20 > @@ -2179,7 +2183,6 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t = *regout) > struct ip ip; > struct ether_header *eh; > int flags; > - uint32_t data; > uint32_t reg; > int l3off, l4off; > uint16_t type; > @@ -2214,10 +2217,9 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t = *regout) > if (flags & CSUM_IP) > reg |=3D URE_TXPKT_IPV4_CS; > =20 > - data =3D m->m_pkthdr.csum_data; > if (flags & (CSUM_IP_TCP | CSUM_IP_UDP)) { > m_copydata(m, l3off, sizeof ip, (caddr_t)&ip); > - l4off =3D l3off + (ip.ip_hl << 2) + data; > + l4off =3D l3off + (ip.ip_hl << 2); > if (__predict_false(l4off > URE_L4_OFFSET_MAX)) > return (1); > =20 > @@ -2230,7 +2232,9 @@ ure_txcsum(struct mbuf *m, int caps, uint32_t = *regout) > } > #ifdef INET6 > else if (flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) { > - l4off =3D l3off + data; > + l4off =3D ip6_lasthdr(m, l3off, IPPROTO_IPV6, NULL); > + if (__predict_false(l4off < 0)) > + return (1); > if (__predict_false(l4off > URE_L4_OFFSET_MAX)) > return (1); > =20 > =20 > =20 From nobody Mon Feb 9 17:25:24 2026 X-Original-To: dev-commits-src-main@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 4f8s5w34NYz6RlHP for ; Mon, 09 Feb 2026 17:25:24 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8s5w2QxTz3jmb for ; Mon, 09 Feb 2026 17:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770657924; 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=ko3n0OzLUchXHDKi7CZ3++9mSxHek69SkaYMJ7KFZRU=; b=IjLWSaGdlBin/abmD8RGLMI2e1l65Hh7GqltxtrkIB2Vib10S6nLtk+zUlcqUNzZFhYgXA hqQ7ZuBBlvk6A+atmC1oP+T2GLGXAU6MeHjslSzxkHI1DMHWmtGNV9nGN/+DMIrf+a32Ts TLc6cf0BA2cI83lsz0jBt7WQveY0FnCptSo+X8PcIKEiYGfi9pL6Gl/3BcPPsGPfFtosQB GA6m4ItYol0Bt5eomUxsKmLDGf5OrEUrcjJnCjJW5io+OPpN5LQmLTfjpTOL85nfh/6OhV 2vdYf6nILZG97Is7d4Nkt6Vw6o0Y7K1HbRoTjmZK6tGuJueCulLGLIII3XFT5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770657924; a=rsa-sha256; cv=none; b=weBZSro9lMOGeVS1/s02vwoGUoIR7HV5FoAVgMCdt0Layqm6H/Wrrtwc/OFdMRkKSFxObM tlBv/A6p1BLrsfr4hqB+3j4QVZ4E//BM/CdeXGjSXTW6i+N009ANPKqWCj7wld+xNVayLd GYXocWX7mYHumfLizSU81YDUEfH36NVt9cVIkgXuCN9fjYlZvm/sPGMHYMA0EcUVWHXiNt m9g5ofDjZJ4MDUS0+0zxdqCGsoaLrGWSXspcnxw8XFAzR7lzyVxX0TCSSxuvcyOcfJgpYS g3VwLGwYBb8v6oGZVKdlHXlTOvh+yEcigskBL2EhrmxZWh+QBBLp+KDHK7+YnQ== 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=1770657924; 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=ko3n0OzLUchXHDKi7CZ3++9mSxHek69SkaYMJ7KFZRU=; b=MM1DqPnr6ZNnh+gCvmKCv0qDp57DL4BleRgHZSUXul5+hL/lBUwyFeqigtaWxeW7ker1py ZrzzToVUobvpV7gAPqOL2Lq1QeU8OvEx5l5IiabJi5aNJWijdru6D8r+xQGUPFCu2bRZe8 3A0ushQyn4Cii7sMIW2ZIehsrwOcrQP36mPprud0S3hxM5Y0yneyHSixMFMWF6sy0m9wjB ayIH7dHwPHM7TRDCvEmrmLmzXBvyVziHlTkWETWOr455zl6S9Lge3pThkAqCyPoHMZJyhO zMjy+kz3hzTyApQRw6h98MBdo+gisH/CKXUuWuLmNkZ3ENxlT97RDU+/v59SoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8s5w1vLKzhyh for ; Mon, 09 Feb 2026 17:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217fd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 17:25:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 0ea31fe85134 - main - arm64: Move creating the ID register views earlier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ea31fe851344af022103fa81dcdf00ef0dddc1d Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 17:25:24 +0000 Message-Id: <698a1884.217fd.793865e2@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea31fe851344af022103fa81dcdf00ef0dddc1d commit 0ea31fe851344af022103fa81dcdf00ef0dddc1d Author: Andrew Turner AuthorDate: 2026-02-09 17:24:26 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 17:24:26 +0000 arm64: Move creating the ID register views earlier These are needed when enabling CPU features so should be processed earlier in the boot. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55103 --- sys/arm64/arm64/identcpu.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index e37c9813582b..7f89098cc840 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2826,6 +2826,26 @@ identify_cpu_sysinit(void *dummy __unused) prev_desc = desc; } + if (dic && idc) { + arm64_icache_sync_range = &arm64_dic_idc_icache_sync_range; + if (bootverbose) + printf("Enabling DIC & IDC ICache sync\n"); + } else if (idc) { + arm64_icache_sync_range = &arm64_idc_aliasing_icache_sync_range; + if (bootverbose) + printf("Enabling IDC ICache sync\n"); + } +} +/* + * This needs to run early to ensure the kernel ID registers have been + * updated for all CPUs before they are used by ifunc resolvers, etc. + */ +SYSINIT(identify_cpu, SI_SUB_CPU, SI_ORDER_MIDDLE, + identify_cpu_sysinit, NULL); + +static void +identify_hwcaps_sysinit(void *dummy __unused) +{ #ifdef INVARIANTS /* Check we dont update the special registers after this point */ hwcaps_set = true; @@ -2848,16 +2868,6 @@ identify_cpu_sysinit(void *dummy __unused) elf32_hwcap |= parse_cpu_features_hwcap32(); #endif - if (dic && idc) { - arm64_icache_sync_range = &arm64_dic_idc_icache_sync_range; - if (bootverbose) - printf("Enabling DIC & IDC ICache sync\n"); - } else if (idc) { - arm64_icache_sync_range = &arm64_idc_aliasing_icache_sync_range; - if (bootverbose) - printf("Enabling IDC ICache sync\n"); - } - if ((elf_hwcap & HWCAP_ATOMICS) != 0) { lse_supported = true; if (bootverbose) @@ -2872,11 +2882,14 @@ identify_cpu_sysinit(void *dummy __unused) install_sys_handler(user_idreg_handler); } /* - * This needs to be after the APs have stareted as they may have errata that + * This needs to be after the APs have started as they may have errata that * means we need to mask out ID registers & that could affect hwcaps, etc. + * + * The errata handling runs at SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 1, so this + * needs to be later than that. */ -SYSINIT(identify_cpu, SI_SUB_CONFIGURE, SI_ORDER_ANY, identify_cpu_sysinit, - NULL); +SYSINIT(identify_hwcaps, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE + 2, + identify_hwcaps_sysinit, NULL); static void cpu_features_sysinit(void *dummy __unused) From nobody Mon Feb 9 17:25:25 2026 X-Original-To: dev-commits-src-main@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 4f8s5x4d14z6Rkq2 for ; Mon, 09 Feb 2026 17:25:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8s5x32L7z3kFm for ; Mon, 09 Feb 2026 17:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770657925; 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=BpY2SW7+RreKu6wqU4m6d8gLGf7YiU8+uyIysUjTcc0=; b=eeVSqtecnZphMTd7ijYpwfC4swExQui49pRVUKHOoFC+G7Bc+kKtVEqI4JYGC0R7qRKOgG ytIEss1m6t7e5KZu38D3o69c1+XEEGTab2QtiuSV7ch9LI6hr7exUjcvDOpraRyb5BQb7o ZZ71QFjXYwtzNqU72KaueOf6ix3C4Xa8NPo8XxptongXVLxIu4/xQvg/IkW1AiF1dubXM5 ezgWorO9dgfIurPDvW2aPwOWyFUlKt5R98+VG3YUm01idH0I28A1HQQAfniVC0ioEMM3Fs Op/q30CQ+Z0B+DAbnvNTccRUbsedfzJVNUW3dZNxmxk9apjPd32QP07cOJ3biA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770657925; a=rsa-sha256; cv=none; b=wrlIReDJlKlHDtIWGfxfLH31He2RpmgQ5xOgSdvIKGcGIfw8ahD+6w5f7t191xyPWoYpu0 sh2Ga+5RElc+H9le+yq5RvpWwp9U08a27L4eZFUB2ktJXoRm0c6DjnIpjw4KNpHFjywap2 o9nRnDHc3MiY/72UGq3Z8YC2E+NNCCqB1SsIXTivxtO1DGeFG3T3yNK0/kHqoHRxitLgtL KF2Ka6lPvrrFKv4jBpSue8ifXWcskr2CDuw5plrBRe5b/S2NglNKNAKvihTcg5RXpL+wSE P6wC0aE/r4Xosn9QdKJyun33ZwYlkTcHYYjlWGKXDxmiKu+sq9iu8Li7Nw3qGg== 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=1770657925; 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=BpY2SW7+RreKu6wqU4m6d8gLGf7YiU8+uyIysUjTcc0=; b=Jf+8tMqEE4nMRTNelMOPBV8eC4kCmpWwKTnwBp9S/yOBlmzp2eXqxp6vPtZtNDDaCQz1x1 2qQKNIQc044wmiOwT8OlcUv65ThGxG1yCZBQmMvVAWckgdCwhSvPlnGv1H6EPEmGaO1H1P FtAP8plGZ+b9hmBpufon5dOHJvLbXkD7/KcmGCcJviEm/1gQQjiXluOr59PXvZgSTtcAld Wc+zWENvLD5UO1+8ymc9RjfHp9brADBOicLVQQL5K74JiwApPnkirHyO7uWL9TmtjC5m3H TNNVAZhLUKH1U8+yjuF3ozaDE+k4+E8+BFfsBc20co2ygxqYOaCQzLNL4lSlFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8s5x2Pmczjbs for ; Mon, 09 Feb 2026 17:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24802 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 17:25:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 3b0b6aa2cd05 - main - arm64: Panic if the ID register isn't known List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b0b6aa2cd05b516ecf4b72f9a3c2aadddf3c94e Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 17:25:25 +0000 Message-Id: <698a1885.24802.27a18a9e@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0b6aa2cd05b516ecf4b72f9a3c2aadddf3c94e commit 3b0b6aa2cd05b516ecf4b72f9a3c2aadddf3c94e Author: Andrew Turner AuthorDate: 2026-02-09 17:24:27 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 17:24:27 +0000 arm64: Panic if the ID register isn't known This will allow for callers to be simplified & not need to check the return status. Keep the return type for now so this can be MFCd without breaking the KBI. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55104 --- sys/arm64/arm64/identcpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 7f89098cc840..a1e7a43977f0 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2526,7 +2526,7 @@ get_kernel_reg_iss(u_int iss, uint64_t *val) } } - return (false); + panic("%s: Invalid register %x", __func__, iss); } /* @@ -2553,7 +2553,7 @@ get_kernel_reg_iss_masked(u_int iss, uint64_t *valp, uint64_t mask) } } - return (false); + panic("%s: Invalid register %x", __func__, iss); } bool From nobody Mon Feb 9 17:25:26 2026 X-Original-To: dev-commits-src-main@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 4f8s5y6sW9z6RlHY for ; Mon, 09 Feb 2026 17:25:26 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8s5y3mmPz3jmf for ; Mon, 09 Feb 2026 17:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770657926; 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=9MHSpNsylEihpoaWHqMbrmNLumzvTOszJzC7jmK6nZ8=; b=j51R2VFJjdByLIogI4Fg26AxCkNmxqXS+acj5VbI+dRIc/tbDwz4Ph796Fvaqqu3tjpi6a Au/v0mnCorHPbYWroU3i2goc1YkCLCAAZMXc0MUUOAcjTIfduCWkG6QVQ7Mw3BFMM8zfGY Gt2qD4SZATktR66u7Lb6VotrirtvykSattNrj47oMuqf+PnaRq6iEWXuXzhcAJCprDN3Ot HfDCi81AChq/lkS+ojvam+FIgXKkI8tK0Kw96HovChU+UlJ7uOd1ofDUlDuNHP+C0uOEiR Hb5lQ2sgcUN1jh6ZZwNzVMv9UbPFOfHydX221c0AGiOWRq/1Y8yVdp64h/mvRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770657926; a=rsa-sha256; cv=none; b=qfMxdLwhAgAd8x4lNhKg+kiSC4FrnwHLAspoPEw0sgLntqOfLR6lIU+KaXekZ4s0S+xDnm LCHXQC3wcMvZwKsdCYTjLuXDmVDvF+b9EXOLji3YVwpXbnpa2khhhFoNlAusqiKVqwaObw HMwnHY/yrEbgicdD1+6fjS4FGajjhSAaDXJpcQSIG0Ty/lB/Vj1XtRrGfB59WOqXWpsgJ5 DJLj9pzOAstjCnIk+jQHpr4xN0xthYTBaFqpMqH/9ElQT+mCA2WWzqdpjHa+4anGG+ea/B iypCfcrzxlf+iCmuuX5ov2PFPLyUxqMTQc0bcc3LOXc40FqF7dQpM8K68WxHUw== 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=1770657926; 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=9MHSpNsylEihpoaWHqMbrmNLumzvTOszJzC7jmK6nZ8=; b=ItH50HtesIy+W1SVr/Tk6mrG0e0FEf0aJvfkkbx8vH6NjeoEefhBg4ix9Wtk78tR13QVKe Wx1RqBChzYO9Yo13nJonAzl24aeRh28zh9y4G0DNY6urTDo9R0rjvBMY8eOM/A27H6mQoG 2fNtLiT81qyT/xwDfhF/JNiWjvp9Rux6+sb+OIxfKzTshoGCV+v7OXkWOToL86b93mTV3Z uo60Gfv6fNmE4uR4YbiUnO0cFBSDPUQPv6udjvAYKLEAJmV/HZ2UycmORg1AzO6b1YIu1/ FvjhOFgwhjyXgxO8Tz5OpIjyCiINC4+undpm9UCICMXCM2beDNqavshY6s7M6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8s5y3H8Nzjd2 for ; Mon, 09 Feb 2026 17:25:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e55 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 17:25:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a8c393384044 - main - arm64: Assume get_kernel_reg returns true List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8c3933840448eaf04ecfe162c0d05caf11090a4 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 17:25:26 +0000 Message-Id: <698a1886.23e55.128c266e@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a8c3933840448eaf04ecfe162c0d05caf11090a4 commit a8c3933840448eaf04ecfe162c0d05caf11090a4 Author: Andrew Turner AuthorDate: 2026-02-09 17:24:27 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 17:24:27 +0000 arm64: Assume get_kernel_reg returns true It now only returns true so this can be assumed and doesn't need to be checked. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55105 --- sys/arm/arm/generic_timer.c | 7 +++---- sys/arm64/acpica/acpi_machdep.c | 6 +----- sys/arm64/arm64/machdep.c | 6 ++---- sys/arm64/arm64/pmap.c | 21 +++++++++------------ sys/arm64/arm64/ptrauth.c | 15 ++++++--------- sys/arm64/arm64/vfp.c | 4 +--- sys/arm64/vmm/vmm.c | 5 ++--- sys/arm64/vmm/vmm_arm64.c | 39 +++++++++++++++++---------------------- sys/dev/hwpmc/hwpmc_arm64.c | 7 +++---- sys/dev/random/armv8rng.c | 4 ++-- sys/libkern/gsb_crc32.c | 7 +++---- 11 files changed, 49 insertions(+), 72 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index e3ba56a6f6ac..43e5d8b56531 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -662,8 +662,8 @@ arm_tmr_attach(device_t dev) sc->get_cntxct = &get_cntxct; #ifdef __aarch64__ - if (get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1) && - ID_AA64MMFR0_ECV_VAL(id_aa64mmfr0_el1) >= ID_AA64MMFR0_ECV_IMPL) + get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1); + if (ID_AA64MMFR0_ECV_VAL(id_aa64mmfr0_el1) >= ID_AA64MMFR0_ECV_IMPL) sc->get_cntxct = &get_cntxctss; #endif #ifdef FDT @@ -912,8 +912,7 @@ wfxt_check(const struct cpu_feat *feat __unused, u_int midr __unused) { uint64_t id_aa64isar2; - if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2)) - return (FEAT_ALWAYS_DISABLE); + get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2); if (ID_AA64ISAR2_WFxT_VAL(id_aa64isar2) >= ID_AA64ISAR2_WFxT_IMPL) return (FEAT_DEFAULT_ENABLE); diff --git a/sys/arm64/acpica/acpi_machdep.c b/sys/arm64/acpica/acpi_machdep.c index 123e5c328255..5ff875a98e53 100644 --- a/sys/arm64/acpica/acpi_machdep.c +++ b/sys/arm64/acpica/acpi_machdep.c @@ -235,11 +235,7 @@ parse_pxm_tables(void *dummy) if (arm64_bus_method != ARM64_BUS_ACPI) return; - if (!get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0)) { - /* chosen arbitrarily */ - mmfr0 = ID_AA64MMFR0_PARange_1T; - } - + get_kernel_reg(ID_AA64MMFR0_EL1, &mmfr0); switch (ID_AA64MMFR0_PARange_VAL(mmfr0)) { case ID_AA64MMFR0_PARange_4G: parange = (vm_paddr_t)4 << 30 /* GiB */; diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index b1e22c900f3f..5e6a39381e84 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -178,8 +178,7 @@ pan_check(const struct cpu_feat *feat __unused, u_int midr __unused) { uint64_t id_aa64mfr1; - if (!get_kernel_reg(ID_AA64MMFR1_EL1, &id_aa64mfr1)) - return (FEAT_ALWAYS_DISABLE); + get_kernel_reg(ID_AA64MMFR1_EL1, &id_aa64mfr1); if (ID_AA64MMFR1_PAN_VAL(id_aa64mfr1) == ID_AA64MMFR1_PAN_NONE) return (FEAT_ALWAYS_DISABLE); @@ -224,8 +223,7 @@ mops_check(const struct cpu_feat *feat __unused, u_int midr __unused) { uint64_t id_aa64isar2; - if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2)) - return (FEAT_ALWAYS_DISABLE); + get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2); if (ID_AA64ISAR2_MOPS_VAL(id_aa64isar2) == ID_AA64ISAR2_MOPS_NONE) return (FEAT_ALWAYS_DISABLE); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index dbf5c820d20b..680209efd881 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9161,16 +9161,15 @@ pmap_init_mp(void *dummy __unused) { uint64_t reg; - if (get_kernel_reg(ID_AA64PFR1_EL1, ®)) { - if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) { - if (bootverbose) - printf("Enabling BTI\n"); - pmap_bti_support = true; + get_kernel_reg(ID_AA64PFR1_EL1, ®); + if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) { + if (bootverbose) + printf("Enabling BTI\n"); + pmap_bti_support = true; - pmap_bti_ranges_zone = uma_zcreate("BTI ranges", - sizeof(struct rs_el), NULL, NULL, NULL, NULL, - UMA_ALIGN_PTR, 0); - } + pmap_bti_ranges_zone = uma_zcreate("BTI ranges", + sizeof(struct rs_el), NULL, NULL, NULL, NULL, + UMA_ALIGN_PTR, 0); } } SYSINIT(pmap_init_mp, SI_SUB_CPU, SI_ORDER_ANY, pmap_init_mp, NULL); @@ -9185,9 +9184,7 @@ pmap_init_cnp(void *dummy __unused) uint64_t reg; u_int cpuid; - if (!get_kernel_reg(ID_AA64MMFR2_EL1, ®)) - return; - + get_kernel_reg(ID_AA64MMFR2_EL1, ®); if (ID_AA64MMFR2_CnP_VAL(reg) != ID_AA64MMFR2_CnP_NONE) { if (bootverbose) printf("Enabling CnP\n"); diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c index ab40b72887e9..29f73db14e74 100644 --- a/sys/arm64/arm64/ptrauth.c +++ b/sys/arm64/arm64/ptrauth.c @@ -113,18 +113,15 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) * The QARMA5 or implementation defined algorithms are reported in * ID_AA64ISAR1_EL1. */ - if (get_kernel_reg(ID_AA64ISAR1_EL1, &isar)) { - if (ID_AA64ISAR1_APA_VAL(isar) > 0 || - ID_AA64ISAR1_API_VAL(isar) > 0) { - return (FEAT_DEFAULT_ENABLE); - } + get_kernel_reg(ID_AA64ISAR1_EL1, &isar); + if (ID_AA64ISAR1_APA_VAL(isar) > 0 || ID_AA64ISAR1_API_VAL(isar) > 0) { + return (FEAT_DEFAULT_ENABLE); } /* The QARMA3 algorithm is reported in ID_AA64ISAR2_EL1. */ - if (get_kernel_reg(ID_AA64ISAR2_EL1, &isar)) { - if (ID_AA64ISAR2_APA3_VAL(isar) > 0) { - return (FEAT_DEFAULT_ENABLE); - } + get_kernel_reg(ID_AA64ISAR2_EL1, &isar); + if (ID_AA64ISAR2_APA3_VAL(isar) > 0) { + return (FEAT_DEFAULT_ENABLE); } return (FEAT_ALWAYS_DISABLE); diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index 64f13458e2d9..d4c0eacf690c 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -895,9 +895,7 @@ sve_init(const void *dummy __unused) uint64_t reg; int i; - if (!get_kernel_reg(ID_AA64PFR0_EL1, ®)) - return; - + get_kernel_reg(ID_AA64PFR0_EL1, ®); if (ID_AA64PFR0_SVE_VAL(reg) == ID_AA64PFR0_SVE_NONE) return; diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index 031400f3f1d0..4231746e7eb2 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -154,9 +154,8 @@ vmm_regs_init(struct vmm_regs *regs, const struct vmm_regs *masks) { #define _FETCH_KERN_REG(reg, field) do { \ regs->field = vmm_arch_regs_masks.field; \ - if (!get_kernel_reg_iss_masked(reg ## _ISS, ®s->field, \ - masks->field)) \ - regs->field = 0; \ + get_kernel_reg_iss_masked(reg ## _ISS, ®s->field, \ + masks->field); \ } while (0) _FETCH_KERN_REG(ID_AA64AFR0_EL1, id_aa64afr0); _FETCH_KERN_REG(ID_AA64AFR1_EL1, id_aa64afr1); diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 6643d32684d8..712783338214 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -251,10 +251,7 @@ vmmops_modinit(int ipinum) return (ENODEV); } - if (!get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1)) { - printf("vmm: Unable to read ID_AA64MMFR0_EL1\n"); - return (ENXIO); - } + get_kernel_reg(ID_AA64MMFR0_EL1, &id_aa64mmfr0_el1); pa_range_field = ID_AA64MMFR0_PARange_VAL(id_aa64mmfr0_el1); /* * Use 3 levels to give us up to 39 bits with 4k pages, or @@ -522,27 +519,25 @@ vmmops_init(struct vm *vm, pmap_t pmap) hyp->vm = vm; hyp->vgic_attached = false; - if (get_kernel_reg(ID_AA64MMFR0_EL1, &idreg)) { - if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF) - hyp->feats |= HYP_FEAT_ECV_POFF; + get_kernel_reg(ID_AA64MMFR0_EL1, &idreg); + if (ID_AA64MMFR0_ECV_VAL(idreg) >= ID_AA64MMFR0_ECV_POFF) + hyp->feats |= HYP_FEAT_ECV_POFF; - switch (ID_AA64MMFR0_FGT_VAL(idreg)) { - case ID_AA64MMFR0_FGT_NONE: - break; - default: - case ID_AA64MMFR0_FGT_8_9: - hyp->feats |= HYP_FEAT_FGT2; - /* FALLTHROUGH */ - case ID_AA64MMFR0_FGT_8_6: - hyp->feats |= HYP_FEAT_FGT; - break; - } + switch (ID_AA64MMFR0_FGT_VAL(idreg)) { + case ID_AA64MMFR0_FGT_NONE: + break; + default: + case ID_AA64MMFR0_FGT_8_9: + hyp->feats |= HYP_FEAT_FGT2; + /* FALLTHROUGH */ + case ID_AA64MMFR0_FGT_8_6: + hyp->feats |= HYP_FEAT_FGT; + break; } - if (get_kernel_reg(ID_AA64MMFR1_EL1, &idreg)) { - if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL) - hyp->feats |= HYP_FEAT_HCX; - } + get_kernel_reg(ID_AA64MMFR1_EL1, &idreg); + if (ID_AA64MMFR1_HCX_VAL(idreg) >= ID_AA64MMFR1_HCX_IMPL) + hyp->feats |= HYP_FEAT_HCX; vtimer_vminit(hyp); vgic_vminit(hyp); diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 310e43065716..794b285c0b3c 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -558,10 +558,9 @@ pmc_arm64_initialize(void) snprintf(pmc_cpuid, sizeof(pmc_cpuid), "0x%016lx", midr); /* Check if we have 64-bit counters */ - if (get_kernel_reg(ID_AA64DFR0_EL1, &dfr)) { - if (ID_AA64DFR0_PMUVer_VAL(dfr) >= ID_AA64DFR0_PMUVer_3_5) - arm64_64bit_events = true; - } + get_kernel_reg(ID_AA64DFR0_EL1, &dfr); + if (ID_AA64DFR0_PMUVer_VAL(dfr) >= ID_AA64DFR0_PMUVer_3_5) + arm64_64bit_events = true; /* * Allocate space for pointers to PMC HW descriptors and for diff --git a/sys/dev/random/armv8rng.c b/sys/dev/random/armv8rng.c index 9573c09aa77a..7aa6f4b0ded1 100644 --- a/sys/dev/random/armv8rng.c +++ b/sys/dev/random/armv8rng.c @@ -98,8 +98,8 @@ rndr_modevent(module_t mod, int type, void *unused) switch (type) { case MOD_LOAD: has_rndr = false; - if (get_kernel_reg(ID_AA64ISAR0_EL1, ®) && - ID_AA64ISAR0_RNDR_VAL(reg) != ID_AA64ISAR0_RNDR_NONE) { + get_kernel_reg(ID_AA64ISAR0_EL1, ®); + if (ID_AA64ISAR0_RNDR_VAL(reg) != ID_AA64ISAR0_RNDR_NONE) { has_rndr = true; random_source_register(&random_armv8_rndr); printf("random: fast provider: \"%s\"\n", diff --git a/sys/libkern/gsb_crc32.c b/sys/libkern/gsb_crc32.c index 8cfee97d8d55..ab8c13d3023c 100644 --- a/sys/libkern/gsb_crc32.c +++ b/sys/libkern/gsb_crc32.c @@ -764,10 +764,9 @@ DEFINE_IFUNC(, uint32_t, calculate_crc32c, { uint64_t reg; - if (get_kernel_reg(ID_AA64ISAR0_EL1, ®)) { - if (ID_AA64ISAR0_CRC32_VAL(reg) >= ID_AA64ISAR0_CRC32_BASE) - return (armv8_crc32c); - } + get_kernel_reg(ID_AA64ISAR0_EL1, ®); + if (ID_AA64ISAR0_CRC32_VAL(reg) >= ID_AA64ISAR0_CRC32_BASE) + return (armv8_crc32c); return (table_crc32c); } From nobody Mon Feb 9 17:25:27 2026 X-Original-To: dev-commits-src-main@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 4f8s5z6DpMz6RlQZ for ; Mon, 09 Feb 2026 17:25:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8s5z4WqVz3jkf for ; Mon, 09 Feb 2026 17:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770657927; 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=D1CHrrykpeicEGWLbK9wNOK2PXP7JNmQCkotM94SITY=; b=NtDyZUXhSNaHIJAO3wJpDXati7v236dkTaKnrCbxuH/0VelnBVzkJCi5jNzjpDqb5hf4x5 XNbOsH+eyMBrPws+ba4XA9cFDcuOo9Nutnj+2ldAXCH99EsyPdHuXKFzTwyC+7VR2jcPhr 4ZoKXcjQ3iAGKOj10edT0SA7FX6twYBFGuhG7WYsCvGl25hmgG7HPYzopLCl2g0wY7T7Wj NVJ1UBXmQ73jP9GQ2U5A0wkIIFmU9cda//1wD5SooDXNQMrKEt0/Lgws94kOv7bRjbPMOD 2qaKiF63qDwq69DIKZqDuX8aj2yswq88bsR3U0Yrthv7EyGpDaPOf68+gwJm0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770657927; a=rsa-sha256; cv=none; b=Wl7gz6c8gLh3xt8WBwKK4CJxreFRaKIXm1sgm3NcDAyoXzR4hjUHjaGuCDLHqIjmg7x5hg 8EpLyh+S5RvzSVg/RqqPl8ICVB2L0H99JYjywxqeXys55yMatueGX15CwsBf74S/XPFAYs BXrCYJqH6a5cyFA5LGhHSX0vxuxw2gNUTpkvxonxDmIO5Dk9cUkpjU/OIYvPYcTAttl7kO GlqatfXzbqHQSH3lbLFpzMMAL37DftH48AdBhJKVh/0tlNvCWYKJspdzE/ZQup4/CrN4bu 5+WCmMC13Sspw+BLiR19tko/Neyb9ykJe2D2io8jOaDheioIvpBEx6283x/1Qw== 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=1770657927; 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=D1CHrrykpeicEGWLbK9wNOK2PXP7JNmQCkotM94SITY=; b=f/KW7VqVxAB6pCIfEOykQE/28bEWfvPdCXlq3+ZM6br7PmTHReyN13p3s7Audu6DbXMt9D AF5/cYnVtKA98u8+aA75n9P4zlsxk2Hm/jYdp1OST4SFHuD4hYwCYTfssvwrymZmGILAnt M+ihRpB/a1Idh5u59G8/ieA3t1PVAcb3FvoUzAfTo5cVwYgwi+uDTgnoHbeqpy5GLC+vXd SnhxPyoQnM4TbQgArzl6oM0ihviGsB9R8nvWn7SQwpU9a8Cqkoxh6nOVobogSC8j/4rMoE HIJzlcpPKwy5OeC7GZkmqXfMVoPyiZt9ghFvr1tOPgEtr2rreFQWiOzke9ROpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8s5z43Mqzhyk for ; Mon, 09 Feb 2026 17:25:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23e59 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 17:25:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1c41e411b554 - main - arm64: Have get_kernel_reg return void List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c41e411b5545a9e68f83b445f67030cb0e79010 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 17:25:27 +0000 Message-Id: <698a1887.23e59.46d466a7@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1c41e411b5545a9e68f83b445f67030cb0e79010 commit 1c41e411b5545a9e68f83b445f67030cb0e79010 Author: Andrew Turner AuthorDate: 2026-02-09 17:24:28 +0000 Commit: Andrew Turner CommitDate: 2026-02-09 17:24:28 +0000 arm64: Have get_kernel_reg return void It now panics when it's unable to find the register, so doesn't need to return a status. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55106 --- sys/arm64/arm64/identcpu.c | 8 ++++---- sys/arm64/include/cpu.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index a1e7a43977f0..91078a411b88 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2514,7 +2514,7 @@ mrs_field_cmp(uint64_t a, uint64_t b, u_int shift, int width, bool sign) return (a - b); } -bool +void get_kernel_reg_iss(u_int iss, uint64_t *val) { int i; @@ -2522,7 +2522,7 @@ get_kernel_reg_iss(u_int iss, uint64_t *val) for (i = 0; i < nitems(user_regs); i++) { if (user_regs[i].iss == iss) { *val = CPU_DESC_FIELD(kern_cpu_desc, i); - return (true); + return; } } @@ -2533,7 +2533,7 @@ get_kernel_reg_iss(u_int iss, uint64_t *val) * Fetch the specified register's value, ensuring that individual field values * do not exceed those in the mask. */ -bool +void get_kernel_reg_iss_masked(u_int iss, uint64_t *valp, uint64_t mask) { const struct mrs_field *fields; @@ -2549,7 +2549,7 @@ get_kernel_reg_iss_masked(u_int iss, uint64_t *valp, uint64_t mask) fields[j].shift, fields[j].sign); } *valp = mask; - return (true); + return; } } diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index b15210633d37..9f1db23744d4 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -282,10 +282,10 @@ void update_special_regs(u_int); void update_special_reg_iss(u_int, uint64_t, uint64_t); #define update_special_reg(reg, clear, set) \ update_special_reg_iss(reg ## _ISS, clear, set) -bool get_kernel_reg_iss(u_int, uint64_t *); +void get_kernel_reg_iss(u_int, uint64_t *); #define get_kernel_reg(reg, valp) \ get_kernel_reg_iss(reg ## _ISS, valp) -bool get_kernel_reg_iss_masked(u_int, uint64_t *, uint64_t); +void get_kernel_reg_iss_masked(u_int, uint64_t *, uint64_t); #define get_kernel_reg_masked(reg, valp, mask) \ get_kernel_reg_iss_masked(reg ## _ISS, valp, mask) bool get_user_reg_iss(u_int, uint64_t *, bool); From nobody Mon Feb 9 17:49:04 2026 X-Original-To: dev-commits-src-main@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 4f8sdK6jQtz6RmTZ for ; Mon, 09 Feb 2026 17:49:09 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8sdK5wZ6z3qXX for ; Mon, 09 Feb 2026 17:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770659349; 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=uCToVI+Y7bzkRYMPiDaUjEgQjGb69DpnVbPebLGc/vo=; b=mN1Qbzge7bgNc1HegeiT8YjeSF71P5pPiGf4YIvo6EdhYEIbnlJzI5W3uEPpuJqy1sH53f NOIxzOyL+6DWmlXaSJWg+/fJF/unyQY7ctiUPV9XpDIC6EaVrCLZIjU+8ylTffCjzkWtb4 av21ZIpBZr8FsXFfqPwSddLbWOeL9e9o5t87vyDwMkFA82Y6taZFYxpEg3o1XjVqkuAPqM zB2d+j72EIc1h8GvBjjok8ts89aw9CC2TUCRNt5Eu7NQlaNx8BngAHSK717U68WqQwrcE8 yObLK0p8NUulIWRgfJqLR1AmVx0U+SRYKEaYQNbqDDIPm314LuQ9inadGhk6Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770659349; a=rsa-sha256; cv=none; b=daLsp0ui+9XPpV2A0Var0nxYCsNc5WJBe3sO31asDOZsB1JDNxT3wgzzxqPOJdSNYr0Hcq G8f7Rb7BdCG2EZwiSohZQDi2SCauuvZ1oNKsw2k9/qt3S39+v7E3968iDpgyH659TYxubt kCBxtJhoTNWaaFXR79KJqByIZvsfekN8Qu4eBYFrEht1gmF16zIsJEkAAoKknZYENkOxds XhtTxP8yZnj9cG9qhRB/ycdZmmp+a7IcxPmOWkl/nvS3B75BVWsrHYDekBk+06gq5aM6pp SPl7x6k6RFEbvdq/zZA/pwTjK3n5ohtpI5RzgReDcP3Nr5g6YW9EIhwKgKOHJA== 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=1770659349; 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=uCToVI+Y7bzkRYMPiDaUjEgQjGb69DpnVbPebLGc/vo=; b=Rc5FTHaVN8J79c1zOsjHcHmZWSFwT2+zj6tbNXFZ5lOsPBS4006ourhhKUwJ9FdIpXAJuY Jptl32ZQgeL0lVpiV51tbuSZxwtigmL4MV8du4sMW2+wGwTNJMu/81Pz12TXtl6w8U5lJd Hd1Qe5nCEuQjeNFbI7jQHRAbQUdLPLSfh9TiednhU96I9bbcwnUCDvNGUeLxnmvVJtd++Y nHFy+vd9YVL9dxknQKLtOlq0y67u4O6IFAUYaXXX6FvPvHewpGuB52zLT7mlpdhnALby1E Ya3dqjFxWkbAYr/n+eikh/VXl5AKpzLSyqh3OaHcLKewRT/a+/Qf5reVxSsjbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8sdK5MCczjZR for ; Mon, 09 Feb 2026 17:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25f85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 17:49:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 30988d0a7bd7 - main - lagg: Make lagg_link_active() static List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30988d0a7bd7ebd5f5825b9b7aa04ff0af788aa7 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 17:49:04 +0000 Message-Id: <698a1e10.25f85.2b826b4e@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=30988d0a7bd7ebd5f5825b9b7aa04ff0af788aa7 commit 30988d0a7bd7ebd5f5825b9b7aa04ff0af788aa7 Author: Zhenlei Huang AuthorDate: 2026-02-09 17:48:07 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-09 17:48:07 +0000 lagg: Make lagg_link_active() static It is declared as static. Make the definition consistent with the declaration. It was ever fixed by commit 52e53e2de0ec, but the commit was reverted, leaving it unfixed. No functional change intended. MFC after: 3 days --- sys/net/if_lagg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 1e4d3d8d85ac..c30af5bfcc4e 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -2326,7 +2326,7 @@ lagg_port_state(struct ifnet *ifp, int state) LAGG_XUNLOCK(sc); } -struct lagg_port * +static struct lagg_port * lagg_link_active(struct lagg_softc *sc, struct lagg_port *lp) { struct lagg_port *lp_next, *rval = NULL; From nobody Mon Feb 9 17:49:46 2026 X-Original-To: dev-commits-src-main@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 4f8sfK3fkYz6RmhF; Mon, 09 Feb 2026 17:50:01 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f8sfK0Bkgz3qVq; Mon, 09 Feb 2026 17:50:00 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 619Hnm0c047291; Mon, 9 Feb 2026 19:49:51 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 619Hnm0c047291 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 619Hnknc047290; Mon, 9 Feb 2026 19:49:46 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 9 Feb 2026 19:49:46 +0200 From: Konstantin Belousov To: Minsoo Choo Cc: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f8sfK0Bkgz3qVq X-Spamd-Bar: ---- On Mon, Feb 09, 2026 at 04:55:41PM +0000, Minsoo Choo wrote: > On Monday, February 9th, 2026 at 11:45 AM, John Baldwin wrote: > > > On 2/9/26 10:56, Minsoo Choo wrote: > > > > > On Monday, February 9th, 2026 at 10:12 AM, John Baldwin jhb@FreeBSD.org wrote: > > > > > > > On 2/8/26 23:18, Konstantin Belousov wrote: > > > > > > > > > The branch main has been updated by kib: > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > > > > > > > > > commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > > > > Author: Minsoo Choo minsoochoo0122@proton.me > > > > > AuthorDate: 2026-02-06 20:03:53 +0000 > > > > > Commit: Konstantin Belousov kib@FreeBSD.org > > > > > CommitDate: 2026-02-09 04:17:16 +0000 > > > > > > > > > > pcb.h: mark struct pcb to be preserved > > > > > > > > > > There are programs that depend on this structure (e.g. kernel debuggers) > > > > > that breaks when the ABI changes. > > > > > > > > > > Signed-off-by: Minsoo Choo minsoochoo0122@proton.me > > > > > Reviewed by: kib > > > > > MFC after: 1 week > > > > > Differential Revision: https://reviews.freebsd.org/D55149 > > > > > > > > Hmmm, I think it is useful to know which fields debuggers use (typically just > > > > registers) vs which ones can be safely changed without impacting debuggers. > > > > > > > > -- > > > > John Baldwin > > > > > > In the review, kib said: > > > > > > > I had to add and preserve the padding fields pcb_pad in the amd64 structure to be compatible with kgdb at least. This makes me sure that the whole pcb layout is fixed by ABI. > > > > > > It is no longer needed and hasn't been needed in a decade. Back when the field was > > first added, kgdb did indeed assume a fixed size for `struct pcb`. However, back in > > 2015 I added a pcb_size variable that debuggers can use to determine this size > > (to properly index the stoppcbs[] array) even if debug symbols weren't present: > > > > commit 645743ea99829e6d578cca5a580cf0a4102fb7dd > > Author: John Baldwin jhb@FreeBSD.org > > > > Date: Thu Nov 12 22:00:59 2015 +0000 > > > > Export various helper variables describing the layout and size of > > certain kernel structures for use by debuggers. This mostly aids > > in examining cores from a kernel without debug symbols as a debugger > > can infer these values if debug symbols are available. > > > > One set of variables describes the layout of 'struct linker_file' to > > walk the list of loaded kernel modules. > > > > A second set of variables describes the layout of 'struct proc' and > > 'struct thread' to walk the list of processes in the kernel and the > > threads in each process. > > > > The 'pcb_size' variable is used to index into the stoppcbs[] array. > > > > The 'vm_maxuser_address' is used to distinguish kernel virtual addresses > > from user addresses. This doesn't have to be perfect, and > > 'vm_maxuser_address' is a cheap and simple way to differentiate kernel > > pointers from simple values like TIDs and PIDs. > > > > While here, annotate the fields in struct pcb used by kgdb on amd64 > > and i386 to note that their ABI should be preserved. Annotations for > > other platforms will be added in the future. > > > > This was even the commit that added the annotations just removed, so a simple > > blame for why the annotations were present would have turned this up. > > > > -- > > John Baldwin > > If this is correct, we should revert this commit. I want to hear kib@ thoughts on this and once he confirms someone with commit access can revert this change. > > My original patch was marking pcb fields as stable for all architectures (lldb aarch64 kernel debugger was broken because of this). I'll create new revision with original patch once revert is pushed. First, I do not mind reverting this, will do in a hour unless we get to some other conclusion in the thread. Second, I want to discuss something related to the struct pcb. Right now the structure is used for three quite unrelated purposes: - as effectively part of the struct thread, despite being a separate allocation when the thread is created - as wakepcb for saving some part of BSP state suspend/resume - as dumppcb for saving all CPUs state for vmcore With these consumers, it seems that fields are only added to the struct, and never removed. For instance, I do not see any use of pcb_sfmask. I really want to split pcb into 'thread pcb' and 'kpcb', and define that kpcb is KBI, while thread pcb would be only stable on the stable branches. kgdb and possibly klldb need kpcb for starting frame information on CPUs when kernel dump does not have dwarf, am I right? From nobody Mon Feb 9 17:57:18 2026 X-Original-To: dev-commits-src-main@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 4f8spk65lFz6Rmpr for ; Mon, 09 Feb 2026 17:57:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8spk51R4z3sYr for ; Mon, 09 Feb 2026 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770659838; 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=sFd4pb+s4XZvp0lw0LzM60oS2OQaevHImVhNdtwDoFA=; b=g2Srp3/vVfVosqWDMW3bFqbo5H4qD+CocmUCZA2OTDDIAhzspvajzQAmbMzbJiMtzto7Dn xgk7XvkG3UOw37x9C95y2vUuBvd6Hxe25QKTj4iL6Uk5BRpwsuG7y6m4q8gvwQRfRhK8y1 61l+WJ7FNX8LeY8LulfeQwSMvSmN2tEQ47wsigO+UjoYHnTwruux94ZcjSFEU7rl/8paJF cNYLS5jBwHmPUaB7qP0GEnxA9YIgawCJ9GGISfSIGMMAC3ltlim4kWzCY5gOktnq50iiFu FYKLFI2qqybZE7YzZxwd7p9UHmgtvQNWs5bRPLbLIOsNSUtcJYZsxXjXBTYhmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770659838; a=rsa-sha256; cv=none; b=mE0H79LrI6sCOauxj1Y9I273gVL5ZQNzSAIvbt7GJpXZgutuDCH18a7lXYdGj/lJ+fdnHd woexv16boJ/Hrc/EeAYiRSN3ad1NyB5EwIviV6h/wzJu9bjiWvQJVNb0A1ffKOdoFGveZq RcuBki5SNhTGb7xQxVAhe7OSxVJPdpFYkLUvLXdNEQr+XvopqORrcamNz/16i0Mv0304Bc YD7Bc+oZMOG+zl2xtsTbfCjTja/mOk5lBt6cG2aiVHcK/xIIn0F2ZmBWVOR9wMzlZUuXvR gjBp1vd3CvDCS8UbR6U2Id4p2wrgaYGfp9mOheE20IoMKXplwvl2/lRSFYqTIQ== 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=1770659838; 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=sFd4pb+s4XZvp0lw0LzM60oS2OQaevHImVhNdtwDoFA=; b=L/gmEXSh5aQvXkBz2KPwhG2IrejwIwM3dqBHEvnq4A8ixjL+it8Ki5U6dl2VQ32xfCGdj2 HZVkZSJdhFHvzHi9HDWRm2/RJDudgL7HE51tOAh75NdKKV7l6bbmHxgdkzUQu301ICqIrJ KBhn5SApfhUSG6tZAoh/v3GudDT/DSf+80oFOXwfaeghOZCwCdt+KG/PXXNOxeACJ95fOv MkdkLyZeoEu73JKHlVK6XrlICv/ogXb+3I69t8rXIKBQcJJiWFdWJauLt1dITIlFoseC/B LCkam36feDVvtEG9qlMtykFj3SDKdLRYikU52wRk3aJ5C2ltZhVTb6myIbqehQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8spk4Rq9zjBF for ; Mon, 09 Feb 2026 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26e3c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 17:57:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 97ce8f7d2b8e - main - amd64: define and use STACKALIGN and REDZONE_SZ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 17:57:18 +0000 Message-Id: <698a1ffe.26e3c.47182d66@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 commit 97ce8f7d2b8eff42460f60e8c49d9849b58b6e81 Author: Konstantin Belousov AuthorDate: 2026-02-07 00:36:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 17:57:00 +0000 amd64: define and use STACKALIGN and REDZONE_SZ Reviewed by: brooks, emaste, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55151 --- sys/amd64/amd64/exec_machdep.c | 4 ++-- sys/amd64/amd64/machdep.c | 6 +++--- sys/amd64/amd64/mp_machdep.c | 4 ++-- sys/amd64/include/param.h | 3 +++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c index 6752b716deb5..b5eda6f83d46 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -151,7 +151,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) td->td_sigstk.ss_flags |= SS_ONSTACK; #endif } else - sp = (char *)regs->tf_rsp - 128; + sp = (char *)regs->tf_rsp - REDZONE_SZ; if (xfpusave != NULL) { sp -= xfpusave_len; sp = (char *)((unsigned long)sp & ~0x3Ful); @@ -159,7 +159,7 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) } sp -= sizeof(struct sigframe); /* Align to 16 bytes. */ - sfp = (struct sigframe *)((unsigned long)sp & ~0xFul); + sfp = (struct sigframe *)STACKALIGN(sp); /* Build the argument list for the signal handler. */ regs->tf_rdi = sig; /* arg 1 in %rdi */ diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index ae5df475f046..b0da0b763b22 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1216,8 +1216,8 @@ amd64_bsp_pcpu_init2(uint64_t rsp0) { PCPU_SET(rsp0, rsp0); - PCPU_SET(pti_rsp0, ((vm_offset_t)PCPU_PTR(pti_stack) + - PC_PTI_STACK_SZ * sizeof(uint64_t)) & ~0xful); + PCPU_SET(pti_rsp0, STACKALIGN((vm_offset_t)PCPU_PTR(pti_stack) + + PC_PTI_STACK_SZ * sizeof(uint64_t))); PCPU_SET(curpcb, thread0.td_pcb); } @@ -1585,7 +1585,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) /* make an initial tss so cpu can get interrupt stack on syscall! */ rsp0 = thread0.td_md.md_stack_base; /* Ensure the stack is aligned to 16 bytes */ - rsp0 &= ~0xFul; + rsp0 = STACKALIGN(rsp0); PCPU_PTR(common_tss)->tss_rsp0 = rsp0; amd64_bsp_pcpu_init2(rsp0); diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 61f1bdb6f942..05e4109e73bb 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -217,8 +217,8 @@ init_secondary(void) pc->pc_curthread = 0; pc->pc_tssp = &pc->pc_common_tss; pc->pc_rsp0 = 0; - pc->pc_pti_rsp0 = (((vm_offset_t)&pc->pc_pti_stack + - PC_PTI_STACK_SZ * sizeof(uint64_t)) & ~0xful); + pc->pc_pti_rsp0 = STACKALIGN(((vm_offset_t)&pc->pc_pti_stack + + PC_PTI_STACK_SZ * sizeof(uint64_t))); gdt = pc->pc_gdt; pc->pc_tss = (struct system_segment_descriptor *)&gdt[GPROC0_SEL]; pc->pc_fs32p = &gdt[GUFS32_SEL]; diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index 642a031d8841..079937d9f53a 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -43,6 +43,9 @@ #include +#define STACKALIGNBYTES (16 - 1) +#define REDZONE_SZ 128 + /* * Machine dependent constants for AMD64. */ From nobody Mon Feb 9 18:19:45 2026 X-Original-To: dev-commits-src-main@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 4f8tJt2qs3z6RpYd for ; Mon, 09 Feb 2026 18:19:58 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Received: from mail-10628.protonmail.ch (mail-10628.protonmail.ch [79.135.106.28]) (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 "protonmail.com", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8tJs62Ncz43Bh for ; Mon, 09 Feb 2026 18:19:52 +0000 (UTC) (envelope-from minsoochoo0122@proton.me) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1770661189; x=1770920389; bh=X12gpE8vhgUpYV3H7nxff003URJgMhqgisvmGMRaR5M=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=P7WwOqODIm39LeEXSnPHCO9dK/0sRqARZfI9mfgEJqkQ+zI3pJdo/adCAHRP2/xad hFz7zYGr6tbbFc/dIqsbqvpg2OcJVwdmQEnHyGPIkVJpNSEQVskb2QyIcxW4/xT1zQ Tu61WQkRtzwMiz6CxSp20JROVCJpNysYO4ip8bU1qSfyL54EOnMQ0xqE7V2vmklLjb WvrHKBA0HonK0e+NoVSXIdA3L81plQv3SrGCCDjAJW50Yps425p1ZsMPQvz8OaU4SW W20VnXqTKltH+C+TQrCtO7CHRmiZCUi5dP8sNkflwO3XFMsTSqgoP0b82Xy0SzT0QR e1+LKmRUEfPew== Date: Mon, 09 Feb 2026 18:19:45 +0000 To: Konstantin Belousov From: Minsoo Choo Cc: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: <92BCAF7B-2D74-4305-896D-A1133FAF0A6A@proton.me> In-Reply-To: References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> Feedback-ID: 45891198:user:proton X-Pm-Message-ID: c212b7ea7b3c74b084972aab8ad988ad5203acec List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:79.135.106.0/24, country:CH] X-Rspamd-Queue-Id: 4f8tJs62Ncz43Bh X-Spamd-Bar: ---- --b1=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14 Content-Type: multipart/alternative; boundary="b2=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14" --b2=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 PiBPbiBGZWIgOSwgMjAyNiwgYXQgMTI6NDksIEtvbnN0YW50aW4gQmVsb3Vzb3YgPGtvc3Rpa2Jl bEBnbWFpbC5jb20+IHdyb3RlOgo+Cj4gRmlyc3QsIEkgZG8gbm90IG1pbmQgcmV2ZXJ0aW5nIHRo aXMsIHdpbGwgZG8gaW4gYSBob3VyIHVubGVzcyB3ZSBnZXQgdG8gc29tZQo+IG90aGVyIGNvbmNs dXNpb24gaW4gdGhlIHRocmVhZC4KPgo+IFNlY29uZCwgSSB3YW50IHRvIGRpc2N1c3Mgc29tZXRo aW5nIHJlbGF0ZWQgdG8gdGhlIHN0cnVjdCBwY2IuIFJpZ2h0IG5vdwo+IHRoZSBzdHJ1Y3R1cmUg aXMgdXNlZCBmb3IgdGhyZWUgcXVpdGUgdW5yZWxhdGVkIHB1cnBvc2VzOgo+IC0gYXMgZWZmZWN0 aXZlbHkgcGFydCBvZiB0aGUgc3RydWN0IHRocmVhZCwgZGVzcGl0ZSBiZWluZyBhIHNlcGFyYXRl Cj4gYWxsb2NhdGlvbiB3aGVuIHRoZSB0aHJlYWQgaXMgY3JlYXRlZAo+IC0gYXMgd2FrZXBjYiBm b3Igc2F2aW5nIHNvbWUgcGFydCBvZiBCU1Agc3RhdGUgc3VzcGVuZC9yZXN1bWUKPiAtIGFzIGR1 bXBwY2IgZm9yIHNhdmluZyBhbGwgQ1BVcyBzdGF0ZSBmb3Igdm1jb3JlCj4gV2l0aCB0aGVzZSBj b25zdW1lcnMsIGl0IHNlZW1zIHRoYXQgZmllbGRzIGFyZSBvbmx5IGFkZGVkIHRvIHRoZSBzdHJ1 Y3QsCj4gYW5kIG5ldmVyIHJlbW92ZWQuIEZvciBpbnN0YW5jZSwgSSBkbyBub3Qgc2VlIGFueSB1 c2Ugb2YgcGNiX3NmbWFzay4KPgo+IEkgcmVhbGx5IHdhbnQgdG8gc3BsaXQgcGNiIGludG8gJ3Ro cmVhZCBwY2InIGFuZCAna3BjYicsIGFuZCBkZWZpbmUKPiB0aGF0IGtwY2IgaXMgS0JJLCB3aGls ZSB0aHJlYWQgcGNiIHdvdWxkIGJlIG9ubHkgc3RhYmxlIG9uIHRoZSBzdGFibGUKPiBicmFuY2hl cy4ga2dkYiBhbmQgcG9zc2libHkga2xsZGIgbmVlZCBrcGNiIGZvciBzdGFydGluZyBmcmFtZSBp bmZvcm1hdGlvbgo+IG9uIENQVXMgd2hlbiBrZXJuZWwgZHVtcCBkb2VzIG5vdCBoYXZlIGR3YXJm LCBhbSBJIHJpZ2h0PwoKSSdtIGZpbmUgd2l0aCB0aGlzIGNoYW5nZS4gQ2FuIHdlIGhhdmUgdmVy c2lvbiBmaWVsZCBpbiBrcGNiPyBUaGlzIHdvdWxkIG1ha2UgZGVidWdnZXIgbG9naWMgZWFzaWVy IHRoYW4gdXNpbmcgb3NyZWxkYXRlLCBidXQgaXQncyBub3QgbmVjZXNzYXJ5LgoKLS0KTWluc29v IENob28= --b2=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: base64 PGh0bWwgYXJpYS1sYWJlbD0ibWVzc2FnZSBib2R5Ij48aGVhZD48bWV0YSBodHRwLWVxdWl2PSJj b250ZW50LXR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCIvPjwvaGVhZD48 Ym9keSBzdHlsZT0ib3ZlcmZsb3ctd3JhcDogYnJlYWstd29yZDsgLXdlYmtpdC1uYnNwLW1vZGU6 IHNwYWNlOyBsaW5lLWJyZWFrOiBhZnRlci13aGl0ZS1zcGFjZTsiPjxiciBpZD0ibGluZUJyZWFr QXRCZWdpbm5pbmdPZk1lc3NhZ2UiLz48ZGl2Pjxici8+PGJsb2NrcXVvdGUgdHlwZT0iY2l0ZSI+ PGRpdj5PbiBGZWIgOSwgMjAyNiwgYXQgMTI6NDksIEtvbnN0YW50aW4gQmVsb3Vzb3YgJmx0O2tv c3Rpa2JlbEBnbWFpbC5jb20mZ3Q7IHdyb3RlOjwvZGl2PjxkaXY+PGRpdj48YnIvPkZpcnN0LCBJ IGRvIG5vdCBtaW5kIHJldmVydGluZyB0aGlzLCB3aWxsIGRvIGluIGEgaG91ciB1bmxlc3Mgd2Ug Z2V0IHRvIHNvbWU8YnIvPm90aGVyIGNvbmNsdXNpb24gaW4gdGhlIHRocmVhZC48YnIvPjxici8+ U2Vjb25kLCBJIHdhbnQgdG8gZGlzY3VzcyBzb21ldGhpbmcgcmVsYXRlZCB0byB0aGUgc3RydWN0 IHBjYi4gwqBSaWdodCBub3c8YnIvPnRoZSBzdHJ1Y3R1cmUgaXMgdXNlZCBmb3IgdGhyZWUgcXVp dGUgdW5yZWxhdGVkIHB1cnBvc2VzOjxici8+LSBhcyBlZmZlY3RpdmVseSBwYXJ0IG9mIHRoZSBz dHJ1Y3QgdGhyZWFkLCBkZXNwaXRlIGJlaW5nIGEgc2VwYXJhdGU8YnIvPiDCoGFsbG9jYXRpb24g d2hlbiB0aGUgdGhyZWFkIGlzIGNyZWF0ZWQ8YnIvPi0gYXMgd2FrZXBjYiBmb3Igc2F2aW5nIHNv bWUgcGFydCBvZiBCU1Agc3RhdGUgc3VzcGVuZC9yZXN1bWU8YnIvPi0gYXMgZHVtcHBjYiBmb3Ig c2F2aW5nIGFsbCBDUFVzIHN0YXRlIGZvciB2bWNvcmU8YnIvPldpdGggdGhlc2UgY29uc3VtZXJz LCBpdCBzZWVtcyB0aGF0IGZpZWxkcyBhcmUgb25seSBhZGRlZCB0byB0aGUgc3RydWN0LDxici8+ YW5kIG5ldmVyIHJlbW92ZWQuIMKgRm9yIGluc3RhbmNlLCBJIGRvIG5vdCBzZWUgYW55IHVzZSBv ZiBwY2Jfc2ZtYXNrLjxici8+PGJyLz5JIHJlYWxseSB3YW50IHRvIHNwbGl0IHBjYiBpbnRvICYj Mzk7dGhyZWFkIHBjYiYjMzk7IGFuZCAmIzM5O2twY2ImIzM5OywgYW5kIGRlZmluZTxici8+dGhh dCBrcGNiIGlzIEtCSSwgd2hpbGUgdGhyZWFkIHBjYiB3b3VsZCBiZSBvbmx5IHN0YWJsZSBvbiB0 aGUgc3RhYmxlPGJyLz5icmFuY2hlcy4gwqBrZ2RiIGFuZCBwb3NzaWJseSBrbGxkYiBuZWVkIGtw Y2IgZm9yIHN0YXJ0aW5nIGZyYW1lIGluZm9ybWF0aW9uPGJyLz5vbiBDUFVzIHdoZW4ga2VybmVs IGR1bXAgZG9lcyBub3QgaGF2ZSBkd2FyZiwgYW0gSSByaWdodD88YnIvPjwvZGl2PjwvZGl2Pjwv YmxvY2txdW90ZT48YnIvPjwvZGl2PjxkaXY+SSYjMzk7bSBmaW5lIHdpdGggdGhpcyBjaGFuZ2Uu IENhbiB3ZSBoYXZlIHZlcnNpb24gZmllbGQgaW4ga3BjYj8gVGhpcyB3b3VsZCBtYWtlIGRlYnVn Z2VyIGxvZ2ljIGVhc2llciB0aGFuIHVzaW5nIG9zcmVsZGF0ZSwgYnV0IGl0JiMzOTtzIG5vdCBu ZWNlc3NhcnkuPC9kaXY+PGJyLz48ZGl2Pg0KPGRpdj4tLTwvZGl2PjxkaXY+TWluc29vIENob288 L2Rpdj4NCjwvZGl2Pg0KPGJyLz48L2JvZHk+PC9odG1sPg== --b2=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14-- --b1=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14 Content-Type: application/pgp-signature; name=signature.asc Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=signature.asc LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0NCg0KaUhVRUFSWUlBQjBXSVFTT09OMUhzcTJE dmFpUGE5d0RCcFYwUWw4enVBVUNhWW9sTHdBS0NSQURCcFYwUWw4eg0KdVA1V0FQMFVDZUVoK29W c2ZTckZxSEczRTlSVXNxVks4OXRIcWdPWFFUV3JYR2MrOUFEL2FiU204MWR1NFRodg0Ka0ZhaC9j MFVDcHhzeHYzZ21tVEdqdXBLK1d6elRRND0NCj1KUHgwDQotLS0tLUVORCBQR1AgU0lHTkFUVVJF LS0tLS0NCg== --b1=_qEAlwm6i785bYWteLCQsfrSEag1kawxkhkhxlSVEq14-- From nobody Mon Feb 9 18:35:56 2026 X-Original-To: dev-commits-src-main@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 4f8tgJ6VT9z6RqNh for ; Mon, 09 Feb 2026 18:35: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8tgJ5nFvz44j7 for ; Mon, 09 Feb 2026 18:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770662156; 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=1xgXrNJ2NNVMFDWSQwPZ7lXaUN62Sow2KZq0QHeCT28=; b=EfKv3x8D1S+VeJ3x5ZX1OVZozOLdx3+8Iqy/84FZ2jmIS9IKt5JPzwzYvEb6U4aI3WjzjO 7KapngZua4YUXZqEIUgmT/v6oCivAPIJnU7aUx/7kKfN+jrKIZtfuDd7has3gUCm1iJMeB HNlXgGlooyL8/lfc5dDfU9KCxgZ6H/tTDuWZ7MJkbl35jDBMF30nRa05cIh030eLAa3+g/ Xtfx0rS1oMc97SfplC23ypmH2NQ2c4/aP1q5BDzPlABR8sfOlUcSttsfzrzOo2TkRQhyn+ yB+7Tu7cydpgOhEpm+gQnDA7J9pVjffTuEk3bqLP39r0mWs6sXAKwZuUJf1bcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770662156; a=rsa-sha256; cv=none; b=tBWU4xjy9bFy8oiNY/628Uz8ZwJYu+CH8/oIZJ1HNp8mq+8TIwViFJ/jMIxJkSsB7Pt3bs 44O1guY2W62s3Y281TbFRZlzzG5KOUHtDusLQwqVZlMZFiESwhAR1WjWPV4jeL5xekVKlD FV+fa7fkwkl70Oh92jqjTgNxqGdDrwY0zyXXBTbULVyxFr+F9ocMhbkZPHZSF4m6FXnOrq xqnDmNUAjHQCZWVpqHWli8IncBT3bCE8p4MXAFVOmGTdKtBG/BvzOFum/To7HxqMrM9E0m Oj9lKUxsjgbYhgxef3YEfomh4197UQvLQ8whgoz0TUPwJel4hOKUZY6PZIX2uQ== 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=1770662156; 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=1xgXrNJ2NNVMFDWSQwPZ7lXaUN62Sow2KZq0QHeCT28=; b=WQcccB7mdRsW1oISTgPVx8A56fYF0/YbzlCQGvHSJfpr4tS5jTW7yLRkhbhe1yYCyXNOfO lRmvdsCUKZGraj5mdogYtmcUPBi8Qz5zPE2vXUb5YbzH4a++Crof0wzgKHo74SLhtblRdU z113WxpHRdVeWfluDdZ6jzCiT4DHf7CVUPeIC/tfOw7HplutLiaowuSHNZWPQaHZDGKZHm Q4UPLRAIFsOvSXGG1eJMfULv5ZH3HEb65tAtQKEGN9bbvmqLzi5f5MftmJNBVVA47QmDeE AT9p4uFH5/3URaqiIrCtLCCjhe2mTys40jOtThTQoIS7rowr+w2kjnbLpOm+xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8tgJ54TrzlPk for ; Mon, 09 Feb 2026 18:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32813 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:35:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 997bfa20d271 - main - RELNOTES: Add some entries for recent commits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 997bfa20d2716e4bae94ab7089ec970b8d884376 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:35:56 +0000 Message-Id: <698a290c.32813.78844438@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=997bfa20d2716e4bae94ab7089ec970b8d884376 commit 997bfa20d2716e4bae94ab7089ec970b8d884376 Author: Mark Johnston AuthorDate: 2026-02-09 18:35:33 +0000 Commit: Mark Johnston CommitDate: 2026-02-09 18:35:33 +0000 RELNOTES: Add some entries for recent commits Reviewed by: olce, jhb Differential Revision: https://reviews.freebsd.org/D55150 --- RELNOTES | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/RELNOTES b/RELNOTES index 9ccece997074..52a2ee77e568 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,47 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +4d707825bf62: + The pdwait(2) system call was added. It provides wait(2)-like + functionality for a process descriptor (see procdesc(4)). + +5c2ee618d5ec: + The pdrfork(2) system call was added. It behaves like rfork(2) but + additionally returns a process descriptor (see procdesc(4)). + +41ccf82b29f3, 591c7a08bf8a: + On arm64, memcpy(3), memmove(3) and memset(3) are now implemented using + the MOPS (Memory Operations) feature instructions when they are + implemented by the system. + +3f0aea09689f: + posix_spawnattr_getexecfd_np(3) and posix_spawnattr_setexecfd_np(3) + functions were added to libc. The latter causes posix_spawn(3) to + call fexecve(2) on the specified file descriptor rather than executing + the file at the provided path. + +fb4b0c911951: + witness(4) now prints additional information to the system console when + a lock order reversal is detected, making debugging such issues easier. + +1322760fd127: + It is now possible to compile both the 4BSD and ULE schedulers into the + same kernel. The scheduler is selectable at boot-time using a tunable. + See the SCHEDULERS section of the tuning(7) man page for details. + +627e126dbb07: + The default value of the net.inet6.ip6.connect_in6addr_wild has changed + to 0. This means that connecting to the all-zeroes IPv6 address no longer + implicitly results in a loopback connection. + +afa70a8496e9: + The pthread_tryjoin_np(3) function was added to libthr(3). It provides + the same functionality as pthread_join(3) but returns instead of + blocking if the target thread has not yet exited. + +ecc039be7fdd: + NanoBSD images can now be built as a non-root user. + 7f54c65abc67: Update smartpqi(4) to vendor version 14.4690.0.2008 - 15.2.0.2008 for the SmartArray storage controllers. This adds support for new From nobody Mon Feb 9 18:48:02 2026 X-Original-To: dev-commits-src-main@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 4f8txH1ghtz6RrDk for ; Mon, 09 Feb 2026 18:48:03 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8txG5przz463F for ; Mon, 09 Feb 2026 18:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770662882; 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=RNs5OPEesGK78Od5K6uQP2//raXJTGnTdt2Zp2jh+gQ=; b=C+SEVTPp0B9fPXVvTZYjvr0eioUZb1f/J55Ri8/LAz7UohEa/5j2v3jxF1F0nEImFp6tsd 5I0c+ifH5SO/Mz1F9Ik+rqqoAO1XGfmPCI+1yvrPANnK7Yyyn3sZWQMP/VApLN0WQUzE21 aQBpuo8PhmRC5Q/WM64LbBfgoI/2Z4bw1GZENPglECO7AhtyoQ9oKE+wWSJBc3AFIrKvbL l025EUl0I2mWB5aTHMjGnKbcYGuzPJg5os7dux9xxdkaGdzkvX8nL+upjQxby6/vgsuIKu sqgdJZ4bqQvtd0olMQoaR70mCrEUiCYG32JWcrRoNNUd0nNY7RZ5Rww/rQp5LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770662882; a=rsa-sha256; cv=none; b=tuTAOAe+WFoZIpLeeSc10fdTddtwbwKaTUG7o7zMa7Bxd6xMnK/3CtUSk0C3eCwql811z8 SRLnPPGpQ+WU2QU0PHAeitqO7ksdTOCKZaq9KXynzYu+czpzdn0dhpu2pvDTUEKeakVUQE JUcajVQIq3PjQ5ok8se7S6oEK0xbdwZwprt2IspALMypVOVFpZJURySwfNC9OZcaPPFj6U kc7gMIjo/5/KkkEnQg3GuCeVzXtY9n/p4o7OYGH3zjgsSaZnlenvLOFnZC0YBlrGVWKBLZ keLTOAKVjEvYxkxaNhHOnh7aFyamqw3oaakXmew8pEkTSotH9ilCA8XIKXW5lw== 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=1770662882; 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=RNs5OPEesGK78Od5K6uQP2//raXJTGnTdt2Zp2jh+gQ=; b=CzYkSZAfFRqvNskGi7OLGE2BuCzAe793gEqAnW3K9rWwDNNdIiabwj1qMSBjmVdfyQzxwF LIWJfHnAmhf37yOHKZPN4Jfd6NERCCs9mLYEL+38L0JYtzKB+fduSgBni114C4+efZnhD7 wYvjhLQ1LP3L0zrO0tBwqvsG1D4iCVyLRmv+KSyi1/8eGbVHUZUFJ8/K3bnaBe5K68QaCH VjG7xsfT9F1/Sq0RZsqTam7aXQKPzibyZBmKrzc/AY0SOdjI+Cbo0i9/uxguNC0NbJNn/g 0kET9H+XhqkE/QRzXEKyaqWaUtVocT4hpqijZIkj1k9moU1Rf8nBc0wtKn/npQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8txG4fFkzlW6 for ; Mon, 09 Feb 2026 18:48:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33f25 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:48:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8066b8923ebf - main - kern/vfs_unmount.c: promote flags to uint64_t List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8066b8923ebfd438dc8cb840d2f57066f4daa45d Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:48:02 +0000 Message-Id: <698a2be2.33f25.70bdf17b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8066b8923ebfd438dc8cb840d2f57066f4daa45d commit 8066b8923ebfd438dc8cb840d2f57066f4daa45d Author: Konstantin Belousov AuthorDate: 2026-02-09 03:11:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:47:18 +0000 kern/vfs_unmount.c: promote flags to uint64_t to prevent sign-extension, causing unexpected flags to be passed to dounmount(). The mnt_flags and MNT_* constants are 64bit wide. Suggested and reviewed by: jah Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55197 --- sys/compat/linux/linux_file.c | 2 +- sys/kern/vfs_mount.c | 4 ++-- sys/sys/syscallsubr.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 96326b894d05..ca089585bb95 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1213,7 +1213,7 @@ linux_oldumount(struct thread *td, struct linux_oldumount_args *args) int linux_umount(struct thread *td, struct linux_umount_args *args) { - int flags; + uint64_t flags; flags = 0; if ((args->flags & LINUX_MNT_FORCE) != 0) { diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 240bf5451a84..2237fcc6b423 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1720,11 +1720,11 @@ int sys_unmount(struct thread *td, struct unmount_args *uap) { - return (kern_unmount(td, uap->path, uap->flags)); + return (kern_unmount(td, uap->path, (unsigned)uap->flags)); } int -kern_unmount(struct thread *td, const char *path, int flags) +kern_unmount(struct thread *td, const char *path, uint64_t flags) { struct nameidata nd; struct mount *mp; diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index e2bbbc188553..35e2b771cbe7 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -403,7 +403,7 @@ int kern_wait6(struct thread *td, enum idtype idtype, id_t id, int *status, int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); -int kern_unmount(struct thread *td, const char *path, int flags); +int kern_unmount(struct thread *td, const char *path, uint64_t flags); int kern_kexec_load(struct thread *td, u_long entry, u_long nseg, struct kexec_segment *seg, u_long flags); From nobody Mon Feb 9 18:56:49 2026 X-Original-To: dev-commits-src-main@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 4f8v7Q1kJYz6RrpT for ; Mon, 09 Feb 2026 18:56:50 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8v7Q0bZdz47WV for ; Mon, 09 Feb 2026 18:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770663410; 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=GXLlztaSQDg1UX3j3odFiYkhfpYf8XMDt77J4p+2z9g=; b=HTkx2gBRywlMKFbF1oaM7UWyHa5TAeyRN/HjbEnXFMWnhuUwvwo/HEhk+EUJJJXgfpAq0U zdbXk7JQmSEKYnUl+Sqq65YEM1s/aZCqW1AM2Pd8fBFvZzjDGRXgGZaahRetsN6lVI4HS8 CuaC/DNhO/IGfJqRVZphI2pegvHYEeiPQsMy25T45FnX44an/C1xj3L+hS7W3I7mhueUgR 0OzWj6ixWOBdBny9C58XR4F7nPNXl+Ep4+xVwy/ffi/RalqLKrC2zvDAEt9zY+N4RMnmmc 7V47IhmTFGUfD9FKk/SsHnVdZuTOAIq/696NIDDarOw16ZKI2ZQFSbThnfLzMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770663410; a=rsa-sha256; cv=none; b=cdODNKVWSuJOZaYNFDBUQDoLNfV+wvDZi/I3YxANgkE1E6CB0VbSHI3KGDZ74E2tB62wLA CnvcYe7tTlaN8qLkgISvJl2JLeUMHPhDLRZE7z0EDBskoM8V/55sOjD6d0Zm0YQ8DVK8Ck Dzu1wTuvCf5DgWQASn9pfMhfUAym3/gSr4GOjd67l+O+f4pft18jBdcTA6My6x59DnSPWG 0SJIcIOrqJ/d0I7SrVqX54ZPhUgQihklSGfWQ7DT07GqlynmOEiZgzHf6Ra7Cdc5qI5uST aSdRMv2dJGSsE/8bZ2fhRMIgqIFzQU7GJFr49aDMUL2mLtqSstLK1ePrXiriiw== 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=1770663410; 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=GXLlztaSQDg1UX3j3odFiYkhfpYf8XMDt77J4p+2z9g=; b=AePuUukFuPLkc5dmR8sm+AKQpyAaDpL0dbreawCOCDomDFdcdEy4bLdKe1QrFiwFbjG6rv vasMy/i/hhxnAFyjnisrwUYd48iHSAJabtiHZEf0Yk6CLVjy6WabqsUxxd8MpXZ+gq/EVS wua+qYRdMT0s/2X/hn2qn6xmBt6qcAHkGdcx73OiPDaL8BMy7fhECvY7FP1yRYTtyRyVUR TMgMIPQ8QgZvSGQQqo0NUOAnlUQatBKd80jmAayTnbCDRCG9v5pqewizeFWUA73f7Z5SkQ Qf0ZgERpPOJ8dKS4Jz3IAcN8nnxKxO/UEGVaMeIkr9PmhzTMHwKRB2ivT6uthA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8v7P72NQzlWp for ; Mon, 09 Feb 2026 18:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34947 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:56:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 24038d696e50 - main - Revert "pcb.h: mark struct pcb to be preserved" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 24038d696e5030f622e87d6651e9dab1cd7fcb2a Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:56:49 +0000 Message-Id: <698a2df1.34947.3356d220@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=24038d696e5030f622e87d6651e9dab1cd7fcb2a commit 24038d696e5030f622e87d6651e9dab1cd7fcb2a Author: Konstantin Belousov AuthorDate: 2026-02-09 18:25:17 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:55:57 +0000 Revert "pcb.h: mark struct pcb to be preserved" kgdb only uses the marked fields from dumppcb for initial frame reconstruction. This reverts commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3. --- sys/amd64/include/pcb.h | 21 ++++++++++----------- sys/arm/include/pcb.h | 4 ---- sys/arm64/include/pcb.h | 5 ----- sys/i386/include/pcb.h | 17 ++++++++--------- sys/powerpc/include/pcb.h | 5 ----- sys/riscv/include/pcb.h | 5 ----- 6 files changed, 18 insertions(+), 39 deletions(-) diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index 5a1e8529ad8b..27e1dce08ee1 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -44,19 +44,18 @@ #ifdef __amd64__ /* - * struct pcb is known to and used by kernel debuggers. Its layout must be kept - * stable. When adding extra fields that are accessed by kernel debuggers, - * debuggers should be backward compatible by using osreldate. + * NB: The fields marked with (*) are used by kernel debuggers. Their + * ABI should be preserved. */ struct pcb { - register_t pcb_r15; - register_t pcb_r14; - register_t pcb_r13; - register_t pcb_r12; - register_t pcb_rbp; - register_t pcb_rsp; - register_t pcb_rbx; - register_t pcb_rip; + register_t pcb_r15; /* (*) */ + register_t pcb_r14; /* (*) */ + register_t pcb_r13; /* (*) */ + register_t pcb_r12; /* (*) */ + register_t pcb_rbp; /* (*) */ + register_t pcb_rsp; /* (*) */ + register_t pcb_rbx; /* (*) */ + register_t pcb_rip; /* (*) */ register_t pcb_fsbase; register_t pcb_gsbase; register_t pcb_kgsbase; diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h index 810b1e665b19..fd77544c22c1 100644 --- a/sys/arm/include/pcb.h +++ b/sys/arm/include/pcb.h @@ -42,10 +42,6 @@ #include /* - * struct pcb is known to and used by kernel debuggers. Its layout must be kept - * stable. When adding extra fields that are accessed by kernel debuggers, - * debuggers should be backward compatible by using osreldate. - * * WARNING! * Keep pcb_regs first for faster access in switch.S */ diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h index 9955f5b22714..c0feb1149cf5 100644 --- a/sys/arm64/include/pcb.h +++ b/sys/arm64/include/pcb.h @@ -46,11 +46,6 @@ struct trapframe; #define PCB_FP 10 #define PCB_LR 11 -/* - * struct pcb is known to and used by kernel debuggers. Its layout must be kept - * stable. When adding extra fields that are accessed by kernel debuggers, - * debuggers should be backward compatible by using osreldate. - */ struct pcb { uint64_t pcb_x[12]; /* These two need to be in order as we access them together */ diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index 1385bfeeef31..1b14efa425b5 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -44,17 +44,16 @@ #include /* - * struct pcb is known to and used by kernel debuggers. Its layout must be kept - * stable. When adding extra fields that are accessed by kernel debuggers, - * debuggers should be backward compatible by using osreldate. + * NB: The fields marked with (*) are used by kernel debuggers. Their + * ABI should be preserved. */ struct pcb { - int pcb_edi; - int pcb_esi; - int pcb_ebp; - int pcb_esp; - int pcb_ebx; - int pcb_eip; + int pcb_edi; /* (*) */ + int pcb_esi; /* (*) */ + int pcb_ebp; /* (*) */ + int pcb_esp; /* (*) */ + int pcb_ebx; /* (*) */ + int pcb_eip; /* (*) */ struct segment_descriptor pcb_fsd; struct segment_descriptor pcb_gsd; int pcb_ds; diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h index 7ebd13dd0ed1..0230cf78aba7 100644 --- a/sys/powerpc/include/pcb.h +++ b/sys/powerpc/include/pcb.h @@ -41,11 +41,6 @@ #include #ifndef _STANDALONE -/* - * struct pcb is known to and used by kernel debuggers. Its layout must be kept - * stable. When adding extra fields that are accessed by kernel debuggers, - * debuggers should be backward compatible by using osreldate. - */ struct pcb { register_t pcb_context[20]; /* non-volatile r12-r31 */ register_t pcb_cr; /* Condition register */ diff --git a/sys/riscv/include/pcb.h b/sys/riscv/include/pcb.h index bcec4c3fd478..bb88516a1385 100644 --- a/sys/riscv/include/pcb.h +++ b/sys/riscv/include/pcb.h @@ -39,11 +39,6 @@ struct trapframe; -/* - * struct pcb is known to and used by kernel debuggers. Its layout must be kept - * stable. When adding extra fields that are accessed by kernel debuggers, - * debuggers should be backward compatible by using osreldate. - */ struct pcb { uint64_t pcb_ra; /* Return address */ uint64_t pcb_sp; /* Stack pointer */ From nobody Mon Feb 9 19:06:54 2026 X-Original-To: dev-commits-src-main@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 4f8vM31b1nz6RsGx for ; Mon, 09 Feb 2026 19:06:55 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM31255z49xL for ; Mon, 09 Feb 2026 19:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664015; 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=Hp12OJEshoaBGiBSWbUaF9j8uAuYEaADdPpalGF4NfY=; b=Ea8EQXl1PoD0I2phKwGBkM1lEz95Gm7I0GT6vDb2cQb6i9Vbw0sqRN7uOlk/fct92A4CH1 WnVsbrNGaKarhw+nsOBGyF9yX3bahm5O4sPii1z1jSyMKi28u8m1VfKqssOCEFLC0rmIyn STstRGUda6hpVm+lEzCJwW++2fwaqlxjcubtdBLaeI9Y4HYJkBH1VLhkqWFa20iSjoBgUc zhNqb/PPSow8ZFAjZkYl2KsW3LhqiO9qo2w0PKUG2CW/ujMbZm7rRzoqeYD5wiLj+coJ0z DKByPuKKrgm31V/tNfkkBHjVV4exXG5zsgka/jzuW53llElbgOIDfd0ACMwkRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664015; a=rsa-sha256; cv=none; b=FVmjYTfleWe9rUYhFuuTkjyupJrIATF5+LHKsw1qM07eNyjway4JpHikKyjaP5G8R2+Efe dyvdv7PNmJCLuGOAZHkocmEnUVPv/qMiO5T2d1GeiTb3E/SGIFx0bj1Iv6gG3HptLtOMbD NvyH3uDD31dcx0DeDWWXlnOjWaOW1i6DMbWRPfRjXoatCLRrYVX8ay79IyDnhsmzGzB2zH MIQ0BK62fMWKRRqXZjjeuwha4r/dWzaqOERDnpLfl20a4W+g4QNqXjw7uzyH+7IyLOF/1/ nVbskz5T0BnUd/axJTGztuS5x3ofDZzpaHK0lykPuwUWoWJl2X4DnmgwEuTBcA== 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=1770664015; 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=Hp12OJEshoaBGiBSWbUaF9j8uAuYEaADdPpalGF4NfY=; b=YNYcWGDlOCD+AvvF0JHBSOZARw9zaRqH6p9R5dR3sCYHpRSsplQhClenC4RaHyAQWVCMBR Q4HHkjW6Ssf5ic73tnnJ+HRTND2VgqtUAQ40IqK3kDEjVahWyKz7uafVGfAtjg7GugnuWw QH6KmjqhRYq8QQtr8cndDPqoJdweOSsOZbJMd1WucTFjK4X6UD29REKDApyRYGhldaOSqZ 2LQJcoLDDRxSUtojetVJt7uXWFGbAkwbQj/6BmhjF1xvFmxGV6bJzlhPhNoF6yCMuERWuW OsfsnBpM4UzdfMx1M3u0hwVAo7oGjVFJo1Y1xZ/VbimN4lu2q1x3j2puaQe7ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM26kRzzlyF for ; Mon, 09 Feb 2026 19:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36753 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c3a04a9585ae - main - sys/abi_compat.h: normalize include guard name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c3a04a9585ae233c98ee2eef73e6a80d17512578 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:54 +0000 Message-Id: <698a304e.36753.55c9745a@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3a04a9585ae233c98ee2eef73e6a80d17512578 commit c3a04a9585ae233c98ee2eef73e6a80d17512578 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:06:16 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/abi_compat.h: normalize include guard name Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/sys/abi_compat.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index bd99a21d8e23..2fcf598ceb7f 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -26,8 +26,8 @@ * SUCH DAMAGE. */ -#ifndef _COMPAT_H_ -#define _COMPAT_H_ +#ifndef _ABI_COMPAT_H_ +#define _ABI_COMPAT_H_ /* * Helper macros for translating objects between different ABIs. @@ -80,4 +80,4 @@ FU64_CP((src).fld, (dst).fld, frac); \ } while (0) -#endif /* !_COMPAT_H_ */ +#endif /* !_ABI_COMPAT_H_ */ From nobody Mon Feb 9 19:06:55 2026 X-Original-To: dev-commits-src-main@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 4f8vM438PHz6RsGy for ; Mon, 09 Feb 2026 19:06: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM40pXQz49tf for ; Mon, 09 Feb 2026 19:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664016; 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=qSrF6BgLjH1EeDXVyT+k2kKV9+GEMHILwyUWpAZmRqo=; b=HzifR3FV1uheyK0AQ8YxKIg6P8tGrM/aEh34kmma1oqMa+H6FXoXdZvHPNYFVHiev0V7In tfLY7uMSE5KpV2Sk+PSF8FUQeNntnU6IUudhCLaVsrk50pZKS4w2WZuMYGrtVxGvB+kLD3 uiiFhXv0GAuglMev0y3FR7ys1twgM5GwFOd9VuZJVOY+InU+hTVxXzxg20e7KM8+md5Tm/ Y+CxkM1rZV9phz4HkUgz3yd3RI2Xsdz7zdyZ1CEq6rlvNSV4nyM3dgVbXHzdydR0lrPeej FLs/fLKtiTzFUTcOhiEXjlDPdnr1NEkombZnXGekRNanDLvvIwWHtWbo1L7e7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664016; a=rsa-sha256; cv=none; b=Anur0O11RSwr+tqsX4dLhExKEHSMmQmgDs4Yesy6Ak0/V6GmQryYhCzJmS4NVm4nnawLyd ai5VIfY2cLsmBjLuobd70Ou25NysX8PHn1hmHQGpIUVCkhv4BwlOfpDNhSAJM43po2C6zs 9K+iXK92DgzAK+YUiU12udm/Vupqle3NSi25z+a1FMrYxQ9esrSAYeYhDsRA+83rn+2FBO 83r/uB2mHdqBlpLb9FRa/igm8yF0YZX3IDLBCpXqF73EH7dgdeJocyEBqN3j7mIxB/4r7I od/rPEmtT3M0Vxid+gJDfkThq7mknQ41ipZfCcHOoLAvfW+wqXm+Xa3ihheSuQ== 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=1770664016; 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=qSrF6BgLjH1EeDXVyT+k2kKV9+GEMHILwyUWpAZmRqo=; b=UeCyysdzXfw/bVT8+OO3CleOem6JZEWNouc5veJSMV0fQD/dS3RxA08Iaf4UIatBbJOZ7B cOlQtcMPSCCNwFA01fOzheHhyOTrb/8i2uAmulvrK99EgXCMv3HaaJwho7kT9/R/D/e152 PyLnrqxaLBUt3PcWCuoV9aIY/FOU4Tj7VwRSQSXX9wvJbgzwSpMtpTq0ll5w6YmG+vAGXc QxBtNoM1xJv7yQF6M1JbjQgo1h3L/7UPz9VU5z2w7HfNWSibwo1I4mwC5ETb01T7O2kYAN TEKRqVdqyS/B+YwEYhCo3/SXBarponu7/oFQR5CrMp/gdRxUmxg4govauCvN0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM372FVzlb2 for ; Mon, 09 Feb 2026 19:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3662d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e651c64bcab0 - main - sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:55 +0000 Message-Id: <698a304f.3662d.769dc949@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875 commit e651c64bcab08c7b12d8ad6e3ad0b1ef3af3b875 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:08:06 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/abi_compat.h: move freebsd32_uint64_t and FU64_CP() there Use private names for uintXX_t types. Remove conflicting (but equal) PTR_IN() definition from dev/mfi.c. Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32.h | 18 ------------------ sys/dev/mfi/mfi.c | 2 -- sys/sys/abi_compat.h | 22 +++++++++++++++++++++- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 25703859a7bb..1b8d2b7fe084 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -38,24 +38,6 @@ #include #include -/* - * i386 is the only arch with a 32-bit time_t. - * Also it is the only arch with (u)int64_t having 4-bytes alignment. - */ -typedef struct { -#ifdef __amd64__ - uint32_t val[2]; -#else - uint64_t val; -#endif -} freebsd32_uint64_t; - -#ifdef __amd64__ -typedef int32_t time32_t; -#else -typedef int64_t time32_t; -#endif - struct timeval32 { time32_t tv_sec; int32_t tv_usec; diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index a7d98f06aea3..474afcff60a7 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -3084,8 +3084,6 @@ out: return (error); } -#define PTRIN(p) ((void *)(uintptr_t)(p)) - static int mfi_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag, struct thread *td) { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 2fcf598ceb7f..1753d8dd25c2 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -29,10 +29,30 @@ #ifndef _ABI_COMPAT_H_ #define _ABI_COMPAT_H_ +#include + /* - * Helper macros for translating objects between different ABIs. + * Helper types and macros for translating objects between different ABIs. */ +/* + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. + */ +typedef struct { +#ifdef __amd64__ + __uint32_t val[2]; +#else + __uint64_t val; +#endif +} freebsd32_uint64_t; + +#ifdef __amd64__ +typedef __int32_t time32_t; +#else +typedef __int64_t time32_t; +#endif + #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v) From nobody Mon Feb 9 19:06:57 2026 X-Original-To: dev-commits-src-main@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 4f8vM554q9z6RsH4 for ; Mon, 09 Feb 2026 19:06:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM52KMPz49tr for ; Mon, 09 Feb 2026 19:06:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664017; 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=xGfSpyv4B7jbYlSYO4dAn89W76Cc0joFtEzcCqc/KIM=; b=I5OSK9jUL9yw9uiFyLOfcnq6VcP02Qb4oORUOE2McMHksyrCXryrt18aNYw7WdJIL1Qwhe 32IlfAI49V5xEd0OKaZBtBrKHuYwN7FFwKK56fOArVkYQHe2FBITaeieuuFATBlx8TksL6 6ZDKA746klCW5ooBIzjrUV7zaIQYKqVG0CDdLBZvAQPsPNWFVBQydYgf/oJxhYsNJWAU03 8JDtSlB/riuYKIcTYnJE3F8+fEEkFeoQ4nYsxe5tyzn1LLtyDR3sMMq4VCgMdvUSFUpaWq /429VI8CW4gTlMxKeQgDDPnP6FIoW8w3O+FUJo7bYTN4BzXwwYhYLR/XmSyLPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664017; a=rsa-sha256; cv=none; b=OT86CoSz4KbT+dt5ANSe8mV47gCHOkSHaPNahExmDhnhQRDPfuNqNzmkFmOOPHCEqppT1w csyTzRVzBFeekKmfJ0opD8dhcLD6c0z9mkyZDsn1OsX7K55RvPnVPESXhwOdpWJUl3DlHD Euqj8zZ5IeEjSOnUrv8YAjSHrlrYvQK7rM6+3YpJbWMCem8MWXxhPUDPA5BvYa8fz4afZz IagYtMY/IK0GJ7JCBnQbz8ayVfmJWcDB4/jDYHT8HMYcp1wy3X0QhaiSN/Iba9E3wg8FmO RJSrISLpv6TQPlvcrU6rtcPD9ZerWqXW/Z5tq0RJUOdTyx8lue8LvoufAjOC3w== 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=1770664017; 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=xGfSpyv4B7jbYlSYO4dAn89W76Cc0joFtEzcCqc/KIM=; b=vc28TMBzg2K1mrAyKPk31jsod3ZFSMPajaMfResjvdkKw5hiYvd6HQ/El5G+CVAVu5Nz+/ usmdx1XcsCy6kNe3Ex5IOqoYY+FSTJDCiig2bT9MJtdDf2z67p7LYja9ubYQ0Ka3lVz/pZ h7cYLh34RPtogSN+yXunI8ZdLCI0m2tXIjVDhUDkV+OJFOY3Wj0tkw5GfXQxNJ8GYP/aXN ciWKyhnaz5xfnjZjHGJlQ0w3IuLoifCtTsC2TL1nFPtlriXFqlNzQa//LwW7qHXCeDLBsW ENEk+TZfuxTtoAUKkmaxsu+/TQNsSV25ryJrI5M8cLOIP/AqXBCMh19XREyPSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM50W6vzlXn for ; Mon, 09 Feb 2026 19:06:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33a5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9ce0c190d8b3 - main - sys/abi_compat.h: add Foundation copyright for uint64_t stuff List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9ce0c190d8b3570c0a537f84952dca8c6e462ec3 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:57 +0000 Message-Id: <698a3051.33a5c.51f685db@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ce0c190d8b3570c0a537f84952dca8c6e462ec3 commit 9ce0c190d8b3570c0a537f84952dca8c6e462ec3 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:10:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/abi_compat.h: add Foundation copyright for uint64_t stuff Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/sys/abi_compat.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 1753d8dd25c2..69fb349edc7a 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -4,6 +4,11 @@ * Copyright (c) 2001 Doug Rabson * All rights reserved. * + * Copyright 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: From nobody Mon Feb 9 19:06:58 2026 X-Original-To: dev-commits-src-main@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 4f8vM65HLlz6RsH6 for ; Mon, 09 Feb 2026 19:06:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM61nktz3C1P for ; Mon, 09 Feb 2026 19:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664018; 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=k4gbA9JFMm65+MN6EgFTyL5/GpDYPzoPdCeXa0IM1hA=; b=i83B4gXx0h/zu5GzZnWQOjnTNcdqGU1SCvAWgyqpWtW1/J0Y9BpcVBfEtUqV0quQqPHiMD wmJudhU1c42K0PKbjtomviYYRLvqNU5jQQ0OBoqKWUCTY5ZP8KV0wFW97IFAXO9fvAzUyA JHZAvAVjF/YLvbZ/w7RNgNiKrd8AUpotyZ+BV6TKInThfs/e/iZcfzVnNucrtDg9zfdNIM KoPMoB2hErNdtu4mpx/K+ONzkuwPv+25mlQogawdH1E3thk6/WCQFLg2qzHvT7LeJSFk2Y urw0wZSnvnuREz3s+VGsG97wGrE9NNlxttx3+4nfjpoln2PNDUSyk9s2raY78g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664018; a=rsa-sha256; cv=none; b=YQayFFGnjwkQKsu/Oi8xpnA7yXHGI0KFai/ns3KF5ADw3v2+33Oq7Hz8+nGDUWQUzPKjyu cEzEhYs0UrKhNbKJMhxGuYFOHtO21pu5PSNNomCHzO9COoOotPKnElT0xvEHIHqSBXj+/D iky2Cz7yxigdvU8FnNono1tqzF3NMjuAvxg6AJiyIqpAWEZZtZfzDsoRlxO+u78UagiJhz tn59mlml5W5HcRwT6ADey/IeDwaqTiUHov0/r3ZYlBn4aJEQXY6n6AxChXvc+NZr9RGlyZ Q5HDu1zqFSUAe1TPvf6WYPhpYtjZU2m5VbqMqupzUw8I7JKICPk1jI1uja2vNA== 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=1770664018; 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=k4gbA9JFMm65+MN6EgFTyL5/GpDYPzoPdCeXa0IM1hA=; b=f8SofwDYdk2HMabjxvpHWInHWr0liMmIKxYRcu7TZozSc3KKF4uEWAgKFolaOvu+2boN6l 5Hl//KOm0XIVym5Ag3p516q2IQLrJiDg81Vsu7IcvWtUOU/LtUCD6VUi2lv3jpz8rGJDxN y7HyX7fajgeO+Xd9WE8abRLxLfX7qoSpcB7sOGJb2/YYgCSzme3cDH1UFpN8B9w3Prf8TP 1YPtbECrBFQKQtxu2+MBZmvVAEL5by3V1IvrJA2im7mKgMtQw6Ih8hk5NUF+rJB3+1k7LG TlzatZX6jAaX74Y0KxrUiLCcLI7H5PPfSduakAgrx8lWTEAxVhlGR6kr3M+Wew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM61LXGzlb3 for ; Mon, 09 Feb 2026 19:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36544 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ad639400dc9f - main - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ad639400dc9f1c5aec470996473bb54edc113dba Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:58 +0000 Message-Id: <698a3052.36544.6d7c1a7c@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ad639400dc9f1c5aec470996473bb54edc113dba commit ad639400dc9f1c5aec470996473bb54edc113dba Author: Konstantin Belousov AuthorDate: 2026-02-05 19:22:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/event.h: use freebsd32_uint64_t for kevent32 64bit members Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32_misc.c | 38 ++++++----------------------------- sys/sys/event.h | 6 ++++-- usr.bin/kdump/kdump.c | 6 +----- 3 files changed, 11 insertions(+), 39 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index c76c9d5c1838..544842803e21 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -713,31 +713,16 @@ freebsd32_pselect(struct thread *td, struct freebsd32_pselect_args *uap) static void freebsd32_kevent_to_kevent32(const struct kevent *kevp, struct kevent32 *ks32) { - uint64_t e; int j; CP(*kevp, *ks32, ident); CP(*kevp, *ks32, filter); CP(*kevp, *ks32, flags); CP(*kevp, *ks32, fflags); -#if BYTE_ORDER == LITTLE_ENDIAN - ks32->data1 = kevp->data; - ks32->data2 = kevp->data >> 32; -#else - ks32->data1 = kevp->data >> 32; - ks32->data2 = kevp->data; -#endif + FU64_CP(*kevp, *ks32, data); PTROUT_CP(*kevp, *ks32, udata); - for (j = 0; j < nitems(kevp->ext); j++) { - e = kevp->ext[j]; -#if BYTE_ORDER == LITTLE_ENDIAN - ks32->ext64[2 * j] = e; - ks32->ext64[2 * j + 1] = e >> 32; -#else - ks32->ext64[2 * j] = e >> 32; - ks32->ext64[2 * j + 1] = e; -#endif - } + for (j = 0; j < nitems(kevp->ext); j++) + FU64_CP(*kevp, *ks32, ext[j]); } void @@ -819,7 +804,6 @@ freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) { struct freebsd32_kevent_args *uap; struct kevent32 ks32[KQ_NEVENTS]; - uint64_t e; int i, j, error; KASSERT(count <= KQ_NEVENTS, ("count (%d) > KQ_NEVENTS", count)); @@ -835,20 +819,10 @@ freebsd32_kevent_copyin(void *arg, struct kevent *kevp, int count) CP(ks32[i], kevp[i], filter); CP(ks32[i], kevp[i], flags); CP(ks32[i], kevp[i], fflags); - kevp[i].data = PAIR32TO64(uint64_t, ks32[i].data); + FU64_CP(ks32[i], kevp[i], data); PTRIN_CP(ks32[i], kevp[i], udata); - for (j = 0; j < nitems(kevp->ext); j++) { -#if BYTE_ORDER == LITTLE_ENDIAN - e = ks32[i].ext64[2 * j + 1]; - e <<= 32; - e += ks32[i].ext64[2 * j]; -#else - e = ks32[i].ext64[2 * j]; - e <<= 32; - e += ks32[i].ext64[2 * j + 1]; -#endif - kevp[i].ext[j] = e; - } + for (j = 0; j < nitems(kevp->ext); j++) + FU64_CP(ks32[i], kevp[i], ext[j]); } done: return (error); diff --git a/sys/sys/event.h b/sys/sys/event.h index ebbcdb703183..0ba8e4796208 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -104,6 +104,8 @@ struct freebsd11_kevent { #endif #if defined(_WANT_KEVENT32) || defined(_KERNEL) +#include + struct kevent32 { __uint32_t ident; /* identifier for this event */ short filter; /* filter for event */ @@ -112,12 +114,12 @@ struct kevent32 { #ifndef __amd64__ __uint32_t pad0; #endif - __uint32_t data1, data2; + freebsd32_uint64_t data; __uint32_t udata; /* opaque user data identifier */ #ifndef __amd64__ __uint32_t pad1; #endif - __uint32_t ext64[8]; + freebsd32_uint64_t ext[4]; }; #ifdef _WANT_FREEBSD11_KEVENT diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 17ed43b55c5a..d3f2ac882e61 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -2404,11 +2404,7 @@ ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) kev.filter = kev32.filter; kev.flags = kev32.flags; kev.fflags = kev32.fflags; -#if BYTE_ORDER == BIG_ENDIAN - kev.data = kev32.data2 | ((int64_t)kev32.data1 << 32); -#else - kev.data = kev32.data1 | ((int64_t)kev32.data2 << 32); -#endif + memcpy(&kev.data, &kev32.data, sizeof(kev.data)); kev.udata = (void *)(uintptr_t)kev32.udata; ktrkevent(&kev); } else if (strcmp(name, "freebsd11_kevent32") == 0) { From nobody Mon Feb 9 19:06:59 2026 X-Original-To: dev-commits-src-main@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 4f8vM75mVWz6RsHB for ; Mon, 09 Feb 2026 19:06:59 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM73MQlz3BnC for ; Mon, 09 Feb 2026 19:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664019; 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=Dr9rlN+jFQXpBfNBG++7n7M60GNunt4z680rTPjIrdE=; b=oI5h5Mq+xUvUFT0ZcaJPnVV0AU8oBM4JtV+1L+lVlv2FL1XnD+hAp+419pFXgwTz40rKjh G0qvKzjRY/EaB8RBw/WYUjnYyGqxArfVH1q8B6OhvNbVFrK0j0GwN772z4I95OII+3HaFi hnyML+RDRLad6K+RVCgdJ2o9dLm6WX21BxkTtIR9ZCFQnzNrkOvQ/96sqZSME6nKs3dIGq F3qqndtX/zeHS/Wy/AqAxX2PJEk8ZwcIJ/F06yxQ3zSLxDrGXd5SEWdn5zChdNq5IDY1mb 1Vg6YuNu79iwO+nTEazdP6UXaNQllq2SJURF+StutbV2XCfHNJdCNmn/RoGjcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664019; a=rsa-sha256; cv=none; b=ZGyvSG0zypAyliSanDRlnFovDUVNt2BEelitwl/LVsWk4i6kQAYnDuec/Blu3xOSoVP87F WhGN4dJDhoXeKEIbGrTzJ1WmYgjRvtksj+1A917xCzn6I1NyuKHIgVbHCVyj1r1RHtx/vr NwvBHKwby0GGKo/yazLh5aU4wcO7JxrFJXdl57FjpVCGeUrxLC7Wz50D0eGIZEozTcjhb/ PYyeoAnFwvj/leUtfwivABkzSx1NBPSsrSj+XiGtntcyDHjGdTFQp/r91QCG2+Cb0GZGOq MHWmZnf4fCSRCAJuJhxZiF0F0nnTwB8N6n/8pipdB9jky6y8a/o7/dwDMj58pA== 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=1770664019; 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=Dr9rlN+jFQXpBfNBG++7n7M60GNunt4z680rTPjIrdE=; b=uG912HPYcIlZIiIomOGy3tdDFrv/FTJmUgWMUQU/xqciLj9oWjHMUAJZ8Dzui2orGZgjTr iv1IjnyyVZ5cVtlkFz/ZqLQp8KMbtIanJtXDekXZvRJ27ghxFLOaeU0MwP0lEhu3qCTqic Wu9Ne5SsGWnMEpp9oxIenQSRweBMTftGqWAFAYClHo0jYoHNOsYDLIEZ7iRSzQL7Izdy08 cKywuM5ktf5zBmwxwZDfgS0+S/xyys2dZHMC1cNnKSlpbysYOGl76a2fzlOU1gFdiweL+V VBu5G+gb3QnwaFrOFTHYImfNjzyXRMdOGOugEzwaGp1TWwCDFTZW62TirBrpQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM71thlzmBT for ; Mon, 09 Feb 2026 19:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:06:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 485e916a67b4 - main - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 485e916a67b4e700de5f50873e1e7b64de394b16 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:06:59 +0000 Message-Id: <698a3053.347cb.5e4af63f@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=485e916a67b4e700de5f50873e1e7b64de394b16 commit 485e916a67b4e700de5f50873e1e7b64de394b16 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:29:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_knote32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32.h | 6 +++--- sys/compat/freebsd32/freebsd32_misc.c | 31 +++---------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 1b8d2b7fe084..15e075174786 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -451,12 +451,12 @@ struct kinfo_knote32 { union { struct { int knt_vnode_type; - uint32_t knt_vnode_fsid[2]; - uint32_t knt_vnode_fileid[2]; + freebsd32_uint64_t knt_vnode_fsid; + freebsd32_uint64_t knt_vnode_fileid; char knt_vnode_fullpath[PATH_MAX]; } knt_vnode; struct { - uint32_t knt_pipe_ino[2]; + freebsd32_uint64_t knt_pipe_ino; } knt_pipe; }; }; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 544842803e21..25a8558335e7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -739,38 +739,13 @@ freebsd32_kinfo_knote_to_32(const struct kinfo_knote *kin, break; case KNOTE_EXTDATA_VNODE: CP(*kin, *kin32, knt_vnode.knt_vnode_type); -#if BYTE_ORDER == LITTLE_ENDIAN - kin32->knt_vnode.knt_vnode_fsid[0] = kin->knt_vnode. - knt_vnode_fsid; - kin32->knt_vnode.knt_vnode_fsid[1] = kin->knt_vnode. - knt_vnode_fsid >> 32; - kin32->knt_vnode.knt_vnode_fileid[0] = kin->knt_vnode. - knt_vnode_fileid; - kin32->knt_vnode.knt_vnode_fileid[1] = kin->knt_vnode. - knt_vnode_fileid >> 32; -#else - kin32->knt_vnode.knt_vnode_fsid[1] = kin->knt_vnode. - knt_vnode_fsid; - kin32->knt_vnode.knt_vnode_fsid[0] = kin->knt_vnode. - knt_vnode_fsid >> 32; - kin32->knt_vnode.knt_vnode_fileid[1] = kin->knt_vnode. - knt_vnode_fileid; - kin32->knt_vnode.knt_vnode_fileid[0] = kin->knt_vnode. - knt_vnode_fileid >> 32; -#endif + FU64_CP(*kin, *kin32, knt_vnode.knt_vnode_fsid); + FU64_CP(*kin, *kin32, knt_vnode.knt_vnode_fileid); memcpy(kin32->knt_vnode.knt_vnode_fullpath, kin->knt_vnode.knt_vnode_fullpath, PATH_MAX); break; case KNOTE_EXTDATA_PIPE: -#if BYTE_ORDER == LITTLE_ENDIAN - kin32->knt_pipe.knt_pipe_ino[0] = kin->knt_pipe.knt_pipe_ino; - kin32->knt_pipe.knt_pipe_ino[1] = kin->knt_pipe. - knt_pipe_ino >> 32; -#else - kin32->knt_pipe.knt_pipe_ino[1] = kin->knt_pipe.knt_pipe_ino; - kin32->knt_pipe.knt_pipe_ino[0] = kin->knt_pipe. - knt_pipe_ino >> 32; -#endif + FU64_CP(*kin, *kin32, knt_pipe.knt_pipe_ino); break; } } From nobody Mon Feb 9 19:07:00 2026 X-Original-To: dev-commits-src-main@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 4f8vM85d7Mz6Rs45 for ; Mon, 09 Feb 2026 19:07:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM8376pz3C1x for ; Mon, 09 Feb 2026 19:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664020; 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=Ti8JXKUH/5t7FHr42y+4UOwPfo01k2z2R/UzLQNMigQ=; b=T61JIGLFJAuKkwo7AYnehbgGOH6mTzLfO1O5Bl4GvvOF4G03Ahw/rSgq2Ezq9geJV0TYnk rocayTWs67qpfZn+FpkVhbUFaZHXULfErvgca9QTHSRBrusi90igSTW0WLhfRBf8EO4P1Y NWM0KcLiI3cqG3POdMGWc58eQuXDYYQ10eqxgX6YnTwbr7iS/g0qZxY6nfIm4ScsPSOzpR oG3Zebf4V70zVhLDc7dhJK75+/H4cNER6+ofV+9iHJuXCQtApeyEWrjHJyCAJYiOOH+t/b BfzYAOK2IvJl1TOxqv0h3py+7yxVcRhaDHz6k1JJmtSp4IjBbbXlmAEYO86Qmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664020; a=rsa-sha256; cv=none; b=P0QoJ1G6DrsDG6enEf03QZls4fDFCK405GUjR58sD6x/fBE6g58sydo1OIx+KeDGNM3xi7 QRKluWuqVovr4k3DvfA/MKoaCPCGV/gPa9+GtvR1d2cvQI/fetlFJNnmjqH9HEsQyIc8BE kRXef+TmX63wpzEKV9PtQrr12C53no7zSo2gCR2BDgwgijVLe3yEfUZHXMQIpWTcozw7QN /an8j+tQuFxzrjYU3FyyhYZMgRgnEdM3AwLFt1Ld/uD98dnwWUUJyVH+ABQQ5X9R3K5M7v U3ncnfr86boDGtqalx0pGGR7h4mOn1EYL5KtCAXJDz91oZnDIUNdvkhBse56wA== 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=1770664020; 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=Ti8JXKUH/5t7FHr42y+4UOwPfo01k2z2R/UzLQNMigQ=; b=qkB3dbQmiZpje5dr5gqXJDqowKfi9jKYpsGGclNBppj3A/H8ODRiOjGP015xPbgLIG0wYy sCWwxfxa0iT+ITkxyx9h9t5vRSG7ZtCtJIyRAAQ8Q1UVoWge4ApG3f7wm5Oh2WuzwqDdUF tCQ9qu6/+5e6NDoemfiMLqM6dgUOJIdYqtvHszQa0k4m79eSa6UnDLEZ+6TX8RriehKeie grMVdbpLvtG29wIF6PovZ+/rdix4iUVXB6v+no86ntlTBLy7Awo3t1pZnEXYyf7fqLj9ma SVCf7SSJ23dWQ1GbBuk7vm7eZCh63w4nDdp4EQH9Jaq4x+vnPrWPK5my/0VUQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM82gMrzlRD for ; Mon, 09 Feb 2026 19:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37521 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:07:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3dc72107d29d - main - sys/compat/freebsd32: use freebsd32_uint64_t for struct ffclock_estimate32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3dc72107d29d304ba21f04426ec82077d23cedcd Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:07:00 +0000 Message-Id: <698a3054.37521.32adc6f3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3dc72107d29d304ba21f04426ec82077d23cedcd commit 3dc72107d29d304ba21f04426ec82077d23cedcd Author: Konstantin Belousov AuthorDate: 2026-02-05 19:35:01 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct ffclock_estimate32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32.h | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 15e075174786..b79ddc71dbe8 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -62,7 +62,7 @@ struct ffclock_estimate32 { struct bintime32 update_time; ffcounter update_ffcount; ffcounter leapsec_next; - uint64_t period; + freebsd32_uint64_t period; uint32_t errb_abs; uint32_t errb_rate; uint32_t status; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 25a8558335e7..7a624b45cbf7 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -4149,7 +4149,7 @@ freebsd32_ffclock_setestimate(struct thread *td, memcpy(&cest.update_time.frac, &cest32.update_time.frac, sizeof(uint64_t)); CP(cest, cest32, update_ffcount); CP(cest, cest32, leapsec_next); - CP(cest, cest32, period); + FU64_CP(cest, cest32, period); CP(cest, cest32, errb_abs); CP(cest, cest32, errb_rate); CP(cest, cest32, status); @@ -4179,7 +4179,7 @@ freebsd32_ffclock_getestimate(struct thread *td, memcpy(&cest32.update_time.frac, &cest.update_time.frac, sizeof(uint64_t)); CP(cest32, cest, update_ffcount); CP(cest32, cest, leapsec_next); - CP(cest32, cest, period); + FU64_CP(cest32, cest, period); CP(cest32, cest, errb_abs); CP(cest32, cest, errb_rate); CP(cest32, cest, status); From nobody Mon Feb 9 19:07:01 2026 X-Original-To: dev-commits-src-main@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 4f8vMB0BTmz6Rs25 for ; Mon, 09 Feb 2026 19:07: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vM93y6nz3C2N for ; Mon, 09 Feb 2026 19:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664021; 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=byRUE0Ji2RKL25NErRn/+AaxfgjqTG5+Pj3D0VAkC3E=; b=X1r7VkjW/ABCRyn2SSpkW72SwkGDxhUwc8yS3U+DxzrPzBSMe3XNoa6mKJw3YjOe5UDaXb e+GT9cuTZludIIzPsw8Phm/Dn2PJacFFIHEu50qzbOuqH8uUXoao49KJB6FByq7hW0L6+T vG6BKaLqg06b6vPbEbRqDTRJlMyo8xsN1TkEifv31t3r6kKQSx/zqqS5k38Sz2W8V2xJCG +dWwpe0BAqKzvnpct7HI42t1fH2V7SOTr39iDtmi5Y4i8q9x/JPoTTQOCz3HVigqfkNSDg roHiR4fhXhFjqKIVdF+tF2gI4BGF87jabswnJ4IVnaI+0lH0ETP/Vz5oaJ0zZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664021; a=rsa-sha256; cv=none; b=vtdr+9U53R0lCSgmHwdY2K7Pyw0zSF4heIT9Z8EmKNja9n+xnkBdmhEQL88y53r6+sUuXW r6cg34M+IAi867SwysgrZzbRLec1mWwr5HYxF+T4K69m3tFZn1S1EEUqBdkHf9ZHMbeyfx J/350yp84UWo0eCd7WAL0kcF82V6PcWErXf4DmXi9mFgLcH0EGl7GgL93YYcW+Tr6LH0f4 r84My52aJleBcus/hGiRbwNYwDSMqg4yCZQ//1CnfnRvBE3YYuaDELebLlaKB+1I5iRbZP OIqiLMUr04AIGRS57Yq/k4nGJs2VqVin+UHa6dulNfC6hkMqCSUQToN2rKUsJw== 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=1770664021; 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=byRUE0Ji2RKL25NErRn/+AaxfgjqTG5+Pj3D0VAkC3E=; b=XHdhVEebuO/kUhplA8eqi8DfGxYl/YllGJd1C098tFVbVtXkyZzPuI9fLGroaz46d1YfN+ 7IQov7wWjCPuN6fD1lQDfo6uIPBtI5+eNYLihX2E0htbHYT1/HWIWBv4B13GDJC4EHRnG+ RqGGHKuXAZooTHeBwSmaOzT0jhd2G5pLqNLdg5sSM9nxCoY6kYfqy/gKu08nDVGPfcYJ9K LLozEmFG7nKD3RqOaEJPBvYuzrMIToedWAbL/zssR6XutXERG3pMg+TMfB1qz+n+JSojIK opFdWewNiE6u8FiX7m4nwcFDCoGhFlOWeiQeNg6fLkWV+n5ler6U8611kE5kBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vM93WyNzllx for ; Mon, 09 Feb 2026 19:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3484c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:07:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: beee89472e3e - main - sys/compat/freebsd32: use freebsd32_uint64_t for several struct stat's List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: beee89472e3e0e3640c9db5c34a6e422830ff00f Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:07:01 +0000 Message-Id: <698a3055.3484c.495d9dfd@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=beee89472e3e0e3640c9db5c34a6e422830ff00f commit beee89472e3e0e3640c9db5c34a6e422830ff00f Author: Konstantin Belousov AuthorDate: 2026-02-05 19:39:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for several struct stat's Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32.h | 10 +++++----- sys/compat/freebsd32/freebsd32_misc.c | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index b79ddc71dbe8..5c7764b75335 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -230,12 +230,12 @@ struct stat32 { #endif struct timespec32 st_birthtim; off_t st_size; - int64_t st_blocks; + freebsd32_uint64_t st_blocks; uint32_t st_blksize; uint32_t st_flags; - uint64_t st_gen; - uint64_t st_filerev; - uint64_t st_spare[9]; + freebsd32_uint64_t st_gen; + freebsd32_uint64_t st_filerev; + freebsd32_uint64_t st_spare[9]; }; struct freebsd11_stat32 { uint32_t st_dev; @@ -249,7 +249,7 @@ struct freebsd11_stat32 { struct timespec32 st_mtim; struct timespec32 st_ctim; off_t st_size; - int64_t st_blocks; + freebsd32_uint64_t st_blocks; uint32_t st_blksize; uint32_t st_flags; uint32_t st_gen; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 7a624b45cbf7..457e599c22d2 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2287,11 +2287,11 @@ copy_stat(struct stat *in, struct stat32 *out) TS_CP(*in, *out, st_mtim); TS_CP(*in, *out, st_ctim); CP(*in, *out, st_size); - CP(*in, *out, st_blocks); + FU64_CP(*in, *out, st_blocks); CP(*in, *out, st_blksize); CP(*in, *out, st_flags); - CP(*in, *out, st_gen); - CP(*in, *out, st_filerev); + FU64_CP(*in, *out, st_gen); + FU64_CP(*in, *out, st_filerev); CP(*in, *out, st_bsdflags); TS_CP(*in, *out, st_birthtim); out->st_padding1 = 0; @@ -2500,7 +2500,7 @@ freebsd11_cvtstat32(struct stat *in, struct freebsd11_stat32 *out) TS_CP(*in, *out, st_mtim); TS_CP(*in, *out, st_ctim); CP(*in, *out, st_size); - CP(*in, *out, st_blocks); + FU64_CP(*in, *out, st_blocks); CP(*in, *out, st_blksize); CP(*in, *out, st_flags); CP(*in, *out, st_gen); From nobody Mon Feb 9 19:07:02 2026 X-Original-To: dev-commits-src-main@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 4f8vMC0v9Rz6Rs4B for ; Mon, 09 Feb 2026 19:07:03 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vMB54lZz3C2X for ; Mon, 09 Feb 2026 19:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664022; 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=V2n6V28LeWQfunT6I/JngXDIq0zuVZqOkZVw79y8qVQ=; b=raXQ4iCL0bN0QkteroiDtkvzqJGLNErIe2Va8Nj7BaSKck563O5BbR+GiNX3Oarufz1+VF qNOgdZNiBrOzczGrE3pY9Lx1sCLyM4uB6Coc4bRoMC6bcr2NbJxpirAhcL2pt6w9694L8a rI94A03ViUIfNJcR4mvVAmJAWtBFiKi9XpYHbLotrgFsXyRPWmQJZn98KXX+OvqXLJEua1 dzQbEsYfBpuveIN2qi48OOifQK0n+taMbAvN00AMFNknLRN44yY3dLZz6sfUSEgfYL/+rA iRHLjeviDPdorsTqPpaNvnbsXw/f+AxFqwVo+iDaFhJ5QE6ETnqhAYxQmw3OVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664022; a=rsa-sha256; cv=none; b=FhWv4TUle6Y53qvyJBMuwD6j36cOCkFKbZwxswz+CE3wsa6yw6/EdszI/d4DXxe+K+rnvf lCo2pWbVnvBUpGzzJIjRlzt8ujoxBgD8lH9cx07XfRTVMMNXcrsNDZz+5oBSrmVAh+bXZD 0jz+hIh5ilMErApIRj4ixWwep0FVlq6v2RSC3zmYuiUJBO6g5IqNNUw21RU7Kb9QXgK+en 18Q+0hN/fk+4gmPDen7o0IbHv6qCE1+HxM1tr/Wzb47L4f4kCC9ye7YQqOXlyt8ohJk2WF Q7ubns8iljfScQv/mNSURsSZA1IsE5QMeVH5l96gpybVgNyBozSgK1OZEr/ePg== 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=1770664022; 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=V2n6V28LeWQfunT6I/JngXDIq0zuVZqOkZVw79y8qVQ=; b=UPx180srXzQQsU432IFwBWfHxTH/06Ev6X+V46GL1c7awm2WWGCorKZEQSZCrrRsdSiXaX Z5WlBJX93Bvqq8pIaTeMiaXANfUrrYF+Pyez3TRoD77wSVDf8XAION2RgkW+6c0fJ5P5Yg XS5qiY0fuF9gOpastPhFzEDQqghSDauERG8NNUvuJxv42mOOUXWLhEnWeFNSGhP0yuVnlJ jWy+988LGw8gwgOwkvo6KO3iq9CtEVIoqJI3wlZeyNBUINfGimNjIj5CU4J2E87lBm4R7v UoYt6Hm1EaFnzZiqxTDe/+F3b2FBDiE3SBeFLMytanbD6KYaRFlT6iW3YV858g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vMB4MzCzlb5 for ; Mon, 09 Feb 2026 19:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37021 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:07:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 154778e35851 - main - sys/compat/freebsd32: ki_pd is missing from struct kinfo_proc32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 154778e3585166f613fd3d2978a0cab2262d1611 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:07:02 +0000 Message-Id: <698a3056.37021.32b78f6e@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=154778e3585166f613fd3d2978a0cab2262d1611 commit 154778e3585166f613fd3d2978a0cab2262d1611 Author: Konstantin Belousov AuthorDate: 2026-02-05 20:02:27 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/compat/freebsd32: ki_pd is missing from struct kinfo_proc32 This is missed by the sizeof(struct kinfo_proc32) assert due to another bug: namely, the use of uint64_t type that has different alignment on i386 than on amd64 host. Fixes: 85078b8573332c2c83a79adea8a61b519fb3b6af Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32.h | 1 + sys/kern/kern_proc.c | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 5c7764b75335..c10a8248aabb 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -413,6 +413,7 @@ struct kinfo_proc32 { uint32_t ki_kstack; uint32_t ki_udata; uint32_t ki_tdaddr; + uint32_t ki_pd; uint32_t ki_uerrmsg; uint32_t ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ int ki_sparelongs[KI_NSPARE_LONG]; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 05b1ed990025..ec06af21c7c3 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1503,6 +1503,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) PTRTRIM_CP(*ki, *ki32, ki_kstack); PTRTRIM_CP(*ki, *ki32, ki_udata); PTRTRIM_CP(*ki, *ki32, ki_tdaddr); + PTRTRIM_CP(*ki, *ki32, ki_pd); CP(*ki, *ki32, ki_sflag); CP(*ki, *ki32, ki_tdflags); PTRTRIM_CP(*ki, *ki32, ki_uerrmsg); From nobody Mon Feb 9 19:07:03 2026 X-Original-To: dev-commits-src-main@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 4f8vMD1ZTnz6Rs2G for ; Mon, 09 Feb 2026 19:07:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vMC6Fzgz3Bnl for ; Mon, 09 Feb 2026 19:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664023; 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=IfuGGhXkrERegKlqJi8obms4vnbC479qp30A3R/0HTM=; b=UUCLKFxiyzbsC5DO2xXIO34Lcx2WyJ1wH42hG0lkj43AaQ1F/OrWqUYxRIrLKjklpORPCr f5TSnXcdS7pfH0LQ7UKjGx8bmu3H0G3cBr1oMIpFfCAxyF1McJ9ZpSMRapNxpFAfVYZkCH rNRpwmPtSRg4qEc0xto234J3FtljWtX3m2pPRRHfVbyEh1uJN90tbR+SAMElVsJt37rM6R IdaFozoGUKJ5mB03iyuAl8M12wG7Ia4LOumR6/ITfdYUAgbDoujaItZDM0dS+jL1ItNMT6 H/XQY5V8GdfR3VMJ7r/w1F6g1klLU9/dLbkA8Osr7on1hNB9cVamJmNcTf6aZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664023; a=rsa-sha256; cv=none; b=RqUla7Pz+s4zT30/jh3MUXdCQqDk4vEwSCAI4k/EOUKF24cS+VCiIfKtCXIFIzqQrgH+1j yN9yoOIYqC7k/9+OL2OnvS/kejl4SFuQ1so65/UKopCENNzBdzyBHrBhQEea4AHrgiU82X COhvk64C4cW4R28NTwy7pP7QiKVWlZeh+8XGJ81yOjzhhvs3KtUs6T2fnMOQwk/WPxm4iD 7bT0EvFWxZZP7XbzyXa5cbkNFvWv1A1s6QQDhg2qQw8Nl9BgTq0juf2D1fFtU1Wy/DpPUN r90o0wUQntXNuIfOdh4XVrG19ILZgOHBscevy18iAMOSK1BZJs3CvwWlycl2FA== 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=1770664023; 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=IfuGGhXkrERegKlqJi8obms4vnbC479qp30A3R/0HTM=; b=YFD2FgeAwHbA7wCN8t4VHpGIN3yR9FmTvwK8ar0blef7j7t6B1w6nGAmABLlynmd6dXczI NzlW37ZaDASqbTxJlX+jP6sio5ZXg2PG5d8H6J+un0t8wsGmzvBrvH3AeBtDkKgTYgzfOg p8nFm5F022cTjUAz/Ac5qgYpTEOWmryO/t6Nqm+uewt5VDx4iaI3odrzJ/Ysuf+74dAYgS 0jUCq4epmIWAtxDBChyWyFNwqOAJgELqmlAuLtxUAFfhGaUXHOx3Y0fJfmF8ZhFXzVBHww A4s0mBHx1sopN3RLPtBjh7SQkSlVQRHrjYsnvn8wmO6zGTZ+5vEFXQCI5raHbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vMC5Fg8zm3w for ; Mon, 09 Feb 2026 19:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34751 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:07:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 31fab773613b - main - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 31fab773613b21183fbd5a313fa8c69d37fcb196 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:07:03 +0000 Message-Id: <698a3057.34751.45778dc0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=31fab773613b21183fbd5a313fa8c69d37fcb196 commit 31fab773613b21183fbd5a313fa8c69d37fcb196 Author: Konstantin Belousov AuthorDate: 2026-02-05 19:40:55 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:19 +0000 sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/compat/freebsd32/freebsd32.h | 4 ++-- sys/kern/kern_proc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index c10a8248aabb..e746a6e027ec 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -374,7 +374,7 @@ struct kinfo_proc32 { u_int ki_slptime; u_int ki_swtime; u_int ki_cow; - uint64_t ki_runtime; + freebsd32_uint64_t ki_runtime; struct timeval32 ki_start; struct timeval32 ki_childtime; int ki_flag; @@ -396,7 +396,7 @@ struct kinfo_proc32 { char ki_moretdname[MAXCOMLEN-TDNAMLEN+1]; char ki_sparestrings[46]; int ki_spareints[KI_NSPARE_INT]; - uint64_t ki_tdev; + freebsd32_uint64_t ki_tdev; int ki_oncpu; int ki_lastcpu; int ki_tracer; diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index ec06af21c7c3..1f9e39a0dda3 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1437,7 +1437,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_sid); CP(*ki, *ki32, ki_tsid); CP(*ki, *ki32, ki_jobc); - CP(*ki, *ki32, ki_tdev); + FU64_CP(*ki, *ki32, ki_tdev); CP(*ki, *ki32, ki_tdev_freebsd11); CP(*ki, *ki32, ki_siglist); CP(*ki, *ki32, ki_sigmask); @@ -1464,7 +1464,7 @@ freebsd32_kinfo_proc_out(const struct kinfo_proc *ki, struct kinfo_proc32 *ki32) CP(*ki, *ki32, ki_slptime); CP(*ki, *ki32, ki_swtime); CP(*ki, *ki32, ki_cow); - CP(*ki, *ki32, ki_runtime); + FU64_CP(*ki, *ki32, ki_runtime); TV_CP(*ki, *ki32, ki_start); TV_CP(*ki, *ki32, ki_childtime); CP(*ki, *ki32, ki_flag); From nobody Mon Feb 9 19:07:04 2026 X-Original-To: dev-commits-src-main@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 4f8vMF0ZmWz6RsLp for ; Mon, 09 Feb 2026 19:07:05 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vMD6fR5z3C07 for ; Mon, 09 Feb 2026 19:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664024; 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=k30a70GZwumoQdB0Mxe2qamBVMQ6m/lnFygQFQJeq6E=; b=uxxJgCTEr6miBm1LvBlz6YnQ43pju9Wn/MnzRv79tYEyWxR0g6QazNsGAvfgrv+espcUdC oXX4xPZApF2G2oxqqXeir1MxeamPfyo5FVwXKsLxuf8cGJINfUGwXOXVefQ4tihwUPeiXS G6Ng7bEUZd0/iPkZD6R4Ho/lAqxsM7a9qHgLm4/h7FJs/7/1gSUd+bzQ1gjWMK8PfCubZf rIxXKoRJKcI3Ios73LaQima5MDqEadnaFPs2YaV387Hu/8PlkVTQM0Azx7j+riCP78m+Ng KiUbngxFuw4O4mBP8s7J5CnMSgm7LdUDzuTgo4zq9F+uqep/YlZzJh2Od3Nx6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664025; a=rsa-sha256; cv=none; b=Yf2o07r3O7ttK79z5AMMFlspvKiDg38p/s45Gd3KpFdLg/NIvGRHXy4J2qgpNqsClbG/ZM 6UDACEjaCfs65PDyanfDT/shXfOxp3j8Bj5EB7eUYIFriVMIUdVeHkNrxvOqGJbJWMnQAX 0KDWhAXJaoiRmBMP3A90l4MAyrRnXVdmblFWWJg/XON4gKVbk8nDKwm62TuCFUCEuHEIVL fTotJpklgdURy+MxZXssPInaywxxDIXaNXVZoZWEDtQLHkpsLvpGbqXiDHxaxZ6TbAbdFQ PZePRjQfwOuKNnpk5DoL9lki3cqLc0cr9D5HGuO+jRg5jIEnoK3yKTLQAkGh8Q== 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=1770664025; 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=k30a70GZwumoQdB0Mxe2qamBVMQ6m/lnFygQFQJeq6E=; b=ga+SQSu3jXcxVirnQ35t/ahbss3UTPYZExKnIWFBgCroE2nDAj26otIKWYYUK2DN7h2zEh 5Z53pb+hSq0vTBF1cAQBZugNdY6+OcHfj57IBzLvbrKOgaETFMx1+wksVheSV25cZ5OuA7 LNW9FG1tz13qDd5HDfcZ45Ob2sRiR80wrdBCcABeAWwV+IwarbKiQCLTkpNIH1Eue4httf cc4D1/MrQgoHwWW1tayK13eIfH9J5axsvfk4bVlRp84F65xyXuYL35urrZKSGkmhig/EAl 7bN37Xf3ZqknLYk8LdK9b0gMYnMXhp/cit+sf8zGgx4TWCZfkl0AE+JfbG7F7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vMD64p8zlXr for ; Mon, 09 Feb 2026 19:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 366a5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:07:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 87632ddf67b0 - main - openzfs sys/types32.h: use abi_compat.h for time32_t List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 87632ddf67b01f3d4787d10332afc1eeece52e2d Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:07:04 +0000 Message-Id: <698a3058.366a5.7f729abc@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87632ddf67b01f3d4787d10332afc1eeece52e2d commit 87632ddf67b01f3d4787d10332afc1eeece52e2d Author: Konstantin Belousov AuthorDate: 2026-02-06 23:47:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:20 +0000 openzfs sys/types32.h: use abi_compat.h for time32_t The time32_t typedef leaks into openzfs compilation environment through sys/event.h. Simultaneously, openzfs provides its own definition that is only correct for amd64 on FreeBSD. Try to fix it by using sys/abi_compat.h directly. Since toolchain build from the make buildworld uses host abi_compat.h, add a preprocessor symbol __HAVE_TIME32_T to signal consumers that time32_t is typedef'ed. If not defined, fall back to old and wrong time32_t, which is enough for bootstraping toolchain. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h | 3 ++- sys/contrib/openzfs/lib/libspl/include/sys/types32.h | 5 +++++ sys/sys/abi_compat.h | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h index 5b7131923460..cb2ef27cf933 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h @@ -30,9 +30,10 @@ #ifndef _SPL_TYPES32_H #define _SPL_TYPES32_H +#include + typedef uint32_t caddr32_t; typedef int32_t daddr32_t; -typedef int32_t time32_t; typedef uint32_t size32_t; #endif /* _SPL_TYPES32_H */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h index 1bcae20187ad..850435b29f2a 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -63,7 +63,12 @@ typedef uint32_t dev32_t; typedef int32_t pid32_t; typedef uint32_t size32_t; typedef int32_t ssize32_t; +#ifdef __FreeBSD__ +#include +#endif +#ifndef __HAVE_TIME32_T typedef int32_t time32_t; +#endif typedef int32_t clock32_t; typedef struct timespec32 { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 69fb349edc7a..f190dcda9b68 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -52,11 +52,16 @@ typedef struct { #endif } freebsd32_uint64_t; -#ifdef __amd64__ +#if __SIZEOF_LONG__ == 8 +#if defined __amd64__ typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif +#else +typedef __int32_t time32_t; +#endif +#define __HAVE_TIME32_T #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v) From nobody Mon Feb 9 19:07:05 2026 X-Original-To: dev-commits-src-main@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 4f8vMG2Hzhz6Rs4H for ; Mon, 09 Feb 2026 19:07:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vMG0LTcz3CCC for ; Mon, 09 Feb 2026 19:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770664026; 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=0V8F/o7n+xPcxUBbQdi+wK8CdHugLtOh6kclOoH86xA=; b=covfs0M2eZF4lYaExxWTFuPi3Q/6szt9lLk8lKppP2yV+vAwsq4nQxG0j3aIRfCRKGg6/o JPG1DHMUP0FGUSmjiyxyC0n0kyXlxBucY6DDlqVoO86cseAodKhekvvy25Z259Ie8xBMxM EmFROPrO3FM5Vcil8XUofsY0cQSRgxVfOFcxS5wc1QGE2/TQYSWLiKEergjmIdF3ijIf4f TrZRL6LLlX7RsGoLGLOk0ZZ+4x0fLmfJxICRgmm74dJipr0QHxg161qFtl0QE35Fy5/+HX 05XcnVW+152VmiPwKLuqRtJpVvpBhJlX9zy3fGLM8YEZmFWpSkwu9YxbIBA4Dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770664026; a=rsa-sha256; cv=none; b=M6mOyaUqTZobeYWMJtRarxZrb4Y+aCUJp1pOXW+XGx3eOtaR/7fH8oqq+Db0RxKyLvzukz /fiw28z/aCLPzPE85CL6AK6JLGg0jURDP7cQkyI1rZbILQ7imjqOXWkZyJxdrrsQzHCBJs r30WQ9wCq9S4hOleWm0X1HBOo5U1prqWlCXMtaISzf0XcT/KmvrvhcQMxAXj8YzpF4Bge+ 6mahchUHlEV44ZCuVSz4A4+KDFHvGlFwWccEhuVsXo/MBx6zyhql+orA3uL9fdFWPQpKNU 5iJ6bNjZKNY2h/IpqaZVFsfY+r2QQu63bnE5UC0jhGKfSwpzGywglgXb0VoLOA== 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=1770664026; 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=0V8F/o7n+xPcxUBbQdi+wK8CdHugLtOh6kclOoH86xA=; b=hQhlVfNQdKzywbD+bCtIsjtecJCZJnREhDLBPagQuzAkbN4Ud7gs8zOTTk8Xtv3wR6uu2s YyIho4nMdh6rQ3SJpxOIjBiLkruw9QRFz++Jp1eKMPIKA8oqspjTLfOd2S4W/XB7H6sTls 1ibb5pzzaaQ/cMeCM1EKm5khDOKtBVRr6Xltv4RIgjQysUCWSpsPc5/393wy3UzbID6W56 gkqMTZRFuPf3ty9oLYUfquYHPBaHKlyesZDRJ0fY7h+4vMIRwbeNi6mPfuafrLU4903ww0 zpE2K1BhNnnGF3L88xx8Qu7AYKmTyW2Mfqtftma49XXfWzkBkgU5WtYMj9Oqaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vMF6qbXzm3y for ; Mon, 09 Feb 2026 19:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3680f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:07:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ec6cf0c52698 - main - sys/user.h: remove XXXSKE markers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ec6cf0c52698f9056cb17456717849653a03f7e4 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:07:05 +0000 Message-Id: <698a3059.3680f.2f1f0e2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ec6cf0c52698f9056cb17456717849653a03f7e4 commit ec6cf0c52698f9056cb17456717849653a03f7e4 Author: Konstantin Belousov AuthorDate: 2026-02-05 20:19:24 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-09 18:57:20 +0000 sys/user.h: remove XXXSKE markers Reviewed by: brooks Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 --- sys/sys/user.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/user.h b/sys/sys/user.h index 1704bc089d85..59210913f889 100644 --- a/sys/sys/user.h +++ b/sys/sys/user.h @@ -196,8 +196,8 @@ struct kinfo_proc { int ki_fibnum; /* Default FIB number */ u_int ki_cr_flags; /* Credential flags */ int ki_jid; /* Process jail ID */ - int ki_numthreads; /* XXXKSE number of threads in total */ - lwpid_t ki_tid; /* XXXKSE thread id */ + int ki_numthreads; /* number of threads in total */ + lwpid_t ki_tid; /* thread id */ struct priority ki_pri; /* process priority */ struct rusage ki_rusage; /* process rusage statistics */ /* XXX - most fields in ki_rusage_ch are not (yet) filled in */ @@ -216,7 +216,7 @@ struct kinfo_proc { void *ki_spareptrs[KI_NSPARE_PTR]; /* spare room for growth */ long ki_sparelongs[KI_NSPARE_LONG]; /* spare room for growth */ long ki_sflag; /* PS_* flags */ - long ki_tdflags; /* XXXKSE kthread flag */ + long ki_tdflags; /* kthread flag */ }; void fill_kinfo_proc(struct proc *, struct kinfo_proc *); /* XXX - the following two defines are temporary */ From nobody Mon Feb 9 19:29:42 2026 X-Original-To: dev-commits-src-main@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 4f8vsR6P7Hz6RtvN for ; Mon, 09 Feb 2026 19:29:47 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8vsR4T2lz3Jlg for ; Mon, 09 Feb 2026 19:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770665387; 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=fCeXkQNo8p/8Te1ZVJOyQ8OY1ymmmrDCZqo6sB1mv/g=; b=VgQs6Nc/T7sibZ483J05nuD4m9OANwodjQMFwWj6Jdzob8rt5hUQ6JSj/xLuqcPKwYmm37 UBA1vDaQtidGOIcOjWqNOJmsVaRILrMGrFEi3PTpcQQUzkJntgl7GcJNCyvamhfFCsZBiq P/5gPXV5bCihLr0trAZoySEt3I8cuSsCbWV+9bN/sXL7L12R2Gtdu9f5QZtuRFqKrK13M1 xFyXpn6lMUrXIjGYx8IjFx2tpRpvoQvqUQDaT4WkTF77shuQNQBs+9YUBty60IGLYBgpeE RnjYlR5Zh8YHS0bHgx8BQBmRzOZipFrKf1EdgJiGLW0iC6zd16psCnKvZSRKfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770665387; a=rsa-sha256; cv=none; b=PXnppITeCSDGvKjm1MHfoF8z/pmKRbcBpgVcG6hwOeaNjmtz9V6vVCe6tEihJpfuV+XD0u Vx5+whj/0Kj5VGrAqH2Yrn5FU9mzU5Iqjv9uHfUU2KOSNqqz/IQUh3edJF1sCHFfyyVNWr PNZPu1iBOFudedbhNoEoqVaIiHH7Av4CA3BayQCuX9/g7upsAXm2Xa5/LJXIBCj6PqksFL EQEYiB1sJAljIoDTUBd3AArSmLLu2zO9BWN+6UqcEYDSXtzbvVYpZxfOvBtNqwp03pUVWv XEb2UHMvyolaP44HBhPRDk5x6KlzRWvbZx5C3pqACxzcXq5V1ZEtV7Vs+24A5A== 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=1770665387; 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=fCeXkQNo8p/8Te1ZVJOyQ8OY1ymmmrDCZqo6sB1mv/g=; b=kGQNJvTEHx9Q/mbIFkODAYNVNf30TacjOtz/wlD9C3HeIS6Pl01l05lh8ET5HxCgYnu9oE SEI5SsCdtnf5CaXftM9FwNemHtzKrGzDvLoNnH/PxP4QIscWoukv67xx1vtN4APKIfqyAe Zu69VJfeMTUFmO2SGQttYaJJ5YIH7yfZKAou2pv7YJlyLTZAG38ZQXcbMAGWzXITYcACJi CAyRXu2TQfMyAywZKm5eaPNyWKajCZNDFYbNFai9+yd9OeNcLqJjafDJnuyJWG4k/eTQED UafYSnxU1oDO0aECwLwsEIx5qBXYa5xP85WS5+RNpgrK34G6EhBfgcUT60JwNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8vsR3wxYzmXZ for ; Mon, 09 Feb 2026 19:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3694e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:29:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: b9d3945831fc - main - ahci: Restrict NVMe redirection by BAR size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9d3945831fc7a60f2065c7a0afc747dc5653c9f Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:29:42 +0000 Message-Id: <698a35a6.3694e.52bf02f9@gitrepo.freebsd.org> The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=b9d3945831fc7a60f2065c7a0afc747dc5653c9f commit b9d3945831fc7a60f2065c7a0afc747dc5653c9f Author: Alexander Motin AuthorDate: 2026-02-09 19:23:26 +0000 Commit: Alexander Motin CommitDate: 2026-02-09 19:23:26 +0000 ahci: Restrict NVMe redirection by BAR size Attempts to access vendor-specific registers on emulator of older Intel hardware was reported to confuse one. Since the redirection obviously require BAR size bigger than normal 2KB of AHCI, add the condition, similar to what Linux is doing. Requested by: kib MFC after: 2 weeks --- sys/dev/ahci/ahci_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 2b4cb37275a6..ed1b734f70be 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -523,7 +523,8 @@ ahci_pci_attach(device_t dev) * here, or the user has to change the mode in the BIOS * from RST to AHCI. */ - if (pci_get_vendor(dev) == 0x8086) { + if (pci_get_vendor(dev) == 0x8086 && + rman_get_size(ctlr->r_mem) >= 512 * 1024) { uint32_t vscap; vscap = ATA_INL(ctlr->r_mem, AHCI_VSCAP); From nobody Mon Feb 9 19:59:23 2026 X-Original-To: dev-commits-src-main@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 4f8wWb59SPz6Rw4T for ; Mon, 09 Feb 2026 19:59:23 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8wWb4KQZz3N8G for ; Mon, 09 Feb 2026 19:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770667163; h=from:from: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; bh=ikgOjAh8XQO78IRpqnr6JStHTPIHafZDNo+0+EpXgEI=; b=X6bLUP/KLp9U/8Uy6P05dfHYr3pVKMYs3rArFq9rSIqFfufKeJtVRVBu4lr9Zz/EzgAvIk cLjaW2AU5T5TjOOhH5eejjv0gGrCxWhgIlydIP5N9M1APdgU6NS4fW2HSidVO6mQLlkTOm 7TkXiFiXZl3nHtOuj5G1pODqMmQsIzRcwrhPZBbze2mj5yb4UqI5YGaHRMBgayICZbo0gN 7YEZA9XoanG+wgJDp/n8r2NN2/JaVoN6vu89xfLbOfe8pwEOrHp7mSIVSaAKFhyr4Lfykq peQFlKjiZ7WZuOdV5Kwcwuj8SsrWOLYjf4s77Qbi5vT4HpU1vNve3cEjuAEthg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770667163; a=rsa-sha256; cv=none; b=QYZZBk6OWGayR5GCt64yfXtq3VSheDfiIOMWbqXhRC96RAritt3s6b4yFV2pbW50R8h/hf CGftnwDMLweev3nJi+RUm2ndlgEdzuwqf9POaW5o0WfZ8vns2d7Ak95n7RWwwd1h6ebBXJ vXyiKoem7bZk0na9YWVRWuhO5lkuOgSykIqEUYJv2vGCRjf6xwEq3cAK50mr/TqWv6mYEe hVoHFXhjow2loSvPkoF9bOg+pcmXHZnuth4joJg+vNKtUkRb/4mZvgZA5QaFEcvdjWIdPh 5xRy7jnyI4p/tLMK7wYjVIwN+mOcpzFNZcOZEDD21Flv2/zM/i0EF+m1j1aG3g== 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=1770667163; h=from:from: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; bh=ikgOjAh8XQO78IRpqnr6JStHTPIHafZDNo+0+EpXgEI=; b=sRE1cpfMd38T4BggvgqFKT+R0b+/c62jY9Vv3+63FK92XJXaDE84bwK0rxMVeldL4chVuX aDyJuBhKfu6f2+Q2CLV2xISCNZltC3B0KQN9x+LjUU3J2dV8ceUpqKZGGvgDkqJiFBSlBu NuYKFaw2CcpoIwcL+Lyyz/fKiq98gL7PTJVzIfspplnQ/yyPYqtkZBwqB1vssjWXkLwp05 idw0mOcEVzaqouGQY43PUzUBMWEVwztq+uamDxmw1TAFdVqlN9Wu2ZKgb8esPkOkc+mSwZ 3IrvYH2OpCDAmtzYeWi6/3yyQX/f5tdDWs1yCMxcGnp2IzWul5rhyoIQOsvW7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8wWb3wLxznWL for ; Mon, 09 Feb 2026 19:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a57e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:59:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Herbert J. Skuhra From: Mitchell Horne Subject: git: 9c800a103c03 - main - ObsoleteFiles.inc: correct entry for zpfind.9.gz List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c800a103c03dd4a32f1f6ac8f409fe38f304848 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:59:23 +0000 Message-Id: <698a3c9b.3a57e.8c5e1cb@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9c800a103c03dd4a32f1f6ac8f409fe38f304848 commit 9c800a103c03dd4a32f1f6ac8f409fe38f304848 Author: Herbert J. Skuhra AuthorDate: 2026-02-09 19:50:04 +0000 Commit: Mitchell Horne CommitDate: 2026-02-09 19:58:31 +0000 ObsoleteFiles.inc: correct entry for zpfind.9.gz It needs the .gz suffix. Fixes: 2ace05b65a2c9 ("pfind(9): follow-up fixes and improvements") --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b0ad8ec977b2..ad3c16769cd0 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -104,7 +104,7 @@ OLD_FILES+=usr/tests/cddl/lib/libtpool/libtpool_test OLD_FILES+=usr/tests/cddl/lib/libtpool/Kyuafile # 20251204: zpfind.9 alias to pfind.9 removed -OLD_FILES+=usr/share/man/man9/zpfind.9 +OLD_FILES+=usr/share/man/man9/zpfind.9.gz # 20251121: Remove duplicate pam_krb5 manual page OLD_FILES+=usr/share/man/man8/pam-krb5.8.gz From nobody Mon Feb 9 19:59:24 2026 X-Original-To: dev-commits-src-main@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 4f8wWd0VkVz6Rw7J for ; Mon, 09 Feb 2026 19:59:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8wWc5QvYz3N8J for ; Mon, 09 Feb 2026 19:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770667164; h=from:from: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; bh=R4eQ67IlXNx1NO36GvZbfw9+PfrOkrfAmn7ZpsoEDLQ=; b=DVPuEZhyF/OUBzKyzji8uw6+2GK9fqz0aiUPmSMys0zPzf2Vd+qbWPBjZ6se5Sowzj0yqk /g0/p+1Wwi+TT2AEa7ROieX9GXG+SUYN8dm/zniaFVADLXUtYCZbBSUlJj4MC2aHbrr5tv EZ6g6cM+YJ61gfi3smCE/fh5QGru6a1MWDJ3e9njekf5ZXuDL9UFBu3Rr7rX2aLM0UU7ZW 4WMiVfP69dtkaQ0Xf4znnDw7VFTV+5DQwsbTl/qizknJCn9DpAEWG11nIPK2FmpOwea2se wmafaXGZbCwvelvUSoMxsNOuAInY2JYqlyd4dNSyXsTa5E2r+TgExvrmQGSteQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770667164; a=rsa-sha256; cv=none; b=LEHCe9IbuXPdfr/aQ2XBR4H0NfPoX9f6ikd1r/C+MG5vZQWNm7V++ZsXyy/gXmacdCuAfH 5vc6erivl5VG+qDnXQAPt5oSCSnXxoBcDt/bd6UFsAmbYYJu1Bi5MTod0LxKW/I0dO8pJD XFMKlnrbpSwbbjcb1e5hnCtDBXAJQcYWsyjl/hVJmHSYLn9ZDdgT2bhHSOKHoUYk7pF9TF JmePpVMfAWx8AY0jvw6e4ZwI81ydwxnvZ1ffwhi2UwmYGdvew0dOwLR5GXf7bn9l5tlQFB irqVl1vFHTbHyrpPBqHX3krwz1CNNt651CT1a+5PbMnoVu90SZ+DxDzGJ2BV3g== 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=1770667164; h=from:from: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; bh=R4eQ67IlXNx1NO36GvZbfw9+PfrOkrfAmn7ZpsoEDLQ=; b=DpFC1ajOV/HYrQkI489I7IsDWaBiOs8EfizYMUyO7LYLHyrgAAcnQA0jpQAeLgTwt30W/d imEd+mTrno/vNLePuwqO0x8JQxqEy59gqCkPlyS2YcpvpGOh4Rzs9jphLZdw/0/AJOdlzW 0Y3FkAFfqiNxJEJVtD0MxKsoTXv/483x7UcsPWBgxh8hv+32Z27M0RS0DArzc0FZGJUtIL eOKNKxaH2mSkZ/L2Y5sndatX6EMJee0yzCEdNN8W/pcgTQvuXDBGedLs8hAqls8gcs47hB FAA29RYDpEHAXOYG56VqoqX3R2S2NPLEotXtykJ77QXRRa6TLcmXdZZruBXL9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8wWc4M3yzn6D for ; Mon, 09 Feb 2026 19:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ba8a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 19:59:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Herbert J. Skuhra From: Mitchell Horne Subject: git: 1c9ca4cf7184 - main - ObsoleteFiles.inc: remove stale allwinner pages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c9ca4cf71841d5f6cee070143b9e29d541e4124 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 19:59:24 +0000 Message-Id: <698a3c9c.3ba8a.14587d34@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1c9ca4cf71841d5f6cee070143b9e29d541e4124 commit 1c9ca4cf71841d5f6cee070143b9e29d541e4124 Author: Herbert J. Skuhra AuthorDate: 2026-02-09 19:56:47 +0000 Commit: Mitchell Horne CommitDate: 2026-02-09 19:58:38 +0000 ObsoleteFiles.inc: remove stale allwinner pages These were moved out of man/man4/arm into man/man4. Add entries to catch the stale copies. Fixes: 15c79c6fa608 ("man4: move allwinner pages and logic to a standard place") --- ObsoleteFiles.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index ad3c16769cd0..4ebfadeb1fba 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20260209: Moved allwinner pages to share/man/man4 +OLD_FILES+=usr/share/man/man4/arm/aw_gpio.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_mmc.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_rtc.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_sid.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_spi.4.gz +OLD_FILES+=usr/share/man/man4/arm/aw_syscon.4.gz + # 20260204: replaced with ATF test OLD_FILES+=usr/tests/usr.bin/m4/legacy_test OLD_FILES+=usr/tests/usr.bin/m4/regress.sh From nobody Mon Feb 9 20:00:46 2026 X-Original-To: dev-commits-src-main@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 4f8wYF64Jvz6Rwsh; Mon, 09 Feb 2026 20:00:49 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8wYF5QgRz3Pgq; Mon, 09 Feb 2026 20:00:49 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770667249; h=from:from: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=7/sEXdDqR1dypmdCBy8pc8TNmtFaqWEtX7hyVQoaiAg=; b=VU/PWGoGdT4Hmb5SG6xifs3p9WjELUiL39JrY4XJu+IgJheTk7hAqsBenAc2JrdTYT6gpI BDYCKAtBogZ/5NwCUSn608g82zqLBMFEkSlVOuuPusuHNNhKIY09Fbjh0SGd8OZPkFOzm2 UiMZffRGXMpTZbNeTVrkwIvsMf/IGCpcuH4hwOqfvSHMopkyXIJqLPqRerdesrTdNyqtWV MHBqcKR0GxRGkwanltkbIdIzgYvv5uAb06IqaRPg+1zCq5HCwBPp6HN6M4QTWMlujYnwNE GEIGy9VOOmhFcILhSVdBl9WutzNVYIToM8ziVZyaggCT7jw3iLyWmJTrx/I6kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770667249; a=rsa-sha256; cv=none; b=ZaFN3cFSOIE3lLdby3N7RIebqhIVEse5R6kfe+bfP3iZ/jDbkOVEn+ZOUHbxlg2qSg06Or kXQ+1LFM60ARiU1JNhXGElphy+YncDGBy6/bYDVRzLiLVCO07u6VOUlBu4tOMaSQrK3LBa +CPiNO9z75OV/1O6iksl1VRn6CEt+/Ya1mCeuiGuD4scVlY7WRFA2Vr9UOkPFQVmzdMo19 fXS1ORE56KKMFnSBkwzc/k7ikSTIKUfUbfTkmMj4nR+g7OTfZpfBxUk/ePYC9tZ19hsQSP 8w789hMozEhrG27zZ1C1YVZ3SL+r7qDFxhk3IoskYwmLeyW6m9922dw23E5vlg== 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=1770667249; h=from:from: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=7/sEXdDqR1dypmdCBy8pc8TNmtFaqWEtX7hyVQoaiAg=; b=PDc8d/0LUiU+pS7Ic/wkE35nl6vXLsqMJxHVSXuUe0n2J2zQJdmfk7mVHsaVMLQog3LPyf Xmdt2FxavU3QisAfEy4cfF+/jCiQXEtGexb8KPHgapf1Y6x+WDElsmLM5u58DI4seOjJqe xnAkbg7pVCHddLCUAYzRNQN7DzAFZVrJnhBJEkjGzh6ZMUQBL017T1KhbNISx5i6avwaJN FJModcKbkfBL8eu+KWLIn8eBAcQXuiOY7afFx+QCunv5olxey+g+BuhMDh97IJ7v6aOGBX M8atq7dp9slbGWSRxAw9QWYC/G3WRa1YjGVCFuouDpvkepf4hswCBmTgHpLilg== Received: from [192.168.2.224] (chtwpe0124w-47-54-102-213.pppoe-dynamic.high-speed.pei.bellaliant.net [47.54.102.213]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8wYF3x9Qz447; Mon, 09 Feb 2026 20:00:49 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: Date: Mon, 9 Feb 2026 16:00:46 -0400 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 15c79c6fa608 - main - man4: move allwinner pages and logic to a standard place To: "Herbert J. Skuhra" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202510202342.59KNgKOl091819@gitrepo.freebsd.org> <87bjhxsyo4.wl-herbert@gojira.at> Content-Language: en-CA From: Mitchell Horne In-Reply-To: <87bjhxsyo4.wl-herbert@gojira.at> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 2/9/26 11:51, Herbert J. Skuhra wrote: > > Should the following be added to ObsoleteFiles.inc ? > > OLD_FILES+=usr/share/man/man4/arm/aw_gpio.4.gzu > OLD_FILES+=usr/share/man/man4/arm/aw_mmc.4.gz > OLD_FILES+=usr/share/man/man4/arm/aw_rtc.4.gz > OLD_FILES+=usr/share/man/man4/arm/aw_sid.4.gz > OLD_FILES+=usr/share/man/man4/arm/aw_spi.4.gz > OLD_FILES+=usr/share/man/man4/arm/aw_syscon.4.gz > > Thanks for catching this. I've pushed the fix, credited to you. Mitchell From nobody Mon Feb 9 20:09:27 2026 X-Original-To: dev-commits-src-main@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 4f8wlC5MZZz6RxGF for ; Mon, 09 Feb 2026 20:09:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8wlC3KL8z3QQJ for ; Mon, 09 Feb 2026 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770667767; 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=A9ZFvE4jHYwOQ+0bEFBpvFQUIp+QC+dY/xHYmnrCgWw=; b=xRwitFTxH+Zgt+C0O5nz8+LmRaIZxKeKTgYZgJfGXJZr3sK6dv9Wj2fCYGiU84c4YT6Abu IyQmA8Bjs0bs8PlrSfNFrsl7VCScs9jCqRsMxNhiJDKqCou6G0uVD4IwJSA3EvtaDzF9Z3 qjc4bwghBe4kKG/5GdHJWEl5itYdmy55wKTdpPg0bsbypf32HEYRO9b/IuUkZllfP/mc3D xDVKrLadCkw32o4OGdRYK+0hoPevwpnYDipgOSx0Pq6u3GqV90qUA/V3RoXbMJzODFDQY6 DUALscWZz3r7zYwzD5QdrQMcmaGLikK3H5g3m7uxVv7GOSY5+EeN2NgWKhxBsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770667767; a=rsa-sha256; cv=none; b=UbXCpkmeaVZfjx87PA99yFHXt+A2ZzcFzCzVA4QlPZY7TrFWooaD03lLQgGBvm/+g+GJ+a uSEqJg8qg1YF2nIX23H4d8ueHz9ubT6Lcqpi8IqFjpgNE3qLYYQFemBIQPDp9HrkdI7WK0 /19HW+vTwywyNNUPoWMh3NNQJxrtjSDiY75VlPNB4KbT1TjihlteKNqk4jIRUxUGa2Ec7+ TfhYijuU1DGbWqzm4NntgS650M3ApmdfS3cTTUzzy9EjpZHowSFlzEkWjEGeTES6O4IOIw FearZQGg+SAwWQOm3Q19DQhVh1FBx/8heaTUx2huejETnPWLtp995IQDg7cB8A== 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=1770667767; 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=A9ZFvE4jHYwOQ+0bEFBpvFQUIp+QC+dY/xHYmnrCgWw=; b=l2TVrCwvRm6A43WPjSl0XgV2tN3iMnAXLVuNl7B0168SPclIB+oWv7wS9SnRXVbUPNCEZM QhF/Ej5n8+n9gaU4RbhfpN1ILyJfad8pR2+P3EHKvzWlb2GMZUu9owPGSXcGq8ZUI98/dH XQ3UscYSCtj79oLkUo+eD4qaf4SS3CZc+eHa0gOKuV/N34aDXVJwafaDTl220/xVqfRrbY BKoTeWiWnD3EB77RQCH5Wq90iciXXye8gU1hD8WJYUrm+03izoyVvGj67TTYPF7vbvRz/O iJum0P5Eo8DW5IW1xwq60LFWLhDuwSAw9RiVhVR728V67B6w1uViv1wciYec6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8wlC27LmznVy for ; Mon, 09 Feb 2026 20:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c704 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 20:09:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Guido Falsi Subject: git: e912723afb4e - main - ifconfig.8: Start new sentence on new line List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e912723afb4e6bcfa828fcb73f35cd82fc6bca68 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 20:09:27 +0000 Message-Id: <698a3ef7.3c704.ad87883@gitrepo.freebsd.org> The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=e912723afb4e6bcfa828fcb73f35cd82fc6bca68 commit e912723afb4e6bcfa828fcb73f35cd82fc6bca68 Author: Guido Falsi AuthorDate: 2026-02-09 20:04:01 +0000 Commit: Guido Falsi CommitDate: 2026-02-09 20:09:20 +0000 ifconfig.8: Start new sentence on new line This change was forgotten by me in the previous commit to this file. Reported by: kib Approved by: implicit (change omitted from previous commit) Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 --- sbin/ifconfig/ifconfig.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index e1d153aa7493..f062ddec774d 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1009,7 +1009,8 @@ Clear a flag .Cm no_dad . .It Cm stableaddr Set a flag to create SLAAC addresses using a stable algorithm -according to RFC 7217. The +according to RFC 7217. +The .Xr sysctl 8 variable .Va net.inet6.ip6.use_stableaddr From nobody Mon Feb 9 20:10:34 2026 X-Original-To: dev-commits-src-main@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 4f8wmc2FMqz6RwmM; Mon, 09 Feb 2026 20:10:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8wmc1fl3z3Qlq; Mon, 09 Feb 2026 20:10:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770667840; h=from:from: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:autocrypt:autocrypt; bh=fnQKBJl3SOnoXkZ3WaHwuHbKpbY8qfCwKx6n7Mg77mM=; b=l8GEVFdwZ9/nQJuHc/JV62U2R6ewdNkRPHS3EQP/9kpEIfw0bNhwFCmkP6jE0eufbSVOzV qTYiXFtwVDJqMGirbxykTW/2i/vVzbe5E6rWxlbVA0k7UiIPAbyfvUOFQFan8frkX6ifz9 VeazSuGr5GCECduqZKgOcC0kb704tu8SoeBLPXbRnTPvXwUwxzpIhrB+P9qwzZhxZwMarp ALeUnJF+HKLfe930PBPO3xAKVxmlVAvMfGrkbjonaqiRitR7TF6Y+I7I66R9v5V6i6caoO xcOiRu+XMSzQl2ynfhcmImWhbjf1OtH0tMhXipwh0woWCPCXzgp0y48WJJ9fGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770667840; a=rsa-sha256; cv=none; b=w5I2JrKwz9yXJVWfora7eEl7gZMRa3631dOBVQnectalhy7CKaDydTdelp4MjVGTb/IoZt H559Vcxb0yI6Zs3qehSfOCWftH2ai0cF9jn5VUoJOeorTrWQ8wxLzvQMYC7oYeveoydyGk iDJ8G1B09PVhIv2zI/dK98Awl497XGvaid0WErCyY1zdD6lKoBpOrQpwinBHW/rj4izbtC NE1YW2tRDnzCcQc4KC+CkKNXAa7aMrSeIg88HPW+NOuBRqCTgturAB7fX9tvpp5D2qKN1q T0Rq1kXQ1gHzf663EfGakT+iHtjjfWa8oS6oiJKgEr4ZzdaBecCz8xOjhdLCzg== 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=1770667840; h=from:from: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:autocrypt:autocrypt; bh=fnQKBJl3SOnoXkZ3WaHwuHbKpbY8qfCwKx6n7Mg77mM=; b=rG0axYkZpflaRMfXmCAqHAujPqLsecZrnfHxaEgNZRGJBk0AcnwnU2uyY9YcpGIBFQocBb 2il6fM+/PXycnc0jDiDQkR/HR+sqa8dY+VZzAec7cWEuoF7S6GJC339RnXDuye/iB2SbB3 bfwgXlM/Bv8tZQCDx/xbI9pypB8ZVPYLNPC6LdcSWMbx4flcGlLhn368tyL86V5OuzNolM mLfeKM3GuQD7CwOLGsdj+Wpwexix4xCxPoMQCXVMYlS52NsIRHjZ7OlIXsfzWInZT2uvB1 gRiOxCHkYUgqS6OyREABwP86B8zB6OKQuQ/fZUnhMdlYMMd3WH7cOMzI6qMo9A== Received: from [IPV6:2a01:e11:2002:4280:ab9b:8bf1:ec36:413a] (unknown [IPv6:2a01:e11:2002:4280:ab9b:8bf1:ec36:413a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f8wmb4C5zz4xW; Mon, 09 Feb 2026 20:10:39 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: <86afcf5e-ca93-467e-b185-7a3a6534bd1f@FreeBSD.org> Date: Mon, 9 Feb 2026 21:10:34 +0100 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 4548149a8102 - main - netinet6: Fix my style issues To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <698734f0.3791d.631908c8@gitrepo.freebsd.org> Content-Language: en-US From: Guido Falsi Autocrypt: addr=madpilot@FreeBSD.org; keydata= xsBNBE+G+l0BCADi/WBQ0aRJfnE7LBPsM0G3m/m3Yx7OPu4iYFvS84xawmRHtCNjWIntsxuX fptkmEo3Rsw816WUrek8dxoUAYdHd+EcpBcnnDzfDH5LW/TZ4gbrFezrHPdRp7wdxi23GN80 qPwHEwXuF0X4Wy5V0OO8B6VT/nA0ADYnBDhXS52HGIJ/GCUjgqJn+phDTdCFLvrSFdmgx4Wl c0W5Z1p5cmDF9l8L/hc959AeyNf7I9dXnjekGM9gVv7UDUYzCifR3U8T0fnfdMmS8NeI9NC+ wuREpRO4lKOkTnj9TtQJRiptlhcHQiAlG1cFqs7EQo57Tqq6cxD1FycZJLuC32bGbgalABEB AAHNIkd1aWRvIEZhbHNpIDxtYWRwaWxvdEBGcmVlQlNELm9yZz7CwHgEEwECACIFAk+G+3MC GwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEBrmhg5Wy9KT2uIIAIrawQ89TnqEhi2C OEQAhx3uqWZuNoS6NyiSgsRCmtSnT2GOgH4Ucbr/I37SkV1B3K6HkoL6lwN8Gjf5KOgLqmTi E1W3RTwS7l8PSvdnjM9i7g351R4mTijtxawB/JcQf/Kge3Yqr1V4g6H+wQXHUStmHThbupuN trzRphvR/e5ekT0FTyVfPmpcbm68i2bwZnKUex/TNIECBykYh8b+SYMLhENf2ayRjCIWS2Ad 7tnTKhMtnS5jtW6qjBy4RoTpQD6oR1xIgkTRlQ49roVCUfdHb+Y/kh+U9G1IcoNy4vkg9IfP dwpSfnP+a8j0AZ1hMnOLZ1fYoQrs+4gVLy8Fs7TOwU0EUxB7QQEQAKFhrDceoPdK/IHDSmoj 6SQYisvM7VdhcleS7E9DoEAVt7yMbf6HbbMVTTY6ckvwTWQssywLBXNVqxgc4WLJjzfUhgef +WE75M3+WFYlOVQLGZY/zEVgma1raYnOHNAOzeHLDmEXjbZP6vGAeDyBbGfQPpE7qGYZ7ube T3XwQO+PklcCrvOPj2ZPcAxGNS2xVU/LzONqCrJqLMJSIcCdsbiSP4G5PnDFHtMokaTY6OEr 8OEQfOAerhcHUa/z7Uu8YtmaqKH+QGkE/WEgaRqSiTnv0JOTD+DxehaqvoKPPZ++2NpCZMHB 2i6A/xifmQwEiIjEXtcueBRzkNUQkxhqZyS13SrhocL9ydtaVPBzZatAEjUDDEJmAMLVFs45 qfyhMiNapHJo2n3MW/E5omqCvEkDdWX/en3P7CK2TemeaDghMsgkNKax/z0wNo5UZCkOPOz0 xpNiUilOVbkuezZZNg65741qee2lfXhQIaZ66yT7hphc/N/z3PIAtLeze4u1VR2EXAuZ2sWA dlKCNTlJMsaU/x70BV11Wd/ypnVzM68dfdQIIAj1iMFAD/lXGlEUmKXg5Ov2VQDlTntQoanC YrAg+8CttPzjrydgLZFq3hrtQmfc0se5yv1WHS69+BsUOG09RvvawUDZxUjW19kyeN9THaNR gow3kSuArUp6zSmJABEBAAHCwF8EGAEIAAkFAlMQe0ECGwwACgkQGuaGDlbL0pMN5wgA4bCk X/qwEVC06ToeR6C2putmSWQMgpDaqrv65Hubo+QGmg2P4ewTYQQ4g6oYWS03qHxqVVWhKz7F jfrV+dH8qbCLfSgIcvdBha7ayGZVrsiuMLKGbw36fcmkZPpSDOfHcP0XH8Z+u9CWj0xUkTxA lZ/7i6gYSUpG2JWNtdmE/X8VVEyXusCLwy0K0BI60A/4dRTIX3C4QKrJ3ZbUXegz70ynjHf+ lQMZ9IZKASoRMuS5FozPQh6abvmwZEPdf5I9riUElzvHrqJ8Bx0t3Pujdoth+yNHpnBxrtO8 LkQdrQ58P0SwcaIX33T2U9pG8bhu5YVR88FQ8OQ0cEsPBpDncg== In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/9/26 02:03, Konstantin Belousov wrote: > On Sat, Feb 07, 2026 at 12:49:52PM +0000, Guido Falsi wrote: >> The branch main has been updated by madpilot: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=4548149a81026ad9b1706b2b7e7ad47a4c1358b6 >> >> commit 4548149a81026ad9b1706b2b7e7ad47a4c1358b6 >> Author: Guido Falsi >> AuthorDate: 2026-02-07 12:46:05 +0000 >> Commit: Guido Falsi >> CommitDate: 2026-02-07 12:46:05 +0000 >> >> netinet6: Fix my style issues >> >> Reported by: pouria >> Reviewed by: pouria, ziaee, glebius >> Approved by: glebius >> Fixes: 31ec8b6407fdd5a87d70265762457c67ce618283 >> Differential Revision: https://reviews.freebsd.org/D55136 >> --- >> sbin/ifconfig/ifconfig.8 | 19 +++++++++++-------- >> sys/netinet6/in6_ifattach.c | 22 +++++++++------------- >> 2 files changed, 20 insertions(+), 21 deletions(-) >> >> diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 >> index 627b7cd3f9e3..e1d153aa7493 100644 >> --- a/sbin/ifconfig/ifconfig.8 >> +++ b/sbin/ifconfig/ifconfig.8 >> @@ -1008,24 +1008,28 @@ Set a flag to disable Duplicate Address Detection. >> Clear a flag >> .Cm no_dad . >> .It Cm stableaddr >> -Set a flag to create SLAAC addresses using a stable algorithm according to RFC 7217 >> -The >> +Set a flag to create SLAAC addresses using a stable algorithm >> +according to RFC 7217. The > New sentence should start at a new line. > >> .Xr sysctl 8 >> variable > Thanks for pointing this out. I fixed it in e912723afb4e6bcfa828fcb73f35cd82fc6bca68 -- Guido Falsi From nobody Mon Feb 9 20:22:58 2026 X-Original-To: dev-commits-src-main@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 4f8x3402tMz6Rxtq for ; Mon, 09 Feb 2026 20:23:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8x333jCHz3SDk for ; Mon, 09 Feb 2026 20:23:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-43767807da6so80490f8f.2 for ; Mon, 09 Feb 2026 12:23:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770668590; x=1771273390; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JzjfvIfO8gvK1ZfjhrvpAnOB5Lc5r6D6l0Q2h++U6Zo=; b=xOC2GVgPC7T5Ogx3NUTRlvZJnfCyx6qQqAmTeO7W6Z5axK6p86Ucl3q0T56SUpjF+u 3rRQPiZkMEYXUA+V49pqI78hEaw0bKRuKovwKWxrv2JpT97zW2Sbrzo/LCXlSe3KB+IB S50cRyEEIRx2Kf8bswE8bstYNXnquzh9T5xTICWAadPSsNUdSp+PSiuy4ZBh/KCh8A4k weU8yDIUIr6IefhdBzICBxUoxHE+fb6QCbjIqdfoL8fuC74lBMOp5K9Qa5BR7rexiMEF JlHPOgquMlP+t+wN9aRaSIi4ifLQxK3yGMPiy3Ww32HA+EP5LMOoL0J0t8MnpwQRuL3U kuaw== X-Forwarded-Encrypted: i=1; AJvYcCXh1wVT/uuIs7BZx+Ud5/sfkYcSgC+s8Pe9gyI+lhMUu1j9ocfKnBj2fW7lC0R3cYe5VdQIfLi//lH/oZPKTOW72Qb4yw==@freebsd.org X-Gm-Message-State: AOJu0YxQI0W2ezS/iYtkKtW8RVawavvEuprfyUNygm9HyEWQaK74V1lr m3a1FiiXsa1AX60Up1T0wYqUdHmtlbzF3DsJsaic2dvtPW2M6pf0D6SFsn2zljUqrRQ= X-Gm-Gg: AZuq6aKgjzwvKXU6qXTCbbpmM/8HWEU2CIwEW72ShEZy7LVsbyPk2/Q7/2PB67nWxG2 +wT7VNXiC43B0UxRrAc1LGxo/qzezDDAFqba1fdSGkODvkZYb9SYyYLOX9gwQDq+ORLK0TJazv1 xEC4inKJs6CZg6fqdrUeVjTcji3nQQ4Q1z8Baq6IOStPjFlPJqZsipkvjjlgmH3jW9UFzMZAr31 HIhQRpUCMd8CPvBsUwi/u1W0RaUU5v2IyleQ624AVG9nyp1zgXbMfG+DssB983AmvUWHfsTY23k /rYMr+Eo3EwukAseR/mUKccCrCktjaixFKsKwZPbmLA05bUUghnYJEQNp8FOJK9QX2JGYQpVq+q lNURPpmstyizz5v5nwKoCHy6uw72mMwiKAcx8ItloltwtRPQECkbJY0B9I/M3Pre167EmtRcF+H ZYm4qrPES9CGJQN5YyGjFy0ELfNFX3XMdU7sHHZgkzlTKr5ZkX9IFGxg== X-Received: by 2002:a05:600c:5253:b0:46e:4e6d:79f4 with SMTP id 5b1f17b1804b1-483201ee7f4mr178021385e9.15.1770668589689; Mon, 09 Feb 2026 12:23:09 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4834d7f1e4fsm13105925e9.15.2026.02.09.12.23.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Feb 2026 12:23:09 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: 31fab773613b - main - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 From: Jessica Clarke In-Reply-To: <698a3057.34751.45778dc0@gitrepo.freebsd.org> Date: Mon, 9 Feb 2026 20:22:58 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7A721AF1-9D9B-4F7A-9E67-F0E8FB989E7D@freebsd.org> References: <698a3057.34751.45778dc0@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4f8x333jCHz3SDk X-Spamd-Bar: ---- > On 9 Feb 2026, at 19:07, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D31fab773613b21183fbd5a313fa8c69d= 37fcb196 >=20 > commit 31fab773613b21183fbd5a313fa8c69d37fcb196 > Author: Konstantin Belousov > AuthorDate: 2026-02-05 19:40:55 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-02-09 18:57:19 +0000 >=20 > sys/compat/freebsd32: use freebsd32_uint64_t for struct = kinfo_proc32 Can we please go with my __aligned(4) suggestion for freebsd32_uint64_t? FU64_CP is getting all over the place now and has no good reason to exist when we can readily use a GNU C feature we=E2=80=99= re already using in other ways. Jessica From nobody Mon Feb 9 20:29:16 2026 X-Original-To: dev-commits-src-main@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 4f8xB44Y6Xz6Ry56 for ; Mon, 09 Feb 2026 20:29:16 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8xB445tcz3SxS for ; Mon, 09 Feb 2026 20:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770668956; 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=50E7IVS1/IIIsM7B/rVJOMnbKYU6m5urdaZk4mk1zv4=; b=jxuOgdD3uLQK1gowGaDu86tL5+JC6tXgyidfHDpnWUqTsLN8qNAamYuxmiwo4P1xgLYe15 g7byNQwLjok5PNwilWTFBJaUEVS3IG68l0jFkcZ5bfzstxVusP6vJr7g9VdC0Jz86AIbrV QLcBZEvcE4rjUw6oxBsoMZbmEB48hIDMF+iLOD+q9WYAJkESe+yfl7wTmzH2HQygvH93v5 hPPy1g+AXQa3lyL7Fha1j/CHnFFy04z8JmBzarnbgUqIqPcSkI/uaaVKWalcGS7nULwaKR q6hvCbDTY5qIHgb7HWBOyVqCqNlsSv0tE3seuqXVE/ZIQ1oTR2aVl12TuyZfow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770668956; a=rsa-sha256; cv=none; b=HmZaTCS+GDcdyiwIExW3KHk0knhCK1a3mnYQELCb/032ESvpzONx4Elo0UBmoPTHXJdW6B LbkvGCxJ57sZzKH2lgGUc6XMnzSNsTA0tLuH5R2D/7/p0j63tTL69pxZ1hnJj8P1mmZDFM QYXVG0/UVLpd8ewGd0XCfAN7GdAoOKFIVejkr9q0CtbRUpri4l+PyD39FLlsg7J7x2OhDe CyLdzEmNmJrO1mLTgm3kFT9g+oUNfJpkWR+itR50wapVQyVWghSrTM/d6vWUhPJmUnHbgk yS4vkBO2JJyjzENkDInSMBS92jBWz7nOLpUJzGszyFCOtbBY0zKvsKrW6req8A== 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=1770668956; 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=50E7IVS1/IIIsM7B/rVJOMnbKYU6m5urdaZk4mk1zv4=; b=mjnQTBNBQqnkMkdMDoGJVtlkKK0j3uP0cG7iH/cz2IkPL4nBoc3HMbtZcsMPwettdscSzf fpaLQ/ZltQ5IarkB1ab9qrgbv2ffDn5Cj6SpgLXghSniwL3VPWjMC0uwYAxJqUyNtdmXqN Zv2xEIYy/lhmGC4Txl07k2ctkx0V2+pVUnkblzL+a+JVwJXOJ3vjSh3AGppLe1gz24bBse HTlx5dM+zUaMU1t/CsRSY5orTAze7aj5xRs+STXWFudeHLs2JaQFMCK0EMbCptVP5Xb6oR OJZ3EMsuPEjU1uqCXUkjrivy5bwHOYvoOjwTHlE3JGQ1JczWRzmGROOuG5+Kzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8xB42xbjznqk for ; Mon, 09 Feb 2026 20:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e329 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 20:29:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Guido Falsi Subject: git: a2eb0894b79b - main - sys/netinet6: switch net.inet6.ip6.use_stableaddr to on by default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2eb0894b79bd0241e51c6888a52bea369ae8a6a Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 20:29:16 +0000 Message-Id: <698a439c.3e329.5d619acd@gitrepo.freebsd.org> The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/src/commit/?id=a2eb0894b79bd0241e51c6888a52bea369ae8a6a commit a2eb0894b79bd0241e51c6888a52bea369ae8a6a Author: Guido Falsi AuthorDate: 2026-02-09 20:27:15 +0000 Commit: Guido Falsi CommitDate: 2026-02-09 20:27:15 +0000 sys/netinet6: switch net.inet6.ip6.use_stableaddr to on by default This change switches to using RFC 7217 algorithm as the default to generate SLAAC addresses for IPv6 interfaces configured with accept_rtadv. Reviewed by: pouria, glebius, zlei Approved by: zlei Relnotes: yes Differential Revision: https://reviews.freebsd.org/D55138 --- UPDATING | 9 +++++++++ sys/netinet6/nd6_rtr.c | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 5029bf086bdd..d4a6e486aed0 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 16.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20260129: + The "net.inet6.ip6.use_stableaddr" sysctl is now on by default. + This changes the default algorithm to choose IPv6 SLAAC autogenerated + addresses from embedding the interface hardware address to using + SHA256-HMAC hash as described in RFC 7217 to derive an opaque but + stable Address. If you are using autoconfigured IPv6 addresses at + reboot they will be different after this change, but constant + thereafter, please update your DNS records if any. + 20260106: Zstd has moved to the new "zstd" package. If you have set-minimal installed, this package will be installed automatically, otherwise diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 0ca97125110c..8f557ba77af5 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -95,7 +95,7 @@ VNET_DEFINE(int, nd6_defifindex); #define V_nd6_defifp VNET(nd6_defifp) VNET_DEFINE(int, ip6_use_tempaddr) = 0; -VNET_DEFINE(bool, ip6_use_stableaddr) = 0; +VNET_DEFINE(bool, ip6_use_stableaddr) = 1; VNET_DEFINE(int, ip6_desync_factor); VNET_DEFINE(uint32_t, ip6_temp_max_desync_factor) = TEMP_MAX_DESYNC_FACTOR_BASE; From nobody Tue Feb 10 00:42:24 2026 X-Original-To: dev-commits-src-main@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 4f92pC4hWWz6R4dl; Tue, 10 Feb 2026 00:42:27 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92pC485xz4FJg; Tue, 10 Feb 2026 00:42:27 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UYggjxCfwRXWVEPGKiqkR6hZBeXzs6pzCMHUxFHU5H4=; b=lRvkzX8BhbaGQLZPGS0WJsv1grzND9NEFmDR2tEEpvv3U+/1werzdLASkOHP4g24xRDKN3 i6jcsHvA+zbdu2uH9YjTDWufL0pkX8dk9sKPIdvb0aEhXqkyjm0LgJReWVFQPbpS23beo3 rGOlS6DQXXZ7mvCKUtVp6cflbXWf97pJH8A/wFOgY/9plHPWus2HQWWASeDrTVpME/DGQ/ m8zu1pYjlJrgnE+VFfyPRG3HEnIprhzQDQliwQodKImlcXsgWkKes6tvPybAcLxCm8IiQ8 O20dw/9UQK1p2XyFIDZef+Gym16ujUFeg19bUnUvnblOHI7xwyOWXzmXplMbeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684147; a=rsa-sha256; cv=none; b=K0dClKe2npPnCL8mujKhejO34CW3EdRYGb5IRsZdDe6gE3GA5eCl/gagWs9ZHPNPbRQSgg CqmYbZPDs4eIY4VZ3sKuCZShHkQ6kNuxSeyP2/N1wFuZULITSmR0sP3e4t0PacZgQ69BXW I/v/CWaeBgmv9gdWL6d3+w80rHBKjqLVuH4iOHOYEY/VxrDj9z5Jnp+U1AK4LZRm55O+XC 4i6A4TliezavslWI/d5nd/fjq0GrjdimiFBTDGTo52Op++0bmFqUpY6nsqBtUPjHQERUYH 1tqzeqViojhYh/SBVnU3pGcfAVEzN/bb8UvRwI28QrBNprJDVnoaz5F2L0xCpA== 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=1770684147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UYggjxCfwRXWVEPGKiqkR6hZBeXzs6pzCMHUxFHU5H4=; b=POjvU6HlrUZYxDiKkfZNl/P+/9BfJmPxEGkFAyOkG/DSoMnEbEQJV4BcCPUlSw1jyV++JB qIOKNHXCKMPkRtKAXhrmzBvtjAHz1DJII/jH12AZb8nx+DD0QXkwJkHpM9afiiA3I+PhSp Q1IHC/yCrNcRwjNjOXndyRavl/ZTjbqJx2cq0abyyQK4BIiYFYBP9bf2PLZfrWYQgR5T/B FJ+SOzpBRs3xLkBVfG/hjD7aVayXquu1m3Tt487dG+xJR6tO3Pwn3qvyinYOmrkPEoNoqR 73StBKh+8xb/1aZwWcMiOB9/Ka6+27ehv27ZxFKC4J/YflESzNeQl9Kd7kGAMA== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f92pC2tc4zBWv; Tue, 10 Feb 2026 00:42:27 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id CA595A64805; Tue, 10 Feb 2026 00:42:07 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 865C22D029E7; Tue, 10 Feb 2026 00:42:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id C5lW18w46QRe; Tue, 10 Feb 2026 00:42:24 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 640C82D029D8; Tue, 10 Feb 2026 00:42:24 +0000 (UTC) Date: Tue, 10 Feb 2026 00:42:24 +0000 (UTC) From: "Bjoern A. Zeeb" To: Konstantin Belousov , Brooks Davis cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ad639400dc9f - main - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members In-Reply-To: <698a3052.36544.6d7c1a7c@gitrepo.freebsd.org> Message-ID: <0qrpp6r-1374-7r1s-8o3o-9280q483q549@mnoonqbm.arg> References: <698a3052.36544.6d7c1a7c@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Mon, 9 Feb 2026, Konstantin Belousov wrote: Hi, > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=ad639400dc9f1c5aec470996473bb54edc113dba > > commit ad639400dc9f1c5aec470996473bb54edc113dba > Author: Konstantin Belousov > AuthorDate: 2026-02-05 19:22:44 +0000 > Commit: Konstantin Belousov > CommitDate: 2026-02-09 18:57:19 +0000 > > sys/event.h: use freebsd32_uint64_t for kevent32 64bit members > > Reviewed by: brooks > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D55135 It seems that this commit breaks drm-kmod radeon drivers at least. I assume given the abi_compat.h now gets exposed via event.h into LinuxKPI and "CP2" etc. are just very generic names. 26 In file included from /home/bz/local_modules_dir/drm-kmod/drivers/gpu/drm/radeon/ci_dpm.c:31: 27 /home/bz/local_modules_dir/drm-kmod/drivers/gpu/drm/radeon/cikd.h:852:10: error: 'CP2' macro redefined [-Werror,-Wmacro-redefined] 28 852 | #define CP2 (1 << 2) 29 | ^ 30 /home/bz/git/FreeBSD/freebsd-src/sys/sys/abi_compat.h:73:9: note: previous definition is here 31 73 | #define CP2(src, dst, sfld, dfld) do { \ 32 | ^ 33 1 error generated. > --- > sys/compat/freebsd32/freebsd32_misc.c | 38 ++++++----------------------------- > sys/sys/event.h | 6 ++++-- > usr.bin/kdump/kdump.c | 6 +----- > 3 files changed, 11 insertions(+), 39 deletions(-) > ... ... ... > diff --git a/sys/sys/event.h b/sys/sys/event.h > index ebbcdb703183..0ba8e4796208 100644 > --- a/sys/sys/event.h > +++ b/sys/sys/event.h > @@ -104,6 +104,8 @@ struct freebsd11_kevent { > #endif > > #if defined(_WANT_KEVENT32) || defined(_KERNEL) > +#include > + > struct kevent32 { > __uint32_t ident; /* identifier for this event */ > short filter; /* filter for event */ ... -- Bjoern A. Zeeb r15:7 From nobody Tue Feb 10 00:46:41 2026 X-Original-To: dev-commits-src-main@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 4f92v62B7vz6R4pL for ; Tue, 10 Feb 2026 00:46: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92v553Drz4G5d for ; Tue, 10 Feb 2026 00:46:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684401; 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=f1cG8JWUPiXj9gb4u4zG6RnFV7zrBg47x20SYqq7AFs=; b=MOvPIXvdS31zaiV459dDERycKGQgINhqRbGXGLrpvawyPO0BjN5/u6w9tK6CxBxcR4SlaL Wk1LaksbOjv87PG/NAfSleoplFtrBy/1ldcqafG49ULjma0RSksbpgo9Pv5GRGrkbD3SQc mi+r9XH9LcK4j/ag+ZnfoXlHW1/vR5V0fHfnQWswxutSVrM6HPFvkciEgYc09y2PX48F2+ flqKaT3zuuQHLsWE+r8l3KBnsHAr652fKdPhpc94hl4W76+K0qmUZwFoqE0k6Tk7ZmmDTB 8C0IpnEuMdCeSJfvPPjI/uaXZPeH5GywY3xx5ONt2sGNAMAFHcjOh9GJa1Sd3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684401; a=rsa-sha256; cv=none; b=crLJae3CTg3Y4r/wvb587AoQEkheeDuqHtKmEGUbu08leKdWm6a+8X+OF7++Fe8vFT8zhe oX14FgRPZoFAB+KuYdiZXvZkwHlj2E7ETU7qSAw4SOTkhpOyRMhv4xxWhnS9znShjSRHXx 3IW27qpiD0PdgcfQzVf2/u5egg52s/KfUh78nEuGULKyz0dWSWSn7hLTO2kqe9Hi9s7Kzg Eo6uyF0ZVF7r5mw9ZVcRtjNTX59EPrFFjnISbjud7gQWEKN0Zxvx8gVffKANJ3yhad5HOY 4pKrMVSffSPb7A6r3NuPhs/imWbsLpe2M+RmHkhtPJHSGTN9cpRyNkjFYZQtWg== 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=1770684401; 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=f1cG8JWUPiXj9gb4u4zG6RnFV7zrBg47x20SYqq7AFs=; b=eqGrZ/+zwSavK0dzn9LF5+qjQ9kMvTPzJyLSei4ZF1wVsbvCOe/eXgkRDp5h3WEtH3eT3G 4KWOKC7aWvSxXj/+LLHqC365qbKhGfW3xurMFhQFP1/C16+lSO3WJZkqNnS5TEgfZjDald UpfRA87Eio/6SZtBI+eQFSkeez08gQzypeKI7fWvEKUf2i0lDk5sKk7rAkbp9xFF4hqaey lfCL6cF6pklUFi1aYA4jtgK4FtbHQwjnF2gkVo5jFTYkuZfbsThhxmtvSNA8yxgGX9st6p O0nbpEyARxMyEPYKB6Vf7Lul9B1EzMJnMvDYVcFc2mynEx3finjDg4NRgylBdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92v53r07zwS4 for ; Tue, 10 Feb 2026 00:46:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27f6d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 840f478eed2a - main - net80211: in net80211_vap_printf() also use vprintf() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 840f478eed2ab18abd1088aa12587bb708a46b56 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:41 +0000 Message-Id: <698a7ff1.27f6d.4e7bb14d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=840f478eed2ab18abd1088aa12587bb708a46b56 commit 840f478eed2ab18abd1088aa12587bb708a46b56 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 13:43:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:40:47 +0000 net80211: in net80211_vap_printf() also use vprintf() While everything else uses vprintf() and net80211_vap_printf() vlog() the debug output of wlandebug sessions can be weird. For consistency use vprintf() everywhere to have homogeneous logging. Sponosred by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54795 --- sys/net80211/ieee80211_freebsd.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index b1380eb8a81c..095be79e7bfe 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -1324,7 +1324,7 @@ net80211_vap_printf(const struct ieee80211vap *vap, const char *fmt, ...) va_start(ap, fmt); snprintf(if_fmt, sizeof(if_fmt), "%s: %s", if_name(vap->iv_ifp), fmt); - vlog(LOG_INFO, if_fmt, ap); + vprintf(if_fmt, ap); va_end(ap); } @@ -1334,14 +1334,12 @@ net80211_vap_printf(const struct ieee80211vap *vap, const char *fmt, ...) void net80211_ic_printf(const struct ieee80211com *ic, const char *fmt, ...) { + char if_fmt[256]; va_list ap; - /* - * TODO: do the vap_printf stuff above, use vlog(LOG_INFO, ...) - */ - printf("%s: ", ic->ic_name); + snprintf(if_fmt, sizeof(if_fmt), "%s: %s", ic->ic_name, fmt); va_start(ap, fmt); - vprintf(fmt, ap); + vprintf(if_fmt, ap); va_end(ap); } From nobody Tue Feb 10 00:46:42 2026 X-Original-To: dev-commits-src-main@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 4f92v7091xz6R4yy for ; Tue, 10 Feb 2026 00:46:43 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92v63yg5z4G1G for ; Tue, 10 Feb 2026 00:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684402; 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=IqAhOLRdmw2CwucRzoVy256heXfx+AFM8LpkeqfdgCQ=; b=j4k48CyN72K4X3D6ZLhqlOcYuIRqR1jNfbTNzvIzEKtGpizqzV0lbpcWvaVGYsetdQ7lHF gpMrHIWQRNoNiduc+67STb2RQbC83AIwZ9v4uLm1kxQUTddS0w/ggvfdcmgY4z13CJk0kN wZZaD9NJbyXWR1nKEKfdpKjhi7TVXBBUNNxd1aIDQQ3MI75uEwNxDJW2x8BfKTjelZqx23 2WYila+gibkIhB16/MzTA19utgEY82T9/FpWhylvc/eNQdGGHY7ENwwObIDI3QV88j3hmc +dHgkfEqsvwnx0O8pMxJHy2zCy5Vd//6BhBcT5A6G4zW9KcCp/nI3MiNvyVRtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684402; a=rsa-sha256; cv=none; b=yHihne5rIAC0tnJdnIz1jgEDKxl0cIe4hx2fmeSme6+zlq+POrtkjibYzxwiGHJ65izd77 C4bBmXURGAXFuwhFnLRbyOB2bmK5WVZgKOSB6myiBwhwLlU/qcKFhnIYe7b7UuoXl1Md3e +MVytX1gDb32fnTSZMu2Q8eYzOG62pUJcgABFLb2hmN0mYq979U5+qPy93IaQD1TLE80QL lvut2PomVIvtQyocmG8lI76WSBuvKNBNLYnDaomC2Y6LgH1SQasdq3qPblJA25n+Dup5lG xgpS/c1BM4mxnZ385EF00x0Keve4gesgRCLXczcqcLBk6tLprtQHIqH6XkUgtw== 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=1770684402; 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=IqAhOLRdmw2CwucRzoVy256heXfx+AFM8LpkeqfdgCQ=; b=qxoYsvqda2PJSaKCsOOm2UqR0wSI8cmYEMCM524Xmg3MvvOUyowIAZUjr61fKVQi8SyW3n 8Sq+M4RxrZ7iOhh8jQJplwtxfWeAfx3JIJt/nzNW7OLbjTyP00QYx/McnkMf5uqDguZSpW et1NZpTHpAlulvATsFagUxhmystFi5JR3KTB7BpJwdMTHo0j8CUzaiNQcC0vRM0LbpvsQR BVzVRIUQSY/zGZh3GNVFcmAQsgO3SUic1paAyRm0ioPfVOhARVNLPQ6d58jdKDhaX0TZMv 9XjOymQYBn059gEDudW8OlO5hiaBZL9h0OWjejlO23N1Pp99xaDlFQ+m/kchDQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92v63ZHXzwX1 for ; Tue, 10 Feb 2026 00:46:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31b05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b615b4805a9c - main - LinuxKPI: expand dma_sync_single_for_cpu() in lkpi_dma_unmap() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b615b4805a9ce83b9b86dd66d46a9f220f9f89c6 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:42 +0000 Message-Id: <698a7ff2.31b05.13e51dcf@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b615b4805a9ce83b9b86dd66d46a9f220f9f89c6 commit b615b4805a9ce83b9b86dd66d46a9f220f9f89c6 Author: Bjoern A. Zeeb AuthorDate: 2026-01-23 19:14:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:40:47 +0000 LinuxKPI: expand dma_sync_single_for_cpu() in lkpi_dma_unmap() In case lkpi_dma_unmap() would call dma_sync_single_for_cpu() we get into a lock recursion which will trigger a panic with debug kernels. It would be hard to provide an internal "locked" version for dma_sync_single_for_cpu(). In the old days this would not have been a problem but (long before we added the missing sync calls) some locks got folded into one in a6619e8d9c1a3. Sponsored by: The FreeBSD Foundation MFC after: 3 days Observed with: iwlwifi mld Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D54841 --- sys/compat/linuxkpi/common/src/linux_pci.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 9e4fad45433a..612a2cb5f46b 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1720,9 +1720,26 @@ lkpi_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len, } LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, dma_addr); - if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0) - dma_sync_single_for_cpu(dev, dma_addr, len, direction); + if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) != 0) + goto skip_sync; + /* dma_sync_single_for_cpu() unrolled to avoid lock recursicn. */ + switch (direction) { + case DMA_BIDIRECTIONAL: + bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_PREREAD); + break; + case DMA_TO_DEVICE: + bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTWRITE); + break; + case DMA_FROM_DEVICE: + bus_dmamap_sync(obj->dmat, obj->dmamap, BUS_DMASYNC_POSTREAD); + break; + default: + break; + } + +skip_sync: bus_dmamap_unload(obj->dmat, obj->dmamap); bus_dmamap_destroy(obj->dmat, obj->dmamap); DMA_PRIV_UNLOCK(priv); From nobody Tue Feb 10 00:46:43 2026 X-Original-To: dev-commits-src-main@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 4f92v767rJz6R4pM for ; Tue, 10 Feb 2026 00:46:43 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92v74WFjz4Fvy for ; Tue, 10 Feb 2026 00:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684403; 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=5ZZyhcr1QTsE48GuJS9wtsbYT1DMAGjj7wuJf9Yx/KY=; b=Eld1sD8S/Qs0LlDjAR3c6087utCTnctZ3M8JPahkcMNo+QcZ5OyDUPSJTssKr2m8p78sqM qMrwteQnD9l+00uBqCIgj3ZqeqipZ/uYo9uzhqn24D9nNvjVgb3yQ//o94SEugRh5/yzQf BtJbP8oXLWT12bO25tKrf7+9MrUbwejKwrvoJaWxGDe3l+xdNsFLuTaKo/CpYw6Y+kVqDx iWpwKKfWbwyfwpMiZgPowfXhRaT+KjphNaA7lYOrTPaDtSSlKXM9/JHhSElsFU9gRPx/Xn ou2uM4s8xWK9dEesGl6NSzJIrB30s5QmtqrkgLi7Ppd2x0lYgIYiizAxQ723MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684403; a=rsa-sha256; cv=none; b=KQkNSiPv/mXE2PYnqYpnO2ELWW37P/JmQkIxD6PPtCXP/LxbLHxBXh9a4oB8cOaw0DV9Du 5VAbPvPvhU6qq1uVp2zrVbqlUQnIrRAtxIAsNAqdSfD4B6Bi+VSxBnGNm9aVGh7rQBZ/D5 ia+TfNzykKAGu9RUS7FeU3Byp32/ROXXt83Iy7KqOLoI+DgOP+ia9a+9PE6pRY0poUF7OA flJUoCO+GbzTrSO6+gXeiCsDjsNoRDHUowWWJnc2vLoCwMlUn0NSuAiNSiHgLmuWRaVE8f /Whh8uUZuutM/BGyFdszKaTjpyKJws/7PHxHJARn8iZ9Gwkn7qiBUxVv6Ik5kg== 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=1770684403; 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=5ZZyhcr1QTsE48GuJS9wtsbYT1DMAGjj7wuJf9Yx/KY=; b=D5yzWUVvB7Cg7SDOhgZE8y78c7nScSX0IaDX9Ke68RDv59HvxQ6P83SnUN7SSoPAGTS0E2 QrsJgQyJ2Tb1WVMYVBHCqoaotd0YRk+xEIAIZ3kGHzdqCqcaTpxuIxXHuYkq2fYBWybs/d UBydrTP8eITonziVBlzDUddqdAmYZBFD9+g9x/9OK6TryxFipKJ293sAZhDgHZfYOu7Blp eJSEr8kqWPB/ffvaIcKkPd9l3sJD5QrSmunOO4XhjyQTtYVcMepOoVekxJtQ+5FwiToWzm Pd1ePwOzfp2BIKQH/U0JBgSraVGvLdwx+sLU0YkWdIgqU5jGDwFtr19950qcAQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92v743dhzx0r for ; Tue, 10 Feb 2026 00:46:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31e5d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 1f19fc2632c9 - main - LinuxKPI: pci: make sure a tailq and lock are initialized List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1f19fc2632c98cfe653a082b5fcb02d16053ed06 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:43 +0000 Message-Id: <698a7ff3.31e5d.1da86e2a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1f19fc2632c98cfe653a082b5fcb02d16053ed06 commit 1f19fc2632c98cfe653a082b5fcb02d16053ed06 Author: Bjoern A. Zeeb AuthorDate: 2026-01-24 22:16:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:30 +0000 LinuxKPI: pci: make sure a tailq and lock are initialized Move the initializations of the tailq and lock from linux_pci_attach_device() into lkpifill_pci_dev() so that they are initialized in all cases we create a device (see all the possible callers of lkpifill_pci_dev()). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste, dumbbell Differential Revision: https://reviews.freebsd.org/D54861 --- sys/compat/linuxkpi/common/src/linux_pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 612a2cb5f46b..477cb321ea9e 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -385,14 +385,16 @@ lkpifill_pci_dev(device_t dev, struct pci_dev *pdev) pdev->dev.bsddev = dev; pdev->dev.parent = &linux_root_device; pdev->dev.release = lkpi_pci_dev_release; - INIT_LIST_HEAD(&pdev->dev.irqents); if (pci_msi_count(dev) > 0) pdev->msi_desc = malloc(pci_msi_count(dev) * sizeof(*pdev->msi_desc), M_DEVBUF, M_WAITOK | M_ZERO); + TAILQ_INIT(&pdev->mmio); + spin_lock_init(&pdev->pcie_cap_lock); spin_lock_init(&pdev->dev.devres_lock); INIT_LIST_HEAD(&pdev->dev.devres_head); + INIT_LIST_HEAD(&pdev->dev.irqents); return (0); } @@ -613,9 +615,6 @@ linux_pci_attach_device(device_t dev, struct pci_driver *pdrv, if (error) goto out_dma_init; - TAILQ_INIT(&pdev->mmio); - spin_lock_init(&pdev->pcie_cap_lock); - spin_lock(&pci_lock); list_add(&pdev->links, &pci_devices); spin_unlock(&pci_lock); From nobody Tue Feb 10 00:46:44 2026 X-Original-To: dev-commits-src-main@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 4f92v90xfkz6R4rn for ; Tue, 10 Feb 2026 00:46:45 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92v84zYSz4Fw2 for ; Tue, 10 Feb 2026 00:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684404; 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=FlwB4m480o8BiRPkowvHORZ64EopBtq99XSLg7Wr3Fg=; b=O/8sWWhvOuEmEkjXsUAtnnV35AVvMCJE2eZbEXWzJlRuj3WU3SNfm03B7p/XZmVnXwN5VQ WOVgfRwqiJwL1tdx72TY3YK9Ar1E5wdHXfqSEdRgsilEhFGIOgVWx3pFMlJXL8/+tLgVCj hIRbVSMjeXXkcs4c8aeQFsBeLfijENDvxF/f4NkesZ8NBeKGEMOn9JOpoqWawvPW1WuMW2 pD9SXWcCHHyGQEeHV72DoEzfme2wqnZu7WPZbKTUwEKygKzv4hh1A1ZUCsjOohQlsHw+7p GGbx957qZKpTxsPSqYqyjiBsJj0aml3VU/K/ZAv8dBosOzHwCn8rx9Kx14hbZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684404; a=rsa-sha256; cv=none; b=lZiSU9PwrRDSY86Cg/a2C+WAVLxqmJnhPECdUKDvPEShefwgI+L1Vj1BKL7mpo/NjMJ51U RhmI1Fc3zzzvaPXjIPVCGpPmO4SJiWAImJETHiAPGm7TcrYpoRjSsvuwzFRxTCDB+wUYPY I6kYlXQFoyIgpqa9HxJfCK6jdLCg3cavd1VZKLS0bQ7dfu+zhMIfR80yvVfxZuobYP/Q5Q JS3cfp4449KRUx62zOC5Aw0auml2e+Cc8N9dO8Q6SDoeaLS0etGH76nQbBwWtwTNPbZksr dWeep+E40Fp4aaYZc8Juypg5A3YwRkZGJCFWYIZqTqxewBhxsUdbOrqWcm0icQ== 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=1770684404; 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=FlwB4m480o8BiRPkowvHORZ64EopBtq99XSLg7Wr3Fg=; b=vLsC/oKywaEd1zJ7PUghwHg7I29gFxqQsZBv14MnW2XcK39uTVflLp8iE2VucKsl6ZD897 BU1Dwu5jePZJr0tegdVm+7GIx9Ko91pEsGgoYAJaoV71l9cT9h66EgFH0Y8lcpjwcr59pd JInyGenOvfMAMBXbH0F5oMzlxVntFzOn5p9UueYnZ+JEcyrYtUCQCPh7JLvvWz8S68ncR3 Fg6fzi8CAvWNRWanNNE7YdtxE0sbkYXbYjhkXk+R/gfhVcLGw+HuHsfclBITAK40MIXRsC vkLPccozwGY2OJp1ek7TrVdJyhH7vVmu3VZ8xYogIko8zJmXfi8ek3gB66fwhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92v84R1Wzx0t for ; Tue, 10 Feb 2026 00:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30542 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 1f4fbcf342f4 - main - LinuxKPI: move MODULE_DEVICE_TABLE from pci.h to module.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1f4fbcf342f41fecc8dff4e0d9a1f9bdb1cdf784 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:44 +0000 Message-Id: <698a7ff4.30542.6ed368c9@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1f4fbcf342f41fecc8dff4e0d9a1f9bdb1cdf784 commit 1f4fbcf342f41fecc8dff4e0d9a1f9bdb1cdf784 Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 20:31:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:44 +0000 LinuxKPI: move MODULE_DEVICE_TABLE from pci.h to module.h Move the MODULE_DEVICE_TABLE macro to module.h where it belongs in preparation for different bus (e.g., USB, SDIO) support. The various struct _device_id, if not elsewhere, should be defined in mod_devicetable.h. This is the next step after 2f5666c1727c. No functional changes. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: emaste, dumbbell Differential Revision: https://reviews.freebsd.org/D54900 --- sys/compat/linuxkpi/common/include/linux/module.h | 18 ++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/pci.h | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h index 079dacf8df6c..fbe57cbbed82 100644 --- a/sys/compat/linuxkpi/common/include/linux/module.h +++ b/sys/compat/linuxkpi/common/include/linux/module.h @@ -53,6 +53,24 @@ #define MODULE_SUPPORTED_DEVICE(name) #define MODULE_IMPORT_NS(_name) +/* Linux has an empty element at the end of the ID table -> nitems() - 1. */ +#define MODULE_DEVICE_TABLE(_bus, _table) \ + \ +static device_method_t _ ## _bus ## _ ## _table ## _methods[] = { \ + DEVMETHOD_END \ +}; \ + \ +static driver_t _ ## _bus ## _ ## _table ## _driver = { \ + "lkpi_" #_bus #_table, \ + _ ## _bus ## _ ## _table ## _methods, \ + 0 \ +}; \ + \ +DRIVER_MODULE(lkpi_ ## _table, _bus, _ ## _bus ## _ ## _table ## _driver,\ + 0, 0); \ + \ +MODULE_DEVICE_TABLE_BUS_ ## _bus(_bus, _table) + /* * THIS_MODULE is used to differentiate modules on Linux. We currently * completely stub out any Linux struct module usage, but THIS_MODULE is still diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index c337be67f5a4..ccbd425de5da 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -76,24 +76,6 @@ struct pci_device_id { MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ _bus, lkpi_ ## _table, _table, nitems(_table) - 1) -/* Linux has an empty element at the end of the ID table -> nitems() - 1. */ -#define MODULE_DEVICE_TABLE(_bus, _table) \ - \ -static device_method_t _ ## _bus ## _ ## _table ## _methods[] = { \ - DEVMETHOD_END \ -}; \ - \ -static driver_t _ ## _bus ## _ ## _table ## _driver = { \ - "lkpi_" #_bus #_table, \ - _ ## _bus ## _ ## _table ## _methods, \ - 0 \ -}; \ - \ -DRIVER_MODULE(lkpi_ ## _table, _bus, _ ## _bus ## _ ## _table ## _driver,\ - 0, 0); \ - \ -MODULE_DEVICE_TABLE_BUS_ ## _bus(_bus, _table) - #define PCI_ANY_ID -1U #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) From nobody Tue Feb 10 00:46:45 2026 X-Original-To: dev-commits-src-main@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 4f92v96stBz6R4rr for ; Tue, 10 Feb 2026 00:46:45 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92v95MlLz4Fw9 for ; Tue, 10 Feb 2026 00:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684405; 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=jxG4Ao88oVgL7SMdHCv6D5vbOVRDvOJ1TdPqq2eSP6I=; b=iDvFNP6CBqlKMEWxo/720bCzc94kuvQ47cDsFmlDJXSAgwOv8by31DAORBDLXUUpuJclAF jx7vI3n46ORXqeOnNPekdUnNH7tkrS5rGPVqaE485dHuKo3buwhThRU8Kx+2a/GK/8A4KJ 4Vt/LzCUYrJL2MKvTEOcFxmr+CcSlhkIE4FgkDMFd1iIX3zne9SeRt58jQuOAIi7DncFdP a9IjREz85qHcfTBoqQL8okJwYP1mQWTidF3q0YL0mohE8DVmT6w3ONjWrW6nCB0mpC3tG+ 7vibTwGaXz//+2F3yI+4Vzf+ZFQc4E/Zxg/m6+71ca9q+pz7uMxo0qRShIvBGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684405; a=rsa-sha256; cv=none; b=uSuKkcDN/n7i2fIWQsjyGT3EWNyC1B7uVBJ8C1YZHRS8Z4ddp21X9TYALKVYkm68DuMa/M Fo938eXTh4macC3FEmJO5+9ExROgbk5C975pcjaM/JvRnrdjV6vtux46kUAbhbUTPPYptB VZ8DAO66rzTIqiRww5Ev/rmu91LxoDwuRG3dYDlOu0aDwHmJ8Bj31GxaQQHmAkmIshMtnH ohJu0NdNg87AKNcW+/7PfGKnWW7Zu7IcrtPS6aB0PGSzko+98/3DnroEu76eg3tdY0WLsy vhMRlwyxIDpzV+6TwKGiVvFrffkVCoQWiwCqbYDTnDlCJArgW45PxlWIaStd3w== 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=1770684405; 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=jxG4Ao88oVgL7SMdHCv6D5vbOVRDvOJ1TdPqq2eSP6I=; b=g8VAhPqLC/j8pxOh8qOc9ltDvOy+qHAm1EqkqsgnLXN20moLyQWz0uHDFqBQgr0PZOtnMn RpHj6z1D6bqvhrzrU0gsZQuv4PPdOD3ZrxGbNv4fj7nckzX7nAFNstz0NkJDU3roDZwFZm hy1DTPG3CDs82UvvEIuKhb/BGTJmkJSkPJ6cS8rTjvCQ6s2iFIjB36JxlPD6oXlLl/LxsL r7HGBwiKKFtILb9HkTARQtn+GgrrNCv1ar588pNY7dFywJMkSwJKblZGP8oJSjvKExa6U6 6I9vpmNbXTWS2GHA4zAWxhY29yIXQKCHfw1P/bU7QkpxQkkAb4zqiaB5obQcfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92v94zrszwpD for ; Tue, 10 Feb 2026 00:46:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2747b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 020ff5e29431 - main - LinuxKPI: mod_devicetable, add comment about [future] LinuxKPI USB List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 020ff5e29431f5b55f2e3876c0e4828205e17cd5 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:45 +0000 Message-Id: <698a7ff5.2747b.49c532a0@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=020ff5e29431f5b55f2e3876c0e4828205e17cd5 commit 020ff5e29431f5b55f2e3876c0e4828205e17cd5 Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 21:00:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:44 +0000 LinuxKPI: mod_devicetable, add comment about [future] LinuxKPI USB USB structures are defined with the native USB implementation. Just leave a comment why they are not here. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D54991 --- sys/compat/linuxkpi/common/include/linux/mod_devicetable.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h b/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h index 87bd6ec24bce..df7c2472861b 100644 --- a/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h +++ b/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h @@ -80,4 +80,10 @@ struct dmi_system_id { #define ACPI_ID_LEN 16 +/* ----------------------------------------------------------------------------- + * USB + */ +/* struct usb_device_id is defined in sys/dev/usb/usbdi.h. */ +/* MODULE_DEVICE_TABLE_BUS_usb we have in usb.h. */ + #endif /* __LINUXKPI_LINUX_MOD_DEVICETABLE_H__ */ From nobody Tue Feb 10 00:46:46 2026 X-Original-To: dev-commits-src-main@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 4f92vC1yGnz6R4xq for ; Tue, 10 Feb 2026 00:46:47 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vB6lv3z4G1g for ; Tue, 10 Feb 2026 00:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684407; 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=PSrvYd9G85CkTuK+bwoO+iTADxb/vngLEmEJoLqAt2U=; b=jPDajiVOiA2omwqkxAp1dl6sU90aRSIUQzdXPwB3rcbNjtcbfeOt42soiRb+rchIJsYf2B Dh7uDghrk7sxFq1N43vn0UAvrv9NjpEmwriSJFnj6PZvM+9T1tJf1X1vEdgSIdEY3FfaET bkAKUnNP1KJPL/26sQp/GZNWy8b3eDfN5FbzBm/CovtJDLT9GRBmTzZLmvefU9bO3QzriC e1ql2yl7P44cvw5ysZYA+vHvk90Y0NLSNGiu/4zWDefAXB9f7ElzTQkda8RPMAV9aeVOoP 01lx0A+FHodttobSUDSbYYzbuPKCA2+7c8gNfar/98eBa3iXhzj5Q3saoJ8Ysg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684407; a=rsa-sha256; cv=none; b=tD8jdXMh95clc3CAWLcSMnKiHV37ctyFhcpPS0ua/v9wEx7SaqRbZzJ6xXfwZgpzlf/uGx L2CPn2PChORaP11Qml0v+IbyswE3/L+CdxvwNbi9GM6J5RCasKb/6rdxXY0IXx34IdRIHo pqZzCznJ2+3ZaGvwwTp7amTy3xUHa62k374MMceDjJUbl2tFwXI1DhUqEraB/HsippxqEa TNGvVhXu3HG4Bg1jm1nPtHRjFRnXy/pyHrOLy4IbE9r5uwIOLDjSNAGLkCz5ji0RCDnhrQ 7YJxnInJPOyWD+PVEdG9L2NxvPUsWBwmJIqpNnU9nxRr8wFXmE2zllBT9VaAOw== 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=1770684407; 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=PSrvYd9G85CkTuK+bwoO+iTADxb/vngLEmEJoLqAt2U=; b=VE+5KSaHgWnCFpulQNsNv3RGj7h8NLOixEwMEEp9p62IhCfb/XaMe+IL9vYWYW4n7S/Wjm aQkFwr7CtpZl1gQPSyiSxwpnmIKX6IJ2Q9mfKQDklPqhVUednJ6wcs1LyqvM14x3R1oGCe Jtwrdk9iFtdTOs0suL0g+G1vsXdzIl8adXBuF5XG8hcmNPhn2P1OsUg+TRbsznWszEoEec H07URqLP1xAtygBv0O3safsubFT7n6dfjKMMIseh5aSyVywxdY6DY07Go+W/UbJ7Cwrs+8 reddNy2rhDA+3M58WOhkC9UPZlnrwQHQbvTd6n31bVCRjGAvIWBT3gIToByVlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vB5Zx9zwpF for ; Tue, 10 Feb 2026 00:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 314a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 31393810a168 - main - LinuxKPI: add scoped_guard(), spinlock guard support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 31393810a168b74cf13ace0e1d35dae6b4a12bf5 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:46 +0000 Message-Id: <698a7ff6.314a9.1c8ee0da@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=31393810a168b74cf13ace0e1d35dae6b4a12bf5 commit 31393810a168b74cf13ace0e1d35dae6b4a12bf5 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:54:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:45 +0000 LinuxKPI: add scoped_guard(), spinlock guard support The "cleanup.h" implementation got a bit more complicated. For one we now use a macro to concatenate a prefix, the name, and a suffix for variable and function declarations. This was triggered by the fact that the "guard_" prefix we used was confusing. We now use a generic "cleanup_" which is only encoded in the single place rather than all over the file. As already indicated by the comment the DEFINE_LOCK_GUARD_0() macro got split up and a _1 version which also takes a type got implemented and is used for a spinlock variant used by rtw89(4) via the new scoped_guard() bits. Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D54808 --- sys/compat/linuxkpi/common/include/linux/cleanup.h | 127 ++++++++++++++++----- .../linuxkpi/common/include/linux/spinlock.h | 10 ++ 2 files changed, 109 insertions(+), 28 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/cleanup.h b/sys/compat/linuxkpi/common/include/linux/cleanup.h index 5bb146f082ed..fb21a81f121b 100644 --- a/sys/compat/linuxkpi/common/include/linux/cleanup.h +++ b/sys/compat/linuxkpi/common/include/linux/cleanup.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2024-2025 The FreeBSD Foundation + * Copyright (c) 2024-2026 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -10,18 +10,26 @@ #ifndef _LINUXKPI_LINUX_CLEANUP_H #define _LINUXKPI_LINUX_CLEANUP_H +#include + +#define CLEANUP_NAME(_n, _s) __CONCAT(__CONCAT(cleanup_, _n), _s) + #define __cleanup(_f) __attribute__((__cleanup__(_f))) +#define DECLARE(_n, _x) \ + CLEANUP_NAME(_n, _t) _x __cleanup(CLEANUP_NAME(_n, _destroy)) = \ + CLEANUP_NAME(_n, _create) + /* * Note: "_T" are special as they are exposed into common code for * statements. Extra care should be taken when changing the code. */ #define DEFINE_GUARD(_n, _dt, _lock, _unlock) \ \ - typedef _dt guard_ ## _n ## _t; \ + typedef _dt CLEANUP_NAME(_n, _t); \ \ static inline _dt \ - guard_ ## _n ## _create( _dt _T) \ + CLEANUP_NAME(_n, _create)( _dt _T) \ { \ _dt c; \ \ @@ -30,7 +38,7 @@ } \ \ static inline void \ - guard_ ## _n ## _destroy(_dt *t) \ + CLEANUP_NAME(_n, _destroy)(_dt *t) \ { \ _dt _T; \ \ @@ -39,9 +47,10 @@ } /* We need to keep these calls unique. */ +#define _guard(_n, _x) \ + DECLARE(_n, _x) #define guard(_n) \ - guard_ ## _n ## _t guard_ ## _n ## _ ## __COUNTER__ \ - __cleanup(guard_ ## _n ## _destroy) = guard_ ## _n ## _create + _guard(_n, guard_ ## _n ## _ ## __COUNTER__) #define DEFINE_FREE(_n, _t, _f) \ static inline void \ @@ -56,38 +65,100 @@ #define __free(_n) __cleanup(__free_##_n) /* - * Given this is a _0 version it should likely be broken up into parts. - * But we have no idead what a _1, _2, ... version would do different - * until we see a call. - * This is used for a not-real-type (rcu). We use a bool to "simulate" - * the lock held. Also _T still special, may not always be used, so tag - * with __unused (or better the LinuxKPI __maybe_unused). + * Our initial version go broken up. Some simplifications like using + * "bool" for the lock had to be changed to a more general type. + * _T is still special and, like other bits, may not always be used, + * so tag with __unused (or better the LinuxKPI __maybe_unused). */ -#define DEFINE_LOCK_GUARD_0(_n, _lock, _unlock, ...) \ +#define _DEFINE_LOCK_GUARD_0(_n, _lock) \ + static inline CLEANUP_NAME(_n, _t) \ + CLEANUP_NAME(_n, _create)(void) \ + { \ + CLEANUP_NAME(_n, _t) _tmp; \ + CLEANUP_NAME(_n, _t) *_T __maybe_unused; \ + \ + _tmp.lock = (void *)1; \ + _T = &_tmp; \ + _lock; \ + return (_tmp); \ + } + +#define _DEFINE_LOCK_GUARD_1(_n, _type, _lock) \ + static inline CLEANUP_NAME(_n, _t) \ + CLEANUP_NAME(_n, _create)(_type *l) \ + { \ + CLEANUP_NAME(_n, _t) _tmp; \ + CLEANUP_NAME(_n, _t) *_T __maybe_unused; \ \ + _tmp.lock = l; \ + _T = &_tmp; \ + _lock; \ + return (_tmp); \ + } + +#define _GUARD_IS_ERR(_v) \ + ({ \ + uintptr_t x = (uintptr_t)(void *)(_v); \ + IS_ERR_VALUE(x); \ + }) + +#define __is_cond_ptr(_n) \ + CLEANUP_NAME(_n, _is_cond) +#define __guard_ptr(_n) \ + CLEANUP_NAME(_n, _ptr) + +#define _DEFINE_CLEANUP_IS_CONDITIONAL(_n, _b) \ + static const bool CLEANUP_NAME(_n, _is_cond) __maybe_unused = _b + +#define _DEFINE_GUARD_LOCK_PTR(_n, _lp) \ + static inline void * \ + CLEANUP_NAME(_n, _lock_ptr)(CLEANUP_NAME(_n, _t) *_T) \ + { \ + void *_p; \ + \ + _p = (void *)(uintptr_t)*(_lp); \ + if (IS_ERR(_p)) \ + _p = NULL; \ + return (_p); \ + } + +#define _DEFINE_UNLOCK_GUARD(_n, _type, _unlock, ...) \ typedef struct { \ - bool lock; \ + _type *lock; \ __VA_ARGS__; \ - } guard_ ## _n ## _t; \ + } CLEANUP_NAME(_n, _t); \ \ static inline void \ - guard_ ## _n ## _destroy(guard_ ## _n ## _t *_T) \ + CLEANUP_NAME(_n, _destroy)(CLEANUP_NAME(_n, _t) *_T) \ { \ - if (_T->lock) { \ + if (!_GUARD_IS_ERR(_T->lock)) { \ _unlock; \ } \ } \ \ - static inline guard_ ## _n ## _t \ - guard_ ## _n ## _create(void) \ - { \ - guard_ ## _n ## _t _tmp; \ - guard_ ## _n ## _t *_T __maybe_unused; \ - \ - _tmp.lock = true; \ - _T = &_tmp; \ - _lock; \ - return (_tmp); \ - } + _DEFINE_GUARD_LOCK_PTR(_n, &_T->lock) + +#define DEFINE_LOCK_GUARD_0(_n, _lock, _unlock, ...) \ + _DEFINE_CLEANUP_IS_CONDITIONAL(_n, false); \ + _DEFINE_UNLOCK_GUARD(_n, void, _unlock, __VA_ARGS__) \ + _DEFINE_LOCK_GUARD_0(_n, _lock) + +/* This allows the type to be set. */ +#define DEFINE_LOCK_GUARD_1(_n, _t, _lock, _unlock, ...) \ + _DEFINE_CLEANUP_IS_CONDITIONAL(_n, false); \ + _DEFINE_UNLOCK_GUARD(_n, _t, _unlock, __VA_ARGS__) \ + _DEFINE_LOCK_GUARD_1(_n, _t, _lock) + +#define _scoped_guard(_n, _l, ...) \ + for (DECLARE(_n, _scoped)(__VA_ARGS__); \ + 1 /*__guard_ptr(_n)(&_scoped) || !__is_cond_ptr(_n) */; \ + ({ goto _l; })) \ + if (0) { \ +_l: \ + break; \ + } else + +#define scoped_guard(_n, ...) \ + _scoped_guard(_n, ___label_ ## __COUNTER__, ##__VA_ARGS__) #endif /* _LINUXKPI_LINUX_CLEANUP_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h index 341e89b6feed..63dc343d1461 100644 --- a/sys/compat/linuxkpi/common/include/linux/spinlock.h +++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -198,4 +199,13 @@ typedef struct raw_spinlock { #define raw_spin_trylock_irqsave(rl, f) spin_trylock_irqsave(&(rl)->lock, (f)) #define raw_spin_unlock_irqrestore(rl, f) spin_unlock_irqrestore(&(rl)->lock, (f)) +/* + * cleanup.h related pre-defined cases. + */ +DEFINE_LOCK_GUARD_1(spinlock_irqsave, + spinlock_t, + spin_lock_irqsave(_T->lock, _T->flags), + spin_unlock_irqrestore(_T->lock, _T->flags), + unsigned long flags) + #endif /* _LINUXKPI_LINUX_SPINLOCK_H_ */ From nobody Tue Feb 10 00:46:48 2026 X-Original-To: dev-commits-src-main@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 4f92vF0x4Qz6R4s5 for ; Tue, 10 Feb 2026 00:46:49 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vD73yGz4Fwg for ; Tue, 10 Feb 2026 00:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684409; 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=0Lh3xbuqqlgyVjqXm+M7X7ODQOwBHEgaBPm4AIHEgC4=; b=UK5lW/RLziVy3jXrZ7tNoy/VXJ21DJvTfUWCb27H5Z56Gbhb/zv/U3HlXaJua/u+alcFsm ycfSFeiN9G8wtbZfgV0M5kPRwEUS+dWD6oYEqWiQVyUJ8UQpAj8ztP3r5s2zDUUGmgEJCo bmvbs9S6RLY14gwlfA0fYQomut/lKrNTQApICuyr6NWF+BE8deqpedKCKC5vMp7zslgPaU gg00LXAwIz9CAmG1TLwW69lughZRwh5MRDz0GQL5BRi9oLe/0OJzm+O4jv/C7WndpjN/zh IyVRM+ZcoEpgzjWlpJ8IZEHy62PAJETcBMrQik+hdINMO0Djhv5+BIi45CoGFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684409; a=rsa-sha256; cv=none; b=I7XY9Ph8OYWpYXvYY3hiM7h5hqncYx7E2aWFtdo1aoh5mQDrdyHUiWT2sjDmBcC2KgTgOx ptoXOKf0EzsK3pzRZAiUEbZzQFfGJc9FQ5u4H+WiAMIGOXdpHS87jRbSMkOC8J2cXChz7L fZfVI0onEaQBiea5nYnMdi5Sr1NdbuFOXDfbnZZiHHIBDqPA6E6OeivfEeGQ/rGX5+pYsB yYkAv1QVq5VWq17Cjo57KoiyqFbTq9bXOu2KdVsdIOi8Iee0g6gIc+47S9zuNkM13iA21G Wt+P1/Opb8RJxBUVxOw4T7Z3D2TGk+TMVNBOGv7GinbMlMZD+Uxiou2z0mDjgA== 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=1770684409; 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=0Lh3xbuqqlgyVjqXm+M7X7ODQOwBHEgaBPm4AIHEgC4=; b=jRGVVF4g0tJKl0oEYb1vlmH8Afeun21UX05pWRSU1dPHPx351eKDNSi+bLWlNyJHaZ0gfP D9bL1TDH217KB4PC3fsUHUcjI4R4/LIPiCdcapuNecRkhYckcRUnsTflRlBFURd6rpl3ZZ V36aAIEua/yA1paVue8OHChu+Cn2hDbzWIz7LX70e1nxvWxpaRTMlQQs7GSjb2rm7mCV0K bwm6y0/wN0uw55EeXoY9Gw9QiS5wvh+xHYhNeiqxlRJPmMY5Yj5zlDxLfgOO1CCHXcV76W LAfk2dvS8IHNyJ0tbb0GE+oOgmRtLe/k5xUoKwBf+k/RAKwQqpnGOkGtgvMO7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vD6h0BzwkC for ; Tue, 10 Feb 2026 00:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3152a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 6387c1135921 - main - ath10k: fix a schedule() call List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 6387c1135921fbc86ab0f3c1508a3719ca9cac54 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:48 +0000 Message-Id: <698a7ff8.3152a.5222f675@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6387c1135921fbc86ab0f3c1508a3719ca9cac54 commit 6387c1135921fbc86ab0f3c1508a3719ca9cac54 Author: Bjoern A. Zeeb AuthorDate: 2025-12-08 00:00:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:45 +0000 ath10k: fix a schedule() call Using kern_yield does not seem ideal either for polling here; use a schedule_timeout() call from LinuxKPI instead and use about 100 iterations per second. Improve an error message to include the error code so we have a better idea of what happens. MFC after: 3 days --- sys/contrib/dev/athk/ath10k/bmi.c | 5 +++++ sys/contrib/dev/athk/ath10k/pci.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/bmi.c b/sys/contrib/dev/athk/ath10k/bmi.c index 6dd92d29f631..30dded5b6bbb 100644 --- a/sys/contrib/dev/athk/ath10k/bmi.c +++ b/sys/contrib/dev/athk/ath10k/bmi.c @@ -66,7 +66,12 @@ int ath10k_bmi_get_target_info(struct ath10k *ar, ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, &resp, &resplen); if (ret) { +#if defined(__linux__) ath10k_warn(ar, "unable to get target info from device\n"); +#elif defined(__FreeBSD__) + ath10k_warn(ar, "unable to get target info from device: %d\n", + ret); +#endif return ret; } diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index e613eaf24797..e9b8573a698b 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -2340,8 +2340,11 @@ static int ath10k_pci_bmi_wait(struct ath10k *ar, #if defined(__linux__) schedule(); #elif defined(__FreeBSD__) - /* Using LinuxKPI we'll hang for-ever as there's no wake_up */ - kern_yield(PRI_USER); + /* + * Using LinuxKPI's schedule() will hang for-ever as there is + * no wake_up. Poll about 100 times per second until timeout. + */ + schedule_timeout(BMI_COMMUNICATION_TIMEOUT_HZ/300); #endif } From nobody Tue Feb 10 00:46:47 2026 X-Original-To: dev-commits-src-main@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 4f92vD0kHDz6R52F for ; Tue, 10 Feb 2026 00:46:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vC6Zv7z4G8D for ; Tue, 10 Feb 2026 00:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684407; 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=6b1UfoWpK3JSX4u2XfIh9SQNzhzt5csA8JpvFCwYtu8=; b=GsBmmuULeSWpKIxe+ypyBttvc9Hjkb3WTO5Hjudn6TlG0XCbPu8aXNd62PtKCLsvI+HJb+ RCG1powN6u4MlbqyR6Sa2H+JhxNKU4DdbYaVwy38NipbZ2TPo0/FYMNW4QQmXt2S6uGrOf G+kIWHeEUsnlv7TpTXLQENK/Ued6AP0RowNvlsXSkztbL5U1XU3HYeul+ytvIkJYKbDyLx ZyOJ5p4YAQRxzlD2yrMlxXC/i4lmulncPsmPtRLWcMlyZcav9fU7HI3q+010UszdmvYB3F R9zm1p4Dz4E1qHWGHHh6WUS7lYu60g3N653WJexlPY9RHJ0b3G0mc83EjA2KWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684407; a=rsa-sha256; cv=none; b=Mlza7eHkZCB1VZnGyrh5OmSjXzEp1L3WRo3W/5aPtCWoWBKnARywW2RZD4J0b5w2K7M5k7 riFTfdJUxwKY4EkllJ02w8f+lPWybdTrTrS9RXTDwqbOzLYkcoS7w5ta0bSschpvSmr64z 1aZb2HEBXzKgZCId/KR3/6oi7uRWvuG45DgVQHFo2nMxNR9BC//lQzaSsPZnLg2SrzEPQc 1BXEixDfvvkXEYOvnBUCP45qYL6+IVfmi4UJyFzSuBLYbPkJvKhEf9Viaq4l5aVREdFL/7 njESBAomMgUoSvScHew/OMur7vF6Xp6+5S72EdcuSkwXfMJp72owD4X21ZBCKg== 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=1770684407; 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=6b1UfoWpK3JSX4u2XfIh9SQNzhzt5csA8JpvFCwYtu8=; b=ocnTIZ0uWcWA7WybU1YsuAaRj8TsQJV6KKbbpgLCZRMA9WXX2CPdFzjnOOuRZjEUxDaIpn FGgFMsjYvpuYLunx2DJKL+NGSvIMg2CQ0MHldd/jfTnLvEQjuhJVRoJMeomDn78IeMh1QJ xTD32hEp1WqL7zGVUHvO4O6Za5gwMY+tx7NyQR5TDsbmVtJXlkBAUMLC53w5RWexBbePRE l0aJmbVutunPQBk9iNczOlxtbbhLMezZbquEzKAqV0Vk4rkwZQ1ogc1quB+fO7ipCPIGYn oMqAiOYnYFTzgzNxuZpBnygj8cBl18E1mJKqvGKz7JEDbcDhGRfiXmyP3PRQsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vC68CbzwX4 for ; Tue, 10 Feb 2026 00:46:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27f71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: d3c4e8952cd1 - main - rtw88: set .bsddriver.name for USB chipsets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: d3c4e8952cd1be2015aa9d83820961283aa4f00c Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:47 +0000 Message-Id: <698a7ff7.27f71.6ee6177f@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c4e8952cd1be2015aa9d83820961283aa4f00c commit d3c4e8952cd1be2015aa9d83820961283aa4f00c Author: Bjoern A. Zeeb AuthorDate: 2026-01-29 11:16:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:45 +0000 rtw88: set .bsddriver.name for USB chipsets We use the FreeBSD-specifc bsddriver.name to get the device name; set it everywere consistently. Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55020 --- sys/contrib/dev/rtw88/rtw8723du.c | 2 +- sys/contrib/dev/rtw88/rtw8812au.c | 3 +++ sys/contrib/dev/rtw88/rtw8814au.c | 3 +++ sys/contrib/dev/rtw88/rtw8821au.c | 3 +++ sys/contrib/dev/rtw88/rtw8821cu.c | 2 +- sys/contrib/dev/rtw88/rtw8822bu.c | 2 +- sys/contrib/dev/rtw88/rtw8822cu.c | 2 +- 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/contrib/dev/rtw88/rtw8723du.c b/sys/contrib/dev/rtw88/rtw8723du.c index 064cbb4d9760..1e1b674ca357 100644 --- a/sys/contrib/dev/rtw88/rtw8723du.c +++ b/sys/contrib/dev/rtw88/rtw8723du.c @@ -28,7 +28,7 @@ static struct usb_driver rtw_8723du_driver = { .id_table = rtw_8723du_id_table, .probe = rtw8723du_probe, .disconnect = rtw_usb_disconnect, -#if defined(__FreeBSD__) && defined(__notyet__) +#if defined(__FreeBSD__) .bsddriver.name = KBUILD_MODNAME, #endif }; diff --git a/sys/contrib/dev/rtw88/rtw8812au.c b/sys/contrib/dev/rtw88/rtw8812au.c index dfea89670372..d6693ab4d273 100644 --- a/sys/contrib/dev/rtw88/rtw8812au.c +++ b/sys/contrib/dev/rtw88/rtw8812au.c @@ -86,6 +86,9 @@ static struct usb_driver rtw_8812au_driver = { .id_table = rtw_8812au_id_table, .probe = rtw_usb_probe, .disconnect = rtw_usb_disconnect, +#if defined(__FreeBSD__) + .bsddriver.name = KBUILD_MODNAME, +#endif }; module_usb_driver(rtw_8812au_driver); diff --git a/sys/contrib/dev/rtw88/rtw8814au.c b/sys/contrib/dev/rtw88/rtw8814au.c index 1a0886ec17dd..86158bf381b0 100644 --- a/sys/contrib/dev/rtw88/rtw8814au.c +++ b/sys/contrib/dev/rtw88/rtw8814au.c @@ -46,6 +46,9 @@ static struct usb_driver rtw_8814au_driver = { .id_table = rtw_8814au_id_table, .probe = rtw_usb_probe, .disconnect = rtw_usb_disconnect, +#if defined(__FreeBSD__) + .bsddriver.name = KBUILD_MODNAME, +#endif }; module_usb_driver(rtw_8814au_driver); diff --git a/sys/contrib/dev/rtw88/rtw8821au.c b/sys/contrib/dev/rtw88/rtw8821au.c index 28c281b32978..d07aa0fca68b 100644 --- a/sys/contrib/dev/rtw88/rtw8821au.c +++ b/sys/contrib/dev/rtw88/rtw8821au.c @@ -70,6 +70,9 @@ static struct usb_driver rtw_8821au_driver = { .id_table = rtw_8821au_id_table, .probe = rtw_usb_probe, .disconnect = rtw_usb_disconnect, +#if defined(__FreeBSD__) + .bsddriver.name = KBUILD_MODNAME, +#endif }; module_usb_driver(rtw_8821au_driver); diff --git a/sys/contrib/dev/rtw88/rtw8821cu.c b/sys/contrib/dev/rtw88/rtw8821cu.c index 3386c54f2646..0f42819f787c 100644 --- a/sys/contrib/dev/rtw88/rtw8821cu.c +++ b/sys/contrib/dev/rtw88/rtw8821cu.c @@ -52,7 +52,7 @@ static struct usb_driver rtw_8821cu_driver = { .id_table = rtw_8821cu_id_table, .probe = rtw_8821cu_probe, .disconnect = rtw_usb_disconnect, -#if defined(__FreeBSD__) && defined(__notyet__) +#if defined(__FreeBSD__) .bsddriver.name = KBUILD_MODNAME, #endif }; diff --git a/sys/contrib/dev/rtw88/rtw8822bu.c b/sys/contrib/dev/rtw88/rtw8822bu.c index 2886f470df71..ae595a867339 100644 --- a/sys/contrib/dev/rtw88/rtw8822bu.c +++ b/sys/contrib/dev/rtw88/rtw8822bu.c @@ -96,7 +96,7 @@ static struct usb_driver rtw_8822bu_driver = { .id_table = rtw_8822bu_id_table, .probe = rtw8822bu_probe, .disconnect = rtw_usb_disconnect, -#if defined(__FreeBSD__) && defined(__notyet__) +#if defined(__FreeBSD__) .bsddriver.name = KBUILD_MODNAME, #endif }; diff --git a/sys/contrib/dev/rtw88/rtw8822cu.c b/sys/contrib/dev/rtw88/rtw8822cu.c index a5f8311c022b..2fdb64374e8c 100644 --- a/sys/contrib/dev/rtw88/rtw8822cu.c +++ b/sys/contrib/dev/rtw88/rtw8822cu.c @@ -38,7 +38,7 @@ static struct usb_driver rtw_8822cu_driver = { .id_table = rtw_8822cu_id_table, .probe = rtw8822cu_probe, .disconnect = rtw_usb_disconnect, -#if defined(__FreeBSD__) && defined(__notyet__) +#if defined(__FreeBSD__) .bsddriver.name = KBUILD_MODNAME, #endif }; From nobody Tue Feb 10 00:46:50 2026 X-Original-To: dev-commits-src-main@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 4f92vG4kVsz6R54h for ; Tue, 10 Feb 2026 00:46:50 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vG0xFhz4G4d for ; Tue, 10 Feb 2026 00:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684410; 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=JAmwt7cnZzIADteU/vMHpAREsTWSRnWMgc1LIQlTUO4=; b=XKuXMcoBxVEFMvgD0YM2Z8A9k9LjOEqdgqlOevjDvprtRXxhzEi0Flpf2pdV0f0MCmRRwi d+OehQ9ZZT3WA1cec/XTL3l1mlzMpLq7TGXFeC1g7OOCx9+iSw7Q4S7Bc7/tJ8xvHpSqEX t+YLSI1UPtTYxL7EThlGyCeSXzdcjCHcl/QG04rLaV77LryaDEzxRxJdnZc2H6o/N/x/3j GZdIQAxtigSm9BoP/n8ndVH9qm7E3Ei0FSjCOiPVz4dW9r6F3aBc9OjpZrVaxxQ2oc6wT7 TKplr/xU7EcIqFSg7yamN+l7SMKHKTXOpA07+lSoXkAJ/3bHi0LjAua/xcBniw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684410; a=rsa-sha256; cv=none; b=Og0LHSY/7tDmLZ2cpUhrnHBV/J0i0NIffWA0WiMCqf/iYevPH+jHHXKhwr4zqYYyIoOQc4 3rqmOPcnco8eds7EXLRJLoeZHasfB9+vrjlCAttAuQUCLwTfVWnGbZxBAGdX77k1aPwWct DPgTcUzjYFOkBtapUi7SIWEa+1MYKJkknAKrvyMXKIGPlFVrPHrg4o2mihmBx9MjbFBlNT +pmkvuti6qvJ7QT5Bc3JRE3uAf8JitZxAWXeULwP8VpuPBt4bdJ/ffvx8Bz0KiPW6JtFoz AIuUJuoLvaq4/xA7DE/inNssWIF4W7KezSl1VtB9SH4jLcoUTPwTNpv/UNf19Q== 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=1770684410; 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=JAmwt7cnZzIADteU/vMHpAREsTWSRnWMgc1LIQlTUO4=; b=PGNIRRR9GJOlIN3regWWNvmMKI6u2GjiT61cP46tZKTbeA5oocZZgCOyrWJfGJqInjTzqB KUio9O7mxFI+DEbp1qhnned8efQSaHqjpCqwfowlKNahoJGeMdnPA6siRUuLej3cWURYkO MfDcsWkTAT11owywA6ngNQqYblH7vFE2MNC2q+D9sspJl5hPBAFMusHEWvEw/eL2dFay99 byJGMX3T92uX1BjQHfDkOAFx1caK/bBOyOPvXYV8+bvztVuFqVKGIsTCa+VFb/UAZQzx0I ZNiM3CZUqimEYWKx2X4zfp6B0B38Na08jq0/brmrFaG5cJqKv/++uwN3wIA0DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vG0BdczwX5 for ; Tue, 10 Feb 2026 00:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 717240c95d29 - main - ath10k: add sysctl to turn on/off fwlog List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 717240c95d297711d3bed0bb8b4cc8403ecbfd6a Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:50 +0000 Message-Id: <698a7ffa.308f7.50b58e7a@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=717240c95d297711d3bed0bb8b4cc8403ecbfd6a commit 717240c95d297711d3bed0bb8b4cc8403ecbfd6a Author: Bjoern A. Zeeb AuthorDate: 2025-12-08 18:47:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:45 +0000 ath10k: add sysctl to turn on/off fwlog FWLOG, if compiled in, was on by default without a way to stop it from printing everything to the console. Add a modparam to enable it with it being disabled by default if available. MFC after: 3 days --- sys/contrib/dev/athk/ath10k/fwlog.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/fwlog.c b/sys/contrib/dev/athk/ath10k/fwlog.c index fb1e292fe2e4..9ea4d36c2c7c 100644 --- a/sys/contrib/dev/athk/ath10k/fwlog.c +++ b/sys/contrib/dev/athk/ath10k/fwlog.c @@ -14,10 +14,20 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX ath10k_fwlog_ +#endif + #include "core.h" #include "debug.h" #if defined(__FreeBSD__) #include "fwlog.h" + +#include /* modparam */ + +static bool enable; +module_param(enable, bool, 0644); +MODULE_PARM_DESC(enable, "Enable firmware loggging."); #endif #define FW_DBGLOG_TIMESTAMP_OFFSET 0 @@ -1526,6 +1536,13 @@ static void ath10k_fwlog_print_work(struct work_struct *work) { void ath10k_handle_fwlog_msg(struct ath10k *ar, struct sk_buff *skb) { +#if defined(__FreeBSD__) + if (!enable) { + dev_kfree_skb(skb); + return; + } +#endif + if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags)) { ath10k_warn(ar, "ignoring fwlog event!!!\n"); dev_kfree_skb(skb); From nobody Tue Feb 10 00:46:51 2026 X-Original-To: dev-commits-src-main@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 4f92vH3xsTz6R4vZ for ; Tue, 10 Feb 2026 00:46:51 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vH17T8z4G2Z for ; Tue, 10 Feb 2026 00:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684411; 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=MCM/oWW0cnLy3KRb6rBDZZMiP26P49oR4UaxobybUyU=; b=pihMaT9+IL0ZwAhgDHcIjIzD4Y1EBjc26BYrIB3f2IOlJqF4m78qVkyin4eN8heGfOWdQA Pd2rkrVzoHQzLBWSDm7tVXRy+LsDFpIF+eYb012od3BJmtZ+ofjz3AeEJYwHVZ6qiy7v34 Mm1fVQgUhKUO5Ie5+kxWJiR7jTeAiJUFY6pMLzyI0GscBDaWdzx5/mFT//oiOqu1KSAE0e irzJN9WyJUxZFtAp8A+Ku3/f2yi2blLoK7lS1xx8TaPldCNdb+NE5YUK2rXggASiEA+6GK PtMK9OUHl+za8jkrUR6bsHaE+YD1LyDmoR8ezIb4UvOvTc3qkWBiSU/JaO71Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684411; a=rsa-sha256; cv=none; b=oJ+2ow3QWXsaNDtx2awbuf7FmSCQy4LSUo7eNf38vEu8e0/V5AZSIUWUDszM94CULOgSnx wS6R29XgYCnOOqLEfptFnj9slzYIKk/2o4DLN4A0du8T5NkHyU/y6yZwbh8/ds6qtkBq3Z kh3WuQ6h2yNVvhx4PIOhym4v9sTJyVf3HuItdRalig60urf+Oj2OaBcwjif0azICUTnMQc 0Q66a1C07048g9xHZPVgca9kwzOQYn7nEyO9jNnmhkhZQLljqNaw/9uTY159VE60N/WS3Z 0m+ap7HvmiWQMEx5KzmFKsNDKMKPXMa27EKb3G7/wv7Y92mZefV0toqyn1ZkaQ== 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=1770684411; 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=MCM/oWW0cnLy3KRb6rBDZZMiP26P49oR4UaxobybUyU=; b=w6weQnUjFj15PH1X7Gd104Ll+/RTTQrz6UMgvscIQR13E5TCZoUe4aP9qCeDQOsW7ERWQg Tn0gUCIwdHO5ZwwbefEBG9UBcjqYxUBElv/AYaocyK4FPvxLvlKu/EMHKDSupMzhUDRpQr LwMr8gVv/SaChjaPIkRnNsztC+1Kcgg33WWXp1Zr89jEu7UYKVzCEgjREoTCszqP+Ed8+8 BghbhTZHyT8aCrPAA7rt1J+6pHyZoknB7bEpbO88rzjKWJnNY/+zsoBZ8xg1K+yUn4K6JZ fxTgo42tXTDHB5bzv0hfChu5ZrIFG4bVFITgtnmqnRt4WzfnGbSJZLoChazkxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vH0j34zwS7 for ; Tue, 10 Feb 2026 00:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31da1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: db20376a4fc9 - main - ath10k: cleanup some bits no longer FreeBSD-specific List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: db20376a4fc949d6a5b30b11f8bf9146c6b3395d Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:51 +0000 Message-Id: <698a7ffb.31da1.74c389f3@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=db20376a4fc949d6a5b30b11f8bf9146c6b3395d commit db20376a4fc949d6a5b30b11f8bf9146c6b3395d Author: Bjoern A. Zeeb AuthorDate: 2025-12-14 22:28:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:46 +0000 ath10k: cleanup some bits no longer FreeBSD-specific We have since I did this port in 2023 added ACPI support to LinuxKPI, so we can use it. Also there is a linux/of.h header so we no longer need to guard the #include. MFC after: 3 days --- sys/contrib/dev/athk/ath10k/core.c | 4 +--- sys/contrib/dev/athk/ath10k/htt_rx.c | 5 ++--- sys/contrib/dev/athk/ath10k/mac.c | 36 +----------------------------------- sys/modules/ath10k/Makefile | 1 + 4 files changed, 5 insertions(+), 41 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/core.c b/sys/contrib/dev/athk/ath10k/core.c index 9ec08b402fd2..6167338b5c79 100644 --- a/sys/contrib/dev/athk/ath10k/core.c +++ b/sys/contrib/dev/athk/ath10k/core.c @@ -13,9 +13,7 @@ #include #include #include -#if defined(__linux__) || (defined(__FreeBSD__) && defined(CONFIG_OF)) #include -#endif #include #include #include @@ -2048,7 +2046,7 @@ static int ath10k_download_cal_nvmem(struct ath10k *ar, const char *cell_name) ret = ath10k_download_board_data(ar, buf, len); kfree(buf); #elif defined(__FreeBSD__) - ret = -ENXIO; + ret = -EOPNOTSUPP; #endif if (ret) ath10k_warn(ar, "failed to download calibration data from nvmem-cell '%s': %d\n", diff --git a/sys/contrib/dev/athk/ath10k/htt_rx.c b/sys/contrib/dev/athk/ath10k/htt_rx.c index ad61fad315c5..d73369ffb697 100644 --- a/sys/contrib/dev/athk/ath10k/htt_rx.c +++ b/sys/contrib/dev/athk/ath10k/htt_rx.c @@ -849,9 +849,6 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt) timer_setup(timer, ath10k_htt_rx_ring_refill_retry, 0); spin_lock_init(&htt->rx_ring.lock); -#if defined(__FreeBSD__) - spin_lock_init(&htt->tx_fetch_ind_q.lock); -#endif htt->rx_ring.fill_cnt = 0; htt->rx_ring.sw_rd_idx.msdu_payld = 0; @@ -1670,6 +1667,7 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, ether_addr_copy(ieee80211_get_DA(hdr), da); ether_addr_copy(ieee80211_get_SA(hdr), sa); #elif defined(__FreeBSD__) + /* ieee80211_get_[DS]A() do not take a const argument. */ hdr2 = (struct ieee80211_hdr *)msdu->data; ether_addr_copy(ieee80211_get_DA(hdr2), da); ether_addr_copy(ieee80211_get_SA(hdr2), sa); @@ -1812,6 +1810,7 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar, ether_addr_copy(ieee80211_get_DA(hdr), da); ether_addr_copy(ieee80211_get_SA(hdr), sa); #elif defined(__FreeBSD__) + /* ieee80211_get_[DS]A() do not take a const argument. */ hdr2 = (struct ieee80211_hdr *)msdu->data; ether_addr_copy(ieee80211_get_DA(hdr2), da); ether_addr_copy(ieee80211_get_SA(hdr2), sa); diff --git a/sys/contrib/dev/athk/ath10k/mac.c b/sys/contrib/dev/athk/ath10k/mac.c index e2bda3c0d925..d8e6bd2d277d 100644 --- a/sys/contrib/dev/athk/ath10k/mac.c +++ b/sys/contrib/dev/athk/ath10k/mac.c @@ -13,9 +13,7 @@ #include #include #include -#if defined(__linux__) || (defined(__FreeBSD__) && defined(CONFIG_OF)) #include -#endif #include #include @@ -5130,7 +5128,7 @@ static int __ath10k_fetch_bb_timing_dt(struct ath10k *ar, bb_timing->bb_tx_timing, bb_timing->bb_xpa_timing); return 0; #else - return -EINVAL; + return -ENOENT; #endif } @@ -9914,22 +9912,14 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) union acpi_object *mcc_value; u32 i; -#if defined(__linux__) if (wrdd->type != ACPI_TYPE_PACKAGE || wrdd->package.count < 2 || wrdd->package.elements[0].type != ACPI_TYPE_INTEGER || wrdd->package.elements[0].integer.value != 0) { -#elif defined(__FreeBSD__) - if (wrdd->Type != ACPI_TYPE_PACKAGE || - wrdd->Package.Count < 2 || - wrdd->Package.Elements[0].Type != ACPI_TYPE_INTEGER || - wrdd->Package.Elements[0].Integer.Value != 0) { -#endif ath10k_warn(ar, "ignoring malformed/unsupported wrdd structure\n"); return 0; } -#if defined(__linux__) for (i = 1; i < wrdd->package.count; ++i) { mcc_pkg = &wrdd->package.elements[i]; @@ -9947,25 +9937,6 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) mcc_value = &mcc_pkg->package.elements[1]; return mcc_value->integer.value; -#elif defined(__FreeBSD__) - for (i = 1; i < wrdd->Package.Count; ++i) { - mcc_pkg = &wrdd->Package.Elements[i]; - - if (mcc_pkg->Type != ACPI_TYPE_PACKAGE) - continue; - if (mcc_pkg->Package.Count < 2) - continue; - if (mcc_pkg->Package.Elements[0].Type != ACPI_TYPE_INTEGER || - mcc_pkg->Package.Elements[1].Type != ACPI_TYPE_INTEGER) - continue; - - domain_type = &mcc_pkg->Package.Elements[0]; - if (domain_type->Integer.Value != WRDD_WIFI) - continue; - - mcc_value = &mcc_pkg->Package.Elements[1]; - return mcc_value->Integer.Value; -#endif } return 0; } @@ -9997,13 +9968,8 @@ static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd) return -EIO; } -#if defined(__linux__) alpha2_code = ath10k_mac_wrdd_get_mcc(ar, wrdd.pointer); kfree(wrdd.pointer); -#elif defined(__FreeBSD__) - alpha2_code = ath10k_mac_wrdd_get_mcc(ar, wrdd.Pointer); - kfree(wrdd.Pointer); -#endif if (!alpha2_code) return -EIO; diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index d8196854b681..93518c66f89f 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -38,6 +38,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} #CFLAGS+= -ferror-limit=0 CFLAGS+= -DCONFIG_ATH10K_DEBUG +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI #CFLAGS+= -DCONFIG_ATH10K_AHB #CFLAGS+= -DCONFIG_ATH10K_DEBUGFS From nobody Tue Feb 10 00:46:52 2026 X-Original-To: dev-commits-src-main@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 4f92vJ4Pyjz6R4y6 for ; Tue, 10 Feb 2026 00:46:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vJ1phmz4G77 for ; Tue, 10 Feb 2026 00:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684412; 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=ZlpDT8EwBVjZkyifJm72ox57MnMUal3FcAUzTUGB00g=; b=KKB2YxMb/DSko+rRwlzyyDpTk7O4SWpGrmrIuRejncUkxZit+a7GAZGRmXaVReu2blJhcr 1jSX6hfxXozCuMn17YNbiNZCkhqRccj17tmMw9h+bppKEufW13BGz8ytzYh0lNOke/fn5h EZnT1duxLcqSqGBDRq7AgEDW27ALKu8lLTDyoibm2hA2QiFkNQftu0C8Kz9jhdqMMr/2nN ii6yIyTGm5OIyZ+Y6C76NA+r180Kk0W+iOwNVMAk9Hj2uUAdOJ82mcIG33Jz9f6I3/4JHy NMprI7AgG7iIoogAKmCslJ1DXoX8QNTWD1u8grv2Nb3llr42t/4LDup3soccIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684412; a=rsa-sha256; cv=none; b=PvrWx2VeV0cTeQLOOgT+Hh0rbEoyzAFfOvlXGNVIsBrgu/FUfKdz3J79aywya2k1enYqx5 a4vJ7n18uetiJzMbtY0tSjwogpQGu/HIORE6rCQ7dhJcUJeuMv/pY2HcrwmcERTpxe3MaH HZGwNqSo/DnjH4bIHLHgXn/MP5O+pKwHgv5VwSG+Lz8Z9wuiPRv9NZfurWmhFHsU/8+OgA YstU25wQUD06cJYs7hA722ldkLA0Qq0ImPNdpL380mtQr1JBBu2Zsjqn2PihNAsicQSmXD OQmDO4IwhGB3EW+TppayngODXLiMIKh2Bm8tiqmwCpQWDYOr2Tr8zoIQlVqWpw== 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=1770684412; 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=ZlpDT8EwBVjZkyifJm72ox57MnMUal3FcAUzTUGB00g=; b=daW/AnH1y5wJ2v9eEAfJhQJ6/RHLr78KyCIS7C9qMDOrsM64DGtilLO/7IJbitaccV9a4P bc+Q3xtLZjxnZ9Z7kjfZYeoaKCvBoR6/q+axHPZY27CtaGPhyBAbHt2CZRSJJ8FtJpu/Z2 Q4m/9dPxagO6pNc1I1p1meQM8X8IFbW/zHPY+r9uK0Q+uObCX34oqMj9cRn6XGUDa7Wbq8 +VPPAQnCxvpCcZKwwch+akW6NFv1eEztoEhQISO4P0qu7Tk57hTNQ1FxEi3Fky/PsxUxuo tga3YSLdXsEsAg/8/DCyOLC9qzKLJGOh4cqn7KnKlsbSqBWjmo9ecoy64pXu7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vJ1Gj4zwX6 for ; Tue, 10 Feb 2026 00:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 305b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c45b60cab05b - main - ath10k: harmonize all MODULE_DEPEND to ath10k List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: c45b60cab05b47b1d87bf49e58f669d9aaf72765 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:52 +0000 Message-Id: <698a7ffc.305b8.7f228af9@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c45b60cab05b47b1d87bf49e58f669d9aaf72765 commit c45b60cab05b47b1d87bf49e58f669d9aaf72765 Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:29:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:46 +0000 ath10k: harmonize all MODULE_DEPEND to ath10k With theoretically multiple bus attachements (unclear if we will ever support anything but PCI) rename the module name to "ath10k" and use it consistently. Move the common depends to core.c and lindebugfs and usb to their respective files. MFC after: 3 days --- sys/contrib/dev/athk/ath10k/core.c | 6 ++++++ sys/contrib/dev/athk/ath10k/debug.c | 6 ++++++ sys/contrib/dev/athk/ath10k/pci.c | 9 --------- sys/contrib/dev/athk/ath10k/usb.c | 3 +++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/core.c b/sys/contrib/dev/athk/ath10k/core.c index 6167338b5c79..a1fd099487fd 100644 --- a/sys/contrib/dev/athk/ath10k/core.c +++ b/sys/contrib/dev/athk/ath10k/core.c @@ -3870,3 +3870,9 @@ EXPORT_SYMBOL(ath10k_core_destroy); MODULE_AUTHOR("Qualcomm Atheros"); MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11ac wireless LAN cards."); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(ath10k, 1); +MODULE_DEPEND(ath10k, linuxkpi, 1, 1, 1); +MODULE_DEPEND(ath10k, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(ath10k, athk_common, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/athk/ath10k/debug.c b/sys/contrib/dev/athk/ath10k/debug.c index 8a79f5418585..7a9e54cfb23b 100644 --- a/sys/contrib/dev/athk/ath10k/debug.c +++ b/sys/contrib/dev/athk/ath10k/debug.c @@ -2777,3 +2777,9 @@ trace: ; EXPORT_SYMBOL(ath10k_dbg_dump); #endif /* CONFIG_ATH10K_DEBUG */ + +#if defined(__FreeBSD__) +#ifdef CONFIG_ATH10K_DEBUGFS +MODULE_DEPEND(ath10k, debugfs, 1, 1, 1); +#endif +#endif diff --git a/sys/contrib/dev/athk/ath10k/pci.c b/sys/contrib/dev/athk/ath10k/pci.c index e9b8573a698b..f4c9af1e12fc 100644 --- a/sys/contrib/dev/athk/ath10k/pci.c +++ b/sys/contrib/dev/athk/ath10k/pci.c @@ -3933,15 +3933,6 @@ module_exit(ath10k_pci_exit); MODULE_AUTHOR("Qualcomm Atheros"); MODULE_DESCRIPTION("Driver support for Qualcomm Atheros PCIe/AHB 802.11ac WLAN devices"); MODULE_LICENSE("Dual BSD/GPL"); -#if defined(__FreeBSD__) -MODULE_VERSION(ath10k_pci, 1); -MODULE_DEPEND(ath10k_pci, linuxkpi, 1, 1, 1); -MODULE_DEPEND(ath10k_pci, linuxkpi_wlan, 1, 1, 1); -MODULE_DEPEND(ath10k_pci, athk_common, 1, 1, 1); -#ifdef CONFIG_ATH10K_DEBUGFS -MODULE_DEPEND(ath10k_pci, debugfs, 1, 1, 1); -#endif -#endif /* QCA988x 2.0 firmware files */ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE); diff --git a/sys/contrib/dev/athk/ath10k/usb.c b/sys/contrib/dev/athk/ath10k/usb.c index 1732a4f98418..9dfa179ba610 100644 --- a/sys/contrib/dev/athk/ath10k/usb.c +++ b/sys/contrib/dev/athk/ath10k/usb.c @@ -1128,3 +1128,6 @@ module_usb_driver(ath10k_usb_driver); MODULE_AUTHOR("Atheros Communications, Inc."); MODULE_DESCRIPTION("Driver support for Qualcomm Atheros USB 802.11ac WLAN devices"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_DEPEND(ath10k, linuxkpi_usb, 1, 1, 1); +#endif From nobody Tue Feb 10 00:46:54 2026 X-Original-To: dev-commits-src-main@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 4f92vL65JJz6R4pf for ; Tue, 10 Feb 2026 00:46:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vL31Nsz4G9s for ; Tue, 10 Feb 2026 00:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684414; 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=QutdJxt6WB4I9gpT0LFyUW5U+gbCHBW87GA/5pcPGH0=; b=vNlspsQ4UZZRlrusFtMCJaaHp24BjVFF+93tnXPAOqKd3pjLr4phzmNbxmw8/HdsWM+OjH 7ng2dY8hXnlMcgxQ47PcpmSw9twOJIlPzI4ZcQaiUhrtiuHgYPKXFF4wbxuMCRWlPko8H5 sRWaU/67vcmRkkvplGcp+CXvc6R3WbH8sBcVcLcXH8+B0jEZUXSwogSRsryOSODoKs1MQz L5vLj2ZDELv+kVLfl9ABl07oKjuF/+gXa6fFOtn0+S89IHml32EJngexrK33riZcDUZzmZ sfOawIpIWypFl/VpXB/ZJ6XB5zBZspG86o0gJ8mputOtHWRQdbkeUKLLnYLJlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684414; a=rsa-sha256; cv=none; b=rny3gDBr0HnDSNBlL8qpvqdGJyEWksgYUXUcs51ywEQd4x1P3cag6lGN1cjOAxPWqWR40W 1PpeGnIwlnllXmXKzt+DZe65CRlJd4WD1f7vZpW30DOGaKg6uM3sQfA5W9RFNQQ1S7eXie 9yjfbG36q/cTWZKdfpU69GQHySjwi1xPfxmdfO5HEJvdXQlIfv3JqoRwziC2d7opwGOXwR imYLnYsC4WodWzMiiTRQmGFoHFv9KjYGG2nUMH2dg9nbdQtjRvh83Rw2YSgHSUFbrDIREl m2SXpQccxDNoOgyEBCj4Z5Hn6uynkerUe+hQ7GBoGU2AKC44iZKpuSKPhEi+hQ== 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=1770684414; 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=QutdJxt6WB4I9gpT0LFyUW5U+gbCHBW87GA/5pcPGH0=; b=wGF+sNXR0ouWkzddu1JVIVwQtGzHK1znLRIQX0oHWViHsHJbLuig4woR+sYOlldZeeckCn 9+07uHL3vpCRER4op65x9svgLdh3Tg7yrpBWIVy3D3ezGUgzDZr/58y2ByjOL86r+Vzcdv ltv1lMKo6LvSk6CQtjDXWOOBsJc7kgSgWemvvMbpJH+FP7DoNoessbu5kmXcQoToaVLumk PhmvgysDI+qumhMuUTDfI2OqFPpGUum4Ij1E6YeAfPvbEjUK2HQs8qoSRNEdkioLkIkTkl VK6+YMY3RBsrKCecbaoUVcLa4Vk3qQ/Dl0ltolfPAn6vFixfJnn3eiPXufeGuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vL2XGMzx3J for ; Tue, 10 Feb 2026 00:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 32efafda3828 - main - ath10k: modules Makefile bus attachments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 32efafda38288848ec71e97eddf085ee0c108109 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:54 +0000 Message-Id: <698a7ffe.308fb.40aa16a7@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=32efafda38288848ec71e97eddf085ee0c108109 commit 32efafda38288848ec71e97eddf085ee0c108109 Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:31:59 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:46 +0000 ath10k: modules Makefile bus attachments Given USB in theory compiles add it to the Makefile. The upstream support was never finished and I see little chances it ever will be so keep USB disabled by default. MFC after: 3 days --- sys/modules/ath10k/Makefile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index 93518c66f89f..16f481116357 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -2,6 +2,10 @@ DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 # Never finished upstream, not working. + WITH_CONFIG_FWLOG= 1 WITH_LEDS= 0 @@ -12,7 +16,15 @@ SRCS+= htc.c htt.c htt_rx.c htt_tx.c SRCS+= txrx.c wmi.c wmi-tlv.c SRCS+= p2p.c swap.c +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c +.endif + +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +.endif # Other SRCS+= ${LINUXKPI_GENSRCS} From nobody Tue Feb 10 00:46:53 2026 X-Original-To: dev-commits-src-main@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 4f92vK4pgdz6R4sB for ; Tue, 10 Feb 2026 00:46:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vK2MQjz4GCr for ; Tue, 10 Feb 2026 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684413; 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=WCZScCLWokUyE2ipnuE5yFWkfK4sjtf5ClPsVVvOowk=; b=bmgVMdc/cwxdYZs/LLhsRcsV8K46NJDGSANzy1GiXksZhnBLqX72F8Q/UqKeuJr1dyAQPL SnG/aW7kxfdhBWm4sABVdotQ8bGiFet8/u942hc+R/mOXFdboDg0dTdE5EsI2JHobM1z5V ywGrKV9QuWyIU8KkuqYLN1soBMUSXZwjVp01tk1JSv1YsE4AvcUuLbVaJApuaA/Iev5jgQ YU+tlNsXM62prmw0vnUCHQeCWWhKZLj4FznVgaYUctedT/O9xEpfgcRsLPMQqovxikSdyy 6ObTDNvZL648gx8jfRQplL27EikaSTw+8oIuIpYAc6XZGUl0Q8RA0ZBIRSTbJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684413; a=rsa-sha256; cv=none; b=EspLtSBALf6GdU4YStZMaLIK3QC9OrnsMg2ylsIkMEn/8Nug3m8nyCjJQVcwpjK3ys8kGA q4bdm8BMX1zQfGFandjHmTAxRY5Rl8r5c0YpSdNuOJPKZUBn7+I1mCsQ1umivT9U3FBKQg NDv8EVODwfA0dCqr0f51yMa/E/zdbzTJmfDWj14KcdVW/39F5EQSdKrMzme1/r6xaCFxvq wpv7Ks35yFysBJ08tZIOOVav5Kua6YgPFditbKE+2sk+4hPtoBOi3kf2uDY5+pQYmvFuVv JMYaXf1BVxRgArIF9QM3BlRExi1lNl86grs3kK07+vss7BYdRgw//6HOuDLP9w== 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=1770684413; 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=WCZScCLWokUyE2ipnuE5yFWkfK4sjtf5ClPsVVvOowk=; b=cSfcs6npovXKuguIa1UziVjoWwqtH9GCYD+4nhsW2hxME0FmL0DMZtKwkwozwYZMaB5l9f Lzr7sQfW5aQy3FVFXV6ihbiPmXP76t+mWzogKJXf8/bGxYR7e+KIjtrhZlejvpemKNlTnI oVt98bCPVh1wsrjWdZX0EdKvA/8Me7moXWNfm4qGUCGyOh1Mkzz8CGgionG6YKlxSmjU0X r3qZDbmJct/VTJkDy2w4YGZvq14IFGFRvxD4MRvseRED4LBclQc9CrfH2ri9iEs5SPPu66 BU6u6K+TsQ0MT/AUoMjcuTFmZk7d3h5yphHjp7GD7AWD9Zej3sevnWdeWVPbBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vK1ygSzx3H for ; Tue, 10 Feb 2026 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31d66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca83c369755b - main - ath10k: usb: make compile using [a future] linuxkpi_usb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: ca83c369755bcc205090093e6e0d045fae24714e Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:53 +0000 Message-Id: <698a7ffd.31d66.25a37939@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca83c369755bcc205090093e6e0d045fae24714e commit ca83c369755bcc205090093e6e0d045fae24714e Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:13:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:46 +0000 ath10k: usb: make compile using [a future] linuxkpi_usb Make ath10k usb code compile just to gather more USB bits. Currently (and likely forever) it is useless as the ath10k USB implementation never got finished. At the moment it lacks an entry for the USB bus attachment in core.c ath10k_hw_params_list[]. ath10k_usb0 on uhub1 ath10k_usb0: on usbus0 ath10k_usb0: Warning: ath10k USB support is incomplete, don't expect anything to work! ath10k_usb0: Unsupported hardware version: 0x5020001 ath10k_usb0: could not get hw params (-22) ath10k_usb0: could not probe fw (-22) There is another possible hardware [1] which was also never merged upstream. [1] https://lists.infradead.org/pipermail/ath10k/2024-August/016037.html "[PATCH] wifi: ath10k: add USB device ID for Atheros QCA9377-7" MFC after: 3 days --- sys/contrib/dev/athk/ath10k/usb.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/usb.c b/sys/contrib/dev/athk/ath10k/usb.c index 9dfa179ba610..a825d442fe33 100644 --- a/sys/contrib/dev/athk/ath10k/usb.c +++ b/sys/contrib/dev/athk/ath10k/usb.c @@ -842,14 +842,22 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, ATH10K_USB_IS_DIR_IN (endpoint->bEndpointAddress) ? "rx" : "tx", endpoint->bEndpointAddress, +#if defined(__linux__) le16_to_cpu(endpoint->wMaxPacketSize)); +#elif defined(__FreeBSD__) + UGETW(endpoint->wMaxPacketSize)); +#endif } else if (ATH10K_USB_IS_INT_EP(endpoint->bmAttributes)) { ath10k_dbg(ar, ATH10K_DBG_USB, "usb %s int ep 0x%2.2x maxpktsz %d interval %d\n", ATH10K_USB_IS_DIR_IN (endpoint->bEndpointAddress) ? "rx" : "tx", endpoint->bEndpointAddress, +#if defined(__linux__) le16_to_cpu(endpoint->wMaxPacketSize), +#elif defined(__FreeBSD__) + UGETW(endpoint->wMaxPacketSize), +#endif endpoint->bInterval); } else if (ATH10K_USB_IS_ISOC_EP(endpoint->bmAttributes)) { /* TODO for ISO */ @@ -858,7 +866,11 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, ATH10K_USB_IS_DIR_IN (endpoint->bEndpointAddress) ? "rx" : "tx", endpoint->bEndpointAddress, +#if defined(__linux__) le16_to_cpu(endpoint->wMaxPacketSize), +#elif defined(__FreeBSD__) + UGETW(endpoint->wMaxPacketSize), +#endif endpoint->bInterval); } @@ -881,8 +893,13 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, pipe->ar_usb = ar_usb; pipe->logical_pipe_num = pipe_num; +#if defined(__linux__) pipe->ep_address = endpoint->bEndpointAddress; pipe->max_packet_size = le16_to_cpu(endpoint->wMaxPacketSize); +#elif defined(__FreeBSD__) + pipe->ep_address = endpoint->bEndpointAddress & UE_ADDR; + pipe->max_packet_size = UGETW(endpoint->wMaxPacketSize); +#endif if (ATH10K_USB_IS_BULK_EP(endpoint->bmAttributes)) { if (ATH10K_USB_IS_DIR_IN(pipe->ep_address)) { @@ -1017,8 +1034,13 @@ static int ath10k_usb_probe(struct usb_interface *interface, netif_napi_add(ar->napi_dev, &ar->napi, ath10k_usb_napi_poll); usb_get_dev(dev); +#if defined(__linux__) vendor_id = le16_to_cpu(dev->descriptor.idVendor); product_id = le16_to_cpu(dev->descriptor.idProduct); +#elif defined(__FreeBSD__) + vendor_id = UGETW(dev->descriptor.idVendor); + product_id = UGETW(dev->descriptor.idProduct); +#endif ath10k_dbg(ar, ATH10K_DBG_BOOT, "usb new func vendor 0x%04x product 0x%04x\n", From nobody Tue Feb 10 01:11:27 2026 X-Original-To: dev-commits-src-main@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 4f93Rx3kc3z6R6m3; Tue, 10 Feb 2026 01:11:41 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f93Rw60sKz4PBw; Tue, 10 Feb 2026 01:11:40 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61A1BRP3062960; Tue, 10 Feb 2026 03:11:30 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61A1BRP3062960 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61A1BRfp062959; Tue, 10 Feb 2026 03:11:27 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 10 Feb 2026 03:11:27 +0200 From: Konstantin Belousov To: "Bjoern A. Zeeb" Cc: Brooks Davis , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ad639400dc9f - main - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members Message-ID: References: <698a3052.36544.6d7c1a7c@gitrepo.freebsd.org> <0qrpp6r-1374-7r1s-8o3o-9280q483q549@mnoonqbm.arg> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0qrpp6r-1374-7r1s-8o3o-9280q483q549@mnoonqbm.arg> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f93Rw60sKz4PBw X-Spamd-Bar: ---- On Tue, Feb 10, 2026 at 12:42:24AM +0000, Bjoern A. Zeeb wrote: > On Mon, 9 Feb 2026, Konstantin Belousov wrote: > > Hi, > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=ad639400dc9f1c5aec470996473bb54edc113dba > > > > commit ad639400dc9f1c5aec470996473bb54edc113dba > > Author: Konstantin Belousov > > AuthorDate: 2026-02-05 19:22:44 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2026-02-09 18:57:19 +0000 > > > > sys/event.h: use freebsd32_uint64_t for kevent32 64bit members > > > > Reviewed by: brooks > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Differential revision: https://reviews.freebsd.org/D55135 > > It seems that this commit breaks drm-kmod radeon drivers at least. > > I assume given the abi_compat.h now gets exposed via event.h into > LinuxKPI and "CP2" etc. are just very generic names. I already created https://reviews.freebsd.org/D55202 > > > 26 In file included from /home/bz/local_modules_dir/drm-kmod/drivers/gpu/drm/radeon/ci_dpm.c:31: > 27 /home/bz/local_modules_dir/drm-kmod/drivers/gpu/drm/radeon/cikd.h:852:10: error: 'CP2' macro redefined [-Werror,-Wmacro-redefined] > 28 852 | #define CP2 (1 << 2) > 29 | ^ > 30 /home/bz/git/FreeBSD/freebsd-src/sys/sys/abi_compat.h:73:9: note: previous definition is here > 31 73 | #define CP2(src, dst, sfld, dfld) do { \ > 32 | ^ > 33 1 error generated. > > > > --- > > sys/compat/freebsd32/freebsd32_misc.c | 38 ++++++----------------------------- > > sys/sys/event.h | 6 ++++-- > > usr.bin/kdump/kdump.c | 6 +----- > > 3 files changed, 11 insertions(+), 39 deletions(-) > > > ... > ... > ... > > diff --git a/sys/sys/event.h b/sys/sys/event.h > > index ebbcdb703183..0ba8e4796208 100644 > > --- a/sys/sys/event.h > > +++ b/sys/sys/event.h > > @@ -104,6 +104,8 @@ struct freebsd11_kevent { > > #endif > > > > #if defined(_WANT_KEVENT32) || defined(_KERNEL) > > +#include > > + > > struct kevent32 { > > __uint32_t ident; /* identifier for this event */ > > short filter; /* filter for event */ > ... > > -- > Bjoern A. Zeeb r15:7 From nobody Tue Feb 10 01:36:34 2026 X-Original-To: dev-commits-src-main@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 4f940l4H3Bz6R94P; Tue, 10 Feb 2026 01:36:39 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f940l3W78z3F5B; Tue, 10 Feb 2026 01:36:39 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770687399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ue4EF6bkfIN/kpD0xtATBBcmayVvstmHn335OszJVXg=; b=LhZp40PfiXmxtoEXT+Prhi4kNKz6blIw0E8RIpSXCdbOT+FWIm/yC41nKwPSQpfGYXKf/h hbNXJwKz3a4q0zfhbxcP+sUBf87X6IRfCXT70prLiuXgyqX6kVcu575N6g6bKzyPxHCQAU j/ul93XZ+NHefXd27/r++NWt3ZrlCqjxTvTgHIMeW14cDcn+MtLkLPIywrS1q+dqEp3iSx 5KH7kW6RNUInSiUvbzNcabFVJmwzEs7kW3/UfChJY+mB0191J6vOocinZVHP+3jSzp+yYR Ln+owKJlRFkGvRtTLdGdOtpd9/ZaJxMbgGgoDFecWRu144lFS28ZNIn1iMfHOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770687399; a=rsa-sha256; cv=none; b=TprBMuu5qq9D6LQ7MFo0z40bpHGqGfMJCpO5roGgGVsug/s6VsTp7UymM1q+OhQgpQakni qXsZfL6HL8ox873txTFaCDa3GEgICQYXSXzj6puQz+twZfPCgIsDl05zgVSFIrGxr5Lget N4EJOLmEOKZuvvNpe3zxecP3IQs55I6BtzMr62U/DqM1oYcU0zZnAGwYAdwEH92K48Ftob VnhYdwvdgg3naVSpMFN9/P0ohJQdukMy3riUHwqZ0tts6kx1U4fs8cHM+12fIFKHp6oCjA UXrdf+ibzMTAKb2/m0xvumCUyT0q4l7VCN62xA3dpuWKYi1O1XYFpyPCJYZ9sA== 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=1770687399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ue4EF6bkfIN/kpD0xtATBBcmayVvstmHn335OszJVXg=; b=Q2t6oJSG2Bj7ZHhHsyS+cQy2PHNVndURYgfNqr/L0ap3BgKc6501aXRxxRB8Dy5WWIxz5t I/4bZyvE9debqcZleFMT2u6bhUDyZVpq4vph2HK/fykPSnomdwyTQmrYcN0L5x+4gedg3X 7sdbaI64cWgBczce6sZ9SvXZQZOwEOezoETfz84NFx6DbsjeUr1Y7QnHbSjWe4S7b9/6Bl Jt/Jw8qSO5DOzjz4ynaj9b7CMAVtqOib6idQUe11KKX7nXGkk6FfyyIzkWhkU+p8qz5zRW eCJBazTgtPNTsMGWFXOOzrvbHTnEUPG7eGuisEdsWYAhMTEhzzqy3vthAAZVSQ== Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E8" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f940l1trpzCQy; Tue, 10 Feb 2026 01:36:39 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 8C38EA64805; Tue, 10 Feb 2026 01:36:19 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 453F32D029E7; Tue, 10 Feb 2026 01:36:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id QxoZU8uzl4wJ; Tue, 10 Feb 2026 01:36:36 +0000 (UTC) Received: from nv.t4-02.sbone.de (nv.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:22]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 0FF952D029D8; Tue, 10 Feb 2026 01:36:36 +0000 (UTC) Date: Tue, 10 Feb 2026 01:36:34 +0000 (UTC) From: "Bjoern A. Zeeb" To: Konstantin Belousov cc: Brooks Davis , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ad639400dc9f - main - sys/event.h: use freebsd32_uint64_t for kevent32 64bit members In-Reply-To: Message-ID: <7os16761-69s-o6r3-qq50-ssp925r78or@serrofq.bet> References: <698a3052.36544.6d7c1a7c@gitrepo.freebsd.org> <0qrpp6r-1374-7r1s-8o3o-9280q483q549@mnoonqbm.arg> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Tue, 10 Feb 2026, Konstantin Belousov wrote: > On Tue, Feb 10, 2026 at 12:42:24AM +0000, Bjoern A. Zeeb wrote: >> On Mon, 9 Feb 2026, Konstantin Belousov wrote: >> >> Hi, >> >>> The branch main has been updated by kib: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=ad639400dc9f1c5aec470996473bb54edc113dba >>> >>> commit ad639400dc9f1c5aec470996473bb54edc113dba >>> Author: Konstantin Belousov >>> AuthorDate: 2026-02-05 19:22:44 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2026-02-09 18:57:19 +0000 >>> >>> sys/event.h: use freebsd32_uint64_t for kevent32 64bit members >>> >>> Reviewed by: brooks >>> Sponsored by: The FreeBSD Foundation >>> MFC after: 1 week >>> Differential revision: https://reviews.freebsd.org/D55135 >> >> It seems that this commit breaks drm-kmod radeon drivers at least. >> >> I assume given the abi_compat.h now gets exposed via event.h into >> LinuxKPI and "CP2" etc. are just very generic names. > I already created https://reviews.freebsd.org/D55202 God bless you! I'll follow-up there. -- Bjoern A. Zeeb r15:7 From nobody Tue Feb 10 01:57:05 2026 X-Original-To: dev-commits-src-main@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 4f94SZ75SRz6RBg3; Tue, 10 Feb 2026 01:57:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f94SZ2s7dz3JS9; Tue, 10 Feb 2026 01:57:18 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61A1v5xP065294; Tue, 10 Feb 2026 03:57:08 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61A1v5xP065294 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61A1v5Se065293; Tue, 10 Feb 2026 03:57:05 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 10 Feb 2026 03:57:05 +0200 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 31fab773613b - main - sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 Message-ID: References: <698a3057.34751.45778dc0@gitrepo.freebsd.org> <7A721AF1-9D9B-4F7A-9E67-F0E8FB989E7D@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7A721AF1-9D9B-4F7A-9E67-F0E8FB989E7D@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f94SZ2s7dz3JS9 X-Spamd-Bar: ---- On Mon, Feb 09, 2026 at 08:22:58PM +0000, Jessica Clarke wrote: > > On 9 Feb 2026, at 19:07, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=31fab773613b21183fbd5a313fa8c69d37fcb196 > > > > commit 31fab773613b21183fbd5a313fa8c69d37fcb196 > > Author: Konstantin Belousov > > AuthorDate: 2026-02-05 19:40:55 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2026-02-09 18:57:19 +0000 > > > > sys/compat/freebsd32: use freebsd32_uint64_t for struct kinfo_proc32 > > Can we please go with my __aligned(4) suggestion for > freebsd32_uint64_t? FU64_CP is getting all over the place now and has > no good reason to exist when we can readily use a GNU C feature we’re > already using in other ways. I strongly prefer to keep using std C instead of gnu extension when possible. In this case it is possible. FU64_CP() might be wrapped into CP() with some use of _Generic(). I might look at this later. From nobody Tue Feb 10 02:11:01 2026 X-Original-To: dev-commits-src-main@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 4f94mQ0Sfyz6RCjn for ; Tue, 10 Feb 2026 02:11: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f94mP47ZBz3Km3 for ; Tue, 10 Feb 2026 02:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770689461; 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=Dzm1uzJEZD8YyE2L2RtOyDbwNQIQC0d4RhvE7RnoGFk=; b=SprrsuBF39ago9PKa6ycnM/k+fkWB0Ul6GeuP/ErG8MRa4um5GKChRCEX7Rfu9xkLtSWJz w+t74VZcXKECADlGbl+gD8JeaUo9LFd0sI9XURWj41rmsKE4sJTAQKCsh87AJDUhSUJ0rW m6VaTUVYR9knbaRdonItn4wU1dlUDXqtk2tMhtUhTnl3kpmtR3R40Vr28mN9sPTL13P9qM oKwBke2c5luUuN8JpGNVbe8m7tLngpxO/2V9o/aF8cT916WOIlSR6SNy8v0mn1lTculJAc eLddzZ0lheh2uqon942TfcYufCJvhMxdakLyEUP28UgQtF1EfyYVLcKH6Llf9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770689461; a=rsa-sha256; cv=none; b=Kxy+4doky7KSQmBp6uz0MW5toLcAHNSRG+vVpqE1PouDsj3VSz+EL1PDcJrnxEI34TFLX9 arU6pzQSZgkAkEhOQAssMzk5uMOOL5te6Gc4HBDYOUc/i3nHkyOMbF/wCJ8nOuE171hSPd zBEwq1IyexUoHswMDVxA2jNzB4fajW2Xh3WGdi6FSdag/W75oDxtJ/+zVzGcya4je+k9gs SpuWx4EXqpEIyidC1mu8acWR1niZSQDlF7sZN/zzro27NR0cpiMeenpkyt9aoCyfCyUnNx 379voRkC1On/gPnhmAtWsnvkpi7MZxXm4MYyAd1PJhsjSGslEbsSCu/tqr1aQw== 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=1770689461; 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=Dzm1uzJEZD8YyE2L2RtOyDbwNQIQC0d4RhvE7RnoGFk=; b=m59fzn01x4bsJXEYzdS8SFSVVoHwiNSQj3KUPQJBPVgVsW65XL4hlNfaWVE0/dSTXT2SNF ic43RhTY7935PE2vSj6moRjyBYj2vgvEh4GYOtjkUNVlYZ20P6LYe7h1CbJuLmLBeldTj/ FGz4mph+sKYuODgbrF6conpAjoinorEJ3yXVIbtkDAMrdWVHBUzncgksrQvLLisNWdLo19 vi2H/GR3F+cyv33w6wsLTN4RfFh03EBxIAIIIWvlUAQ7AFjN79QiBfghT8QP/VmDEd+609 pQIaQdwB4jBhBeEXJbdzoSI7bR1ifig9+YqAQMl8E0r9KeNsUgSil+dwS7qD9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f94mP3M67z103m for ; Tue, 10 Feb 2026 02:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a453 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 02:11:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ecadac729a1b - main - sys/event.h: reduce namespace pollution from sys/abi_compat.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ecadac729a1b855fe0d77a682ee424c3da1eb3db Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 02:11:01 +0000 Message-Id: <698a93b5.3a453.439a3c1b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ecadac729a1b855fe0d77a682ee424c3da1eb3db commit ecadac729a1b855fe0d77a682ee424c3da1eb3db Author: Konstantin Belousov AuthorDate: 2026-02-09 20:13:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-10 02:10:11 +0000 sys/event.h: reduce namespace pollution from sys/abi_compat.h Split out types definitions into sys/abi_types.h, and only include abi_types.h into sys/event.h. Tested and reviewed by: bz Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55202 --- sys/dev/mfi/mfi.c | 5 +++-- sys/sys/abi_compat.h | 30 +----------------------------- sys/sys/abi_types.h | 39 +++++++++++++++++++++++++++++++++++++++ sys/sys/event.h | 2 +- 4 files changed, 44 insertions(+), 32 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 474afcff60a7..8ad343d6d813 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -52,11 +52,12 @@ * SUCH DAMAGE. */ -#include #include "opt_mfi.h" -#include #include +#ifdef COMPAT_FREEBSD32 +#include +#endif #include #include #include diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index f190dcda9b68..e696f0bae9db 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -4,11 +4,6 @@ * Copyright (c) 2001 Doug Rabson * All rights reserved. * - * Copyright 2026 The FreeBSD Foundation - * - * Portions of this software were developed by Konstantin Belousov - * under sponsorship from the FreeBSD Foundation. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -34,35 +29,12 @@ #ifndef _ABI_COMPAT_H_ #define _ABI_COMPAT_H_ -#include +#include /* * Helper types and macros for translating objects between different ABIs. */ -/* - * i386 is the only arch with a 32-bit time_t. - * Also it is the only arch with (u)int64_t having 4-bytes alignment. - */ -typedef struct { -#ifdef __amd64__ - __uint32_t val[2]; -#else - __uint64_t val; -#endif -} freebsd32_uint64_t; - -#if __SIZEOF_LONG__ == 8 -#if defined __amd64__ -typedef __int32_t time32_t; -#else -typedef __int64_t time32_t; -#endif -#else -typedef __int32_t time32_t; -#endif -#define __HAVE_TIME32_T - #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h new file mode 100644 index 000000000000..e449c86323f7 --- /dev/null +++ b/sys/sys/abi_types.h @@ -0,0 +1,39 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + */ + +#ifndef _ABI_TYPES_H_ +#define _ABI_TYPES_H_ + +#include + +/* + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. + */ +typedef struct { +#ifdef __amd64__ + __uint32_t val[2]; +#else + __uint64_t val; +#endif +} freebsd32_uint64_t; + +#if __SIZEOF_LONG__ == 8 +#if defined __amd64__ +typedef __int32_t time32_t; +#else +typedef __int64_t time32_t; +#endif +#else +typedef __int32_t time32_t; +#endif +#define __HAVE_TIME32_T + +#endif diff --git a/sys/sys/event.h b/sys/sys/event.h index 0ba8e4796208..70d2926d1943 100644 --- a/sys/sys/event.h +++ b/sys/sys/event.h @@ -104,7 +104,7 @@ struct freebsd11_kevent { #endif #if defined(_WANT_KEVENT32) || defined(_KERNEL) -#include +#include struct kevent32 { __uint32_t ident; /* identifier for this event */ From nobody Tue Feb 10 02:44:23 2026 X-Original-To: dev-commits-src-main@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 4f95Vv4gQmz6RGLr for ; Tue, 10 Feb 2026 02:44:23 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f95Vv3xGdz3RZ9 for ; Tue, 10 Feb 2026 02:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770691463; 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=JwnPKGYRUAk6HpJ7N5d0MVvleBNgjoPHgOIQC1ic5fs=; b=xfdMYEo7L4ek1zBcHWLrMlK0Zc5fL8X4/fAzahXcOax3rVvK5hIsb8wkQqXlL50ho6ZXFy B17/xblI5rNCah6sEuO2smN1tNMEw/dC5HRgnXpPnUNVGbMJiZpmEQtfPShf7faOE0olla X1QLpsqjIBXXWamSsZRpwotnFk0r2Sfx1NljWRBuLeKD/DdrKL/STNkADDxS8u+pbJtMw/ ZRXWuuaMgm3CwXykAJmT9rzUUFbgLoZ/H0GfZLbUz4uPaBRj1CaTyFBs3FyXQb/yhx7E2D D9tDkVrL3mBFUUisNJ59snrvjaWqtWTDVW7YE4/bkHZ79rdXbH/a0KuhYhw6Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770691463; a=rsa-sha256; cv=none; b=ZCvZl/3/wBfbluYx/T8LELOmUOAM7CTYERIOOkjSlGyXOJJxxxw2NNi66XjymQlXTIYf6W sva3d2b44BrVw/Z9CMzAxLy6kyYi0QHpenyUHyD9sCRZmhlL/6K+NbyzNllFbCy0CkKHng bwcrf9eRkIpvSXmD+eyFan4lfiDm8mnY4zN2mnwrmyJTrTK7amGr3tV650yLiEWsZkl9zY sOVWMhiatsD7E1AM9FDmMgOwF+ynvF+oIwkNLmmYPqWjPy6mJw1momwEFdAaGAasRrop+0 osDTW1dfmGdYzxyY4zM4FKeW4k4Y4ycrW4cQFKIrGJ2/V+Sx5ZnSPWf9/aLW/w== 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=1770691463; 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=JwnPKGYRUAk6HpJ7N5d0MVvleBNgjoPHgOIQC1ic5fs=; b=L4V6kVnQNNjFhT4dAxJdjMsxjqkKC3tTVB4M3/TCEh8cEMoAPlC95bebBV5uFE+UncjMoG SANqaw3HkT7N0EFJQLXoqgFVY6gZ+yMIZq8MjE1eeQHrg3UFOI2XCLLlx9eP8z1CRmWlvS 4+lGlLvcLz7jhZaOuc31o4/uV4fNkf52VxkpWX53q+YmLB6eiIz0fVlbWlgqxZ9BctFAqQ bExGgL07bFQcg7QIi2o48L9j3PfKza8XzmBFc9KBSIketdhLtZ0NS8A8zQDznUs+W4U4eL Z/XaVUJeQhvMXSVb3MugrA17tad/sLYLJwNupBUcLG9jE+DtnvejzxytijDF0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f95Vv3Hdwz113P for ; Tue, 10 Feb 2026 02:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e10f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 02:44:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5f3192b3fddd - main - amd64/acpica/acpi_wakeup.c: do not store to WARMBOOT_OFF in efi_boot case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5f3192b3fddd974db36af0279403aba1371c68ec Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 02:44:23 +0000 Message-Id: <698a9b87.3e10f.73acc6a4@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5f3192b3fddd974db36af0279403aba1371c68ec commit 5f3192b3fddd974db36af0279403aba1371c68ec Author: Konstantin Belousov AuthorDate: 2026-02-10 01:37:18 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-10 02:38:33 +0000 amd64/acpica/acpi_wakeup.c: do not store to WARMBOOT_OFF in efi_boot case Split acpi_wakeup_cpus() into acpi_wakeup_cpus_bios() and acpi_wakeup_cpus_efi(). The former needs to manipulate zero page and CMOS state, the later does not. Referenced commit left the write to WARMBOOT_OFF in case of acpi_wakeup_ap() failed. Fixes: e99255c8a6cae324aeede7f5013d080a2d361e3f Reviewed by: imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55205 --- sys/amd64/acpica/acpi_wakeup.c | 58 ++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 6e6b9ac618dd..1200d20f14c2 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -75,9 +75,7 @@ extern struct susppcb **susppcbs; static cpuset_t suspcpus; static void acpi_stop_beep(void *, enum power_stype); - static int acpi_wakeup_ap(struct acpi_softc *, int); -static void acpi_wakeup_cpus(struct acpi_softc *); #define ACPI_WAKEPT_PAGES 7 @@ -129,24 +127,22 @@ acpi_wakeup_ap(struct acpi_softc *sc, int cpu) #define BIOS_WARM (0x0a) static void -acpi_wakeup_cpus(struct acpi_softc *sc) +acpi_wakeup_cpus_bios(struct acpi_softc *sc) { uint32_t mpbioswarmvec; int cpu; u_char mpbiosreason; - if (!efi_boot) { - /* save the current value of the warm-start vector */ - mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); - outb(CMOS_REG, BIOS_RESET); - mpbiosreason = inb(CMOS_DATA); - - /* setup a vector to our boot code */ - *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; - *((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4; - outb(CMOS_REG, BIOS_RESET); - outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ - } + /* save the current value of the warm-start vector */ + mpbioswarmvec = *((uint32_t *)WARMBOOT_OFF); + outb(CMOS_REG, BIOS_RESET); + mpbiosreason = inb(CMOS_DATA); + + /* setup a vector to our boot code */ + *((volatile u_short *)WARMBOOT_OFF) = WARMBOOT_TARGET; + *((volatile u_short *)WARMBOOT_SEG) = sc->acpi_wakephys >> 4; + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */ /* Wake up each AP. */ for (cpu = 1; cpu < mp_ncpus; cpu++) { @@ -160,12 +156,26 @@ acpi_wakeup_cpus(struct acpi_softc *sc) } } - if (!efi_boot) { - /* restore the warmstart vector */ - *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + /* restore the warmstart vector */ + *(uint32_t *)WARMBOOT_OFF = mpbioswarmvec; + + outb(CMOS_REG, BIOS_RESET); + outb(CMOS_DATA, mpbiosreason); +} + +static void +acpi_wakeup_cpus_efi(struct acpi_softc *sc) +{ + int cpu; - outb(CMOS_REG, BIOS_RESET); - outb(CMOS_DATA, mpbiosreason); + /* Wake up each AP. */ + for (cpu = 1; cpu < mp_ncpus; cpu++) { + if (!CPU_ISSET(cpu, &suspcpus)) + continue; + if (acpi_wakeup_ap(sc, cpu) == 0) { + panic("acpi_wakeup: failed to resume AP #%d (PHY #%d)", + cpu, cpu_apic_ids[cpu]); + } } } @@ -264,8 +274,12 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); lapic_xapic_mode(); - if (!CPU_EMPTY(&suspcpus)) - acpi_wakeup_cpus(sc); + if (!CPU_EMPTY(&suspcpus)) { + if (efi_boot) + acpi_wakeup_cpus_efi(sc); + else + acpi_wakeup_cpus_bios(sc); + } } if (!CPU_EMPTY(&suspcpus)) From nobody Tue Feb 10 07:09:22 2026 X-Original-To: dev-commits-src-main@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 4f9CNf6G6cz6RbMj for ; Tue, 10 Feb 2026 07:09:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9CNf3Z02z3rl2 for ; Tue, 10 Feb 2026 07:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770707362; 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=/N7C8la5y79M9alWXGr4rJ4hBagi+AG+qlxQkYQ0Oig=; b=sIP7WRxMw6BogtdSjMARRpLgozbbKqwqBDMQId+R51eUJ6MQoI3nC3jKqBoDx2XcdM/gGH I+v2xf457EWo4XAzz0YRGB7ccu+GMWX2etDWPrGsXNVr8gsyEOdJIlh7X2jZ7MbJcIsexf mfmXxCVZm/W2G6KTCZGthFmAtC4UG+1G70icgRQQW9HHnA56LvzUK2/ikwX98+x0c3Iknk zi4RijOxaRytQRuclNqHjjfapJD1bPWiKPNzL3s9uLAJiytqOO/97bEnMpqaR6H3ozDP85 vfW6R8jgQb8obryLVqRmostmvyZgCGuPrjoJyejN+iiYO0WNt2l9vbKphjuMRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770707362; a=rsa-sha256; cv=none; b=vtwiIG3WU6NNFh0q5tGFrW4rmQw5tgy9LMyxlbhfAq5kOSUu8DN2Zm6tk4RgnopUlqsOxH A8DXYYNEUUvBWuYMnRQ2r9ue+q7P77pb2okfBVLQZLcQK4II9RIa5CjhdYe2lkHil1lJGe xsHhZSpnPFd7UtJ1LkgJFkqEmp9fdhdpHztLi2sV1GQmJ52RLrxy4hz5imEQHjncT7RCzo vDN31WEPyzri41875qsAnXSl0J+IPPgQU5GYldI5/C2gKNkafSaQlb4Qj219NUejZTYeZW V9MIPm0J+1dfMoyEfptSC3pzV+9kyIlE2J7LP143UvIwYeGHCk1uFZKc5twe+Q== 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=1770707362; 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=/N7C8la5y79M9alWXGr4rJ4hBagi+AG+qlxQkYQ0Oig=; b=FK1FJBUmd5b/k81J2Bz7ex3FgDSRN9jdAAYqeLB3MP7TMg2ooRMzUCs8TuNLUpEHcpf+1z BKth8pymQhTJZu3A1IYUd+64vZX9uP01HBurqbbzip84y0j1LcSMqweAU3hmTLbhSHgfKt R8HUSzPfy8tvu4ZSNu+TPlhk9gRmIT/+rWDl5BnykmzgtW+XCE/2QdGu9BRx1LxHcdSBCG fDvVI5FZdHde1DW7UwjhD7Ikpqr4tS0AOYyoNN4Ij4booP9FFb3RRQi1bKDo6hF/nvxBZc aDgEJ3EF268KFyXxAcqh4XY/CjumW6vYQiVRzq09+an4bxGoYNGuaTLKZTHPPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9CNf2cphz17hX for ; Tue, 10 Feb 2026 07:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a731 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 07:09:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bf603dbbb2c9 - main - dev/mfi: include sys/abi_compat.h unconditionally List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bf603dbbb2c9964bba3d5bf2ba2371a75a0cc521 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 07:09:22 +0000 Message-Id: <698ad9a2.3a731.47ecc5d8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf603dbbb2c9964bba3d5bf2ba2371a75a0cc521 commit bf603dbbb2c9964bba3d5bf2ba2371a75a0cc521 Author: Konstantin Belousov AuthorDate: 2026-02-10 04:17:53 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-10 07:08:57 +0000 dev/mfi: include sys/abi_compat.h unconditionally not only for COMPAT_FREEBSD32 case. The driver uses INPTR() for non-compat32 code. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/mfi/mfi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index 8ad343d6d813..6ab6e5a7f19e 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -55,9 +55,7 @@ #include "opt_mfi.h" #include -#ifdef COMPAT_FREEBSD32 #include -#endif #include #include #include From nobody Tue Feb 10 08:36:52 2026 X-Original-To: dev-commits-src-main@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 4f9FKd5FdHz6Rhxm for ; Tue, 10 Feb 2026 08:36:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9FKd2qRvz45rs for ; Tue, 10 Feb 2026 08:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770712613; 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=PJvNYv+z3UH5liXNhrs0mO8bW/RtB0sErEYQC1aXEOs=; b=XI8grgaKeEhFTJ8Pd8348CxYZ6Q0G9eP34mHFcL7V7p+OHt+TfiBX84FdvNzXS1yp0e+R2 U+rBt2vGI94C07vPAsuvBq8pOUam55kfEh+13BPLE1B3cFjX801mib9Nyid9pwVOMncTHA 6Xep5PNV1nELPbvbWcsx1L4Aj2+SR6J8gTrCqww6oVcWv7/M1ciwGA9JZ73IKoMbSOIKBW qYQtfqCKa+sWPUK2tvr20BsJw7Xp3yDjIwAdrulu29kGtm9ACRQGz6Hji1rjX+QrLs5hir nfWELGb5UaMpzZ3G7qoQkRQ9BpZ99Yd2jOXbOnyYd3hEkfTunjQpoIqUCzCsgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770712613; a=rsa-sha256; cv=none; b=p7Gmx5Yp0pj+YsHlTkiVNPFp5mmXShpCvKXN6miPc5dzj3QuOGMOrGFod+h9sXyE4TB4RD r92aOEVGVWlmdJkvD14MSYSDNfDfwrMlQjHVr72eorB6gHFUorpyiwIz5oIoAFVWuqyW0i RpIQ/I6alxma6ajfXp1rRYdI6No1obNA09FPWNf5A/KdsoN2m5N1IGvLT0/GD9BTf3LNDR FUoljW3ExvB/IJzwo8Kxc9nfx65pjFwtDPYj0Aspu+DLet6JfYIxr852fUP5mV7o2iU+Wo Fy62zDWkKwvX65hmWp6wRsd6kdl2JSmZUTMBq4nxNK/7VdKH36IwdA/tZRmIig== 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=1770712613; 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=PJvNYv+z3UH5liXNhrs0mO8bW/RtB0sErEYQC1aXEOs=; b=FRPR0xq84JobtUOKzS0Wj+Tl6vMpB7HDp1WzYIsmqGitsKZ/uMjCu+Ich1QTCw0bOSbrXy G3co6QNVBaN7dfx4M5Trg+AtZyVphZLw1N2WulAaMDv/pRQIFdgH6LaewN0+CyXbz5SQP8 9sd5EyvmT5qfUsH1Wjh3H9wT9feezNxf5ILIzv6sQDgupoCO3MS4isaCh1P7R9uTPqLg81 g8PBle9J0t2FodGyz0QIaouro1Ux/gmJFzJGwqCUvBhtWg0B17QHxzFVTHcZ+Zvdd0WFLh 2uZKj2wepO/KQ7jxZgi0u7nfXqTVGfnEVTDO2Hxhr867PngXq5Q6VE8WfazkpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9FKd1rWqz19XY for ; Tue, 10 Feb 2026 08:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4256f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 08:36:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 10f91d9ff7b8 - main - rtw89: update Realtek's rtw89 driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 10f91d9ff7b827aac6035e224e6ddc2c79f3a0cd Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 08:36:52 +0000 Message-Id: <698aee24.4256f.3f169059@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=10f91d9ff7b827aac6035e224e6ddc2c79f3a0cd commit 10f91d9ff7b827aac6035e224e6ddc2c79f3a0cd Merge: bf603dbbb2c9 f5eb24d531de Author: Bjoern A. Zeeb AuthorDate: 2025-12-05 20:48:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 08:35:34 +0000 rtw89: update Realtek's rtw89 driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). Sponsored by: The FreeBSD Foundation MFC after: 3 days PR: 285228 sys/contrib/dev/rtw89/Kconfig | 22 + sys/contrib/dev/rtw89/Makefile | 6 + sys/contrib/dev/rtw89/cam.c | 173 +++--- sys/contrib/dev/rtw89/cam.h | 446 ++++------------ sys/contrib/dev/rtw89/chan.c | 11 +- sys/contrib/dev/rtw89/chan.h | 10 +- sys/contrib/dev/rtw89/coex.c | 5 +- sys/contrib/dev/rtw89/core.c | 911 ++++++++++++++++++++++++++++---- sys/contrib/dev/rtw89/core.h | 242 ++++++++- sys/contrib/dev/rtw89/debug.c | 424 ++++++++++++++- sys/contrib/dev/rtw89/debug.h | 1 + sys/contrib/dev/rtw89/fw.c | 353 ++++++++++--- sys/contrib/dev/rtw89/fw.h | 144 ++++- sys/contrib/dev/rtw89/mac.c | 270 ++++++++-- sys/contrib/dev/rtw89/mac.h | 115 +++- sys/contrib/dev/rtw89/mac80211.c | 124 ++++- sys/contrib/dev/rtw89/mac_be.c | 10 +- sys/contrib/dev/rtw89/pci.c | 486 +++++++++++++---- sys/contrib/dev/rtw89/pci.h | 132 ++++- sys/contrib/dev/rtw89/pci_be.c | 18 +- sys/contrib/dev/rtw89/phy.c | 541 +++++++++++++++++-- sys/contrib/dev/rtw89/phy.h | 24 +- sys/contrib/dev/rtw89/phy_be.c | 13 + sys/contrib/dev/rtw89/ps.c | 26 +- sys/contrib/dev/rtw89/reg.h | 80 ++- sys/contrib/dev/rtw89/regd.c | 22 +- sys/contrib/dev/rtw89/rtw8851b.c | 7 + sys/contrib/dev/rtw89/rtw8851b_rfk.c | 167 +++--- sys/contrib/dev/rtw89/rtw8851be.c | 4 + sys/contrib/dev/rtw89/rtw8851bu.c | 27 + sys/contrib/dev/rtw89/rtw8852a.c | 129 ++++- sys/contrib/dev/rtw89/rtw8852a_rfk.c | 16 +- sys/contrib/dev/rtw89/rtw8852ae.c | 4 + sys/contrib/dev/rtw89/rtw8852au.c | 79 +++ sys/contrib/dev/rtw89/rtw8852b.c | 7 + sys/contrib/dev/rtw89/rtw8852b_common.c | 6 +- sys/contrib/dev/rtw89/rtw8852b_rfk.c | 6 +- sys/contrib/dev/rtw89/rtw8852be.c | 4 + sys/contrib/dev/rtw89/rtw8852bt.c | 4 + sys/contrib/dev/rtw89/rtw8852bt_rfk.c | 14 +- sys/contrib/dev/rtw89/rtw8852bte.c | 4 + sys/contrib/dev/rtw89/rtw8852bu.c | 26 + sys/contrib/dev/rtw89/rtw8852c.c | 172 +++++- sys/contrib/dev/rtw89/rtw8852c.h | 2 +- sys/contrib/dev/rtw89/rtw8852c_rfk.c | 69 ++- sys/contrib/dev/rtw89/rtw8852ce.c | 4 + sys/contrib/dev/rtw89/rtw8852cu.c | 69 +++ sys/contrib/dev/rtw89/rtw8922a.c | 26 +- sys/contrib/dev/rtw89/rtw8922ae.c | 4 + sys/contrib/dev/rtw89/sar.c | 15 + sys/contrib/dev/rtw89/sar.h | 1 + sys/contrib/dev/rtw89/ser.c | 5 +- sys/contrib/dev/rtw89/txrx.h | 45 +- sys/contrib/dev/rtw89/usb.c | 115 ++-- sys/contrib/dev/rtw89/usb.h | 12 + sys/contrib/dev/rtw89/wow.c | 87 ++- sys/contrib/dev/rtw89/wow.h | 6 + sys/modules/rtw89/Makefile | 7 +- 58 files changed, 4651 insertions(+), 1101 deletions(-) diff --cc sys/contrib/dev/rtw89/Makefile index 23e43c444f69,000000000000..1be81f254fca mode 100644,000000..100644 --- a/sys/contrib/dev/rtw89/Makefile +++ b/sys/contrib/dev/rtw89/Makefile @@@ -1,92 -1,0 +1,98 @@@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +obj-$(CONFIG_RTW89_CORE) += rtw89_core.o +rtw89_core-y += core.o \ + mac80211.o \ + mac.o \ + mac_be.o \ + phy.o \ + phy_be.o \ + fw.o \ + cam.o \ + efuse.o \ + efuse_be.o \ + regd.o \ + sar.o \ + coex.o \ + ps.o \ + chan.o \ + ser.o \ + acpi.o \ + util.o + +rtw89_core-$(CONFIG_PM) += wow.o + +obj-$(CONFIG_RTW89_8851B) += rtw89_8851b.o +rtw89_8851b-objs := rtw8851b.o \ + rtw8851b_table.o \ + rtw8851b_rfk.o \ + rtw8851b_rfk_table.o + +obj-$(CONFIG_RTW89_8851BE) += rtw89_8851be.o +rtw89_8851be-objs := rtw8851be.o + +obj-$(CONFIG_RTW89_8851BU) += rtw89_8851bu.o +rtw89_8851bu-objs := rtw8851bu.o + +obj-$(CONFIG_RTW89_8852A) += rtw89_8852a.o +rtw89_8852a-objs := rtw8852a.o \ + rtw8852a_table.o \ + rtw8852a_rfk.o \ + rtw8852a_rfk_table.o + +obj-$(CONFIG_RTW89_8852AE) += rtw89_8852ae.o +rtw89_8852ae-objs := rtw8852ae.o + ++obj-$(CONFIG_RTW89_8852AU) += rtw89_8852au.o ++rtw89_8852au-objs := rtw8852au.o ++ +obj-$(CONFIG_RTW89_8852B_COMMON) += rtw89_8852b_common.o +rtw89_8852b_common-objs := rtw8852b_common.o + +obj-$(CONFIG_RTW89_8852B) += rtw89_8852b.o +rtw89_8852b-objs := rtw8852b.o \ + rtw8852b_table.o \ + rtw8852b_rfk.o \ + rtw8852b_rfk_table.o + +obj-$(CONFIG_RTW89_8852BE) += rtw89_8852be.o +rtw89_8852be-objs := rtw8852be.o + +obj-$(CONFIG_RTW89_8852BU) += rtw89_8852bu.o +rtw89_8852bu-objs := rtw8852bu.o + +obj-$(CONFIG_RTW89_8852BT) += rtw89_8852bt.o +rtw89_8852bt-objs := rtw8852bt.o \ + rtw8852bt_rfk.o \ + rtw8852bt_rfk_table.o + +obj-$(CONFIG_RTW89_8852BTE) += rtw89_8852bte.o +rtw89_8852bte-objs := rtw8852bte.o + +obj-$(CONFIG_RTW89_8852C) += rtw89_8852c.o +rtw89_8852c-objs := rtw8852c.o \ + rtw8852c_table.o \ + rtw8852c_rfk.o \ + rtw8852c_rfk_table.o + +obj-$(CONFIG_RTW89_8852CE) += rtw89_8852ce.o +rtw89_8852ce-objs := rtw8852ce.o + ++obj-$(CONFIG_RTW89_8852CU) += rtw89_8852cu.o ++rtw89_8852cu-objs := rtw8852cu.o ++ +obj-$(CONFIG_RTW89_8922A) += rtw89_8922a.o +rtw89_8922a-objs := rtw8922a.o \ + rtw8922a_rfk.o + +obj-$(CONFIG_RTW89_8922AE) += rtw89_8922ae.o +rtw89_8922ae-objs := rtw8922ae.o + +rtw89_core-$(CONFIG_RTW89_DEBUG) += debug.o + +obj-$(CONFIG_RTW89_PCI) += rtw89_pci.o +rtw89_pci-y := pci.o pci_be.o + +obj-$(CONFIG_RTW89_USB) += rtw89_usb.o +rtw89_usb-y := usb.o + diff --cc sys/contrib/dev/rtw89/core.c index 1220378d08cf,000000000000..b1b16dda3304 mode 100644,000000..100644 --- a/sys/contrib/dev/rtw89/core.c +++ b/sys/contrib/dev/rtw89/core.c @@@ -1,5998 -1,0 +1,6725 @@@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright(c) 2019-2020 Realtek Corporation + */ + +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX rtw89_ +#endif + +#include ++#include +#include + +#include "cam.h" +#include "chan.h" +#include "coex.h" +#include "core.h" +#include "efuse.h" +#include "fw.h" +#include "mac.h" +#include "phy.h" +#include "ps.h" +#include "reg.h" +#include "sar.h" +#include "ser.h" +#include "txrx.h" +#include "util.h" +#include "wow.h" + +static bool rtw89_disable_ps_mode; +module_param_named(disable_ps_mode, rtw89_disable_ps_mode, bool, 0644); +MODULE_PARM_DESC(disable_ps_mode, "Set Y to disable low power mode"); + +#if defined(__FreeBSD__) +static bool rtw_ht_support = false; +module_param_named(support_ht, rtw_ht_support, bool, 0644); +MODULE_PARM_DESC(support_ht, "Set to Y to enable HT support"); + +static bool rtw_vht_support = false; +module_param_named(support_vht, rtw_vht_support, bool, 0644); +MODULE_PARM_DESC(support_vht, "Set to Y to enable VHT support"); + +static bool rtw_eht_support = false; +module_param_named(support_eht, rtw_eht_support, bool, 0644); +MODULE_PARM_DESC(support_eht, "Set to Y to enable EHT support"); +#endif + + +#define RTW89_DEF_CHAN(_freq, _hw_val, _flags, _band) \ + { .center_freq = _freq, .hw_value = _hw_val, .flags = _flags, .band = _band, } +#define RTW89_DEF_CHAN_2G(_freq, _hw_val) \ + RTW89_DEF_CHAN(_freq, _hw_val, 0, NL80211_BAND_2GHZ) +#define RTW89_DEF_CHAN_5G(_freq, _hw_val) \ + RTW89_DEF_CHAN(_freq, _hw_val, 0, NL80211_BAND_5GHZ) +#define RTW89_DEF_CHAN_5G_NO_HT40MINUS(_freq, _hw_val) \ + RTW89_DEF_CHAN(_freq, _hw_val, IEEE80211_CHAN_NO_HT40MINUS, NL80211_BAND_5GHZ) +#define RTW89_DEF_CHAN_6G(_freq, _hw_val) \ + RTW89_DEF_CHAN(_freq, _hw_val, 0, NL80211_BAND_6GHZ) + +static struct ieee80211_channel rtw89_channels_2ghz[] = { + RTW89_DEF_CHAN_2G(2412, 1), + RTW89_DEF_CHAN_2G(2417, 2), + RTW89_DEF_CHAN_2G(2422, 3), + RTW89_DEF_CHAN_2G(2427, 4), + RTW89_DEF_CHAN_2G(2432, 5), + RTW89_DEF_CHAN_2G(2437, 6), + RTW89_DEF_CHAN_2G(2442, 7), + RTW89_DEF_CHAN_2G(2447, 8), + RTW89_DEF_CHAN_2G(2452, 9), + RTW89_DEF_CHAN_2G(2457, 10), + RTW89_DEF_CHAN_2G(2462, 11), + RTW89_DEF_CHAN_2G(2467, 12), + RTW89_DEF_CHAN_2G(2472, 13), + RTW89_DEF_CHAN_2G(2484, 14), +}; + +static struct ieee80211_channel rtw89_channels_5ghz[] = { + RTW89_DEF_CHAN_5G(5180, 36), + RTW89_DEF_CHAN_5G(5200, 40), + RTW89_DEF_CHAN_5G(5220, 44), + RTW89_DEF_CHAN_5G(5240, 48), + RTW89_DEF_CHAN_5G(5260, 52), + RTW89_DEF_CHAN_5G(5280, 56), + RTW89_DEF_CHAN_5G(5300, 60), + RTW89_DEF_CHAN_5G(5320, 64), + RTW89_DEF_CHAN_5G(5500, 100), + RTW89_DEF_CHAN_5G(5520, 104), + RTW89_DEF_CHAN_5G(5540, 108), + RTW89_DEF_CHAN_5G(5560, 112), + RTW89_DEF_CHAN_5G(5580, 116), + RTW89_DEF_CHAN_5G(5600, 120), + RTW89_DEF_CHAN_5G(5620, 124), + RTW89_DEF_CHAN_5G(5640, 128), + RTW89_DEF_CHAN_5G(5660, 132), + RTW89_DEF_CHAN_5G(5680, 136), + RTW89_DEF_CHAN_5G(5700, 140), + RTW89_DEF_CHAN_5G(5720, 144), + RTW89_DEF_CHAN_5G(5745, 149), + RTW89_DEF_CHAN_5G(5765, 153), + RTW89_DEF_CHAN_5G(5785, 157), + RTW89_DEF_CHAN_5G(5805, 161), + RTW89_DEF_CHAN_5G_NO_HT40MINUS(5825, 165), + RTW89_DEF_CHAN_5G(5845, 169), + RTW89_DEF_CHAN_5G(5865, 173), + RTW89_DEF_CHAN_5G(5885, 177), +}; + +static_assert(RTW89_5GHZ_UNII4_START_INDEX + RTW89_5GHZ_UNII4_CHANNEL_NUM == + ARRAY_SIZE(rtw89_channels_5ghz)); + +static struct ieee80211_channel rtw89_channels_6ghz[] = { + RTW89_DEF_CHAN_6G(5955, 1), + RTW89_DEF_CHAN_6G(5975, 5), + RTW89_DEF_CHAN_6G(5995, 9), + RTW89_DEF_CHAN_6G(6015, 13), + RTW89_DEF_CHAN_6G(6035, 17), + RTW89_DEF_CHAN_6G(6055, 21), + RTW89_DEF_CHAN_6G(6075, 25), + RTW89_DEF_CHAN_6G(6095, 29), + RTW89_DEF_CHAN_6G(6115, 33), + RTW89_DEF_CHAN_6G(6135, 37), + RTW89_DEF_CHAN_6G(6155, 41), + RTW89_DEF_CHAN_6G(6175, 45), + RTW89_DEF_CHAN_6G(6195, 49), + RTW89_DEF_CHAN_6G(6215, 53), + RTW89_DEF_CHAN_6G(6235, 57), + RTW89_DEF_CHAN_6G(6255, 61), + RTW89_DEF_CHAN_6G(6275, 65), + RTW89_DEF_CHAN_6G(6295, 69), + RTW89_DEF_CHAN_6G(6315, 73), + RTW89_DEF_CHAN_6G(6335, 77), + RTW89_DEF_CHAN_6G(6355, 81), + RTW89_DEF_CHAN_6G(6375, 85), + RTW89_DEF_CHAN_6G(6395, 89), + RTW89_DEF_CHAN_6G(6415, 93), + RTW89_DEF_CHAN_6G(6435, 97), + RTW89_DEF_CHAN_6G(6455, 101), + RTW89_DEF_CHAN_6G(6475, 105), + RTW89_DEF_CHAN_6G(6495, 109), + RTW89_DEF_CHAN_6G(6515, 113), + RTW89_DEF_CHAN_6G(6535, 117), + RTW89_DEF_CHAN_6G(6555, 121), + RTW89_DEF_CHAN_6G(6575, 125), + RTW89_DEF_CHAN_6G(6595, 129), + RTW89_DEF_CHAN_6G(6615, 133), + RTW89_DEF_CHAN_6G(6635, 137), + RTW89_DEF_CHAN_6G(6655, 141), + RTW89_DEF_CHAN_6G(6675, 145), + RTW89_DEF_CHAN_6G(6695, 149), + RTW89_DEF_CHAN_6G(6715, 153), + RTW89_DEF_CHAN_6G(6735, 157), + RTW89_DEF_CHAN_6G(6755, 161), + RTW89_DEF_CHAN_6G(6775, 165), + RTW89_DEF_CHAN_6G(6795, 169), + RTW89_DEF_CHAN_6G(6815, 173), + RTW89_DEF_CHAN_6G(6835, 177), + RTW89_DEF_CHAN_6G(6855, 181), + RTW89_DEF_CHAN_6G(6875, 185), + RTW89_DEF_CHAN_6G(6895, 189), + RTW89_DEF_CHAN_6G(6915, 193), + RTW89_DEF_CHAN_6G(6935, 197), + RTW89_DEF_CHAN_6G(6955, 201), + RTW89_DEF_CHAN_6G(6975, 205), + RTW89_DEF_CHAN_6G(6995, 209), + RTW89_DEF_CHAN_6G(7015, 213), + RTW89_DEF_CHAN_6G(7035, 217), + RTW89_DEF_CHAN_6G(7055, 221), + RTW89_DEF_CHAN_6G(7075, 225), + RTW89_DEF_CHAN_6G(7095, 229), + RTW89_DEF_CHAN_6G(7115, 233), +}; + +static struct ieee80211_rate rtw89_bitrates[] = { + { .bitrate = 10, .hw_value = 0x00, }, + { .bitrate = 20, .hw_value = 0x01, }, + { .bitrate = 55, .hw_value = 0x02, }, + { .bitrate = 110, .hw_value = 0x03, }, + { .bitrate = 60, .hw_value = 0x04, }, + { .bitrate = 90, .hw_value = 0x05, }, + { .bitrate = 120, .hw_value = 0x06, }, + { .bitrate = 180, .hw_value = 0x07, }, + { .bitrate = 240, .hw_value = 0x08, }, + { .bitrate = 360, .hw_value = 0x09, }, + { .bitrate = 480, .hw_value = 0x0a, }, + { .bitrate = 540, .hw_value = 0x0b, }, +}; + +static const struct ieee80211_iface_limit rtw89_iface_limits[] = { + { + .max = 1, + .types = BIT(NL80211_IFTYPE_STATION), + }, + { + .max = 1, + .types = BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_P2P_GO) | + BIT(NL80211_IFTYPE_AP), + }, +}; + +static const struct ieee80211_iface_limit rtw89_iface_limits_mcc[] = { + { + .max = 1, + .types = BIT(NL80211_IFTYPE_STATION), + }, + { + .max = 1, + .types = BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_P2P_GO), + }, +}; + +static const struct ieee80211_iface_combination rtw89_iface_combs[] = { + { + .limits = rtw89_iface_limits, + .n_limits = ARRAY_SIZE(rtw89_iface_limits), + .max_interfaces = RTW89_MAX_INTERFACE_NUM, + .num_different_channels = 1, + }, + { + .limits = rtw89_iface_limits_mcc, + .n_limits = ARRAY_SIZE(rtw89_iface_limits_mcc), + .max_interfaces = RTW89_MAX_INTERFACE_NUM, + .num_different_channels = 2, + }, +}; + +static const u8 rtw89_ext_capa_sta[] = { + [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, + [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, + [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, +}; + +static const struct wiphy_iftype_ext_capab rtw89_iftypes_ext_capa[] = { + { + .iftype = NL80211_IFTYPE_STATION, + .extended_capabilities = rtw89_ext_capa_sta, + .extended_capabilities_mask = rtw89_ext_capa_sta, + .extended_capabilities_len = sizeof(rtw89_ext_capa_sta), + /* relevant only if EHT is supported */ + .eml_capabilities = 0, + .mld_capa_and_ops = 0, + }, +}; + +#define RTW89_6GHZ_SPAN_HEAD 6145 +#define RTW89_6GHZ_SPAN_IDX(center_freq) \ + ((((int)(center_freq) - RTW89_6GHZ_SPAN_HEAD) / 5) / 2) + +#define RTW89_DECL_6GHZ_SPAN(center_freq, subband_l, subband_h) \ + [RTW89_6GHZ_SPAN_IDX(center_freq)] = { \ + .sar_subband_low = RTW89_SAR_6GHZ_ ## subband_l, \ + .sar_subband_high = RTW89_SAR_6GHZ_ ## subband_h, \ + .acpi_sar_subband_low = RTW89_ACPI_SAR_6GHZ_ ## subband_l, \ + .acpi_sar_subband_high = RTW89_ACPI_SAR_6GHZ_ ## subband_h, \ + .ant_gain_subband_low = RTW89_ANT_GAIN_6GHZ_ ## subband_l, \ + .ant_gain_subband_high = RTW89_ANT_GAIN_6GHZ_ ## subband_h, \ + } + +/* Since 6GHz subbands are not edge aligned, some cases span two subbands. + * In the following, we describe each of them with rtw89_6ghz_span. + */ +static const struct rtw89_6ghz_span rtw89_overlapping_6ghz[] = { + RTW89_DECL_6GHZ_SPAN(6145, SUBBAND_5_L, SUBBAND_5_H), + RTW89_DECL_6GHZ_SPAN(6165, SUBBAND_5_L, SUBBAND_5_H), + RTW89_DECL_6GHZ_SPAN(6185, SUBBAND_5_L, SUBBAND_5_H), + RTW89_DECL_6GHZ_SPAN(6505, SUBBAND_6, SUBBAND_7_L), + RTW89_DECL_6GHZ_SPAN(6525, SUBBAND_6, SUBBAND_7_L), + RTW89_DECL_6GHZ_SPAN(6545, SUBBAND_6, SUBBAND_7_L), + RTW89_DECL_6GHZ_SPAN(6665, SUBBAND_7_L, SUBBAND_7_H), + RTW89_DECL_6GHZ_SPAN(6705, SUBBAND_7_L, SUBBAND_7_H), + RTW89_DECL_6GHZ_SPAN(6825, SUBBAND_7_H, SUBBAND_8), + RTW89_DECL_6GHZ_SPAN(6865, SUBBAND_7_H, SUBBAND_8), + RTW89_DECL_6GHZ_SPAN(6875, SUBBAND_7_H, SUBBAND_8), + RTW89_DECL_6GHZ_SPAN(6885, SUBBAND_7_H, SUBBAND_8), +}; + +const struct rtw89_6ghz_span * +rtw89_get_6ghz_span(struct rtw89_dev *rtwdev, u32 center_freq) +{ + int idx; + + if (center_freq >= RTW89_6GHZ_SPAN_HEAD) { + idx = RTW89_6GHZ_SPAN_IDX(center_freq); + /* To decrease size of rtw89_overlapping_6ghz[], + * RTW89_6GHZ_SPAN_IDX() truncates the leading NULLs + * to make first span as index 0 of the table. So, if center + * frequency is less than the first one, it will get netative. + */ + if (idx >= 0 && idx < ARRAY_SIZE(rtw89_overlapping_6ghz)) + return &rtw89_overlapping_6ghz[idx]; + } + + return NULL; +} + - bool rtw89_ra_report_to_bitrate(struct rtw89_dev *rtwdev, u8 rpt_rate, u16 *bitrate) ++bool rtw89_legacy_rate_to_bitrate(struct rtw89_dev *rtwdev, u8 legacy_rate, u16 *bitrate) +{ - struct ieee80211_rate rate; ++ const struct ieee80211_rate *rate; + - if (unlikely(rpt_rate >= ARRAY_SIZE(rtw89_bitrates))) { - rtw89_debug(rtwdev, RTW89_DBG_UNEXP, "invalid rpt rate %d\n", rpt_rate); ++ if (unlikely(legacy_rate >= ARRAY_SIZE(rtw89_bitrates))) { ++ rtw89_debug(rtwdev, RTW89_DBG_UNEXP, ++ "invalid legacy rate %d\n", legacy_rate); + return false; + } + - rate = rtw89_bitrates[rpt_rate]; - *bitrate = rate.bitrate; ++ rate = &rtw89_bitrates[legacy_rate]; ++ *bitrate = rate->bitrate; + + return true; +} + +static const struct ieee80211_supported_band rtw89_sband_2ghz = { + .band = NL80211_BAND_2GHZ, + .channels = rtw89_channels_2ghz, + .n_channels = ARRAY_SIZE(rtw89_channels_2ghz), + .bitrates = rtw89_bitrates, + .n_bitrates = ARRAY_SIZE(rtw89_bitrates), + .ht_cap = {0}, + .vht_cap = {0}, +}; + +static const struct ieee80211_supported_band rtw89_sband_5ghz = { + .band = NL80211_BAND_5GHZ, + .channels = rtw89_channels_5ghz, + .n_channels = ARRAY_SIZE(rtw89_channels_5ghz), + + /* 5G has no CCK rates, 1M/2M/5.5M/11M */ + .bitrates = rtw89_bitrates + 4, + .n_bitrates = ARRAY_SIZE(rtw89_bitrates) - 4, + .ht_cap = {0}, + .vht_cap = {0}, +}; + +static const struct ieee80211_supported_band rtw89_sband_6ghz = { + .band = NL80211_BAND_6GHZ, + .channels = rtw89_channels_6ghz, + .n_channels = ARRAY_SIZE(rtw89_channels_6ghz), + + /* 6G has no CCK rates, 1M/2M/5.5M/11M */ + .bitrates = rtw89_bitrates + 4, + .n_bitrates = ARRAY_SIZE(rtw89_bitrates) - 4, +}; + ++static const struct rtw89_hw_rate_def { ++ enum rtw89_hw_rate ht; ++ enum rtw89_hw_rate vht[RTW89_NSS_NUM]; ++} rtw89_hw_rate[RTW89_CHIP_GEN_NUM] = { ++ [RTW89_CHIP_AX] = { ++ .ht = RTW89_HW_RATE_MCS0, ++ .vht = {RTW89_HW_RATE_VHT_NSS1_MCS0, ++ RTW89_HW_RATE_VHT_NSS2_MCS0, ++ RTW89_HW_RATE_VHT_NSS3_MCS0, ++ RTW89_HW_RATE_VHT_NSS4_MCS0}, ++ }, ++ [RTW89_CHIP_BE] = { ++ .ht = RTW89_HW_RATE_V1_MCS0, ++ .vht = {RTW89_HW_RATE_V1_VHT_NSS1_MCS0, ++ RTW89_HW_RATE_V1_VHT_NSS2_MCS0, ++ RTW89_HW_RATE_V1_VHT_NSS3_MCS0, ++ RTW89_HW_RATE_V1_VHT_NSS4_MCS0}, ++ }, ++}; ++ +static void __rtw89_traffic_stats_accu(struct rtw89_traffic_stats *stats, + struct sk_buff *skb, bool tx) +{ + if (tx) { + stats->tx_cnt++; + stats->tx_unicast += skb->len; + } else { + stats->rx_cnt++; + stats->rx_unicast += skb->len; + } +} + +static void rtw89_traffic_stats_accu(struct rtw89_dev *rtwdev, + struct rtw89_vif *rtwvif, + struct sk_buff *skb, + bool accu_dev, bool tx) +{ + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + + if (!ieee80211_is_data(hdr->frame_control)) + return; + + if (is_broadcast_ether_addr(hdr->addr1) || + is_multicast_ether_addr(hdr->addr1)) + return; + + if (accu_dev) + __rtw89_traffic_stats_accu(&rtwdev->stats, skb, tx); + + if (rtwvif) { + __rtw89_traffic_stats_accu(&rtwvif->stats, skb, tx); + __rtw89_traffic_stats_accu(&rtwvif->stats_ps, skb, tx); + } +} + +void rtw89_get_default_chandef(struct cfg80211_chan_def *chandef) +{ + cfg80211_chandef_create(chandef, &rtw89_channels_2ghz[0], + NL80211_CHAN_NO_HT); +} + +void rtw89_get_channel_params(const struct cfg80211_chan_def *chandef, + struct rtw89_chan *chan) +{ + struct ieee80211_channel *channel = chandef->chan; + enum nl80211_chan_width width = chandef->width; + u32 primary_freq, center_freq; + u8 center_chan; + u8 bandwidth = RTW89_CHANNEL_WIDTH_20; + u32 offset; + u8 band; + + center_chan = channel->hw_value; + primary_freq = channel->center_freq; + center_freq = chandef->center_freq1; + + switch (width) { + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_20: + bandwidth = RTW89_CHANNEL_WIDTH_20; + break; + case NL80211_CHAN_WIDTH_40: + bandwidth = RTW89_CHANNEL_WIDTH_40; + if (primary_freq > center_freq) { + center_chan -= 2; + } else { + center_chan += 2; + } + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_160: + bandwidth = nl_to_rtw89_bandwidth(width); + if (primary_freq > center_freq) { + offset = (primary_freq - center_freq - 10) / 20; + center_chan -= 2 + offset * 4; + } else { + offset = (center_freq - primary_freq - 10) / 20; + center_chan += 2 + offset * 4; + } + break; + default: + center_chan = 0; + break; + } + + switch (channel->band) { + default: + case NL80211_BAND_2GHZ: + band = RTW89_BAND_2G; + break; + case NL80211_BAND_5GHZ: + band = RTW89_BAND_5G; + break; + case NL80211_BAND_6GHZ: + band = RTW89_BAND_6G; + break; + } + + rtw89_chan_create(chan, center_chan, channel->hw_value, band, bandwidth); +} + +static void __rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev, + const struct rtw89_chan *chan, + enum rtw89_phy_idx phy_idx) +{ + const struct rtw89_chip_info *chip = rtwdev->chip; + bool entity_active; + + entity_active = rtw89_get_entity_state(rtwdev, phy_idx); + if (!entity_active) + return; + + chip->ops->set_txpwr(rtwdev, chan, phy_idx); +} + +void rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev) +{ + const struct rtw89_chan *chan; + + chan = rtw89_mgnt_chan_get(rtwdev, 0); + __rtw89_core_set_chip_txpwr(rtwdev, chan, RTW89_PHY_0); + + if (!rtwdev->support_mlo) + return; + + chan = rtw89_mgnt_chan_get(rtwdev, 1); + __rtw89_core_set_chip_txpwr(rtwdev, chan, RTW89_PHY_1); +} + ++static void rtw89_chip_rfk_channel_for_pure_mon_vif(struct rtw89_dev *rtwdev, ++ enum rtw89_phy_idx phy_idx) ++{ ++ struct rtw89_vif *rtwvif = rtwdev->pure_monitor_mode_vif; ++ struct rtw89_vif_link *rtwvif_link; ++ ++ if (!rtwvif) ++ return; ++ ++ rtwvif_link = rtw89_vif_get_link_inst(rtwvif, phy_idx); ++ if (!rtwvif_link) ++ return; ++ ++ rtw89_chip_rfk_channel(rtwdev, rtwvif_link); ++} ++ +static void __rtw89_set_channel(struct rtw89_dev *rtwdev, + const struct rtw89_chan *chan, + enum rtw89_mac_idx mac_idx, + enum rtw89_phy_idx phy_idx) +{ + const struct rtw89_chip_info *chip = rtwdev->chip; + const struct rtw89_chan_rcd *chan_rcd; + struct rtw89_channel_help_params bak; + bool entity_active; + + entity_active = rtw89_get_entity_state(rtwdev, phy_idx); + + chan_rcd = rtw89_chan_rcd_get_by_chan(chan); + + rtw89_chip_set_channel_prepare(rtwdev, &bak, chan, mac_idx, phy_idx); + + chip->ops->set_channel(rtwdev, chan, mac_idx, phy_idx); + + chip->ops->set_txpwr(rtwdev, chan, phy_idx); + + rtw89_chip_set_channel_done(rtwdev, &bak, chan, mac_idx, phy_idx); + + if (!entity_active || chan_rcd->band_changed) { + rtw89_btc_ntfy_switch_band(rtwdev, phy_idx, chan->band_type); + rtw89_chip_rfk_band_changed(rtwdev, phy_idx, chan); + } + + rtw89_set_entity_state(rtwdev, phy_idx, true); ++ ++ rtw89_chip_rfk_channel_for_pure_mon_vif(rtwdev, phy_idx); +} + +int rtw89_set_channel(struct rtw89_dev *rtwdev) +{ + const struct rtw89_chan *chan; + enum rtw89_entity_mode mode; + + mode = rtw89_entity_recalc(rtwdev); + if (mode < 0 || mode >= NUM_OF_RTW89_ENTITY_MODE) { + WARN(1, "Invalid ent mode: %d\n", mode); + return -EINVAL; + } + + chan = rtw89_mgnt_chan_get(rtwdev, 0); + __rtw89_set_channel(rtwdev, chan, RTW89_MAC_0, RTW89_PHY_0); + + if (!rtwdev->support_mlo) + return 0; + + chan = rtw89_mgnt_chan_get(rtwdev, 1); + __rtw89_set_channel(rtwdev, chan, RTW89_MAC_1, RTW89_PHY_1); + + return 0; +} + +static enum rtw89_core_tx_type +rtw89_core_get_tx_type(struct rtw89_dev *rtwdev, + struct sk_buff *skb) +{ + struct ieee80211_hdr *hdr = (void *)skb->data; + __le16 fc = hdr->frame_control; + + if (ieee80211_is_mgmt(fc) || ieee80211_is_nullfunc(fc)) + return RTW89_CORE_TX_TYPE_MGMT; + + return RTW89_CORE_TX_TYPE_DATA; +} + +static void +rtw89_core_tx_update_ampdu_info(struct rtw89_dev *rtwdev, + struct rtw89_core_tx_request *tx_req, + enum btc_pkt_type pkt_type) +{ + struct rtw89_sta_link *rtwsta_link = tx_req->rtwsta_link; + struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info; + struct ieee80211_link_sta *link_sta; + struct sk_buff *skb = tx_req->skb; + struct rtw89_sta *rtwsta; + u8 ampdu_num; + u8 tid; + + if (pkt_type == PACKET_EAPOL) { + desc_info->bk = true; + return; + } + + if (!(IEEE80211_SKB_CB(skb)->flags & IEEE80211_TX_CTL_AMPDU)) + return; + + if (!rtwsta_link) { + rtw89_warn(rtwdev, "cannot set ampdu info without sta\n"); + return; + } + + tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; + rtwsta = rtwsta_link->rtwsta; + + rcu_read_lock(); + + link_sta = rtw89_sta_rcu_dereference_link(rtwsta_link, false); + ampdu_num = (u8)((rtwsta->ampdu_params[tid].agg_num ? + rtwsta->ampdu_params[tid].agg_num : + 4 << link_sta->ht_cap.ampdu_factor) - 1); + + desc_info->agg_en = true; + desc_info->ampdu_density = link_sta->ht_cap.ampdu_density; + desc_info->ampdu_num = ampdu_num; + + rcu_read_unlock(); +} + +static void +rtw89_core_tx_update_sec_key(struct rtw89_dev *rtwdev, + struct rtw89_core_tx_request *tx_req) +{ + struct rtw89_cam_info *cam_info = &rtwdev->cam_info; + const struct rtw89_chip_info *chip = rtwdev->chip; + const struct rtw89_sec_cam_entry *sec_cam; + struct ieee80211_tx_info *info; + struct ieee80211_key_conf *key; + struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info; + struct sk_buff *skb = tx_req->skb; + u8 sec_type = RTW89_SEC_KEY_TYPE_NONE; + u8 sec_cam_idx; + u64 pn64; + + info = IEEE80211_SKB_CB(skb); + key = info->control.hw_key; + sec_cam_idx = key->hw_key_idx; + sec_cam = cam_info->sec_entries[sec_cam_idx]; + if (!sec_cam) { + rtw89_warn(rtwdev, "sec cam entry is empty\n"); + return; + } + + switch (key->cipher) { + case WLAN_CIPHER_SUITE_WEP40: + sec_type = RTW89_SEC_KEY_TYPE_WEP40; + break; + case WLAN_CIPHER_SUITE_WEP104: + sec_type = RTW89_SEC_KEY_TYPE_WEP104; + break; + case WLAN_CIPHER_SUITE_TKIP: + sec_type = RTW89_SEC_KEY_TYPE_TKIP; + break; + case WLAN_CIPHER_SUITE_CCMP: + sec_type = RTW89_SEC_KEY_TYPE_CCMP128; + break; + case WLAN_CIPHER_SUITE_CCMP_256: + sec_type = RTW89_SEC_KEY_TYPE_CCMP256; + break; + case WLAN_CIPHER_SUITE_GCMP: + sec_type = RTW89_SEC_KEY_TYPE_GCMP128; + break; + case WLAN_CIPHER_SUITE_GCMP_256: + sec_type = RTW89_SEC_KEY_TYPE_GCMP256; + break; + default: + rtw89_warn(rtwdev, "key cipher not supported %d\n", key->cipher); + return; + } + + desc_info->sec_en = true; + desc_info->sec_keyid = key->keyidx; + desc_info->sec_type = sec_type; + desc_info->sec_cam_idx = sec_cam->sec_cam_idx; + + if (!chip->hw_sec_hdr) + return; + + pn64 = atomic64_inc_return(&key->tx_pn); + desc_info->sec_seq[0] = pn64; + desc_info->sec_seq[1] = pn64 >> 8; + desc_info->sec_seq[2] = pn64 >> 16; + desc_info->sec_seq[3] = pn64 >> 24; + desc_info->sec_seq[4] = pn64 >> 32; + desc_info->sec_seq[5] = pn64 >> 40; + desc_info->wp_offset = 1; /* in unit of 8 bytes for security header */ +} + +static u16 rtw89_core_get_mgmt_rate(struct rtw89_dev *rtwdev, + struct rtw89_core_tx_request *tx_req, + const struct rtw89_chan *chan) +{ + struct sk_buff *skb = tx_req->skb; + struct rtw89_vif_link *rtwvif_link = tx_req->rtwvif_link; + struct rtw89_sta_link *rtwsta_link = tx_req->rtwsta_link; + struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); + struct ieee80211_vif *vif = tx_info->control.vif; + struct ieee80211_bss_conf *bss_conf; + u16 lowest_rate; + u16 rate; + + if (tx_info->flags & IEEE80211_TX_CTL_NO_CCK_RATE || + (vif && vif->p2p)) + lowest_rate = RTW89_HW_RATE_OFDM6; + else if (chan->band_type == RTW89_BAND_2G) + lowest_rate = RTW89_HW_RATE_CCK1; + else + lowest_rate = RTW89_HW_RATE_OFDM6; + + if (!rtwvif_link) + return lowest_rate; + + rcu_read_lock(); + + bss_conf = rtw89_vif_rcu_dereference_link(rtwvif_link, false); + if (!bss_conf->basic_rates || !rtwsta_link) { + rate = lowest_rate; + goto out; + } + + rate = __ffs(bss_conf->basic_rates) + lowest_rate; + +out: + rcu_read_unlock(); + + return rate; +} + +static u8 rtw89_core_tx_get_mac_id(struct rtw89_dev *rtwdev, + struct rtw89_core_tx_request *tx_req) +{ + struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info; + struct rtw89_vif_link *rtwvif_link = tx_req->rtwvif_link; + struct rtw89_sta_link *rtwsta_link = tx_req->rtwsta_link; + + if (desc_info->mlo && !desc_info->sw_mld) { + if (rtwsta_link) + return rtw89_sta_get_main_macid(rtwsta_link->rtwsta); + else + return rtw89_vif_get_main_macid(rtwvif_link->rtwvif); + } + + if (!rtwsta_link) + return rtwvif_link->mac_id; + + return rtwsta_link->mac_id; +} + +static void rtw89_core_tx_update_llc_hdr(struct rtw89_dev *rtwdev, + struct rtw89_tx_desc_info *desc_info, + struct sk_buff *skb) +{ + struct ieee80211_hdr *hdr = (void *)skb->data; + __le16 fc = hdr->frame_control; + + desc_info->hdr_llc_len = ieee80211_hdrlen(fc); + desc_info->hdr_llc_len >>= 1; /* in unit of 2 bytes */ +} + ++u8 rtw89_core_get_ch_dma(struct rtw89_dev *rtwdev, u8 qsel) ++{ ++ switch (qsel) { ++ default: ++ rtw89_warn(rtwdev, "Cannot map qsel to dma: %d\n", qsel); ++ fallthrough; ++ case RTW89_TX_QSEL_BE_0: ++ case RTW89_TX_QSEL_BE_1: ++ case RTW89_TX_QSEL_BE_2: ++ case RTW89_TX_QSEL_BE_3: ++ return RTW89_TXCH_ACH0; ++ case RTW89_TX_QSEL_BK_0: ++ case RTW89_TX_QSEL_BK_1: ++ case RTW89_TX_QSEL_BK_2: ++ case RTW89_TX_QSEL_BK_3: ++ return RTW89_TXCH_ACH1; ++ case RTW89_TX_QSEL_VI_0: ++ case RTW89_TX_QSEL_VI_1: ++ case RTW89_TX_QSEL_VI_2: ++ case RTW89_TX_QSEL_VI_3: ++ return RTW89_TXCH_ACH2; ++ case RTW89_TX_QSEL_VO_0: ++ case RTW89_TX_QSEL_VO_1: ++ case RTW89_TX_QSEL_VO_2: ++ case RTW89_TX_QSEL_VO_3: ++ return RTW89_TXCH_ACH3; ++ case RTW89_TX_QSEL_B0_MGMT: ++ return RTW89_TXCH_CH8; ++ case RTW89_TX_QSEL_B0_HI: ++ return RTW89_TXCH_CH9; ++ case RTW89_TX_QSEL_B1_MGMT: *** 59787 LINES SKIPPED *** From nobody Tue Feb 10 09:30:41 2026 X-Original-To: dev-commits-src-main@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 4f9GWj3PSgz6RlcH for ; Tue, 10 Feb 2026 09:30:41 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9GWj2sCpz3Ck8 for ; Tue, 10 Feb 2026 09:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770715841; h=from:from: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; bh=88pyhemmKjXRK1XQugAXZutybubMr0/4DahQwOeoC2A=; b=ndS1fsSATkOTuvrHAxn/HI/UVex2GPbQWR+b+UW+iMGVXC+/j21atXPsD6m9ai5YbGK0FM SuYYm9eF8JV7PGBkEPQfs6oTOKDpgxak/vcOA/1MMohlFMmYTIwvXFXWf2XEPfUJ14FrSW x2ZR4z5IiyCiFZF48v6gaiFM3CJNSodasXlTq5m7jJZjelW33gQgEQjY8GZPxTu+ZM6wZ/ McR1EXYOB8nSf0w2g4W6WeIqYADLN5SAgkJ3C/gBJeVKyKCWQvOqPC2NejQ+RzEMUPNgB5 6e4T+lqitD7TFkQWX2iAF9PqRO63ItjX1pOIqUIXuudKUjCqWrZjWd6+t/udwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770715841; a=rsa-sha256; cv=none; b=iW6smtb8kqivGqasL8K/QbDLF1VPUt9Aoqd8SXWb9J33Sm7u1lnEZ8jqcAU8VOa4V/V505 E9nbbcsU65qjHToUIkM/VQgU/dS24Vue2+nkiq8Ka7u1sp8kt2in8voJcbt9yiPqVUS1fu qF5H0OZdjTf/5Ymzfx+9PuAY4cAtMSKkzZky+Zn6OvxDJKhWwgKEjK0eF5EvxwHQUzKfuq k5oPB+E2C0wckUUb3zMbmND0BiAht4iThwRs2Fy/KTqvv+AHZr4Ji8dXGaLUkdwniYAd1p 3xNs3QWxIH/rwTtKimhhR2v2Oy4OveQlBFUd90dkF5rncoR0/3KWt0OxHLojMg== 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=1770715841; h=from:from: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; bh=88pyhemmKjXRK1XQugAXZutybubMr0/4DahQwOeoC2A=; b=sjKs8me4qjXSdr4fOtW+HlmQH4swYH9w5tPu6Xwvv5X5UwJxMofPRJ6K+Tx0U8g2RsWLXU X7vkiyjbs/t5+7S7df0bl4LsAvmI7S3r4PYo1Oeu5dI8Ye1aYgt+3HjmNU2XyLmko3fz/i OoED1qRGHxqnZkt5wtPYyf/j0Fi3cK6irv2ffew74/DFQiEcj7KCKeGYmRWcWswmMz5v9d n6m6a/2imPbPQdl95AR9REm2u+BDwkGlojBVMXE+D9GnX+omP7ae8uBpdNV1i22La+w32h 0R3FiXBV+tj1rptaRZnFQkneb8U+rMYnBWTxZvQaPKvFRRJly+EJQJAvfttA3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9GWj1rPKz1BmR for ; Tue, 10 Feb 2026 09:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18e09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 09:30:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chandrakanth Patil From: Sumit Saxena Subject: git: feb0a7e19f3c - main - pci_iov: Reuse downstream bridge bus window if it already covers VF bus List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: feb0a7e19f3c2e4c7eb90668b1e3dc34b5bb6dd6 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 09:30:41 +0000 Message-Id: <698afac1.18e09.6eae697b@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=feb0a7e19f3c2e4c7eb90668b1e3dc34b5bb6dd6 commit feb0a7e19f3c2e4c7eb90668b1e3dc34b5bb6dd6 Author: Chandrakanth Patil AuthorDate: 2026-02-10 09:23:16 +0000 Commit: Sumit Saxena CommitDate: 2026-02-10 09:30:06 +0000 pci_iov: Reuse downstream bridge bus window if it already covers VF bus If the parent bridge's [secondary, subordinate] window already covers the VF bus (e.g., programmed by BIOS or a prior PF), skip allocating PCI_RES_BUS. This avoids a duplicate rman allocation in the multi-PF case while still allocating when growth is actually needed. Reviewed by: ssaxena Differential Revision: https://reviews.freebsd.org/D52163 MFC After: 1 week --- sys/dev/pci/pci_iov.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/sys/dev/pci/pci_iov.c b/sys/dev/pci/pci_iov.c index e0e47e11d401..0e6104fe37f2 100644 --- a/sys/dev/pci/pci_iov.c +++ b/sys/dev/pci/pci_iov.c @@ -735,16 +735,27 @@ pci_iov_config(struct cdev *cdev, struct pci_iov_arg *arg) last_rid = first_rid + (num_vfs - 1) * rid_stride; if (pci_get_bus(dev) != PCI_RID2BUS(last_rid)) { - int rid = 0; - uint16_t last_rid_bus = PCI_RID2BUS(last_rid); - - iov->iov_bus_res = bus_alloc_resource(bus, PCI_RES_BUS, &rid, - last_rid_bus, last_rid_bus, 1, RF_ACTIVE); - if (iov->iov_bus_res == NULL) { - device_printf(dev, - "failed to allocate PCIe bus number for VFs\n"); - error = ENOSPC; - goto out; + device_t pcib = device_get_parent(bus); + uint8_t secbus = pci_read_config(pcib, PCIR_SECBUS_1, 1); + uint8_t subbus = pci_read_config(pcib, PCIR_SUBBUS_1, 1); + uint16_t vf_bus = PCI_RID2BUS(last_rid); + + /* + * XXX: This should not be directly accessing the bridge registers and does + * nothing to prevent some other device from releasing this bus number while + * another PF is using it. + */ + if (secbus == 0 || vf_bus < secbus || vf_bus > subbus) { + int rid = 0; + + iov->iov_bus_res = bus_alloc_resource(bus, PCI_RES_BUS, &rid, + vf_bus, vf_bus, 1, RF_ACTIVE); + if (iov->iov_bus_res == NULL) { + device_printf(dev, + "failed to allocate PCIe bus number for VFs\n"); + error = ENOSPC; + goto out; + } } } From nobody Tue Feb 10 09:30:42 2026 X-Original-To: dev-commits-src-main@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 4f9GWk5xtVz6RlcM for ; Tue, 10 Feb 2026 09:30: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9GWk3fVSz3Crw for ; Tue, 10 Feb 2026 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770715842; h=from:from: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; bh=UldjtbBu/w1WdE+ExDxsHGz9OY1tpINYhXlao+dSB28=; b=U4Lxg0oHHodaDO+OePbk8Uw3HlvbdhJcGpCyioV4ONIQfwEXEJlCHQzZzye2SH0wJtKL5d 3Oc/DyrFF5EGbt2aH7nCJq83eZ4cih1xiB3nOY9W+fL9OKs48eDfFRTkJTLMEdJEKp2ZDy N27n8gJnXFDkeQckuylwWJZ/XyFfVkputBBKc3hslcnnnzyer7NDmoJX+v7ncSRGYzJLq4 UCDjgH0aI/i5mMHkCNQhK8YHwBRC3Bov0Mtf16+yjO2qf5ABfZSu2izpiJGAoQHB/d5HTZ oadEqfKkVDWapcffq5h3OhTrH2J9YvEfc0oUYWHpK8wGe9gQS5I+PDyFK3fhjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770715842; a=rsa-sha256; cv=none; b=l8iFjWdq4YH+PcZQn3Gm30Xp/NHOqlufW089BhTsn8+NCnGZXdw1toRgwobOs0rBrbaNWU BsC5O/aYXa5yfLA4Hqk5gTLMQKeoyOoO4xCpBMwqCYfcA5NNlX6+tGGRIgCITUoF8s5hL2 3ekcGZhJcbY8PxDsNBeMzpV6EzBZyEYAYuHKnP+qOMYru+FxQImCMTZz1/CbVVBap62Wbp ZFC9DT7Ul+cX3blNwvQsfYK9yIjOMPSU4DTskFSuGE+Ov5JKKZm0Gd4uXSk/roUn6TyJw+ 2eZCh2wUYop41pxH9xhf+gSib+bVdUP8j8yObQ64RV3/IGb65Z6qIUI3sIkUoA== 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=1770715842; h=from:from: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; bh=UldjtbBu/w1WdE+ExDxsHGz9OY1tpINYhXlao+dSB28=; b=U3Ym/of28PjkQrepJDGbGWYfyhDxDOQtfkI5DvUuiT1wX6FLVt2s4W2lSlcoOH3xrTuMkg AtwFK9CtWyy3YQ7f5VB/nEmHQaZLkdOptrRsHpTbHQLOcZZTdctb/ddYSCgQHC5FXi1qHV lzgLF+IwTCmy96QaCCuMbS3BbWoi3vj4CNwgaJlDMsmzepTG64fSenz9S5Hk2CirfoL5x9 G0XF2LzhQ2VZDRISL1Px7pqIh0z5jMHtVTvQWYn7wfA95Ac0j4U8bl9O6qkHCpSjU7GtCM iT5FO2RempRphu86A2HLP7uay5korukyGMtfl88/4o9O0DXFi4lz8iAYtT3SSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9GWk30Bmz1CJf for ; Tue, 10 Feb 2026 09:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19463 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 09:30:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Chandrakanth Patil From: Sumit Saxena Subject: git: c2f799d4193f - main - iflib: Add support for SIOCGIFDOWNREASON ioctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2f799d4193f135f4d36e9f622b10b825b9144eb Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 09:30:42 +0000 Message-Id: <698afac2.19463.238207ee@gitrepo.freebsd.org> The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=c2f799d4193f135f4d36e9f622b10b825b9144eb commit c2f799d4193f135f4d36e9f622b10b825b9144eb Author: Chandrakanth Patil AuthorDate: 2026-01-30 07:15:55 +0000 Commit: Sumit Saxena CommitDate: 2026-02-10 09:30:06 +0000 iflib: Add support for SIOCGIFDOWNREASON ioctl This change adds native support for the SIOCGIFDOWNREASON ioctl in iflib. When ifconfig issues SIOCGIFDOWNREASON, the request is now routed through a new driver callback (IFDI_GET_DOWNREASON). iflib allocates the ifdownreason structure, calls the driver to fill the down-reason message, and then returns the data back to ifconfig for display. Without this change, iflib-based drivers cannot implement link-down reason reporting even if the hardware provides the information. No functional change for existing drivers unless they implement the new IFDI_GET_DOWNREASON method. Existing drivers continue to behave as before. Reviewed by: gallatin, erj, kgalazka, ssaxena, #iflib Differential Revision: https://reviews.freebsd.org/D54045 MFC After: 1 week --- sys/net/ifdi_if.m | 11 +++++++++++ sys/net/iflib.c | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/sys/net/ifdi_if.m b/sys/net/ifdi_if.m index f4a3db5092ab..cb24ba36ee60 100644 --- a/sys/net/ifdi_if.m +++ b/sys/net/ifdi_if.m @@ -117,6 +117,12 @@ CODE { { return (false); } + + static int + null_get_downreason(if_ctx_t _ctx __unused, struct ifdownreason *_ifdr __unused) + { + return (ENOTSUP); + } }; # @@ -364,3 +370,8 @@ METHOD bool needs_restart { if_ctx_t _ctx; enum iflib_restart_event _event; } DEFAULT null_needs_restart; + +METHOD int get_downreason { + if_ctx_t _ctx; + struct ifdownreason *_ifdr; +} DEFAULT null_get_downreason; diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 8e2fd257ca74..08282d1799b8 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -4540,6 +4540,11 @@ iflib_if_ioctl(if_t ifp, u_long command, caddr_t data) err = IFDI_PRIV_IOCTL(ctx, command, data); CTX_UNLOCK(ctx); break; + case SIOCGIFDOWNREASON: + CTX_LOCK(ctx); + err = IFDI_GET_DOWNREASON(ctx, (struct ifdownreason *)data); + CTX_UNLOCK(ctx); + break; default: err = ether_ioctl(ifp, command, data); break; From nobody Tue Feb 10 10:08:09 2026 X-Original-To: dev-commits-src-main@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 4f9HNJ2qP4z6RpZF; Tue, 10 Feb 2026 10:09:20 +0000 (UTC) (envelope-from herbert@gojira.at) Received: from fout-b3-smtp.messagingengine.com (fout-b3-smtp.messagingengine.com [202.12.124.146]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f9HNG6VfFz3Hls; Tue, 10 Feb 2026 10:09:18 +0000 (UTC) (envelope-from herbert@gojira.at) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gojira.at header.s=fm3 header.b=YwRe+wUg; dkim=pass header.d=messagingengine.com header.s=fm3 header.b=rLkg9rOu; dmarc=none; spf=pass (mx1.freebsd.org: domain of herbert@gojira.at designates 202.12.124.146 as permitted sender) smtp.mailfrom=herbert@gojira.at Received: from phl-compute-07.internal (phl-compute-07.internal [10.202.2.47]) by mailfout.stl.internal (Postfix) with ESMTP id 3A90D1D000A7; Tue, 10 Feb 2026 05:09:17 -0500 (EST) Received: from phl-frontend-04 ([10.202.2.163]) by phl-compute-07.internal (MEProxy); Tue, 10 Feb 2026 05:09:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gojira.at; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1770718156; x=1770804556; bh=Ffzb7hE0u3 hWiMLH5jhotmirGLpOVPFwE69o5hrzMDU=; b=YwRe+wUg6bYQyCbgD8TAMAnLux gpqqf1s6Enx/B0KoWTWWC/4nP0EPiSHWWYLQOLFPuN11tu428ZM2PV/iCFBFSSdR rXG/i+uHMITRdsrD6sgXADSRw8qIlF+RtOZnvOQkBA347GHrR8C7+n9PwG9PNB4V K0+IgVuaeCtX9cJ7GuXXo/LlLOTR3DNzf4OoB5FmrkGF27cLDVW2B+pK4bLf8xaM ZZYRD1wVglUjLK+icqTDSb5lTNranBCzTRZzosy2Zw3meljfYURfp6vWdLyAPbbB 7UeDgZDZ9z/6XzgDf8n9tSlVPPx3NVF6fMNc2YBkdWGUyBpyYpbksYueck1Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1770718156; x=1770804556; bh=Ffzb7hE0u3hWiMLH5jhotmirGLpOVPFwE69 o5hrzMDU=; b=rLkg9rOu7f+ErXCbWKryyLlyFLAGQ+ZHSnvOwsu+2K4Vk1Ry6DN ygZen+Louw/kzMGpSzhoZRc9Yfee4GornD/k87gTAc9daJejdDLrfRP4Jzm/mUH9 BOeFD2hJPLpB2ppLWJ09Lpdmc9Uj9fs9jJuzbm3VZVvMwjksfOdr82vc6Qc779dW reF3I10iZuTFdAF8V/i2CFlzWtXhqNQcIcUYHBfBxx/mkHz1y/67xHLAcAutyrhX /FHAuhZeipU7yTZ6NCAYT8ZUVm97bfZ9eLccE09h4/2vwAzfWe2DMnZkdVvr1AoZ gocg4XZOQZNFSs2FfppZv6v9aRdjH2PIAiQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleelgedtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfurfetoffkrfgpnffqhgenuceu rghilhhouhhtmecufedttdenucenucfjughrpeffkffhvfevufgjfhgfgggtsehttdertd dtredvnecuhfhrohhmpedfjfgvrhgsvghrthculfdrucfukhhuhhhrrgdfuceohhgvrhgs vghrthesghhojhhirhgrrdgrtheqnecuggftrfgrthhtvghrnhepgfehteethfejueeitd evjedvfeffhffghfeljeejlefhudfgveffueffudetkeefnecuffhomhgrihhnpehfrhgv vggsshgurdhorhhgpdhophhtshdrmhhkpdhprhhoghdrmhhknecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhephhgvrhgsvghrthesghhojhhirhgr rdgrthdpnhgspghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoh epihhvhiesfhhrvggvsghsugdrohhrghdprhgtphhtthhopehsrhgtqdgtohhmmhhithht vghrshesfhhrvggvsghsugdrohhrghdprhgtphhtthhopeguvghvqdgtohhmmhhithhsqd hsrhgtqdgrlhhlsehfrhgvvggsshgurdhorhhgpdhrtghpthhtohepuggvvhdqtghomhhm ihhtshdqshhrtgdqmhgrihhnsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: i64fe486c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 10 Feb 2026 05:09:15 -0500 (EST) Date: Tue, 10 Feb 2026 11:08:09 +0100 Message-ID: <87v7g4j4hi.wl-herbert@gojira.at> From: "Herbert J. Skuhra" To: Lexi Winter Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 49e44e06d1ad - main - man7: Move atf.7 and tests.7 to the right package In-Reply-To: <202509232207.58NM74Y3043514@gitrepo.freebsd.org> References: <202509232207.58NM74Y3043514@gitrepo.freebsd.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/31.0 Mule/6.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-Spamd-Result: default: False [-2.59 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.988]; R_SPF_ALLOW(-0.20)[+ip4:202.12.124.128/27]; R_DKIM_ALLOW(-0.20)[gojira.at:s=fm3,messagingengine.com:s=fm3]; RCVD_IN_DNSWL_LOW(-0.10)[202.12.124.146:from]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[messagingengine.com:dkim]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DMARC_NA(0.00)[gojira.at]; DKIM_TRACE(0.00)[gojira.at:+,messagingengine.com:+] X-Rspamd-Queue-Id: 4f9HNG6VfFz3Hls X-Spamd-Bar: -- On Wed, 24 Sep 2025 00:07:04 +0200, Lexi Winter wrote: > > The branch main has been updated by ivy: > > URL: https://cgit.FreeBSD.org/src/commit/?id=49e44e06d1ade850cff5e84bf8c5fc425e4411c8 > > commit 49e44e06d1ade850cff5e84bf8c5fc425e4411c8 > Author: Lexi Winter > AuthorDate: 2025-09-23 21:57:10 +0000 > Commit: Lexi Winter > CommitDate: 2025-09-23 22:06:33 +0000 > > man7: Move atf.7 and tests.7 to the right package > > atf.7 should be in -atf, and tests.7 should be in -tests. > > MFC after: 1 day > Differential Revision: https://reviews.freebsd.org/D52661 > --- > share/man/man7/Makefile | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile > index 1e50242a1754..ef8a5a555a07 100644 > --- a/share/man/man7/Makefile > +++ b/share/man/man7/Makefile > @@ -1,5 +1,7 @@ > .include > > +MANGROUPS= MAN > + > #MISSING: eqnchar.7 ms.7 term.7 > MAN= arch.7 \ > ascii.7 \ > @@ -31,7 +33,6 @@ MAN= arch.7 \ > stats.7 \ > stdint.7 \ > sticky.7 \ > - tests.7 \ > tracing.7 \ > tuning.7 > > @@ -54,14 +55,21 @@ MLINKS+= networking.7 wifi.7 > .endif > > .if ${MK_TESTS} != "no" > -ATF= ${SRCTOP}/contrib/atf > -.PATH: ${ATF}/doc > -MAN+= atf.7 > +MANGROUPS+= ATF TESTS > + > +TESTS= tests.7 > +TESTSPACKAGE= tests > + > +ATF= atf.7 > +ATFPACKAGE= atf > + > +ATFPATH= ${SRCTOP}/contrib/atf > +.PATH: ${ATFPATH}/doc > > CLEANFILES+= atf.7 > atf.7: atf.7.in > sed -e 's,__DOCDIR__,/usr/share/doc/atf,g' \ > - <"${ATF}/doc/atf.7.in" >atf.7 > + <"${ATFPATH}/doc/atf.7.in" >atf.7 > .endif > > .include According to commit e1c6a283f3eaacf77244672cc9a09aab482dfba6 tests.7 is installed unconditionally. But this is no longer the case, right? Should the man page be added to tools/build/mk/OptionalObsoleteFiles.inc (MK_TESTS)? From nobody Tue Feb 10 10:16:53 2026 X-Original-To: dev-commits-src-main@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 4f9HY210Dlz6Rq77 for ; Tue, 10 Feb 2026 10:16:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9HY14QXBz3KvZ for ; Tue, 10 Feb 2026 10:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770718613; 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=BnfAsoSRY4tUZ8ZaQMnjm7B2IYXPlCKO+HjvVq9IsbQ=; b=Z3AU64OhNZYRtv6MPmQN8YFLpUjWle0HdUavc2g0LbE440Rq/KmqfqAL/w7+hyHxNVy5b5 jG0BTBn9eLer0uOcRUCnJnAeejGjizbJUQDYn8pHAi+f89v8E+YmnI3uTeb/FywLVItdAN AMwShwQpDo/w6pSe2htYMPvSlMtGpKMOTurb0G/7ATm9icm90RmzwquyDQlIk+dcmxFCK7 Pve2YEY6eylls2cRLZq0I/iUGqyWE+8sdORg2XfjlqsSLPmC+ArRyjRzcjDDia2J4kwnur GC8WZg0mh3FVs4FRpxWmidtlqEueRNmWTEHca/H0fyxunhedKOUF/fsUE6cbQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770718613; a=rsa-sha256; cv=none; b=qtFwZyhkm6V7kZDY01/5dgFxeULCrFOGSI6u6s9ssNUNrYoZjLo0crFZQg/z+hVqC74Nsu OL9IlF4kzRlVIIefYxZsqYGYJ9gw302+FfFJCABh3EL4RujBd+RW5ivseesZmg535Iahs3 E9AAEbaIkyjMJMklgWlXNmxtMjTSVDjuvU8zWL4/vtHM2NqVl7wvCiY4EJ/ocH1HJQcrq1 hw3A25Bzv6MjD1ErA9H+r+K3cCjMp7M6NbMe+xv+BP3n632Gs7XU++rxZ3PSvHOP4yQHEM ppqOFhiZKZHe9CDgH7uecEY2OPZ/VkSkKU8ktJbYcT8J0enN1L60o/NCATZHDQ== 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=1770718613; 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=BnfAsoSRY4tUZ8ZaQMnjm7B2IYXPlCKO+HjvVq9IsbQ=; b=HagQkJA5XdQr29qpBhAvFZXTbATI/n7/48CsyY9Cuta0THw4GbMQSRz1ZyzcuuNty3GTNc 7RuC1E3Y5GFY2gwIosZkRTapgeGWGG8MW1ncA4E1wMyynl7j4LTzfmcRanvk1LjrOMIwmu 5mhgWiLqrwzYoDmFSnRsnn6BwjAa59N3ib7np742pvT4j8/YD4oe1Ogfv8JYyvR5bqnAZr 4VTLhxTVfMcLhdzYriSu6NnrLYIbCtGuF+2yjUJ03D/JzwPFc/uo5FslwSoSD5Pzja80AA xqgJ+QWwrB8HpdPamN4szFTEyrSm4+CXeD/26pls7ZkC65sRermYSorP5+5luw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9HY13gP3z1DF2 for ; Tue, 10 Feb 2026 10:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0a8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 10:16:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 49c1b388d5a8 - main - rtw88: harmonize all MODULE_DEPEND to rtw88 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 49c1b388d5a89761980d24aee14f3bd0db7c0dda Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 10:16:53 +0000 Message-Id: <698b0595.1d0a8.67c93ff5@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=49c1b388d5a89761980d24aee14f3bd0db7c0dda commit 49c1b388d5a89761980d24aee14f3bd0db7c0dda Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 16:18:49 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 10:16:33 +0000 rtw88: harmonize all MODULE_DEPEND to rtw88 From the time I used to split up the driver into a core part and bus attachment sub-drivers the various bus attachments had their own module name but all is "rtw88" now. Core functionality depends on linuxkpi, linuxkpi_wlan, and for debug.c lindebugfs. Each bus attachment then depends on its own parent layer if needed: PCI gets pull in through linuxkpi, USB: depends on [the future] linuxkpi_usb, and SDIO: depends on [the future] linuxkpi_sdio. Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55021 --- sys/contrib/dev/rtw88/debug.c | 4 ++++ sys/contrib/dev/rtw88/main.c | 5 +++++ sys/contrib/dev/rtw88/pci.c | 8 -------- sys/contrib/dev/rtw88/usb.c | 5 +---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index 53742a3220f2..1e2b11cf1dd3 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -1381,3 +1381,7 @@ void rtw_dbg(struct rtw_dev *rtwdev, enum rtw_debug_mask mask, EXPORT_SYMBOL(rtw_dbg); #endif /* CONFIG_RTW88_DEBUG */ + +#ifdef CONFIG_RTW88_DEBUGFS +MODULE_DEPEND(rtw88, lindebugfs, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c index d9e6e9477dfb..b38709b180fd 100644 --- a/sys/contrib/dev/rtw88/main.c +++ b/sys/contrib/dev/rtw88/main.c @@ -2591,3 +2591,8 @@ void rtw_set_ampdu_factor(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek 802.11ac wireless core module"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(rtw88, 1); +MODULE_DEPEND(rtw88, linuxkpi, 1, 1, 1); +MODULE_DEPEND(rtw88, linuxkpi_wlan, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c index e4cbaae4646f..1dc4f5915d2d 100644 --- a/sys/contrib/dev/rtw88/pci.c +++ b/sys/contrib/dev/rtw88/pci.c @@ -1964,11 +1964,3 @@ EXPORT_SYMBOL(rtw_pci_shutdown); MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek PCI 802.11ac wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); -#if defined(__FreeBSD__) -MODULE_VERSION(rtw_pci, 1); -MODULE_DEPEND(rtw_pci, linuxkpi, 1, 1, 1); -MODULE_DEPEND(rtw_pci, linuxkpi_wlan, 1, 1, 1); -#ifdef CONFIG_RTW88_DEBUGFS -MODULE_DEPEND(rtw_pci, lindebugfs, 1, 1, 1); -#endif -#endif diff --git a/sys/contrib/dev/rtw88/usb.c b/sys/contrib/dev/rtw88/usb.c index 9fe00af9fc0e..69a4cb60184f 100644 --- a/sys/contrib/dev/rtw88/usb.c +++ b/sys/contrib/dev/rtw88/usb.c @@ -1379,8 +1379,5 @@ MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek USB 802.11ac wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); #if defined(__FreeBSD__) -MODULE_VERSION(rtw88_usb, 1); -MODULE_DEPEND(rtw88_usb, rtw88_core, 1, 1, 1); -MODULE_DEPEND(rtw88_usb, linuxkpi, 1, 1, 1); -MODULE_DEPEND(rtw88_usb, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(rtw88, linuxkpi_usb, 1, 1, 1); #endif From nobody Tue Feb 10 10:16:54 2026 X-Original-To: dev-commits-src-main@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 4f9HY26gYcz6Rq4k for ; Tue, 10 Feb 2026 10:16:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9HY24J6Gz3L8C for ; Tue, 10 Feb 2026 10:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770718614; 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=tYOvYqxYSsF1UWKOCLYANWaxljExD6qxj4n7Jvkln7c=; b=gb4pNT4ULKU76bUhSzKhPb3mFjXubdTACkzX/wvri7KGtQQhhM/4gYZ91n2xPnFN+9V9o2 93lAa/Ypu6uvz5TuHQuF1rx90Vi4tPcfcQEEWJDrBBqKzysFoufiOqfixBnkFIAALBXe2T w+TfRG/srSV3bjPvZrsgHZIxRlONuoiHE14UC5AxK1eLP1/fd2V9PLKFOc0VtKaG9pkyvv Rh/F4lJxDjVXnD+LMlbJqz75aZ49HtVNSC1cS69VdUFqOgNwYrII3HWukNLnPC5WoLfABb ttcTgMgmOF4YRjgHCJWfPaTkqrv5nJhM/iTlklyo5G7DoPGdN75Ek3cRFSil5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770718614; a=rsa-sha256; cv=none; b=l8EV7YgTI+vS6/BgKaYqjm8R1zXzWToZ3JVTpWS8wZolQaRPH++R9zbwvw1Yrhbs/2GULg YR/YUxrEAXgm6k0Ue5Fmug3Ua0/6hYK2EK/GzD5UxLPEn3me8+2CsvOp8qrE5xdAqHa7Sy bvUOpqAicNXPewQtOtZ7n2zbBuu4373dp/D8R5kgxg5+1nEf+F4Ys+G0aKy8Mkj/8CzPI4 NPfC+s1MFC3WOPBjUWAHVciT1tJQLUN6quGQemE8BD3EyN6ciORzhs6hPh6pazEQk9ZZzn 7IfoTFp5E0Mtw9xI3MEUt4/F6LBpMlwdSdKNrV1EfNA3Sp9b3FRCeUME87RvqA== 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=1770718614; 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=tYOvYqxYSsF1UWKOCLYANWaxljExD6qxj4n7Jvkln7c=; b=UrBRebk8w09HxTPRywx0tMKvuR1Wt/vELPc5ScFaJwZnpNnXsH+tnt61TcEVIZtmoQvObc goIZESrFN1QI7H3BmrXjeKQE4DaW06QKIIG1S7u8lXExF+t+SkmomPjHMb9Fwj6A2Dj/IW hBadEd2FiiwLkYnf29FFd6zDPDT/PMTYLTQOAs5nGNr5VA89m63TBfevt/iL/Lr8pKkeBg EgrP2+8du3PyPRIG/uewHqz+BFjEM643FZW6bm6i8r6UbWtsmb7diq1LTmkXtr9ZQ5/Luj 34AsebKFb3L6kAxl5ZwdlkQtycupN7ojxOMwKwuUtuQMH61hzhQvmA9hSnsIOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9HY23qMZz1DCT for ; Tue, 10 Feb 2026 10:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d0ac by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 10:16:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9e1755611960 - main - rtw88: Add bus attachments to the module Makefile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9e175561196066a09c1a89202fd60e0433b87868 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 10:16:54 +0000 Message-Id: <698b0596.1d0ac.29a3b02d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9e175561196066a09c1a89202fd60e0433b87868 commit 9e175561196066a09c1a89202fd60e0433b87868 Author: Bjoern A. Zeeb AuthorDate: 2026-01-26 13:19:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 10:16:34 +0000 rtw88: Add bus attachments to the module Makefile In addition to PCIe we will support USB and also prepare for SDIO (still disabled locally). The module SRCS are split up into a common part, which we always add. All three bus parts are guarded by a local variable in the Makefile. In addition the PCI parts require PCI to be compiled into the kernel. We add that check in case of, e.g., SoCs with SDIO but no PCI, which may not have PCI in the kernel config and thus the module would fail to attach. USB has no additional check as it is fully loadable and does not have to be in a kernel config. SDIO depends on an MMCCAM-enabled kernel but is otherwise loadable. While we could, we are not splitting the various bus attachments into individual modules as we generally do not do that in FreeBSD. [1] Sponsored by: The FreeBSD Foundation MFC after: 3 days Discussed with: imp and jhb (2022, 2024), see also 17732dd8f01b [1] OKed by: imp (KERN_OPTS checks initially suggested by jhb) Differential Revision: https://reviews.freebsd.org/D55022 --- sys/modules/rtw88/Makefile | 82 +++++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index 0ce6ad3f99bb..2347093db1a5 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -1,7 +1,15 @@ +.include + DEVRTW88DIR= ${SRCTOP}/sys/contrib/dev/rtw88 .PATH: ${DEVRTW88DIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 +WITH_SDIO= 0 + +# Options. WITH_CONFIG_PM= 0 WITH_DEBUGFS= 1 WITH_LEDS= 0 @@ -19,41 +27,69 @@ SRCS+= wow.c CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} .endif -# PCI parts. +# Common +SRCS+= rtw8723x.c # 87x3 common +SRCS+= rtw8703b.c rtw8703b_tables.c # 11n +SRCS+= rtw8723d.c rtw8723d_table.c # 11n +SRCS+= rtw8814a.c rtw8814a_table.c # 11ac +SRCS+= rtw8821c.c rtw8821c_table.c # 11ac +SRCS+= rtw8822b.c rtw8822b_table.c # 11ac +SRCS+= rtw8822c.c rtw8822c_table.c # 11ac + +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pci.c -SRCS+= rtw8723x.c # 87x3 common -SRCS+= rtw8703b.c rtw8703b_tables.c # 11n -SRCS+= rtw8723d.c rtw8723d_table.c rtw8723de.c # 11n -SRCS+= rtw8821c.c rtw8821c_table.c rtw8821ce.c # 11ac -SRCS+= rtw8822b.c rtw8822b_table.c rtw8822be.c # 11ac -SRCS+= rtw8822c.c rtw8822c_table.c rtw8822ce.c # 11ac -SRCS+= rtw8814a.c rtw8814a_table.c rtw8814ae.c # 11ac - -# USB parts -#SRCS+= rtw88xxa.c # 88xxa common -#SRCS+= rtw8812a.c rtw8812a_table.c rtw8812au.c -#SRCS+= rtw8814au.c -#SRCS+= rtw8821a.c rtw8821a_table.c rtw8821au.c -#CFLAGS+= -DCONFIG_RTW88_USB +SRCS+= rtw8723de.c +SRCS+= rtw8814ae.c +SRCS+= rtw8821ce.c +SRCS+= rtw8822be.c +SRCS+= rtw8822ce.c +.endif + +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +SRCS+= rtw8723du.c +SRCS+= rtw88xxa.c # 88xxa common +SRCS+= rtw8812a.c rtw8812a_table.c rtw8812au.c +SRCS+= rtw8814au.c +SRCS+= rtw8821a.c rtw8821a_table.c rtw8821au.c +SRCS+= rtw8821cu.c +SRCS+= rtw8822bu.c +SRCS+= rtw8822cu.c + +CFLAGS+= -DCONFIG_RTW88_USB +.endif + +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} +SRCS+= rtw8723cs.c +SRCS+= rtw8723ds.c +SRCS+= rtw8821cs.c +SRCS+= rtw8822bs.c +SRCS+= rtw8822cs.c +.endif .if defined(WITH_LEDS) && ${WITH_LEDS} > 0 CFLAGS+= -DCONFIG_RTW88_LEDS SRCS+= led.c .endif +.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 +CFLAGS+= -DCONFIG_RTW88_DEBUGFS +.endif + # Other -SRCS+= ${LINUXKPI_GENSRCS} -SRCS+= opt_wlan.h opt_inet6.h opt_inet.h +SRCS+= opt_wlan.h opt_inet6.h opt_inet.h +SRCS+= ${LINUXKPI_GENSRCS} -CFLAGS+= -DKBUILD_MODNAME='"rtw88"' -CFLAGS+= -DLINUXKPI_VERSION=61900 +CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -I${DEVRTW88DIR} -CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_RTW88_DEBUG -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -CFLAGS+= -DCONFIG_RTW88_DEBUGFS -.endif + +CFLAGS+= -DKBUILD_MODNAME='"rtw88"' +CFLAGS+= -DLINUXKPI_VERSION=61900 # Helpful after fresh imports. #CFLAGS+= -ferror-limit=0 From nobody Tue Feb 10 10:16:55 2026 X-Original-To: dev-commits-src-main@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 4f9HY375Myz6Rq7F for ; Tue, 10 Feb 2026 10:16:55 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9HY34rDsz3L18 for ; Tue, 10 Feb 2026 10:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770718615; 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=RyNPsksBfStlhO6z3/pYzyJ14bDcjuGJgZ8C7SMKtRw=; b=MLfld7t5pli+WfAa4YQU47ly6/Yr/2q8iA9LeqBxBgYotwIKjdigbc8BiHyDbvUDOl79Bb VBQz7iB0ObSf6X3nn51wrd38GwxtgrjKX0CFLt6CiFbDXUtHMivoLdAmx/jEUE0h+yr5bC RMpaT0vyos2YEbctjVeAD7i593AaNsx7vulvIA9Xc6ADrt4Um+ONauAKJvqr2Nn/WYa72k REj17PONK5QPOeYAmR9z9Bd7WA8107/mS3BzRmK7GY7jqXXAxFdbwy4vd85btwzQPtAWEM rx2mwnCZ4YzluLZ8F3ZMiGuZqnws+0hgw95F7r5Q6+Po/CTquN7wDzJjEyZUjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770718615; a=rsa-sha256; cv=none; b=JB8NkrA5N0BIm6U8r+zIBjyu28nbVoGDBsaAOKnqhm017BTxG5f+yUyBrB/fH5LezsvYYI BcyS5aNzyfukW0x8g4a0d3RuAEYxC7wcaUWUnmJIhIP/AVbEiF6gTQinU2IXm1S8TrCJQR n9fwePmlpLor+JEsZpQyqjpF45zzVZmhQ+MazAkz+lC+A3QcHJjnFQwPearo1apggYrtkb H1OAIGVhVR2A2MKA8QUSvcT6vedmTuuyEs5cl5Bz354D/UwgRQ4TyU1rU8ugUTAIKCXFU1 HcyBvrlpPMHAdCwVVRy6ecRN5karmLMA9cm0im08BuvKJq/CNGu6gluFdxnO1Q== 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=1770718615; 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=RyNPsksBfStlhO6z3/pYzyJ14bDcjuGJgZ8C7SMKtRw=; b=hMsL0RYfawqJJtRFFw5uWxivS1MQdQO5FxTqic5xTLsRqGwb7vwU9vbWci45lCH4XRMJw2 XPi3TVl3uug9kN6FviOs8CqLbBOUW5xcu/twi8U9RectTvfNOlG01VvfdoEs+V7boXYBKJ FjQX5Xc8cG7HrT+YNtZ7P7uCBluq/LbDhfdM1rhdqH9/diIJq1DhaTJQoy7WYpe99n2K+5 G9WA7YF4gX+y9IVUJqaGAqkeFKPB/LQwtMGMbbef5+hMf25dCNsrGZ4ZKGU693m0xtgG6J pQ12kyqEDcctDQWn3bh1wqlxTjxjnJ+/NWljjgUFAKA+xjcVsuWCFh5FfIOtfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9HY34RMHz1Clx for ; Tue, 10 Feb 2026 10:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e6cb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 10:16:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 57b839612b7a - main - rtw89: cleanup static_assert() calls List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 57b839612b7abb891057f1efe380c509664f868b Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 10:16:55 +0000 Message-Id: <698b0597.1e6cb.49010151@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=57b839612b7abb891057f1efe380c509664f868b commit 57b839612b7abb891057f1efe380c509664f868b Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:51:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 10:16:34 +0000 rtw89: cleanup static_assert() calls These days we can use static_assert() without trouble so remove the FreeBSD-specific rtw89_static_assert implementation. This reduces the diff to upstream and will ease future driver updates. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/core.h | 6 ------ sys/contrib/dev/rtw89/debug.c | 12 ------------ sys/contrib/dev/rtw89/fw.h | 8 -------- sys/contrib/dev/rtw89/phy.c | 8 -------- sys/contrib/dev/rtw89/rtw8851b.c | 6 ------ sys/contrib/dev/rtw89/rtw8852c.c | 6 ------ sys/contrib/dev/rtw89/rtw8852c_rfk.c | 4 ---- sys/contrib/dev/rtw89/sar.c | 4 ---- sys/contrib/dev/rtw89/ser.c | 4 ---- 9 files changed, 58 deletions(-) diff --git a/sys/contrib/dev/rtw89/core.h b/sys/contrib/dev/rtw89/core.h index a8bfa538515e..b6b810567a35 100644 --- a/sys/contrib/dev/rtw89/core.h +++ b/sys/contrib/dev/rtw89/core.h @@ -7703,10 +7703,4 @@ void rtw89_core_ntfy_btc_event(struct rtw89_dev *rtwdev, enum rtw89_btc_hmsg eve int rtw89_core_mlsr_switch(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, unsigned int link_id); -#if defined(__linux__) -#define rtw89_static_assert(_x) static_assert(_x) -#elif defined(__FreeBSD__) -#define rtw89_static_assert(_x) _Static_assert(_x, "bad array size") -#endif - #endif diff --git a/sys/contrib/dev/rtw89/debug.c b/sys/contrib/dev/rtw89/debug.c index ad11256fffb7..0db142ba6d89 100644 --- a/sys/contrib/dev/rtw89/debug.c +++ b/sys/contrib/dev/rtw89/debug.c @@ -505,11 +505,7 @@ static const struct txpwr_ent __txpwr_ent_byr_ax[] = { __GEN_TXPWR_ENT4("HEDCM_2NSS", "MCS0 ", "MCS1 ", "MCS3 ", "MCS4 "), }; -#if defined(__linux__) static_assert((ARRAY_SIZE(__txpwr_ent_byr_ax) * 4) == -#elif defined(__FreeBSD__) -rtw89_static_assert((ARRAY_SIZE(__txpwr_ent_byr_ax) * 4) == -#endif (R_AX_PWR_BY_RATE_MAX - R_AX_PWR_BY_RATE + 4)); static const struct txpwr_map __txpwr_map_byr_ax = { @@ -565,11 +561,7 @@ static const struct txpwr_ent __txpwr_ent_lmt_ax[] = { __GEN_TXPWR_ENT2("MCS_2TX_40M_2p5", "NON_BF", "BF"), }; -#if defined(__linux__) static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ax) * 2) == -#elif defined(__FreeBSD__) -rtw89_static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ax) * 2) == -#endif (R_AX_PWR_LMT_MAX - R_AX_PWR_LMT + 4)); static const struct txpwr_map __txpwr_map_lmt_ax = { @@ -597,11 +589,7 @@ static const struct txpwr_ent __txpwr_ent_lmt_ru_ax[] = { "RU106_4", "RU106_5", "RU106_6", "RU106_7"), }; -#if defined(__linux__) static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ru_ax) * 8) == -#elif defined(__FreeBSD__) -rtw89_static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ru_ax) * 8) == -#endif (R_AX_PWR_RU_LMT_MAX - R_AX_PWR_RU_LMT + 4)); static const struct txpwr_map __txpwr_map_lmt_ru_ax = { diff --git a/sys/contrib/dev/rtw89/fw.h b/sys/contrib/dev/rtw89/fw.h index 940a7b39bee1..cedb4a47a769 100644 --- a/sys/contrib/dev/rtw89/fw.h +++ b/sys/contrib/dev/rtw89/fw.h @@ -3608,11 +3608,7 @@ struct rtw89_fw_c2h_attr { static inline struct rtw89_fw_c2h_attr *RTW89_SKB_C2H_CB(struct sk_buff *skb) { -#if defined(__linux__) static_assert(sizeof(skb->cb) >= sizeof(struct rtw89_fw_c2h_attr)); -#elif defined(__FreeBSD__) - rtw89_static_assert(sizeof(skb->cb) >= sizeof(struct rtw89_fw_c2h_attr)); -#endif return (struct rtw89_fw_c2h_attr *)skb->cb; } @@ -3818,11 +3814,7 @@ struct rtw89_mac_mcc_tsf_rpt { u32 tsf_y_high; }; -#if defined(__linux__) static_assert(sizeof(struct rtw89_mac_mcc_tsf_rpt) <= RTW89_COMPLETION_BUF_SIZE); -#elif defined(__FreeBSD__) -rtw89_static_assert(sizeof(struct rtw89_mac_mcc_tsf_rpt) <= RTW89_COMPLETION_BUF_SIZE); -#endif #define RTW89_GET_MAC_C2H_MCC_TSF_RPT_MACID_X(c2h) \ le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(7, 0)) diff --git a/sys/contrib/dev/rtw89/phy.c b/sys/contrib/dev/rtw89/phy.c index bbd4e3d7d360..f60753369516 100644 --- a/sys/contrib/dev/rtw89/phy.c +++ b/sys/contrib/dev/rtw89/phy.c @@ -2856,11 +2856,7 @@ rtw89_phy_fill_txpwr_limit_ru_160m_ax(struct rtw89_dev *rtwdev, static const int ofst[] = { -14, -10, -6, -2, 2, 6, 10, 14 }; int i; -#if defined(__linux__) static_assert(ARRAY_SIZE(ofst) == RTW89_RU_SEC_NUM_AX); -#elif defined(__FreeBSD__) - rtw89_static_assert(ARRAY_SIZE(ofst) == RTW89_RU_SEC_NUM_AX); -#endif for (i = 0; i < RTW89_RU_SEC_NUM_AX; i++) { lmt_ru->ru26[i] = rtw89_phy_read_txpwr_limit_ru(rtwdev, band, RTW89_RU26, @@ -7556,11 +7552,7 @@ static void [RTW89_RFK_F_DELAY] = _rfk_delay, }; -#if defined(__linux__) static_assert(ARRAY_SIZE(_rfk_handler) == RTW89_RFK_F_NUM); -#elif defined(__FreeBSD__) -rtw89_static_assert(ARRAY_SIZE(_rfk_handler) == RTW89_RFK_F_NUM); -#endif void rtw89_rfk_parser(struct rtw89_dev *rtwdev, const struct rtw89_rfk_tbl *tbl) diff --git a/sys/contrib/dev/rtw89/rtw8851b.c b/sys/contrib/dev/rtw89/rtw8851b.c index 04246a31cc0e..84b628d23882 100644 --- a/sys/contrib/dev/rtw89/rtw8851b.c +++ b/sys/contrib/dev/rtw89/rtw8851b.c @@ -1825,15 +1825,9 @@ static void rtw8851b_bb_set_tx_shape_dfir(struct rtw89_dev *rtwdev, #define __DFIR_CFG_ADDR(i) (R_TXFIR0 + ((i) << 2)) #define __DFIR_CFG_MASK 0xffffffff #define __DFIR_CFG_NR 8 -#if defined(__linux__) #define __DECL_DFIR_PARAM(_name, _val...) \ static const u32 param_ ## _name[] = {_val}; \ static_assert(ARRAY_SIZE(param_ ## _name) == __DFIR_CFG_NR) -#elif defined(__FreeBSD__) -#define __DECL_DFIR_PARAM(_name, _val...) \ - static const u32 param_ ## _name[] = {_val}; \ - rtw89_static_assert(ARRAY_SIZE(param_ ## _name) == __DFIR_CFG_NR) -#endif __DECL_DFIR_PARAM(flat, 0x023D23FF, 0x0029B354, 0x000FC1C8, 0x00FDB053, diff --git a/sys/contrib/dev/rtw89/rtw8852c.c b/sys/contrib/dev/rtw89/rtw8852c.c index 6f272aab48a5..db99450e9158 100644 --- a/sys/contrib/dev/rtw89/rtw8852c.c +++ b/sys/contrib/dev/rtw89/rtw8852c.c @@ -2085,15 +2085,9 @@ static void rtw8852c_bb_set_tx_shape_dfir(struct rtw89_dev *rtwdev, { #define __DFIR_CFG_MASK 0xffffff #define __DFIR_CFG_NR 8 -#if defined(__linux__) #define __DECL_DFIR_VAR(_prefix, _name, _val...) \ static const u32 _prefix ## _ ## _name[] = {_val}; \ static_assert(ARRAY_SIZE(_prefix ## _ ## _name) == __DFIR_CFG_NR) -#elif defined(__FreeBSD__) -#define __DECL_DFIR_VAR(_prefix, _name, _val...) \ - static const u32 _prefix ## _ ## _name[] = {_val}; \ - rtw89_static_assert(ARRAY_SIZE(_prefix ## _ ## _name) == __DFIR_CFG_NR) -#endif #define __DECL_DFIR_PARAM(_name, _val...) __DECL_DFIR_VAR(param, _name, _val) #define __DECL_DFIR_ADDR(_name, _val...) __DECL_DFIR_VAR(addr, _name, _val) diff --git a/sys/contrib/dev/rtw89/rtw8852c_rfk.c b/sys/contrib/dev/rtw89/rtw8852c_rfk.c index 129b940da62a..cbee484dee30 100644 --- a/sys/contrib/dev/rtw89/rtw8852c_rfk.c +++ b/sys/contrib/dev/rtw89/rtw8852c_rfk.c @@ -2704,11 +2704,7 @@ static void _dpk_cal_select(struct rtw89_dev *rtwdev, bool force, u8 path; bool is_fail = true, reloaded[RTW8852C_DPK_RF_PATH] = {false}; -#if defined(__linux__) static_assert(ARRAY_SIZE(kip_reg) == RTW8852C_DPK_KIP_REG_NUM); -#elif defined(__FreeBSD__) - rtw89_static_assert(ARRAY_SIZE(kip_reg) == RTW8852C_DPK_KIP_REG_NUM); -#endif if (dpk->is_dpk_reload_en) { for (path = 0; path < RTW8852C_DPK_RF_PATH; path++) { diff --git a/sys/contrib/dev/rtw89/sar.c b/sys/contrib/dev/rtw89/sar.c index ed3fa4e6b0a5..ef7feccccd5e 100644 --- a/sys/contrib/dev/rtw89/sar.c +++ b/sys/contrib/dev/rtw89/sar.c @@ -406,11 +406,7 @@ static const struct cfg80211_sar_freq_ranges rtw89_common_sar_freq_ranges[] = { { .start_freq = 6875, .end_freq = 7115, }, }; -#if defined(__linux__) static_assert(RTW89_SAR_SUBBAND_NR == -#elif defined(__FreeBSD__) -rtw89_static_assert(RTW89_SAR_SUBBAND_NR == -#endif ARRAY_SIZE(rtw89_common_sar_freq_ranges)); const struct cfg80211_sar_capa rtw89_sar_capa = { diff --git a/sys/contrib/dev/rtw89/ser.c b/sys/contrib/dev/rtw89/ser.c index 03f56b03875a..f99e179f7ff9 100644 --- a/sys/contrib/dev/rtw89/ser.c +++ b/sys/contrib/dev/rtw89/ser.c @@ -620,11 +620,7 @@ struct __fw_backtrace_info { u32 sp; } __packed; -#if defined(__linux__) static_assert(RTW89_FW_BACKTRACE_INFO_SIZE == -#elif defined(__FreeBSD__) -rtw89_static_assert(RTW89_FW_BACKTRACE_INFO_SIZE == -#endif sizeof(struct __fw_backtrace_info)); static u32 convert_addr_from_wcpu(u32 wcpu_addr) From nobody Tue Feb 10 10:16:56 2026 X-Original-To: dev-commits-src-main@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 4f9HY52XBNz6Rq0X for ; Tue, 10 Feb 2026 10:16:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9HY45nKcz3Ky9 for ; Tue, 10 Feb 2026 10:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770718616; 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=2JANKdInbJwUrnjef/vwRlHqdivDD1wgbzIz3kVlgOY=; b=V0R+4/Ld0rxWMn23DBK+Itubhlu1B9G4XVVXJlOmOGCGkYM0nXixiOCcgobLpGa9ReyP1w Ps+/G5zUVN4HRwdItxNq/H5eQ2kk3wpGLdWzAoSPf39TQZg5JMJ85IFDC6ITMQ0StqQDgQ 9j4e2nsGy6UBtG+KX7EtUL3+YuTxP07aCDW6gwIPRSD1z6QYwU3TJte68te0ENx3gZxdsH u9GaRBwQ4EPirgIiM15xEOzE8kPckDnBf6rg/3cjqTjs/RQWBNtpW3TtSS8dYkPmSRxlyw 19qV/PW8Uv2UApHJYa3PdbxE2qLiGevIp2jt/Dzqlo1WUvrjYTF0OEshJuVCpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770718616; a=rsa-sha256; cv=none; b=KSzSLprItA15w/y3NUlRp1ZTGUbfts5OimfebFuyA/r+2FqTM9yd+doTTa3qV/qXtB4vSA 0ot1wyHPmaYl0ZCwh1WY73caEDZA9kE7mlHbXd77mDWBkc/ZWvKn7hoPlGau+uNU203t9G gBod3I9UTY+TiyDNgj+jp+mbDqNKYOevXAjPpisVIRciPW49oT3aKyLngke0uT92xOkM6d NugtV37HxxeMEdkOBS4mcwaN/uM8PuZxENsJafRyUTTI7QRQjtL72jsm8tXgJkW9fTtAh2 IGDV+oJpTZcQEk/8vrc9Xb1qW0xdUKeoN1SkPJ9BFRGq5zYpKdQQAUZba0X0Wg== 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=1770718616; 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=2JANKdInbJwUrnjef/vwRlHqdivDD1wgbzIz3kVlgOY=; b=BtBaU0OczTa0CPs9QauycqoIJqZttRmWrERN78da5zqQAc544FmJwHYcWsX5klJfLbxoow yUSHd/t2kPV3lAzzfgKUKDBMroeIBSTRbr+QQ1Fpsx0jwsduiXUZVlXZ1YNYmV6ws+NFQX WGqsbrs9W/tklO+anyQFbfolYnPSMjsx1OG4WUEsh7J+egrbCvzylW2vBJm0k9gxznClnw qp7OBDGfadrYCp05F2CpZMbVKyBUJ+WTFHpr56DXi7z4i6fV6p1poZez06MQINwtvlnmXS TtQpaKBgff2+rvmkgCqrDVqo+WOL9CxdQ003OSNislm+8R1yKfaenbTngvo81g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9HY45HMHz1Cly for ; Tue, 10 Feb 2026 10:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c65a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 10:16:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 7fc5c8df4c90 - main - rtw89: harmonize all MODULE_DEPEND to rtw89 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7fc5c8df4c90a2067c936e3026be6bd6840cd5ec Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 10:16:56 +0000 Message-Id: <698b0598.1c65a.434b842f@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7fc5c8df4c90a2067c936e3026be6bd6840cd5ec commit 7fc5c8df4c90a2067c936e3026be6bd6840cd5ec Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 18:05:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 10:16:34 +0000 rtw89: harmonize all MODULE_DEPEND to rtw89 rtw89 came like rtw88 was done. Given rtw88 once was split up rtw89 got modelled the same way. Clean this up too. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/core.c | 5 +++++ sys/contrib/dev/rtw89/debug.c | 5 +++++ sys/contrib/dev/rtw89/pci.c | 8 -------- sys/contrib/dev/rtw89/usb.c | 3 +++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/contrib/dev/rtw89/core.c b/sys/contrib/dev/rtw89/core.c index b1b16dda3304..aeaf1c8f80c5 100644 --- a/sys/contrib/dev/rtw89/core.c +++ b/sys/contrib/dev/rtw89/core.c @@ -6723,3 +6723,8 @@ EXPORT_SYMBOL(rtw89_free_ieee80211_hw); MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek 802.11ax wireless core module"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_VERSION(rtw89, 1); +MODULE_DEPEND(rtw89, linuxkpi, 1, 1, 1); +MODULE_DEPEND(rtw89, linuxkpi_wlan, 1, 1, 1); +#endif diff --git a/sys/contrib/dev/rtw89/debug.c b/sys/contrib/dev/rtw89/debug.c index 0db142ba6d89..086c1dedf03c 100644 --- a/sys/contrib/dev/rtw89/debug.c +++ b/sys/contrib/dev/rtw89/debug.c @@ -4889,3 +4889,8 @@ void rtw89_debug(struct rtw89_dev *rtwdev, enum rtw89_debug_mask mask, } EXPORT_SYMBOL(rtw89_debug); #endif +#if defined(__FreeBSD__) +#ifdef CONFIG_RTW89_DEBUGFS +MODULE_DEPEND(rtw89, lindebugfs, 1, 1, 1); +#endif +#endif diff --git a/sys/contrib/dev/rtw89/pci.c b/sys/contrib/dev/rtw89/pci.c index e8de0f0e9ad8..aeb6570928f9 100644 --- a/sys/contrib/dev/rtw89/pci.c +++ b/sys/contrib/dev/rtw89/pci.c @@ -4931,11 +4931,3 @@ EXPORT_SYMBOL(rtw89_pci_remove); MODULE_AUTHOR("Realtek Corporation"); MODULE_DESCRIPTION("Realtek PCI 802.11ax wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); -#if defined(__FreeBSD__) -MODULE_VERSION(rtw89_pci, 1); -MODULE_DEPEND(rtw89_pci, linuxkpi, 1, 1, 1); -MODULE_DEPEND(rtw89_pci, linuxkpi_wlan, 1, 1, 1); -#ifdef CONFIG_RTW89_DEBUGFS -MODULE_DEPEND(rtw89_pci, lindebugfs, 1, 1, 1); -#endif -#endif diff --git a/sys/contrib/dev/rtw89/usb.c b/sys/contrib/dev/rtw89/usb.c index d7d968207a39..3282225df4f6 100644 --- a/sys/contrib/dev/rtw89/usb.c +++ b/sys/contrib/dev/rtw89/usb.c @@ -1069,3 +1069,6 @@ EXPORT_SYMBOL(rtw89_usb_disconnect); MODULE_AUTHOR("Bitterblue Smith "); MODULE_DESCRIPTION("Realtek USB 802.11ax wireless driver"); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_DEPEND(rtw89, linuxkpi_usb, 1, 1, 1); +#endif From nobody Tue Feb 10 10:16:57 2026 X-Original-To: dev-commits-src-main@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 4f9HY63Nnwz6Rq7R for ; Tue, 10 Feb 2026 10:16:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9HY56gjTz3L3Y for ; Tue, 10 Feb 2026 10:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770718617; 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=adNCCo9tFqMgxvCUlKYb/KVhC90m7polV5tpMiqvVwU=; b=lPqTqezYp+B7+coCKG5Y5hi+2mGAb7d8ARHt4jqhg3Hl4Jiwxc8QF+YD3ZJpb1Veyo0fui pSK3xxxZbhdbtMlmGVvYT5Gr+9miN9QjCZj5aSdJjAPbB8AJarmsfx3df1266Y8GOJWg0Z Gy12EH/7qgPTEt2TGgt0Xh4QuKQHIm4ahls+TUEDdhyVJIBQgp6MZdDzVv7n6em1qHLGZi 5Obse90OkdXdANQj6nVh+TY4AQLRx+wjNQZMxheyM3S4tljl+UlEvbq3cfP7+My708yYod fP+PyXgrkiYsxGhGoWCKg8bGKbhYkzwoZVIVGYPCBXaOJq2E8Regnwv52jETvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770718618; a=rsa-sha256; cv=none; b=nw8DOpMXMoWNqOvZBkU4OJAcbgMH6JQRt2FPsoSYr4rn0u4BiTpl8kZq+cr6Vf8gIXJGme ujSWvob8fnvGnXlcUJu97Sztr7PIHprbtacaj7UMZwR4xWVmhrnlD1o9ai6eDwyupKp/xK bs7AvmkJxAPXSfKByB01+bQ32GNUbO2hPdKpFKp0oRYDe/8ewZFV0h4LXcDt5E40Pz5yAR 0iGtXhc1wvtwF72VDu9WcZw79NISRqRv2dCMa+tptrSfbA2Y044BvH5o1VStEEJVzYBxhd 22TU+rjo5OZDn4sZO2aSW19BN4OjWOUqltG08EA5wjCmmdUOan1ph5Ec0V0edQ== 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=1770718617; 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=adNCCo9tFqMgxvCUlKYb/KVhC90m7polV5tpMiqvVwU=; b=krZW7MscTjWphoeiXP9x0M3I5B7aUz+1zE1e+yMxzuFP8vHwrecB1TtR3DbHd/JX4DdeUs Jb+YWZcyZuOoydvjv1G5h3cQhJlWDejvlb7ocrrgMVKCdkNOQ7wA8/+6iexlmfsxt0oF1o C3XqvYM2ybf6XjAwuZwBJb77knEM/qSZfseNiTwycbV5PQ0ObQLuCQ1vvpgVjoC77H/ZN9 4AuYm2vhpQcDkiqaqWN9OpOoOnoQJB5YyDJ+EdrYJDeH7xI/Ks9DGlbz7VBzScilQCDPkD EGm0lKBalLWbSXG/BtAOS7ubgNxdmk/m01S2gkPp0VvenYKk1EpK2fXMq6nhSA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9HY564S8z1DTG for ; Tue, 10 Feb 2026 10:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e114 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 10:16:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f19cb3c72b00 - main - rtw89: module Makefile add USB bus attachments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f19cb3c72b001f5ca2204888bfab50e2f388547d Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 10:16:57 +0000 Message-Id: <698b0599.1e114.7c16d819@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f19cb3c72b001f5ca2204888bfab50e2f388547d commit f19cb3c72b001f5ca2204888bfab50e2f388547d Author: Bjoern A. Zeeb AuthorDate: 2026-01-31 23:16:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 10:16:35 +0000 rtw89: module Makefile add USB bus attachments Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/rtw89/Makefile | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 701e40fcb2d7..63032afa6f89 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -4,6 +4,12 @@ DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 .PATH: ${DEVRTW89DIR} +# Bus attachments. +WITH_PCI= 1 +WITH_USB= 0 +WITH_SDIO= 0 + +# Options. WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 .if ${KERN_OPTS:MDEV_ACPI} @@ -12,24 +18,20 @@ WITH_CONFIG_ACPI= 1 KMOD= if_rtw89 +# Core parts. SRCS= core.c -SRCS+= pci.c pci_be.c SRCS+= chan.c mac80211.c mac.c mac_be.c phy.c phy_be.c fw.c SRCS+= cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c SRCS+= util.c -SRCS+= rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c -SRCS+= rtw8852ae.c -SRCS+= rtw8852c.c rtw8852c_rfk.c rtw8852c_rfk_table.c rtw8852c_table.c -SRCS+= rtw8852ce.c + +# Common SRCS+= rtw8851b.c rtw8851b_rfk.c rtw8851b_rfk_table.c rtw8851b_table.c -SRCS+= rtw8851be.c +SRCS+= rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c SRCS+= rtw8852b_common.c SRCS+= rtw8852b.c rtw8852b_rfk.c rtw8852b_rfk_table.c rtw8852b_table.c -SRCS+= rtw8852be.c SRCS+= rtw8852bt.c rtw8852bt_rfk.c rtw8852bt_rfk_table.c -SRCS+= rtw8852bte.c +SRCS+= rtw8852c.c rtw8852c_rfk.c rtw8852c_rfk_table.c rtw8852c_table.c SRCS+= rtw8922a.c rtw8922a_rfk.c -SRCS+= rtw8922ae.c .if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 SRCS.DEV_ACPI+= acpi.c @@ -38,10 +40,25 @@ CFLAGS+= -DCONFIG_ACPI # This needs to always stay on for the LinuxKPI header file. CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI -# USB parts -#SRCS+= rtw8851bu.c -#SRCS+= rtw8852au.c rtw8852bu.c rtw8852cu.c -#SRCS+= usb.c +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} +SRCS+= pci.c pci_be.c +SRCS+= rtw8851be.c +SRCS+= rtw8852ae.c +SRCS+= rtw8852be.c +SRCS+= rtw8852bte.c +SRCS+= rtw8852ce.c +SRCS+= rtw8922ae.c +.endif + +# USB parts; USB can be loaded and is unconditional on any kernel config. +.if defined(WITH_USB) && ${WITH_USB} > 0 +SRCS+= usb.c +SRCS+= rtw8851bu.c +SRCS+= rtw8852au.c +SRCS+= rtw8852bu.c +SRCS+= rtw8852cu.c +.endif # CONFIG_RTW89_DEBUG (always on for now) SRCS+= debug.c From nobody Tue Feb 10 12:41:24 2026 X-Original-To: dev-commits-src-main@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 4f9Llm6FDYz6S0Ct for ; Tue, 10 Feb 2026 12:41:24 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Llm4yqmz3bZX for ; Tue, 10 Feb 2026 12:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770727284; 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=ozgmx/m2dt5/q+t3aQ0ry4pL905LmCMGRP0FVP4fx5A=; b=If6bpKv6fMvX8xteOru37J9/u3A5xDTHWIX3eNYCupjxh6o6DKAM74I6JNFKuFVs+03BlP BIQWZYSGXweRFx2+yOLQc8Nd/0/OrLvhpO6hldvJp96DPxEJJAbISU66vMXDesR0n2DhoV IXzlFHzWlD68CKk99rVy5VgKxA+zuTduS6sAlUHRsfnCaxi9QReyY5IMXwytU0jki7eoVX Pt3n6jyLNQbKlB2aHKSSLhPY2hX8gMdQEpWC2bEKz86BKDf+NK8qNzZsxlgn5EFyC3X5Ab cFdL5V2kBrf9KJRetQZt3DYQqfUAOVeIoG0YwoRqOs7DKbsqFiECe6pyXIbGog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770727284; a=rsa-sha256; cv=none; b=h35LRK74C7EaUSHcRIVmF1XWnSapZYY3+ffIuefPN2m5N6IjBJrSFV78T04qIMh0hY4QDI ho/j5HJVD4ne5Bfvhm1H36nw90A3WDake5HpdHV4pZtpHD/NIYXX2xnvh3CRPG+Ir0cRNF FKjVkLeSyyS6nNd4Oj8YS9/zmLzD6JnU93GPPj32OZfAPqEe2rgSfR2woQIzhAmvMff8Vv iLuLLjtDjt96Rmxad7QLFvTLMntVrlZl/tBhsUpymobdM2QYOT2RJBtidqFSWaTUNKQHMt q1xrulGP1Ho+VRnAglWLF7LF9WWuRcvSLNJT3GzNWRc2/XYv/zyhLsdTWOnn6w== 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=1770727284; 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=ozgmx/m2dt5/q+t3aQ0ry4pL905LmCMGRP0FVP4fx5A=; b=KxnF1jHXsR3ok2h0D1n/5n/aU8VpV1a7PtONBZtixusiVRTtMkvW9M6qSyWoOzMiVlWclv GG7WP4PRulLtwNFupkj7QyTh/9DPPR6mqJokC7+7KvuvuFqvPvNev+y6G1B3cR811ctRrK 10CSxLrzL1eVjAGYB6fLUGdZEnf/WTJeNcqm4P19V8z1W7uWCzUQ1aaZ2D5ehqj4RgVyjC tWNsWTFOtOVUO2H0nqe2MF6ck5PBX6htzVQpKB0Is1UObgRyy4ZuwTCNa4+H+BhRzQNd1H 8n6X1lCPSx3rZYnyE5aM9zWvnHJdfHzNsytCId4SLHMZZWcUp59jIlgjPAuFag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Llm3t1kz1JM3 for ; Tue, 10 Feb 2026 12:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36615 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 12:41:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Johan=?utf-8?Q? S=C3=B6llv?=ander Subject: git: 821243b3877d - main - sbin/geom: Convert err/warn() to xo_err/warn() and style(9) fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: js X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 821243b3877d90290ba519f2aeccf6f48430db32 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 12:41:24 +0000 Message-Id: <698b2774.36615.ed0728c@gitrepo.freebsd.org> The branch main has been updated by js: URL: https://cgit.FreeBSD.org/src/commit/?id=821243b3877d90290ba519f2aeccf6f48430db32 commit 821243b3877d90290ba519f2aeccf6f48430db32 Author: Johan Söllvander AuthorDate: 2026-02-10 12:19:50 +0000 Commit: Johan Söllvander CommitDate: 2026-02-10 12:19:50 +0000 sbin/geom: Convert err/warn() to xo_err/warn() and style(9) fixes Finishing up the libxo conversion of geom by switching err(3) to their libxo equivalents. While here, fix some style(9) issues. There are still a few left, but at least they're fewer now. Reviewed by: asomers Approved by: asomers (mentor) MFC after: 2 weeks Sponsored by: ConnectWise Differential Revision: https://reviews.freebsd.org/D54938 --- sbin/geom/core/geom.c | 79 ++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index a1b1b351ebb3..757eadc218ef 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -201,7 +201,7 @@ load_module(void) /* Not present in kernel, try loading it. */ if (kldload(name2) < 0 || modfind(name1) < 0) { if (errno != EEXIST) { - err(EXIT_FAILURE, "cannot load %s", name2); + xo_err(EXIT_FAILURE, "cannot load %s", name2); } } } @@ -259,7 +259,8 @@ set_option(struct gctl_req *req, struct g_option *opt, const char *val) size_t optnamesize; if (G_OPT_NUM(opt) == UCHAR_MAX) - errx(EXIT_FAILURE, "Too many -%c options.", opt->go_char); + xo_errx(EXIT_FAILURE, "Too many -%c options.", + opt->go_char); /* * Base option name length plus 3 bytes for option number @@ -268,7 +269,7 @@ set_option(struct gctl_req *req, struct g_option *opt, const char *val) optnamesize = strlen(opt->go_name) + 3 + 1; ptr = malloc(optnamesize); if (ptr == NULL) - errx(EXIT_FAILURE, "No memory."); + xo_errx(EXIT_FAILURE, "No memory."); snprintf(ptr, optnamesize, "%s%u", opt->go_name, G_OPT_NUM(opt)); G_OPT_NUMINC(opt); optname = ptr; @@ -278,12 +279,12 @@ set_option(struct gctl_req *req, struct g_option *opt, const char *val) if (G_OPT_TYPE(opt) == G_TYPE_NUMBER) { if (expand_number(val, &number) == -1) { - err(EXIT_FAILURE, "Invalid value for '%c' argument", + xo_err(EXIT_FAILURE, "Invalid value for '%c' argument", opt->go_char); } ptr = malloc(sizeof(intmax_t)); if (ptr == NULL) - errx(EXIT_FAILURE, "No memory."); + xo_errx(EXIT_FAILURE, "No memory."); *(intmax_t *)ptr = number; opt->go_val = ptr; gctl_ro_param(req, optname, sizeof(intmax_t), opt->go_val); @@ -292,7 +293,7 @@ set_option(struct gctl_req *req, struct g_option *opt, const char *val) } else if (G_OPT_TYPE(opt) == G_TYPE_BOOL) { ptr = malloc(sizeof(int)); if (ptr == NULL) - errx(EXIT_FAILURE, "No memory."); + xo_errx(EXIT_FAILURE, "No memory."); *(int *)ptr = *val - '0'; opt->go_val = ptr; gctl_ro_param(req, optname, sizeof(int), opt->go_val); @@ -346,16 +347,16 @@ parse_arguments(struct g_command *cmd, struct gctl_req *req, int *argc, /* Options passed to kernel. */ opt = find_option(cmd, ch); if (opt == NULL) { - if (ch == 'v' && (cmd->gc_flags & G_FLAG_VERBOSE) != 0){ + if (ch == 'v' && (cmd->gc_flags & G_FLAG_VERBOSE) != 0) { if (++vcount < 2) continue; else - warnx("Option 'v' specified twice."); + xo_warnx("Option 'v' specified twice."); } usage(); } if (!G_OPT_ISMULTI(opt) && G_OPT_ISDONE(opt)) { - warnx("Option '%c' specified twice.", opt->go_char); + xo_warnx("Option '%c' specified twice.", opt->go_char); usage(); } G_OPT_DONE(opt); @@ -383,7 +384,7 @@ parse_arguments(struct g_command *cmd, struct gctl_req *req, int *argc, set_option(req, opt, "0"); } else { if (opt->go_val == NULL) { - warnx("Option '%c' not specified.", + xo_warnx("Option '%c' not specified.", opt->go_char); usage(); } else if (opt->go_val == G_VAL_OPTIONAL) { @@ -470,14 +471,12 @@ run_command(int argc, char *argv[]) /* Now, try to find a standard command. */ cmd = find_command(argv[0], GEOM_STD_CMDS); if (cmd == NULL) { - warnx("Unknown command: %s.", argv[0]); + xo_warnx("Unknown command: %s.", argv[0]); usage(); } - if (!std_available(cmd->gc_name)) { - warnx("Command '%s' not available; " + if (!std_available(cmd->gc_name)) + xo_errx(EXIT_FAILURE, "Command '%s' not available; " "try 'load' first.", argv[0]); - exit(EXIT_FAILURE); - } } if ((cmd->gc_flags & G_FLAG_LOADKLD) != 0) load_module(); @@ -502,7 +501,7 @@ run_command(int argc, char *argv[]) errstr = gctl_issue(req); } if (errstr != NULL && errstr[0] != '\0') { - warnx("%s", errstr); + xo_warnx("%s", errstr); /* Suppress EXIT_FAILURE for warnings */ if (strncmp(errstr, "warning: ", strlen("warning: ")) == 0) req->nerror = 0; @@ -543,7 +542,7 @@ load_library(void) ret = 0; tofree = totalpath = strdup(library_path()); if (totalpath == NULL) - err(EXIT_FAILURE, "Not enough memory for library path"); + xo_err(EXIT_FAILURE, "Not enough memory for library path"); if (strchr(totalpath, ':') != NULL) curpath = strsep(&totalpath, ":"); @@ -563,7 +562,7 @@ load_library(void) curpath = strsep(&totalpath, ":"); continue; } - err(EXIT_FAILURE, "Cannot access library"); + xo_err(EXIT_FAILURE, "Cannot access library"); } break; } @@ -573,27 +572,28 @@ load_library(void) return; dlh = dlopen(path, RTLD_NOW); if (dlh == NULL) - errx(EXIT_FAILURE, "Cannot open library: %s.", dlerror()); + xo_errx(EXIT_FAILURE, "Cannot open library: %s.", dlerror()); lib_version = dlsym(dlh, "lib_version"); if (lib_version == NULL) { - warnx("Cannot find symbol %s: %s.", "lib_version", dlerror()); + xo_warnx("Cannot find symbol %s: %s.", "lib_version", + dlerror()); dlclose(dlh); exit(EXIT_FAILURE); } if (*lib_version != G_LIB_VERSION) { dlclose(dlh); - errx(EXIT_FAILURE, "%s and %s are not synchronized.", + xo_errx(EXIT_FAILURE, "%s and %s are not synchronized.", getprogname(), path); } version = dlsym(dlh, "version"); if (version == NULL) { - warnx("Cannot find symbol %s: %s.", "version", dlerror()); + xo_warnx("Cannot find symbol %s: %s.", "version", dlerror()); dlclose(dlh); exit(EXIT_FAILURE); } class_commands = dlsym(dlh, "class_commands"); if (class_commands == NULL) { - warnx("Cannot find symbol %s: %s.", "class_commands", + xo_warnx("Cannot find symbol %s: %s.", "class_commands", dlerror()); dlclose(dlh); exit(EXIT_FAILURE); @@ -614,7 +614,7 @@ set_class_name(void) *s1 = tolower(*s1); gclass_name = malloc(strlen(class_name) + 1); if (gclass_name == NULL) - errx(EXIT_FAILURE, "No memory"); + xo_errx(EXIT_FAILURE, "No memory"); s1 = gclass_name; s2 = class_name; for (; *s2 != '\0'; s2++) @@ -645,7 +645,7 @@ get_class(int *argc, char ***argv) *argc -= 1; *argv += 1; } else { - errx(EXIT_FAILURE, "Invalid utility name."); + xo_errx(EXIT_FAILURE, "Invalid utility name."); } #ifndef STATIC_GEOM_CLASSES @@ -664,7 +664,7 @@ get_class(int *argc, char ***argv) /* If we can't load or list, it's not a class. */ if (!std_load_available() && !std_list_available()) - errx(EXIT_FAILURE, "Invalid class name '%s'.", class_name); + xo_errx(EXIT_FAILURE, "Invalid class name '%s'.", class_name); if (*argc < 1) usage(); @@ -786,7 +786,7 @@ show_tree(void) error = geom_gettree(&mesh); if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + xo_errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); width = compute_tree_width(&mesh); @@ -824,7 +824,7 @@ main(int argc, char *argv[]) case 'p': provider_name = strdup(optarg); if (provider_name == NULL) - err(1, "strdup"); + xo_err(1, "strdup"); break; case 't': tflag = true; @@ -842,7 +842,7 @@ main(int argc, char *argv[]) xo_set_version(GEOM_XO_VERSION); if (tflag && provider_name != NULL) { - errx(EXIT_FAILURE, + xo_errx(EXIT_FAILURE, "At most one of -P and -t may be specified."); } @@ -1003,11 +1003,11 @@ list_one_geom_by_provider(const char *provider_name) error = geom_gettree(&mesh); if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + xo_errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); gp = find_geom_by_provider(&mesh, provider_name); if (gp == NULL) - errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name); + xo_errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name); xo_open_container(provider_name); xo_emit("{Lwc:Geom class}{:class}\n", gp->lg_class->lg_name); @@ -1031,7 +1031,7 @@ std_list_available(void) error = geom_gettree_geom(&mesh, gclass_name, "", 0); if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + xo_errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); classp = find_class(&mesh, gclass_name); geom_deletetree(&mesh); if (classp != NULL) @@ -1055,11 +1055,11 @@ std_list(struct gctl_req *req, unsigned flags __unused) } else error = geom_gettree(&mesh); if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + xo_errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); classp = find_class(&mesh, gclass_name); if (classp == NULL) { geom_deletetree(&mesh); - errx(EXIT_FAILURE, "Class '%s' not found.", gclass_name); + xo_errx(EXIT_FAILURE, "Class '%s' not found.", gclass_name); } all = gctl_get_int(req, "all"); if (nargs > 0) { @@ -1067,7 +1067,7 @@ std_list(struct gctl_req *req, unsigned flags __unused) name = gctl_get_ascii(req, "arg%d", i); gp = find_geom(classp, name); if (gp == NULL) { - errx(EXIT_FAILURE, "Class '%s' does not have " + xo_errx(EXIT_FAILURE, "Class '%s' does not have " "an instance named '%s'.", gclass_name, name); } @@ -1340,10 +1340,10 @@ std_status(struct gctl_req *req, unsigned flags __unused) error = geom_gettree(&mesh); if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + xo_errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); classp = find_class(&mesh, gclass_name); if (classp == NULL) - errx(EXIT_FAILURE, "Class %s not found.", gclass_name); + xo_errx(EXIT_FAILURE, "Class %s not found.", gclass_name); nargs = gctl_get_int(req, "nargs"); all = gctl_get_int(req, "all"); geoms = gctl_get_int(req, "geoms"); @@ -1356,7 +1356,8 @@ std_status(struct gctl_req *req, unsigned flags __unused) name = gctl_get_ascii(req, "arg%d", i); gp = find_geom(classp, name); if (gp == NULL) - errx(EXIT_FAILURE, "No such geom: %s.", name); + xo_errx(EXIT_FAILURE, "No such geom: %s.", + name); if (geoms) { status_update_len(gp, &name_len, &status_len); @@ -1438,7 +1439,7 @@ std_load_available(void) bzero(paths, sizeof(paths)); len = sizeof(paths); if (sysctlbyname("kern.module_path", paths, &len, NULL, 0) < 0) - err(EXIT_FAILURE, "sysctl(kern.module_path)"); + xo_err(EXIT_FAILURE, "sysctl(kern.module_path)"); for (p = strtok(paths, ";"); p != NULL; p = strtok(NULL, ";")) { snprintf(name, sizeof(name), "%s/geom_%s.ko", p, class_name); /* From nobody Tue Feb 10 13:33:46 2026 X-Original-To: dev-commits-src-main@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 4f9MwB3Lgvz6RJsB for ; Tue, 10 Feb 2026 13:33:46 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9MwB2qsTz3h5p for ; Tue, 10 Feb 2026 13:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770730426; 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=0m4GAfgj7bRJqsq01g0g9l84quIQ9RFhNlLFLmHPJ9Y=; b=oCM4dubrR9EX78Cdri2tL+Fd1DgwTzG/vzwQhAIWQHNUXWxQPYkpJHyNNGGDLquMwORcPo q2sXWVGMDexE6RhcBuF1IkjsG1VCfSMCwXc4inQrpSgNQ6WwRd82dGqUQWOZ+zmMjUXt6I p+rWljrmxcrNupT2SNZUewK9hUABt02/vbPaVqixCOrsLvCm58jXLDE2IkfBuO9kc2zJWt XbvVOflmn2BbWShMvQAU/Umf5YCzV4+It3axWpSvwALPh1QjxOPuDM3PyvVIPwVhnwYlPw xUJcwpH3B1pNwMGKfIhxqrWNNI7xGPSDYALvAgrQVrdbOCPrzkmLJBt5+taONg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770730426; a=rsa-sha256; cv=none; b=pf8lqdFj2b0r9SDI0c00xMIiUBrM0IUd4+XmbQBKhfomRR+hs6txJ6Wjm0YY9C0Dig8mMU Tv8saAeEzoqPGVKwbkKeKtiF69sDGRcKOppVAL6S147Y4QezwcgzLsysfOrnkpBRMcHbQF LOH1EYRpZIg6y6GRY9x5cxbgufluLLblLpGQrRoXkCsL64vLrsutqA1Hmg4IZ9VHe8X3Tt GtvU4Gkz919Zxmbco/9mcDP4mVnyRlKXaUcGlQiPEc4PWJfUsw36cbhzCWOIvt/EBXkx3k yJJs0VwHsrKuCehG+CaLvGJ2oSR/S1b0xutCdESsr0kgtiv09wi32u0ymLTJ5Q== 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=1770730426; 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=0m4GAfgj7bRJqsq01g0g9l84quIQ9RFhNlLFLmHPJ9Y=; b=M9rkrkKxgiaXRRUSpBaosDd+t4D5QWzKLzCIXAl/6SWZeNXzVBfcWicbpmdPivMaBZRJsP mGUhwQQCroJ0dYoQHk9nq8BdsiY6TbRPwFtS+pdKFaF/aPteyl31tz3WnNv0bXxywY3PSC XebDIVZ+TMHxzE6rpwGwAP9SKrEdyqMoG7qlGeC87TadiHzrSZf1GFmVgIV+IxEMLJ7/m3 EeN5EolQT2idkcReUK/3mqxtvL9zalOkQsQiVO6kJANSFdkvcwpTVDuyHGkUlcVReKwGLA K10W0QgLCKIQpRynvGzGOYWKXAYtmJ0sk+00c8mvWnKMmysldFfxw2KJOfFpfQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9MwB2L9Mz1K9h for ; Tue, 10 Feb 2026 13:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a3dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:33:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 1acfc913e6b9 - main - pci_vendors: update to 2026-02-10 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1acfc913e6b936dec3effc7d1e902a50e5432406 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:33:46 +0000 Message-Id: <698b33ba.3a3dd.4550c386@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1acfc913e6b936dec3effc7d1e902a50e5432406 commit 1acfc913e6b936dec3effc7d1e902a50e5432406 Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:33:11 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-10 13:33:42 +0000 pci_vendors: update to 2026-02-10 --- share/misc/pci_vendors | 466 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 358 insertions(+), 108 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index bcb3d2f9e030..12ba7ca86ea5 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # -# List of PCI ID's +# List of PCI IDs # -# Version: 2025.12.12 -# Date: 2025-12-12 03:15:02 +# Version: 2026.02.10 +# Date: 2026-02-10 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -268,15 +268,7 @@ 0e11 409c Smart Array 6400 0e11 409d Smart Array 6400 EM 005a Remote Insight II board - Lights-Out - 007c NC7770 1000BaseTX - 007d NC6770 1000BaseTX - 0085 NC7780 1000BaseTX 00b1 Remote Insight II board - PCI device - 00bb NC7760 - 00ca NC7771 - 00cf NC7772 - 00d1 NC7783 - 00e3 NC7761 0508 Netelligent 4/16 Token Ring 1000 Triflex/Pentium Bridge, Model 1000 2000 Triflex/Pentium Bridge, Model 2000 @@ -324,7 +316,6 @@ b012 Netelligent 10 T/2 PCI UTP/Coax b030 Netelligent 10/100 TX UTP b060 Smart Array 5300 Controller - b0e1 NC3133 Fast Ethernet Module b178 Smart Array 5i/532 0e11 4080 Smart Array 5i 0e11 4082 Smart Array 532 @@ -839,6 +830,7 @@ 15d9 1d08 AOC-S4016L-L16IR Storage Adapter 17aa 7855 ThinkSystem RAID 950W-16i 8GB Flash PCIe Gen4 24Gb Adapter 1d49 020a ThinkSystem 450W-16e SAS/SATA PCIe Gen4 24Gb HBA + 1d49 020c ThinkSystem 450W-16e PCIe Gen4 HBA 00ab SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC) # 8 Internal and 8 External port channel 9400 HBA 1000 3040 HBA 9400-8i8e @@ -4027,6 +4019,7 @@ 1002 0b36 Reference RX 5700 XT 1458 2313 Radeon RX 5700 XT Gaming OC 1458 231d Radeon RX 5600 XT/REV 2.0 [Windforce 6GB OC] + 1462 381e RX 5600 XT MECH OC 148c 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 1682 5701 RX 5700 XT RAW II 1849 5102 RX5700 CLD 8GO [ASRock Challenger D RX 5700 OC] @@ -4034,8 +4027,9 @@ 1da2 e409 Sapphire Technology Limited Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] 1da2 e410 Sapphire NITRO+ RX 5700 XT 1da2 e411 Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT] - 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5500M] + 7340 Navi 14 [Radeon RX 5500/5500M / Pro 5300/5500M] 106b 0210 Radeon Pro 5300M + 106b 0219 iMac (Retina 5K, 27-inch, 2020) [Radeon Pro 5300] 7341 Navi 14 [Radeon Pro W5500] 7347 Navi 14 [Radeon Pro W5500M] 734f Navi 14 [Radeon Pro W5300M] @@ -4130,6 +4124,7 @@ 7461 Navi 32 [AMD Radeon PRO V710] 7470 Navi 32 [Radeon PRO W7700] 747e Navi 32 [Radeon RX 7700 XT / 7800 XT] + 1462 7e26 Radeon RX 7800 XT [Nitro+] 148c 2427 RX 7800 XT [Hellhound / Red Devil] 7480 Navi 33 [Radeon RX 7600/7600 XT/7600M XT/7600S/7700S / PRO W7600] 1849 5313 RX 7600 Challenger OC @@ -4153,6 +4148,7 @@ 1da2 e490 Navi 48 XTX [Sapphire Pulse Radeon RX 9070 XT] 7551 Navi 48 [Radeon AI PRO R9700] 7590 Navi 44 [Radeon RX 9060 XT] + 1458 2429 GV-R9060XTGAMING OC-16GD [Radeon RX 9060 XT GAMING OC 16G] 1eae 8601 RX-96TS316W7 [SWIFT RX 9060 XT OC White Triple Fan Gaming Edition 16GB] 75a0 Aqua Vanjaram [Instinct MI350X] 75a3 Aqua Vanjaram [Instinct MI355X] @@ -9547,7 +9543,7 @@ e1c5 0005 TA1-PCI e1c5 0006 TA1-PCI4 9036 9036 - 9050 PCI <-> IOBus Bridge + 9050 PCI9050 32-bit 33MHz PCI <-> IOBus Bridge 103c 10b0 82350 PCI GPIB 10b5 1067 IXXAT CAN i165 10b5 114e Wasco WITIO PCI168extended @@ -9583,6 +9579,8 @@ 15ed 1001 Macrolink MCCS 16-port Serial 15ed 1002 Macrolink MCCS 8-port Serial Hot Swap 15ed 1003 Macrolink MCCS 16-port Serial Hot Swap + 1761 018e 40-199-002 + 1761 025d 40-662-001 5654 2036 OpenSwitch 6 Telephony card 5654 3132 OpenSwitch 12 Telephony card 5654 5634 OpenLine4 Telephony Card @@ -10359,7 +10357,7 @@ 0068 nForce2 USB Controller 1043 0c11 A7N8X Mainboard a0a0 03b4 UK79G-1394 motherboard - 006a nForce2 AC97 Audio Controler (MCP) + 006a nForce2 AC97 Audio Controller (MCP) 1043 8095 nForce2 AC97 Audio Controller (MCP) a0a0 0304 UK79G-1394 motherboard 006b nForce Audio Processing Unit @@ -10962,6 +10960,7 @@ 1043 02fb V9250 Magic 1043 8180 V9520-X/TD/128M 107d 2967 WinFast A340T 128MB + 1462 9073 MS-8907 (FX5200-TDR128) 1462 9110 MS-8911 (FX5200-TD128) 1462 9171 MS-8917 (FX5200-T128) 1462 9360 MS-8936 (FX5200-T128) @@ -14006,6 +14005,7 @@ 1385 4700 MA521 802.11b Wireless PC Card 1737 0019 WPC11v4 802.11b Wireless-B Notebook Adapter 8185 RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller + 187e 8225 ZyAIR G-302 v3 818b RTL8192EE PCIe Wireless Network Adapter 8190 RTL8190 802.11n PCI Wireless Network Adapter 8191 RTL8192CE PCIe Wireless Network Adapter @@ -16955,7 +16955,8 @@ 11c9 Magma 0010 16-line serial port w/- DMA 0011 4-line serial port w/- DMA -11ca LSI Systems, Inc +11ca IBEX Technology Co., Ltd. + 0039 PAC with Altera Agilex 7 FPGA M-Series [IPAC-1000] 11cb Specialix Research Ltd. 2000 PCI_9050 11cb 0200 SX @@ -18686,6 +18687,7 @@ 1028 23a6 MTFDLBQ30T7THL-1BK1JABDA 1028 23a7 MTFDLAL61T4THL-1BK1JABDA 1028 23a8 MTFDLAL30T7THL-1BK1JABDA + 51cd 9650 PRO NVMe SSD 5404 2210 NVMe SSD [Cobain] 5405 2300 NVMe SSD [Santana] 5407 3400 NVMe SSD [Hendrix] @@ -20743,10 +20745,6 @@ f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. [MSI] 3483 MSI USB 3.0 (VIA VL80x-based xHCI USB Controller) -# This is MSI refreshed variant of their MECH series Navi 23 GPU card (73EF) - 5027 RX 6650XT MECH 2X - 7c56 Realtek Ethernet controller RTL8111H - aaf0 Radeon RX 580 Gaming X 8G 1463 Fast Corporation 1464 Interactive Circuits & Systems Ltd 1465 GN NETTEST Telecom DIV. @@ -20795,8 +20793,6 @@ 148a OPTO 148b INNOMEDIALOGIC Inc. 148c Tul Corporation / PowerColor - 2391 Radeon RX 590 [Red Devil] - 2398 AXRX 5700 XT 8GBD6-3DHE/OC [PowerColor Red Devil Radeon RX 5700 XT] 148d DIGICOM Systems, Inc. 1003 HCF 56k Data/Fax Modem 148e OSI Plus Corporation @@ -20924,8 +20920,9 @@ 7662 MT7662E 802.11ac PCI Express Wireless Network Adapter 7663 MT7663 802.11ac PCI Express Wireless Network Adapter 7902 MT7902 802.11ax PCIe Wireless Network Adapter [Filogic 310] - 7915 MT7915E 802.11ax PCI Express Wireless Network Adapter - 7916 MT7905D/MT7975 + 7915 MT7915A/MT7915D normal link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] +# MT7905D/MT7975 contain MT7915. If it works at G1 speed this extra device appears for extra bandwidth + 7916 MT7915A/MT7915D hif link PCIe Wi-Fi 6(802.11ax) 80MHz 4x4/2x2 Wireless Network Adapter [Filogic 615] # WiFi 6E capable 7922 MT7922 802.11ax PCI Express Wireless Network Adapter 1a3b 5300 ASUS PCE-AXE59BT @@ -20933,8 +20930,10 @@ 7927 MT7927 802.11be 320MHz 2x2 PCIe Wireless Network Adapter [Filogic 380] 7961 MT7921 802.11ax PCIe Wireless Network Adapter [Filogic 330] 7988 MT7988 PCI Express Host Bridge [Filogic 880] - 7990 MT7996 802.11be PCI Express Wireless Network Adapter (Port 0) - 7991 MT7996 802.11be PCI Express Wireless Network Adapter (Port 1) + 7990 MT7996 primary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7991 MT7996 secondary link PCIe Wi-Fi 7(802.11be) 320MHz Wireless Network Adapter [Filogic 680] + 7992 MT7992 primary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] + 799a MT7992 secondary link PCIe Wi-Fi 7(802.11be) 160MHz Wireless Network Adapter [Filogic 660] 8650 MT7650 Bluetooth 14c4 IWASAKI Information Systems Co Ltd 14c5 Automation Products AB @@ -22025,6 +22024,8 @@ 0e11 0042 Yogi # Integrated in CX86111/CX86113 processors 1830 CX861xx Integrated Host Bridge + 1f86 DBH CX11880 Codec + 1f87 SMIC CX11880 Codec 2003 HSF 56k Data/Fax Modem 2004 HSF 56k Data/Fax/Voice Modem 2005 HSF 56k Data/Fax/Voice/Spkp (w/Handset) Modem @@ -22632,7 +22633,8 @@ 0224 CX9 Family [ConnectX-9 Flash Recovery] 0225 CX9 Family [ConnectX-9 Secure Flash Recovery-RMA] 0226 CX10 Family [ConnectX-10 Flash Recovery] - 0227 CX10 Family [ConnectX-10 Secure Flash Recovery-RMA] +# Name change request + 0227 CX10 Family [ConnectX-10 RMA] 0228 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Flash Recovery] 0229 CX9 PCIe Switch Family [ConnectX-9 PCIe Switch Secure Flash Recovery-RMA] 024e MT53100 [Spectrum-2, Flash recovery mode] @@ -22659,11 +22661,11 @@ 0274 Spectrum-6 in Flash Recovery Mode 0275 Spectrum-6 RMA 0277 Spectrum-6 Tile - 0278 Quantum-4 in Flash Recovery Mode - 0279 Quantum-4 RMA + 0278 NVLink-6 Switch in Flash Recovery Mode + 0279 NVLink-6 Switch RMA 027a Eros Chiplet - 027c Nvlink-7 Switch in Flash Recovery Mode - 027d Nvlink-7 Switch RMA + 027c NVLink-7 Switch in Flash Recovery Mode + 027d NVLink-7 Switch RMA 027e Spectrum-7 Tile 0281 NPS-600 Flash Recovery 0282 ArcusE Flash recovery @@ -22687,8 +22689,8 @@ 029a OPHY3.1 # Sagitta 029c OPHY3.5 - 02a0 Nvlink-8 Switch in Flash Recovery Mode - 02a1 Nvlink-8 RMA + 02a0 NVLink-8 Switch in Flash Recovery Mode + 02a1 NVLink-8 Switch RMA 02a2 Spectrum-7 in Flash Recovery Mode 02a3 Spectrum-7 RMA 1002 MT25400 Family [ConnectX-2 Virtual Function] @@ -22757,6 +22759,8 @@ 117c 00b4 FastFrame N322 Dual-port 25Gb Ethernet Adapter 117c 40b7 ThunderLink TLN3-3252 Dual-port 25Gb Ethernet Adapter 117c 40b8 ThunderLink TLN3-3102 Dual-port 10Gb Ethernet Adapter + 1458 0280 CLN4C44 + 1458 0281 CLN4C44 with NCSI 15b3 0001 ConnectX-4 Lx EN network interface card, 25GbE single-port SFP28, PCIe3.0 x8, tall bracket, ROHS R6 15b3 0003 Stand-up ConnectX-4 Lx EN, 25GbE dual-port SFP28, PCIe3.0 x8, MCX4121A-ACAT 15b3 0004 ConnectX-4 Lx Stand-up dual-port 10GbE MCX4121A-XCAT @@ -22809,6 +22813,7 @@ 1024 CX8 PCIe Switch Family [ConnectX-8 PCIe Switch] 1025 CX9 Family [ConnectX-9] 1027 CX10 Family [ConnectX-10] + 1028 CX10 Family [ConnectX-10 Trusted Network Control Memory] 1974 MT28800 Family [ConnectX-5 PCIe Bridge] 1975 MT416842 Family [BlueField SoC PCIe Bridge] 1976 MT28908 Family [ConnectX-6 PCIe Bridge] @@ -22827,6 +22832,8 @@ 2024 MT43244 Family [BlueField-3 SoC Emulated PCIe Bridge] 2025 ConnectX/BlueField Family mlx5Gen Emulated PCIe Bridge [Emulated PCIe Bridge] 2100 CX8 Family [CX8 Data Direct Interface] +# Chip to Chip Link + 2101 CX10 Family [ConnectX-10 C2C] 4117 MT27712A0-FDCF-AE 1bd4 0039 SN10XMP2P25 1bd4 003a 25G SFP28 SP EO251FM9 Adapter @@ -22920,9 +22927,9 @@ d2f2 Quantum-2 NDR (400Gbps) switch d2f4 Quantum-3 d2f6 Quantum-3CPO - d2f8 Quantum-4 - d2fa Nvlink-7 Switch - d2fc Nvlink-8 Switch + d2f8 NVLink-6 Switch + d2fa NVLink-7 Switch + d2fc NVLink-8 Switch 15b4 CCI/TRIAD 15b5 Cimetrics Inc 15b6 Texas Memory Systems Inc @@ -23296,8 +23303,6 @@ 167e ONNTO Corp. 1681 Hercules 1682 XFX Pine Group Inc. - 5701 Radeon 5700 XT Thicc III Ultra - c580 Radeon RX 580 1688 CastleNet Technology Inc. 1170 WLAN 802.11b card 168a Utimaco IS GmbH @@ -23310,9 +23315,14 @@ # nee Atheros Communications, Inc. 168c Qualcomm Atheros 0007 AR5210 Wireless Network Adapter [AR5000 802.11a] + 1186 3a00 DWL-A650 5GHz Wireless CardBus Adapter + 1186 3a02 DWL-A520 5GHz Wireless PCI Adapter + 1668 0429 802CA Wireless PC Card 1737 0007 WPC54A Wireless PC Card 1b47 0100 Harmony 8450CN Wireless CardBus Module 1b47 0110 Skyline 4030 / Harmony 8450 802.11a Wireless CardBus Adapter + 1b47 0400 PC50E-8-FC/A Wireless Access Point Radio Card + 8086 2500 PRO/Wireless 5000 LAN CardBus Adapter 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5211 Wireless Network Adapter [AR5001A 802.11a] 0012 AR5211 Wireless Network Adapter [AR5001X 802.11ab] @@ -23807,6 +23817,7 @@ 7174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller 172a Accelerated Encryption 13c8 AEP SureWare Runner 1000V3 +172f Sparkle Computer Co., Ltd. # nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions 1228 iRMC-S5 HTI Device @@ -23877,12 +23888,22 @@ 0843 PCA-8439 General-purpose multifunctional PCIe card with 16 analog inputs ff00 CTU CAN FD PCIe Card 1761 Pickering Interfaces Ltd - 4411 50-297A + 4411 Pickering Devices with FPGA Based Bus Communication + 1761 082f 40-737-901 + 1761 086c 40-576-001 + 1761 0881 40-584-001 + 1761 311a 42-738-001 + 1761 3190 41-765-004 + 1761 31ab 41-670-003 1761 331f 50-297A-014 1761 3320 50-297A-050 1761 3321 50-297A-056 + 1761 3366 41-625-004 1761 3368 50-297A-130 1761 3372 50-297A-122 + 1761 33a1 40-419-004 + 1761 33a3 41-770-002 + 1761 3714 42-297A-050 1771 InnoVISION Multimedia Ltd. 1775 General Electric 177d Cavium, Inc. @@ -24503,6 +24524,7 @@ 08b0 MVC200-DC 1846 Alcatel-Lucent 1849 ASRock Incorporation + 1150 ASPEED AST1150 PCI-to-PCI Bridge 9602 RS780/RS880 PCI to PCI bridge (int gfx) 184a Thales Computers 1100 MAX II cPLD @@ -24537,8 +24559,6 @@ a102 VigraWATCH PMC a103 Vigra I/O 187e ZyXEL Communications Corporation - 3403 ZyAir G-110 802.11g - 340e M-302 802.11g XtremeMIMO 1885 Avvida Systems Inc. 1888 Varisys Ltd 0301 VMFX1 FPGA PMC module @@ -25170,6 +25190,8 @@ 1993 Innominate Security Technologies AG 1998 Toyou Feiji Electronics Co., Ltd. 0001 TOBOLT1 51987 NVMe SSD + 1998 0384 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD + 1998 0768 TOBOLT1 51987 7680G 2.5" U.2 NVMe SSD 1998 2012 TOBOLT1 51987 3840G 2.5" U.2 NVMe SSD 1999 A-Logics a900 AM-7209 Video Processor @@ -25325,7 +25347,7 @@ 19e5 0125 HBA SP186-M-40i 19e5 0180 HBA SP186-M-16i 19e5 0188 HBA SP186-M-8i - a120 HiSilicon PCIe Root Port with Gen4 + a120 HiSilicon PCIe Root Port a121 HiSilicon PCI-PCI Bridge a122 HiSilicon Embedded DMA Engine a124 HiSilicon Internal SDI Function Engine @@ -25385,7 +25407,7 @@ 15d9 086b X10DRS (AST2400 BMC) 15d9 1b95 H12SSL-i (AST2500 BMC) 15d9 1d50 X14DBG-AP (AST2600 BMC) - 1849 2000 ROME2D32LM3 (AST2500 BMC) + 1849 2000 Onboard Graphics 1a05 deltaww 1a07 Kvaser AB 0006 CAN interface PC104+ HS/HS @@ -26167,7 +26189,9 @@ # Nytro 5060H (Rocinante High Performance) non-SED 1bb1 0181 Nytro 5060H 1bb1 01a1 Nytro XP7102 + 0153 Nytro 5x50 NVMe SSD 0155 Nytro 5x50 NVMe SSD + 2000 PCIe Gen4 SSD 5012 FireCuda/IronWolf 510 SSD 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520/IronWolf 525 SSD @@ -26277,6 +26301,8 @@ 3252 CH382 PCIe Dual Port Serial Adapter # Device ID reused: CH352 is for PCI bus, CH382 for PCIe. 3253 CH352/CH382 PCI/PCIe Dual Port Serial Adapter + 3470 CH384 Serial Adapter, 4-port mode + 3853 CH384 Serial Adapter, 8-port mode 1c09 CSP, Inc. 4254 10G-PCIE3-8D-2S 4255 10G-PCIE3-8D-Q @@ -26633,7 +26659,7 @@ 1602 LEGEND 900 NVMe SSD (DRAM-less) # SX6000LNP 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) - 2708 Premier Extreme microSDXC SD7.1 Express Card (DRAM-less) + 2708 Premier Extreme SDXC SD 7.0 / microSDXC SD 7.1 Express Card (DRAM-less) 32a8 SM2P32A8 NVMe SSD (DRAM-less) 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f4 IM2P33F4 NVMe SSD (DRAM-less) @@ -26695,6 +26721,12 @@ 5201 AM520 PCIe 3.0 NVMe SSD 128GB 5212 AM521 PCIe 3.0 NVMe SSD 256GB 5414 AM541 PCIe 4.0 NVMe SSD 1024GB + 6020 NVMe SSD Controller UM3X1X series + 1cc4 8320 NVMe SSD UM301a M.2 480GB + 1cc4 8321 NVMe SSD UM301a M.2 960GB + 1cc4 8322 NVMe SSD UM301a M.2 1.92TB + 1ea0 8320 NVMe SSD TM1300 M.2 480GB + 1ea0 8322 NVMe SSD TM1300 M.2 1.92TB 6201 AM620 PCIe 3.0 NVMe SSD 128GB 6202 AM620 PCIe 3.0 NVMe SSD 256GB 6203 AM620 PCIe 3.0 NVMe SSD 512GB @@ -26717,6 +26749,15 @@ 6b14 RPJYJ1T24MLR1HWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 6c13 AM6C1 PCIe 4.0 NVMe SSD 6d03 AM6DX PCIe 5.0 NVMe SSD + 7030 NVMe SSD Controller UH7X3X series + 1cc4 7112 NVMe SSD UH733a U.2 1.6TB + 1cc4 7113 NVMe SSD UH733a U.2 3.2TB + 1cc4 7114 NVMe SSD UH733a U.2 6.4TB + 1cc4 7115 NVMe SSD UH733a U.2 12.8TB + 1cc4 7122 NVMe SSD UH713a U.2 1.92TB + 1cc4 7123 NVMe SSD UH713a U.2 3.84TB + 1cc4 7124 NVMe SSD UH713a U.2 7.68TB + 1cc4 7125 NVMe SSD UH713a U.2 15.36TB 8030 NVMe SSD Controller UH8X2X/UH7X2X series 1cc4 1122 NVMe SSD UH812a U.2 1.92TB 1cc4 1123 NVMe SSD UH812a U.2 3.84TB @@ -26764,6 +26805,8 @@ 1ea0 6125 NVMe SSD TP3510 U.2 15.36TB 1ea0 6224 NVMe SSD TP3510 E3.S 7.68TB 1ea0 6225 NVMe SSD TP3510 E3.S 15.36TB + 1ea0 7124 NVMe SSD TP3512 U.2 7.68TB + 1ea0 7125 NVMe SSD TP3512 U.2 15.36TB 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -27243,6 +27286,7 @@ 1466 Data Fabric: Device 18h; Function 6 1467 Data Fabric: Device 18h; Function 7 1468 NTBCCP + 6211 K100_AI 7901 FCH SATA Controller [AHCI mode] 7904 FCH SATA Controller [AHCI mode] 7906 FCH SD Flash Controller @@ -27664,6 +27708,9 @@ 1de5 Eideticom, Inc 1000 IO Memory Controller 2000 NoLoad Hardware Development Kit + 2100 NoLoad Accelerator Platform + 2200 NoLoad Cryptographic Accelerator + 2300 NoLoad Data Services 3000 eBPF-based PCIe Accelerator 1ded Alibaba (China) Co., Ltd. 107f Elastic RDMA Adapter @@ -27798,6 +27845,7 @@ 05c0 PCIe 6 Fabric Switch PF6xxx [Scorpio] 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter +1e0b Shenzhen Decenta Technology Co.,LTD 1e0d SambaNova Systems, Inc 1e0f KIOXIA Corporation 0001 NVMe SSD Controller BG4 (DRAM-less) @@ -28235,6 +28283,7 @@ 50d0 NVME RAID Card DP800 50d1 Flexraid6 NVMeRAID 1e3d Burlywood, Inc +1e3e Shanghai Iluvatar CoreX Semiconductor Co., Ltd. 1e43 MaxLinear Inc 8904 MxL8904 8906 MxL8906 @@ -28278,12 +28327,12 @@ 1602 NVMe SSD Controller MAP1602 (DRAM-less) 1608 NVMe SSD Controller MAP1608 (DRAM-less) 1e4c GSI Technology - 0010 Associative Processing Unit [Gemini-1] + 0010 Gemini-I 1e4c 0010 Leda-E 1e4c 0120 SE120 - 0020 Associative Processing Unit [Gemini-2] - 1e4c 0010 Leda-E2 + 0020 Gemini-II 1e4c 0011 Leda-E2 rev 1.1 + 1e4c 0020 G2-Edge 1e50 IP3 Tech (HK) Limited 1e52 Tenstorrent Inc 401e Wormhole @@ -28464,6 +28513,7 @@ 1ec8 12a2 Fantasy I Device 8900 GR308 8902 GR3 Audio + 8904 GR308 9800 Fantasy II 1ec8 12a2 Fantasy II Device 9802 Fantasy II @@ -28481,6 +28531,7 @@ 1ed2 FuriosaAI, Inc. 0000 Warboy 0001 RNGD + 0002 RNGD-Plus 2222 RNGD-S 1ed3 Yeston 1ed5 Moore Threads Technology Co.,Ltd @@ -28808,10 +28859,26 @@ 1f0f 0001 D1055AS vDPA Ethernet Controller 1042 D1055AS vDPA Storage Controller 1f0f 0001 D1055AS vDPA Storage Controller + 1045 D1205CQ vPDA Ethernet Controller + 1f0f 0001 D1205CQ vPDA Ethernet Controller + 1046 D1205CQ vPDA Storage Controller + 1f0f 0001 D1205CQ vPDA Storage Controller + 1047 D1205CQ RDMA Ethernet Controller + 1f0f 0001 D1205CQ RDMA Ethernet Controller 1220 D1055AS Ethernet Controller 1221 D1055AS Ethernet Controller 1222 D1055AS Ethernet Controller 1223 D1055AS Ethernet Controller + 1224 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1225 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1226 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1227 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller + 1228 D1205CQ Ethernet Controller + 1f0f 0001 D1205CQ Ethernet Controller 1600 M16104 Family 1f0f 0001 N1045XS, Quad-port 10GbE, PCIe 3.0 x8 1601 M16104 Family Virtual Function @@ -28832,6 +28899,7 @@ 1a02 M16102 Family 1f0f 0001 N1025XT, Dual-port 10GbE, PCIe 3.0 x4, Fan 2022 D1055AS PCI Express Switch Upstream Port + 2023 D1205CQ PCI Express Switch Upstream Port 3403 M18110 Family 3404 M18110 Lx Family 3405 M18110 Family BASE-T @@ -28852,9 +28920,13 @@ 3502 M18305 Family 1f0f 0001 S2055AS, 2x 25GbE, SFP28, PCIe 4.0 x8 1f0f 0002 S2025XS, 2x 10GbE, SFP+, PCIe 4.0 x8 + 3504 M18305 Family BASE-T + 1f0f 0001 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8, Fan + 1f0f 0002 S2025XT, 2x 10GbE, Base-T, PCIe 4.0 x8 350a M18305 Family Virtual Function 1f0f 0001 M18305 Family Virtual Function 9088 D1055AS PCI Express Switch Downstream Port + 9089 D1205CQ PCI Express Switch Downstream Port 1f16 XConn Technologies c500 XC50256 CXL2.0 Switch c510 XC51256 PCIe 5.0 Switch @@ -28944,7 +29016,7 @@ 5236 NV7000 NVMe SSD 5765 PCIe 3 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited -1f47 YUSUR Technology Co., Ltd. +1f47 YUSUR Technology 1001 K2-Pro Family [FLEXFLOW-2200T] 1f47 0001 FLEXFLOW-2200T 2*10GE Ethernet Adapter 1f47 0002 FLEXFLOW-2200T 2*25GE Ethernet Adapter @@ -28984,6 +29056,10 @@ 1f47 0006 Ethernet 25G 2P FLEXFLOW-2200R 1f47 0007 Ethernet 50G 2P FLEXFLOW-2200R 1f47 0008 Ethernet 100G 2P FLEXFLOW-2200R + 3301 K3 Family [FLEXFLOW-3100R] + 1f47 0001 FLEXFLOW-3100R 1*100GE Ethernet Adapter + 3302 K3 Family [FLEXFLOW-3100R Virtual Function] + 3303 K3 Family [CONFLUX-3100R MGMT Function] 4001 K2-Pro Family [CONFLUX-2200E] 1f47 0001 Ethernet 25G 2P CONFLUX-2200E 1f47 0002 Ethernet 40G 2P CONFLUX-2200E @@ -29042,6 +29118,7 @@ 6002 K2-Pro Family [CONFLUX-2200X Virtual Function] 6003 K2-Pro Family [CONFLUX-2200X MGMT Function] 6004 K2-Pro Family [CONFLUX-2200X DATA Offload Engine] +1f49 NeuReality LTD 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. 1008 Mango GPUBoost - RDMA @@ -29084,6 +29161,13 @@ 1608 PCIe Gen4 x4 M.2 2280 1f88 TE3420 PCIe Gen3 x4 M.2 2280 2269 XE4403 Series NVMe PCIe Gen4x4 SSD + 3101 EP1021 Series M.2 2242 NVMe PCIe Gen3x4 SSD + 3105 EP2021 Series M.2 2242 NVMe PCIe Gen4x4 SSD + 3201 EP1021 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3202 EP1031 Series M.2 2280 NVMe PCIe Gen3x4 SSD + 3205 EP2021 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3206 EP2031 Series M.2 2280 NVMe PCIe Gen4x4 SSD + 3261 DP1421 Series M.2 2280 NVMe PCIe Gen3x4 SSD 3420 PCIe Gen3 x4 M.2 2280 6100 TE3420 Series NVMe PCIe Gen3x4 SSD 6101 XE3420 Series NVMe PCIe Gen3x4 SSD @@ -29198,6 +29282,12 @@ 0028 IC695RMX228 RX3i 128MB Redundancy Memory Xchange with Single Fiber transceiver 0029 IC695PMM345 PACMotion Digital Motion Control Module (EtherCAT) 002a IC695HSC318 RX3i High Speed Counter (8 counters) + 8003 IC695CPU310/CMU310/NIU001 RX3i Controller 300 MHz Celeron + 8004 IC695CPU315/320/CRU320 RX3i Controller 1.0 GHz Celeron-M + 8005 IC695PNS001/101 RX3i Profinet Scanner + 8006 IC695CPE/CRE330 RX3i Controller 1.0 GHz G-series + 8007 IC695CPE302/305/310/NIU001+ RX3i Controller 1.1 GHz Atom Z510 + 800d IC695CPE302/305/310/NIU001+ RX3i Controller Atom x3930 1fc9 Tehuti Networks Ltd. 3009 10-Giga TOE SmartNIC 3010 10-Giga TOE SmartNIC @@ -29351,6 +29441,7 @@ 2004 Smart Link Ltd. 201f SpacemiT 0001 X60 PCIe 2.0 x2 Root Complex + 0002 X100 PCIe Root Complex 202c CAEN S.p.A. 5818 A5818 2036 Netforward Microelectronics Co., Ltd. @@ -29360,10 +29451,29 @@ 2036 0862 NF1618 Family NX862 (2*50GE) 2036 0863 NF1618 Family NX863 (2*100GE) 2036 0864 NF1618 Family NX864 (1*200GE) + 2036 0865 NF1618 Family NX865 (2*200GE) 1619 NF1618 Family Virtual Function + 8000 NP36xxx PCIe Gen 6 Switch + 2036 0104 NP36104 PCIe Gen 6 26 port/104 lane Switch Upstream/Downstream Port + 2036 0144 NP36144 PCIe Gen 6 36 port/144 lane Switch Upstream/Downstream Port + 2036 1000 NP36000 PCIe Gen 6 Virtual Upstream/Downstream Port + 2036 1001 NP36000 Virtual PCIe MGR 1.x Endpoint + 2036 1002 NP36000 Virtual PCIe DMA 1.x Endpoint + 2036 1003 NP36000 Virtual PCIe NTB 1.x Endpoint + 2036 1004 NP36000 Virtual PCIe Placeholder 1.x Endpoint + 2036 1005 NP36000 Virtual PCIe C2PMem 1.x Endpoint + 2036 1006 NP36000 Virtual PCIe Pktgen 1.x Endpoint 203b XTX Markets Technologies Ltd. +2044 Shenzhen Jiahua Zhongli Technology Co., LTD. + 8200 CeaCent CS211X 12G SAS RAID controller + 2044 2110 CeaCent CS2110-8i + 2044 2111 CeaCent CS2110-16i + 8201 CeaCent CS215X 12G SAS RAID controller + 2044 2150 CeaCent CS2150-8i + 2044 2151 CeaCent CS2150-16i 2046 GXMICRO Technology (Shanghai) Co., Ltd. 2048 Beijing SpaceControl Technology Co.Ltd +2052 Frontgrade Gaisler AB 2058 Lime Microsystems Ltd. 205c Zhejiang VMing Semiconductor Co., Ltd. 1514 EP9410 U.2 1.92TB NVME SSD @@ -29372,6 +29482,21 @@ 1535 EP9430 U.2 3.2TB NVME SSD 1536 EP9430 U.2 6.4TB NVME SSD 205d Shanghai Zijing Xinjie Intelligent Technology Co., Ltd. +205e SDTECH + 0000 SD85xxx PCIe Gen5 Switch + 205e 0048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 205e 0096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 205e 0104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 205e 0144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port + 205e 2004 SD85000 PCIe NT Endpoint + 205e 2005 SD85000 PCIe gDMA Endpoint + 205e 2006 SD85000 PCIe Management Endpoint + 5048 SD85048 PCIe Gen 5 48 lane Switch Upstream/Downstream Port + 5096 SD85096 PCIe Gen 5 96 lane Switch Upstream/Downstream Port + 5104 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5105 SD85104 PCIe Gen 5 104 lane Switch Upstream/Downstream Port + 5144 SD85144 PCIe Gen 5 144 lane Switch Upstream/Downstream Port 2061 Unis Flash Memory 4000 E4000 controller 4100 E4100 controller @@ -29402,6 +29527,19 @@ 2061 2061 E520Q NVMe SSD 30.72TB PCIe 5.0 U.2 2061 2062 E520Q NVMe SSD 61.44TB PCIe 5.0 U.2 2061 2063 E520Q NVMe SSD 122.88TB PCIe 5.0 U.2 + 5300 E5300 NVMe Controller + 2061 2041 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2042 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2043 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2044 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2045 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 2046 E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 + 2061 2085 E5300 NVMe SSD 3.2TB PCIe 5.0 U.2 + 2061 2086 E5300 NVMe SSD 3.84TB PCIe 5.0 U.2 + 2061 2087 E5300 NVMe SSD 6.4TB PCIe 5.0 U.2 + 2061 2088 E5300 NVMe SSD 7.68TB PCIe 5.0 U.2 + 2061 2089 E5300 NVMe SSD 12.8TB PCIe 5.0 U.2 + 2061 208a E5300 NVMe SSD 15.36TB PCIe 5.0 U.2 2063 Hubei Yangtze Mason Semiconductor Technology Co., Ltd. 0bb8 MC3000 0bb9 RC3000 @@ -29444,16 +29582,18 @@ 208a MICIUS Laboratory 2094 Shenzhen Wodposit Electronics Co., Ltd. 1281 WPBSNM8-256GTP - 1282 WPBSNM8-512GTP NVMe SSD (DRAM-less) + 1282 WPBSNM8-512GTP 1283 WPBSNM8-1TTP 1284 WPBSNM8-256GMP - 1285 WPBSNM8-512GMP - 1286 WPBSNM8-2TMP - 1287 WPBSNM8-1TMP - 1661 WPBSN4M8-512GMP - 1662 WPBSN4M8-1TMP - 1663 WPBSN4M8-2TMP - 1664 WPBSN4M8-1TGP NVMe SSD (DRAM-less) + 1285 WPBSN4M8-512GMP + 1286 WPBSN4M8-1TMP + 1287 WPBSN4M8-2TMP + 1661 WPBSNM8-512GMP + 1662 WPBSNM8-1TMP + 1663 WPBSNM8-2TMP + 1664 WPBSN4M8-1TGP + 1665 WPBSN4M8-2TGP + 1666 WPBSN4M8-4TGP 2096 Kaitian Information Technology Co., Ltd. 5401 KCP54(01) 2280 PCIe G4 x4 TLCKCP54(01) 2280 PCIe G4 x4 TLC 5402 KCP54(02) 2280 PCIe G4 x4 TLC @@ -29513,6 +29653,12 @@ 20e3 Elix Systems SA 20e7 TOPSSD 20f4 TRENDnet +20f6 Shenzhen Zhishi Network Technology Co., Ltd. + 0001 MPU H1 +20f9 Shenzhen Silicon Dynamic Networks Co., Ltd. +2106 ZCHL Technology Co., Ltd + 0001 HL100 Accelerator Controller + 2106 0001 HLC100 Accelerator Card 2116 ZyDAS Technology Corp. 21b4 Hunan Goke Microelectronics Co., Ltd 21c3 21st Century Computer Corp. @@ -29755,10 +29901,10 @@ 7173 CH355 PCI Quad Serial Port Controller 434e Cornelis Networks 0001 CN5000 HFI Silicon, Dual Port, BGA [discrete] - 434e 0001 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled - 434e 0002 CN5000 HFI Adapter, Dual Port, QSFP-DD, x16 PCIe Gen 5, Air-Cooled - 434e 0003 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Air-Cooled, Thermally Enhanced - 434e 0004 CN5000 HFI Adapter, Single Port, QSFP, x16 PCIe Gen 5, Conduction-Cooled + 434e 0001 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5 + 434e 0002 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5 + 434e 0003 CN5000 SuperNIC, Single Port, QSFP, x16 PCIe Gen 5, II + 434e 0004 CN5000 SuperNIC, Dual Port, QSFP-DD, x16 PCIe Gen 5, II 0002 CN6000 HFI Silicon, Dual Port, BGA [discrete] 8001 CN5000 Switch Silicon, 48 Port, BGA 4444 Internext Compression Inc @@ -31172,6 +31318,8 @@ 0dc5 Ethernet Connection (23) I219-LM 1028 0c06 Precision 3580 0dc6 Ethernet Connection (23) I219-V + 0dc7 Ethernet Connection I219-LM + 0dc8 Ethernet Connection I219-V 0dcd Ethernet Connection C825-X 0dd2 Ethernet Network Adapter I710 1137 0000 I710T4LG 4x1 GbE RJ45 PCIe NIC @@ -32138,11 +32286,13 @@ 8086 0002 Ethernet Network Adapter E835-C-Q2 for OCP 3.0 8086 0003 Ethernet Network Adapter E835-CC-Q1 8086 0004 Ethernet Network Adapter E835-CC-Q1 for OCP 3.0 + 8086 0005 Ethernet Network Adapter E835-C-Q2 124a Ethernet Controller E835-CC for SFP 8086 0001 Ethernet Network Adapter E835-XXV-2 for OCP 3.0 8086 0002 Ethernet Network Adapter E835-XXV-4 8086 0003 Ethernet Network Adapter E835-XXV-2 8086 0004 Ethernet Network Adapter E835-XXV-4 for OCP 3.0 + 8086 0008 Ethernet Network Adapter E835-XXV-2 124b 82380FB (MPCI2) Mobile Docking Controller 124c Ethernet Connection E823-L for backplane 124d Ethernet Connection E823-L for SFP @@ -32856,7 +33006,7 @@ 1603 Broadwell-U Processor Thermal Subsystem 1604 Broadwell-U Host Bridge -OPI 1605 Broadwell-U PCI Express x8 Controller - 1606 HD Graphics + 1606 Broadwell-U GT1 [HD Graphics] 1607 Broadwell-U CHAPS Device 1608 Broadwell-U Host Bridge -OPI 1609 Broadwell-U x4 PCIe @@ -32867,19 +33017,19 @@ 160e Broadwell-U Integrated Graphics 160f Broadwell-U SoftSKU 1610 Broadwell-U Host Bridge - DMI - 1612 HD Graphics 5600 + 1612 Broadwell-H GT2 [HD Graphics 5600] 1614 Broadwell-U Host Bridge - DMI - 1616 HD Graphics 5500 + 1616 Broadwell-U GT2 [HD Graphics 5500] 103c 2216 ZBook 15u G2 Mobile Workstation 1618 Broadwell-U Host Bridge - DMI 161a Broadwell-U Integrated Graphics 161b Broadwell-U Integrated Graphics 161d Broadwell-U Integrated Graphics - 161e HD Graphics 5300 - 1622 Iris Pro Graphics 6200 - 1626 HD Graphics 6000 - 162a Iris Pro Graphics P6300 - 162b Iris Graphics 6100 + 161e Broadwell-Y GT2 [HD Graphics 5300] + 1622 Broadwell-DT/H GT3 [Iris Pro Graphics 6200] + 1626 Broadwell-U GT3 [HD Graphics 6000] + 162a Broadwell-DT GT3 [Iris Pro Graphics P6300] + 162b Broadwell-U GT3 [Iris Graphics 6100] 162d Broadwell-U Integrated Graphics 162e Broadwell-U Integrated Graphics 1632 Broadwell-U Integrated Graphics @@ -32920,7 +33070,7 @@ 18f3 Atom Processor P5xxx Series SATA Controller 1900 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1901 6th-10th Gen Core Processor PCIe Controller (x16) - 1902 HD Graphics 510 + 1902 Skylake-S GT1 [HD Graphics 510] 1903 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Thermal Subsystem 1028 06d6 Latitude 7275 tablet 1028 06dc Latitude E7470 @@ -32936,7 +33086,7 @@ 17aa 2247 ThinkPad T570 17aa 382a B51-80 Laptop 1905 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x8) - 1906 HD Graphics 510 + 1906 Skylake-U GT1 [HD Graphics 510] 17aa 382a B51-80 Laptop 1908 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1909 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor PCIe Controller (x4) @@ -32956,8 +33106,8 @@ 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 17aa 225d ThinkPad T480 - 1912 HD Graphics 530 - 1916 Skylake GT2 [HD Graphics 520] + 1912 Skylake-S GT2 [HD Graphics 530] + 1916 Skylake-U GT2 [HD Graphics 520] 1028 06dc Latitude E7470 1028 06f3 Latitude 3570 103c 8079 EliteBook 840 G3 @@ -32966,24 +33116,24 @@ 1919 Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Imaging Unit 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 - 191b HD Graphics 530 + 191b Skylake-H GT2 [HD Graphics 530] 1028 06e4 XPS 15 9550 103c 825b OMEN-17-w001nv - 191d HD Graphics P530 - 191e HD Graphics 515 + 191d Skylake-DT/H GT2 [HD Graphics P530] + 191e Skylake-Y GT2 [HD Graphics 515] 1028 06d6 Latitude 7275 tablet 1028 06e6 Latitude 11 5175 2-in-1 191f Xeon E3-1200 v5/E3-1500 v5/6th Gen Core Processor Host Bridge/DRAM Registers 1921 HD Graphics 520 1923 HD Graphics 535 - 1926 Iris Graphics 540 - 1927 Iris Graphics 550 + 1926 Skylake-U GT3 [Iris Graphics 540] + 1927 Skylake-U GT3 [Iris Graphics 550] 192b Iris Graphics 555 - 192d Iris Graphics P555 + 192d Skylake-H GT3 [Iris Graphics P555] 1932 Iris Pro Graphics 580 - 193a Iris Pro Graphics P580 - 193b Iris Pro Graphics 580 - 193d Iris Pro Graphics P580 + 193a Skylake-H GT4 [Iris Pro Graphics P580] + 193b Skylake-H GT4 [Iris Pro Graphics 580] + 193d Skylake-H GT4 [Iris Pro Graphics P580] 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller @@ -36467,6 +36617,7 @@ 2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers 15d9 0821 X10DRW-i 3101 Killer E3100X 2.5 Gigabit Ethernet Controller + 3102 Ethernet Controller I226-K 3140 Easel/Monette Hill Image Processor [Pixel Visual Core] 3165 Wireless 3165 8086 4010 Dual Band Wireless AC 3165 [Stone Peak 1x1] @@ -37831,6 +37982,7 @@ 103c 87b9 Thunderbolt Dock G4 PCIe NIC 17aa 2303 ThinkPad Universal Thunderbolt 4 Dock PCIe NIC 1ab6 0225 TS4 On-Board 2.5GbE Ethernet Adaptor + 5503 Ethernet Controller I226-LMvP 550a Ethernet Connection (18) I219-LM 550b Ethernet Connection (18) I219-LM 550c Ethernet Connection (19) I219-LM @@ -37854,7 +38006,11 @@ 56a3 DG2 [Arc Xe Graphics] 56a4 DG2 [Arc Xe Graphics] 56a5 DG2 [Arc A380] + 172f 3941 A380 ELF + 172f 3943 A380 ELF + 172f 4017 A380 Pioneer 56a6 DG2 [Arc A310] + 172f 4019 A380 ECO 56a7 DG2 [Arc Xe Graphics] 56a8 DG2 [Arc Xe Graphics] 56a9 DG2 [Arc Xe Graphics] @@ -37915,13 +38071,13 @@ 1af4 1100 QEMU Virtual Machine 5900 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5901 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x16) - 5902 HD Graphics 610 + 5902 Kaby Lake-S GT1 [HD Graphics 610] 5904 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 1025 115f Aspire E5-575G 17aa 2247 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen 5905 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x8) - 5906 HD Graphics 610 + 5906 Kaby Lake-U GT1 [HD Graphics 610] 5909 Xeon E3-1200 v6/7th Gen Core Processor PCIe Controller (x4) 590b HD Graphics 610 590c Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers @@ -37932,31 +38088,31 @@ 1462 7a72 H270 PC MATE 5910 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5911 Xeon E3-1200 v6/7th Gen Core Processor Gaussian Mixture Model - 5912 HD Graphics 630 + 5912 Kaby Lake-S GT2 [HD Graphics 630] 1043 8694 H110I-PLUS Motherboard 1462 7994 H110M ECO/GAMING 1462 7a72 H270 PC MATE 5914 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 17aa 225d ThinkPad T480 - 5916 HD Graphics 620 + 5916 Kaby Lake-U GT2 [HD Graphics 620] 1025 1094 Aspire E5-575G 17aa 2248 ThinkPad T570 17aa 224f ThinkPad X1 Carbon 5th Gen - 5917 UHD Graphics 620 + 5917 Kaby Lake-R GT2 [UHD Graphics 620] 17aa 225d ThinkPad T480 (20L5) 17aa 225e ThinkPad T480 5918 Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers - 591b HD Graphics 630 + 591b Kaby Lake-H GT2 [HD Graphics 630] 591c UHD Graphics 615 - 591d HD Graphics P630 - 591e HD Graphics 615 + 591d Kaby Lake-DT GT2 [HD Graphics P630] + 591e Kaby Lake-Y GT2 [HD Graphics 615] 591f Xeon E3-1200 v6/7th Gen Core Processor Host Bridge/DRAM Registers 5921 HD Graphics 620 5923 HD Graphics 635 - 5926 Iris Plus Graphics 640 - 5927 Iris Plus Graphics 650 + 5926 Kaby Lake-U GT3 [Iris Plus Graphics 640] + 5927 Kaby Lake-U GT3 [Iris Plus Graphics 650] 5a84 Apollo Lake [HD Graphics 505] - 5a85 HD Graphics 500 + 5a85 Apollo Lake GT1 [HD Graphics 500] 5a88 Celeron N3350/Pentium N4200/Atom E3900 Series Imaging Unit 5a98 Celeron N3350/Pentium N4200/Atom E3900 Series Audio Cluster 5a9a Celeron N3350/Pentium N4200/Atom E3900 Series Trusted Execution Engine @@ -38019,6 +38175,19 @@ 65fa 5100 Chipset PCI Express x16 Port 4-7 65ff 5100 Chipset DMA Engine 674c CRI + 6e23 Nova Lake PCH-S SMbus Controller + 6e24 Nova Lake PCH-S SPI Controller + 6e28 Nova Lake PCH-S Serial IO UART Controller #0 + 6e29 Nova Lake PCH-S Serial IO UART Controller #1 + 6e2a Nova Lake PCH-S Serial IO SPI Controller #0 + 6e2b Nova Lake PCH-S Serial IO SPI Controller #1 + 6e4c Nova Lake PCH-S Serial IO I2C Controller #0 + 6e4d Nova Lake PCH-S Serial IO I2C Controller #1 + 6e4e Nova Lake PCH-S Serial IO I2C Controller #2 + 6e4f Nova Lake PCH-S Serial IO I2C Controller #3 + 6e5e Nova Lake PCH-S Serial IO SPI Controller #2 + 6e7a Nova Lake PCH-S Serial IO I2C Controller #4 + 6e7b Nova Lake PCH-S Serial IO I2C Controller #5 6f00 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D DMI2 15d9 0832 X10SRL-F 6f01 Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI Express Root Port 0 *** 202 LINES SKIPPED *** From nobody Tue Feb 10 13:36:24 2026 X-Original-To: dev-commits-src-main@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 4f9MzK3j20z6RKMJ for ; Tue, 10 Feb 2026 13:36:29 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9MzK2mw3z3hkB for ; Tue, 10 Feb 2026 13:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770730589; 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=gfpuWBm4qO+Hef+GPLOFGGhGz0/nkTJGXG2D5aQClJY=; b=CoBQHCudg3gzJKsvuup1CMjxm32Pk5a/FOBU+XUxzm7ixauXdKGsU0NkUCN0gutDPaSRYD Pdey7xpq0LUKbsxA9o+qKER3fRSrrC/chc9sQUOL3yrD1oa4WkF3gtjcsFok75t0THiDPE +rHzI4nz2P98/Aqz3i5eubf8m0R+odhDepp0nPOIOtqeFdl3bA5bZpglRTTd2XJ0xMOJ2z wO5SGAkdQm7Su3fNbwgosfpSAay8tGeX5qdEAhClbUmxD4RcPXm62YcDHGzMei1JWEgTpJ BFg7VNwCeb4n/+Xrvkaq26RiKuwlUMVnQiTpXg1WMoChVGhSUlf7LZLZFBd3pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770730589; a=rsa-sha256; cv=none; b=DZ+pyMHp5RfUUNVzOLl6SZF/NFudz9meABlYQHdWVtX7l3wNuq/FFzngPK9u7KbtL/yEbg 4wRPd15qmF1rLwqQw/D5WcM6gOOhjELE3to4q8CwgGOLntb5+ZeZymocBs+bM9FIrXsajE DHxsrmAMilWtIxAtbo9v3A8oi+S4mZrZVb9dJ70P7Z8/nDt2VISqfBJ0XyqXYWBMjOi0DO zLJ4Tf698eWPH82VgmF6TAmSSCVRBnxSTpaWAcxYUf/TwW6SxUpfn5rRqRNDq+pjUv3Ks+ tE8ratyf2tUwtbFKAH8IbSrgIhklCGmD+FjSOMRQrqdL14P8EXRqUdBszipycA== 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=1770730589; 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=gfpuWBm4qO+Hef+GPLOFGGhGz0/nkTJGXG2D5aQClJY=; b=XLEG8M7Prh7tGMiXdDzg93POnPFRdKz6kwgoAKluhYhf+Eu3QIs+jIp0hgXurjOuufMhqQ THSi6UdySSm1Au5QrLXOODQztBUt5lBGG4ZNwzqppjDIKUT28TdVcP4sC1t8HxSvX8guyW 6jki/Ur9KkXNLV129A4uW1T4yhuMDTI9jTDrGs17UcPFDJHfKfwOoYBt/HkJ2EtjMeijS8 yFP6UplD9LnyFGzv0+9FV/TIPzBBZ2HeIR3SZcBUO+wRrx7gks/AkxF3WzSftkLgdcNU4Q Whvi+LLqOHDqcLZ69tvFLnuMHR+cVtLukdTdfVijSO3HQgzh8S2/1aIQf751iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9MzD283Sz1JkT for ; Tue, 10 Feb 2026 13:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be80 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:36:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 3f4213f00ac5 - main - rtw88: remove more references to rtw88fw List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 3f4213f00ac5eea0a56cebeb1ba9f64a2489a956 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:36:24 +0000 Message-Id: <698b3458.3be80.44425dc0@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3f4213f00ac5eea0a56cebeb1ba9f64a2489a956 commit 3f4213f00ac5eea0a56cebeb1ba9f64a2489a956 Author: Bjoern A. Zeeb AuthorDate: 2026-02-10 13:30:53 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 13:36:06 +0000 rtw88: remove more references to rtw88fw When I removed the Realtek rtww8x firmware from base I missed to add rtw88fw.4 to ObsoleteFiles.inc [1]. While adding this, also remove a leftover reference in rtw88.4. Reported by: Herbert J. Skuhra (herbert gojira.at) [1] Fixes: cf94672363d6 MFC after: 3 days --- ObsoleteFiles.inc | 3 ++- share/man/man4/rtw88.4 | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4ebfadeb1fba..a534ff1e4249 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -2023,8 +2023,9 @@ OLD_FILES+=usr/share/examples/diskless/README.BOOTP OLD_FILES+=usr/share/examples/diskless/README.TEMPLATING OLD_FILES+=usr/share/examples/diskless/clone_root -# 20230905 +# 20230905: Removed rtw8x firmware files from src.git OLD_FILES+=usr/share/doc/legal/realtek_rtw88_firmware.LICENCE +OLD_FILES+=usr/share/man/man4/rtw88fw.4.gz # 20230828 MOVED_LIBS+=usr/lib/librt.so.1 diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4 index 4c2cba8311ae..e01f508ef80e 100644 --- a/share/man/man4/rtw88.4 +++ b/share/man/man4/rtw88.4 @@ -1,9 +1,9 @@ .\"- .\" SPDX-License-Identifier: BSD-2-Clause .\" -.\" Copyright (c) 2022-2025 Bjoern A. Zeeb +.\" Copyright (c) 2022-2026 Bjoern A. Zeeb .\" -.Dd June 13, 2025 +.Dd February 10, 2026 .Dt RTW88 4 .Os .Sh NAME @@ -84,7 +84,6 @@ for network buffer memory to the lower 32bit of physical memory and make the driver work. .El .Sh SEE ALSO -.Xr rtw88fw 4 , .Xr wlan 4 , .Xr networking 7 , .Xr fwget 8 , From nobody Tue Feb 10 13:38:51 2026 X-Original-To: dev-commits-src-main@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 4f9N243Jtbz6RKV7 for ; Tue, 10 Feb 2026 13:38:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9N2401S3z3jYD for ; Tue, 10 Feb 2026 13:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770730732; 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=PARfgoYdQmYRqokPKuYDwlgpEcTqkZcdxWkHSTpvvo4=; b=ImNtnSfTtoX6OmvHPhZtRLNoO5UycFb3B0X8xXPKhUKXcm/TEFS1CcdJCbR+bX5/R/LWGl jusHfyoQF258QYOfIdKr/0XAehJ57ErgvNizNFXWwoZaXqm2ql1/ES6ijAxYGqbiEeKtC3 KTvU8mVxeqMdeHwXR2THSGIWf92ZmkE+ilUH0jLNvcB1+8xe+5G6CRE2iFkWlswL5/ldWP o+SG9JEzkB1GB+Bj/OpXOdtEX+3dx3Q4yGnO7e1A2opeBHC6KBi1QCNHb2ffRtdNCj2Zva vY3MCbLWNL99GyVqMDoU59VkYklJZp9+8n3XVKi8iuYovI4M0YILxeTYpiPG9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770730732; a=rsa-sha256; cv=none; b=jT7c/IEjfrTa+WL5QvdmoI8wRxcs7SJ7uU+hdZfZZvoaV47QpxmebbNUDnU61Pcx4XBOho 8fmorFkIsU89s7ryjYE5CEXvPig64xiYxxvME442v+IPZguSS9qROpqNeCssMU3dltAe99 R3mWxtM9EjdxszRIZ/18P+lPKxV74rRl+6Jv0MSP9tGT/py7GIPE98zDMcjRyFFY1YITgC uQ1Ar8krQO07gjT1Q8k1qVTljwkXCxQ5HHR3l3ZkDTDtEDgjpW33O3esSPqhRcG1gG4SRI RwFWKQJasZF1Tx+j4KzAuUwebqdpvUxP2vZpSg+mpANQkpsyER3uwMcGMzZFag== 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=1770730732; 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=PARfgoYdQmYRqokPKuYDwlgpEcTqkZcdxWkHSTpvvo4=; b=ixtfZxf1o0yWkFFbOJnQb/LQdqBVLJH8YSB+d7WBQecLcwNYQiUvBT/0kRXOo3Ia0GF8oy 8vgbMkxz9xbOPBmZ9+mTlGK0jQvfLLUmzkXItKEC9t6xI82hyXhWbr0oD29E3KLeDZQkmO 6EyF8hDLEavTvjpceN3wDQdwMGRE1LgnRDXC+ncXstGSSclt5Ekva16NRLgNIcnwzi7xWl CDKBXNfK6+0VCyQOemkcLv6Ogev9SGO3ekUrWBb5OG7AeHjG04zVmkFw8+UqE/90ByeguN oeymXJclaSPgw0TtAx1qXq/EFOGZnjfgdBKw/+8G7hPUdsEo+S9BRkzPob2fxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9N236gGSz1KPF for ; Tue, 10 Feb 2026 13:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b209 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:38:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8d4c1043bb06 - main - usb_vendors: update to 2025.12.13 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d4c1043bb0630710cbea9f744cdaef499c0ed79 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:38:51 +0000 Message-Id: <698b34eb.3b209.1cbc8791@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8d4c1043bb0630710cbea9f744cdaef499c0ed79 commit 8d4c1043bb0630710cbea9f744cdaef499c0ed79 Author: Baptiste Daroussin AuthorDate: 2026-02-10 13:38:37 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-10 13:38:48 +0000 usb_vendors: update to 2025.12.13 --- share/misc/usb_vendors | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/misc/usb_vendors b/share/misc/usb_vendors index fa798e65ed9a..5832b6f9f660 100644 --- a/share/misc/usb_vendors +++ b/share/misc/usb_vendors @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2025.09.15 -# Date: 2025-09-15 20:34:02 +# Version: 2025.12.13 +# Date: 2025-12-13 20:34:01 # # Vendors, devices and interfaces. Please keep sorted. @@ -24056,6 +24056,7 @@ C 08 Mass Storage 00 Control/Bulk/Interrupt 01 Control/Bulk 50 Bulk-Only + 62 USB Attached SCSI C 09 Hub 00 Unused 00 Full speed (or root) hub From nobody Tue Feb 10 13:51:15 2026 X-Original-To: dev-commits-src-main@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 4f9NJN2hfrz6RLBv for ; Tue, 10 Feb 2026 13:51:16 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9NJN0Y17z3lvK for ; Tue, 10 Feb 2026 13:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770731476; 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=+FM4HUbkN2tMotkM6ygvI5DjScCpk1EcIoZz9PaYWCI=; b=KEcgbYMDe1XEwFUHbxMa0gtSZ4oXwChN4qP12Szx1UspoohyaNDRETChfvTNmlN8Js7RVt vtv6B4VNtopar40C+Wl8nTqo5/4dNpX99va9EDEPUHQAb3IyKaFfTCn0LzJlTljEiWFuW/ AQSQTJi4tRjzFiIekCUP0vK6g3sIMydwWu47t1AK22tKpaXkuFzYyj504HBKc8ONqwlS2b sVaoueD3VzXf+o/bWnHrsZ9mnNg6sndYtNPExCvWH99hOmXG47zmrSHkTGzjQfk9d5cqdr qSw1VgrHMFdwzC/1vrhGxlM5anNnkkR/VfiM+HdBjQjoeRhuyrlHQ8tDnGRV9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770731476; a=rsa-sha256; cv=none; b=Pvoi4SRj2WGTaIuK1zbNSyzfiNVqAKq6tzaR+bClLozS6nBp9+IEMfNarRCSFuVAmUb6dR tOqGgVSjxvZAdRzjABSnegfTmw0G6xC6lMh0f+98rJaDjsxW6GIOci8565A+RB5mMYPaLJ no2fjXTKe6oxjOiWPp9LsbCvLhnw5f+OvJaA0ow3fiJZwusMU1tDqCT09NvOcBRR1Y+xjY QmTUthgGJDcFP0/raZnZMOAt+0zHZzvNdqxjzxVQ4OAK4T8r8LvnXYIpRbvUQj1eeZgdeK SJFWl+1g2u8jMHWam5bW5czF4YCxmgowR0k39mJvnZsSHCazn218s7Z6oez6Ng== 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=1770731476; 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=+FM4HUbkN2tMotkM6ygvI5DjScCpk1EcIoZz9PaYWCI=; b=hjJwnoSerXQues0nXdQ7Sv/oRObx1NmFYj2xIQaT+liXpUWgqeUmPLpX0+nQdYj6ZMcHq6 BGIboJ14jHU8Stx2tkXQlebUk2vB6Gs3PbSUc/leIE9qcIfzqBYXHxGMwpEi7ZwrfqziiP P+bZyoetI8Z2e6s75qxpcu5xVqwNNFJ7gtHF7la9hdnauGd5qJ1OFyD8mE9gSVqeoCo5ki ChqYGYS7QPSV11HwR3elJNzwBqFfATZuZ97LASuThFEjGLarCNvgd19AC2qY5AVE1ndRvS mmOM6yKy6/yYwUU8Qg2H4aSiUVyP7MV1MLToj69OTCE4K8cWjFfKXwJhFzgWMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9NJN02F6z1KxR for ; Tue, 10 Feb 2026 13:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d975 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:51:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 0a757ef9a79d - main - ip_mroute: Use a local variable to store a VIF pointer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a757ef9a79d101bb4b7429ab5802579888dce98 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:51:15 +0000 Message-Id: <698b37d3.3d975.385b7868@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0a757ef9a79d101bb4b7429ab5802579888dce98 commit 0a757ef9a79d101bb4b7429ab5802579888dce98 Author: Mark Johnston AuthorDate: 2026-02-09 22:51:55 +0000 Commit: Mark Johnston CommitDate: 2026-02-10 13:45:06 +0000 ip_mroute: Use a local variable to store a VIF pointer This is cleaner and will make it a bit easier to add some more indirection to the VIF table, specifically, to add per-FIB tables. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55057 --- sys/netinet/ip_mroute.c | 51 ++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 196ae5292909..fb42c04548e7 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -593,7 +593,10 @@ get_sg_cnt(struct sioc_sg_req *req) static int get_vif_cnt(struct sioc_vif_req *req) { - vifi_t vifi = req->vifi; + struct vif *vif; + vifi_t vifi; + + vifi = req->vifi; MRW_RLOCK(); if (vifi >= V_numvifs) { @@ -601,12 +604,13 @@ get_vif_cnt(struct sioc_vif_req *req) return EINVAL; } - mtx_lock(&V_viftable[vifi].v_mtx); - req->icount = V_viftable[vifi].v_pkt_in; - req->ocount = V_viftable[vifi].v_pkt_out; - req->ibytes = V_viftable[vifi].v_bytes_in; - req->obytes = V_viftable[vifi].v_bytes_out; - mtx_unlock(&V_viftable[vifi].v_mtx); + vif = &V_viftable[vifi]; + mtx_lock(&vif->v_mtx); + req->icount = vif->v_pkt_in; + req->ocount = vif->v_pkt_out; + req->ibytes = vif->v_bytes_in; + req->obytes = vif->v_bytes_out; + mtx_unlock(&vif->v_mtx); MRW_RUNLOCK(); return 0; @@ -1573,6 +1577,7 @@ static int ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) { struct ip *ip = mtod(m, struct ip *); + struct vif *vif; vifi_t vifi; int plen = ntohs(ip->ip_len); @@ -1597,9 +1602,10 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) * Don't forward if it didn't arrive from the parent vif for its origin. */ vifi = rt->mfc_parent; - if ((vifi >= V_numvifs) || (V_viftable[vifi].v_ifp != ifp)) { + vif = &V_viftable[vifi]; + if (vifi >= V_numvifs || vif->v_ifp != ifp) { CTR4(KTR_IPMF, "%s: rx on wrong ifp %p (vifi %d, v_ifp %p)", - __func__, ifp, (int)vifi, V_viftable[vifi].v_ifp); + __func__, ifp, (int)vifi, vif->v_ifp); MRTSTAT_INC(mrts_wrong_if); ++rt->mfc_wrong_if; /* @@ -1611,7 +1617,7 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) * of the iif (broadcast media, GRE tunnel, etc). */ if (V_pim_assert_enabled && (vifi < V_numvifs) && - V_viftable[vifi].v_ifp) { + vif->v_ifp != NULL) { if (ifp == V_multicast_register_if) PIMSTAT_INC(pims_rcv_registers_wrongiif); @@ -1654,15 +1660,15 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) } /* If I sourced this packet, it counts as output, else it was input. */ - mtx_lock(&V_viftable[vifi].v_mtx); - if (in_hosteq(ip->ip_src, V_viftable[vifi].v_lcl_addr)) { - V_viftable[vifi].v_pkt_out++; - V_viftable[vifi].v_bytes_out += plen; + mtx_lock(&vif->v_mtx); + if (in_hosteq(ip->ip_src, vif->v_lcl_addr)) { + vif->v_pkt_out++; + vif->v_bytes_out += plen; } else { - V_viftable[vifi].v_pkt_in++; - V_viftable[vifi].v_bytes_in += plen; + vif->v_pkt_in++; + vif->v_bytes_in += plen; } - mtx_unlock(&V_viftable[vifi].v_mtx); + mtx_unlock(&vif->v_mtx); rt->mfc_pkt_cnt++; rt->mfc_byte_cnt += plen; @@ -1675,12 +1681,13 @@ ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif) */ for (vifi = 0; vifi < V_numvifs; vifi++) if ((rt->mfc_ttls[vifi] > 0) && (ip->ip_ttl > rt->mfc_ttls[vifi])) { - V_viftable[vifi].v_pkt_out++; - V_viftable[vifi].v_bytes_out += plen; - if (V_viftable[vifi].v_flags & VIFF_REGISTER) - pim_register_send(ip, V_viftable + vifi, m, rt); + vif = &V_viftable[vifi]; + vif->v_pkt_out++; + vif->v_bytes_out += plen; + if (vif->v_flags & VIFF_REGISTER) + pim_register_send(ip, vif, m, rt); else - phyint_send(ip, V_viftable + vifi, m); + phyint_send(ip, vif, m); } /* From nobody Tue Feb 10 13:51:17 2026 X-Original-To: dev-commits-src-main@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 4f9NJP4q74z6RLC0 for ; Tue, 10 Feb 2026 13:51:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9NJP1dLKz3lkY for ; Tue, 10 Feb 2026 13:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770731477; 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=oZW1KcR59TEpHnrKLSJx/nL3BGQaFEXzXHKHhTMFFY0=; b=LfmxMRg6etvzxHstQcetGm+4bjsk7gfktzE5ZqNTP48T0EsSKHr9Fw1ViGq332u8tTbRyQ un/9YZ1vRLTqYK0dzVx9Uj43A8unnH3DwOgqUxGtLqWse6LCPUQYgjjayNQltkRKCgSqGE JQv8+oaeCE6oIhe7eN394BPSyfIFrZJdz7J1BU8RzonapGf2GTsdoYcL5uhwId1zgfaE3C ozKt0pA56OkjpvucYFr4GZDoU0tqkaZQG+WNqnyV3/WrnF4Rixh2K6FbpS7QmDBHf5oZQK FGDU8MsXc0Fy4EFhLXnCQy5+eZltaUDvuBJ7F7nAVsn3qamSSBrOElpAYSeIxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770731477; a=rsa-sha256; cv=none; b=dBOjXKgefVYagOUP9mktg9ff4cNFRfEi7y6Mfh9R8NTn8gZAVDInJuuq6ln1VDdq+/Gu7q P4E1npaozYKyhe7IQ4xEMd9jWP8T/uR8TLqiRYubMFd6J8apSDw624LxMOVusLJsTU0YOx IRNYiPoR2hRI0X34cqVcTBhYatuBwbN/85ue7wl/PBR87LMpD8OuCn1PVL8DXsY4nphU9e D0YGLO5FQOC0HVnD6yqsse0ajPv9k2yVwemSFLvM9qP0qxJ0t0GbdZwq5xGOrZ/eXsNn1p S4E9Nr+vpqnxjwMmIwJiv79ci1HeVjmT5RIgAU8GFuoNEnSULYl6jWUbSTHgMw== 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=1770731477; 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=oZW1KcR59TEpHnrKLSJx/nL3BGQaFEXzXHKHhTMFFY0=; b=cb5qF25Cx33KsbQqmICwzlQt99JEgTcuXJrcbNrMDqTd8RYDqiz3tkRyUbJUXjxosnb2G9 j0yMSxjreGIyqlfblb8bxnXe1RvyV+Pdwagtk0j2sicLLcFB6ohDEqG/5itQGqnid2OlD1 UZeKiGBEqnqJipUoGhTEJNgSGKqxGQKvZVrn2CPcV5DgUZ79QOG/NspWGxchwG28aRZGWN K97C5upoHvnEDIJzpAtjOAMSr0YXOe1zOhNGmY4784w2w58DGIYy7Ijhbzr8I2ckH/ojrr f3GZjNjLC8v+BYkYcGibycPQTfzIGh/15ei1iZwpmScZs1U2xT9FB6HTa++yZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9NJP0wkYz1L2x for ; Tue, 10 Feb 2026 13:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d09c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:51:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9df6a7f9a60b - main - ip_mroute: Try to make function pointer declarations more consistent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df6a7f9a60b76eda2ac82826528487ca43edf46 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:51:17 +0000 Message-Id: <698b37d5.3d09c.3705f2b9@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9df6a7f9a60b76eda2ac82826528487ca43edf46 commit 9df6a7f9a60b76eda2ac82826528487ca43edf46 Author: Mark Johnston AuthorDate: 2026-02-09 22:52:08 +0000 Commit: Mark Johnston CommitDate: 2026-02-10 13:45:06 +0000 ip_mroute: Try to make function pointer declarations more consistent The ip_mroute and ip6_mroute modules hook into the network stack via several function pointers. Declarations for these pointers are scattered around several headers. Put them all in the same place, ip(6)_mroute.h. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55058 --- sys/netinet/igmp.c | 1 + sys/netinet/in_mcast.c | 1 + sys/netinet/ip_input.c | 1 + sys/netinet/ip_mroute.h | 21 ++++++++++++++++++--- sys/netinet/ip_output.c | 1 + sys/netinet/ip_var.h | 10 ---------- sys/netinet6/ip6_input.c | 1 + sys/netinet6/ip6_mroute.h | 14 ++++++++++++++ sys/netinet6/ip6_output.c | 1 + sys/netinet6/ip6_var.h | 2 -- sys/netinet6/mld6.c | 1 + 11 files changed, 39 insertions(+), 15 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index de9d38c7fb9d..35128dadffe6 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -79,6 +79,7 @@ #include #include #include +#include #include diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 131e72780ebe..20e6f9d8b322 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -66,6 +66,7 @@ #include #include #include +#include #ifndef KTR_IGMPV3 #define KTR_IGMPV3 KTR_INET diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 1e1747d04c45..4b8294c93967 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -82,6 +82,7 @@ #include #include #include +#include #ifdef SCTP #include #endif diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index ed98e59a7c77..6f09006ec9e2 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -356,14 +356,29 @@ struct bw_meter { }; #ifdef _KERNEL +VNET_DECLARE(struct socket *, ip_mrouter); /* multicast routing daemon */ +#define V_ip_mrouter VNET(ip_mrouter) +struct ifnet; +struct ip; +struct ip_moptions; +struct mbuf; +struct socket; struct sockopt; -extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); -extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); +extern u_long (*ip_mcast_src)(int); +extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, + struct ip_moptions *); extern int (*ip_mrouter_done)(void); -extern int (*mrt_ioctl)(u_long, caddr_t, int); +extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); +extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); + +extern void (*ip_rsvp_force_done)(struct socket *); +extern int (*ip_rsvp_vif)(struct socket *, struct sockopt *); +extern int (*legal_vif_num)(int); +extern int (*mrt_ioctl)(u_long, caddr_t, int); +extern int (*rsvp_input_p)(struct mbuf **, int *, int); #endif /* _KERNEL */ #endif /* _NETINET_IP_MROUTE_H_ */ diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index f1aa3c498ef7..1edc4906b542 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -78,6 +78,7 @@ #include #include #include +#include #include #include diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index c113484079a3..934ca80a083d 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -199,9 +199,6 @@ VNET_DECLARE(int, ipsendredirects); VNET_DECLARE(int, ipstealth); /* stealth forwarding */ #endif VNET_DECLARE(struct socket *, ip_rsvpd); /* reservation protocol daemon*/ -VNET_DECLARE(struct socket *, ip_mrouter); /* multicast routing daemon */ -extern int (*legal_vif_num)(int); -extern u_long (*ip_mcast_src)(int); VNET_DECLARE(int, rsvp_on); VNET_DECLARE(int, drop_redirect); VNET_DECLARE(int, ip_random_id); @@ -214,7 +211,6 @@ VNET_DECLARE(int, ip_random_id); #define V_ipstealth VNET(ipstealth) #endif #define V_ip_rsvpd VNET(ip_rsvpd) -#define V_ip_mrouter VNET(ip_mrouter) #define V_rsvp_on VNET(rsvp_on) #define V_drop_redirect VNET(drop_redirect) #define V_ip_random_id VNET(ip_random_id) @@ -227,9 +223,6 @@ int ip_ctloutput(struct socket *, struct sockopt *sopt); int ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu, u_long if_hwassist_flags); void ip_forward(struct mbuf *m, int srcrt); -extern int - (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, - struct ip_moptions *); int ip_output(struct mbuf *, struct mbuf *, struct route *, int, struct ip_moptions *, struct inpcb *); @@ -244,9 +237,6 @@ int rsvp_input(struct mbuf **, int *, int); int ip_rsvp_init(struct socket *); int ip_rsvp_done(void); -extern int (*ip_rsvp_vif)(struct socket *, struct sockopt *); -extern void (*ip_rsvp_force_done)(struct socket *); -extern int (*rsvp_input_p)(struct mbuf **, int *, int); typedef int ipproto_input_t(struct mbuf **, int *, int); struct icmp; diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index a23f5d46d6a3..656b3b996f90 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -118,6 +118,7 @@ #include #include #include +#include #ifdef SCTP #include #include diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h index dd23196c799a..2f298df6a1ce 100644 --- a/sys/netinet6/ip6_mroute.h +++ b/sys/netinet6/ip6_mroute.h @@ -270,10 +270,24 @@ struct rtdetq { /* XXX: rtdetq is also defined in ip_mroute.h */ #endif #define MAX_UPQ6 4 /* max. no of pkts in upcall Q */ +#endif /* _KERNEL || KERNEL */ +#ifdef _KERNEL +VNET_DECLARE(struct socket *, ip6_mrouter); /* multicast routing daemon */ +#define V_ip6_mrouter VNET(ip6_mrouter) + +struct ifnet; +struct ip6_hdr; +struct mbuf; +struct socket; +struct sockopt; + +extern int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, + struct mbuf *); extern int (*ip6_mrouter_set)(struct socket *so, struct sockopt *sopt); extern int (*ip6_mrouter_get)(struct socket *so, struct sockopt *sopt); extern int (*ip6_mrouter_done)(void); + extern int (*mrt6_ioctl)(u_long, caddr_t); #endif /* _KERNEL */ diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index dca1bcf04371..4b0c08b4e493 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -110,6 +110,7 @@ #include #include #include +#include #include #if defined(SCTP) || defined(SCTP_SUPPORT) diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index c1645f587483..4951f43ea4da 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -309,7 +309,6 @@ VNET_DECLARE(int, ip6_v6only); #define V_ip6_mcast_pmtu VNET(ip6_mcast_pmtu) #define V_ip6_v6only VNET(ip6_v6only) -VNET_DECLARE(struct socket *, ip6_mrouter); /* multicast routing daemon */ VNET_DECLARE(int, ip6_sendredirects); /* send IP redirects when forwarding? */ VNET_DECLARE(int, ip6_accept_rtadv); /* Acts as a host not a router */ VNET_DECLARE(int, ip6_no_radr); /* No defroute from RA */ @@ -320,7 +319,6 @@ VNET_DECLARE(int, ip6_rfc6204w3); /* Accept defroute from RA even when VNET_DECLARE(int, ip6_hdrnestlimit); /* upper limit of # of extension * headers */ VNET_DECLARE(int, ip6_dad_count); /* DupAddrDetectionTransmits */ -#define V_ip6_mrouter VNET(ip6_mrouter) #define V_ip6_sendredirects VNET(ip6_sendredirects) #define V_ip6_accept_rtadv VNET(ip6_accept_rtadv) #define V_ip6_no_radr VNET(ip6_no_radr) diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index f14d2c76ffda..d00a9c13ec8d 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -90,6 +90,7 @@ #include #include #include +#include #include #include From nobody Tue Feb 10 13:51:18 2026 X-Original-To: dev-commits-src-main@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 4f9NJQ6wWyz6RLQ1 for ; Tue, 10 Feb 2026 13:51:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9NJQ28Mnz3lxT for ; Tue, 10 Feb 2026 13:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770731478; 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=qae+gOFQEHxwxVPZ9vu5FJP5kWJL+sW5RzaAGggxm4E=; b=AMnC2JnenL7JU60LPwLzzkOfeJSFHzNpcRP5MCac1td8s6zV0/ZRXSHD83LdPrbw4frjk1 b4+d3ov3ET6SlZ6+YlNKxT7O55KSB2WaYW6k6kqI8rkRPMcefuEtw4GoUGNtRbRRWqCncc icALygrdpr00dfqoVhAr2L+Aae01qeZSsBS3cHXD4ejwBxHO8iIHCdTFc/FYkNyELaG5sF sZdR6oENbqZxH2kENFLfbshvZ6VPVWuCeN3u3flF2bPm7+mh3/l07T5rtOYoxHzkKG6ARA Cv/ZDIPYk3zgz7XZQcYJ5Swyi1AO0Aqv7Fnt5kL0BrdZeGGQAO4u3omYQlZUiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770731478; a=rsa-sha256; cv=none; b=LekLoxpbfgIAKBQUyKP4O9UaX0BkzBGaXgqLG0Cl26Vpbn/1RGXRhUmSjzzweIcpmbRpSK x0AJ/JjP4e/umxdl3D9Hd+5QS4R3lgvGtAorqPaRAjmSxnO9AEzGNih6vgwVEjd9MhyYyM yM6TmDpeni8jsBlyzL8LN+yu17v5jwoWfSBKnDhUiA4XQyVIe7BQWu2vjmFFcsBnMfgNsf d2oI6vuXpNVuKDdzy8S5YHfN+cn74vONy+/HlAkbApqjexCbhedDrAyz4g4X2wHTjyxJSU R2Y13iZls2+b7f6BsggZAQw3dnwqJoB1PQURKmENBH9j1eyqKN16IGsO1ifvDg== 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=1770731478; 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=qae+gOFQEHxwxVPZ9vu5FJP5kWJL+sW5RzaAGggxm4E=; b=WMkoE7mxTSB/YaElbYW6ZFDjhc/bGCcukog3m/z6YUreqTUh5zTwml+3SkQeXGWKi16N0m qr9+x6CcmyuTbkTH4C6EedcFU3812MmL1jdXjzIged7SIE4q17PQ+YkRNFhde26rwttA69 CR71hVBEHUTZLXQ91wW3o/qqORJ/+c76ZDUtAOLIlkC/Olx4SBM01HqJMu9Oi14MQ3Ph/f yep58csLCrqMqAda0FT3hIynL2jSsyEtj92tQQxqPmsrZ6ca+XMGw8w85LZBsWSir1wmss Stgs822O9QXChZUr5/CKWlXRitL7mab4Ck4+kbtnBN5TrG+wJctKsBxFJyuAkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9NJQ1k1bz1KgY for ; Tue, 10 Feb 2026 13:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d3e8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:51:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d8f7a7b44a95 - main - ip6_mroute: Deindent some code in ip6_mdq() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8f7a7b44a951368d637bbbdc06c28ffd6331d76 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:51:18 +0000 Message-Id: <698b37d6.3d3e8.6c61bb81@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8f7a7b44a951368d637bbbdc06c28ffd6331d76 commit d8f7a7b44a951368d637bbbdc06c28ffd6331d76 Author: Mark Johnston AuthorDate: 2026-02-09 22:52:20 +0000 Commit: Mark Johnston CommitDate: 2026-02-10 13:45:06 +0000 ip6_mroute: Deindent some code in ip6_mdq() Deal with the mifi >= nummifs case early so that we can de-indent the rest of the code. This also ensures that the debug log (compiled out by default) doesn't perform an out-of-bounds access. Remove a bogus NULL test in an inner loop while here. No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55059 --- sys/netinet6/ip6_mroute.c | 134 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 66 deletions(-) diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 5706c12fc5e4..46378cca5e21 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -1362,96 +1362,98 @@ ip6_mdq(struct mbuf *m, struct ifnet *ifp, struct mf6c *rt) * for its origin. */ mifi = rt->mf6c_parent; - if ((mifi >= nummifs) || (mif6table[mifi].m6_ifp != ifp)) { - /* came in the wrong interface */ - MRT6_DLOG(DEBUG_FORWARD, - "wrong if: ifid %d mifi %d mififid %x", ifp->if_index, - mifi, mif6table[mifi].m6_ifp->if_index); + if (mifi >= nummifs || mif6table[mifi].m6_ifp != ifp) { MRT6STAT_INC(mrt6s_wrong_if); rt->mf6c_wrong_if++; + if (mifi >= nummifs) + return (0); + + mifp = &mif6table[mifi]; + MRT6_DLOG(DEBUG_FORWARD, + "wrong if: ifid %d mifi %d mififid %x", ifp->if_index, + mifi, mifp->m6_ifp->if_index); + /* * If we are doing PIM processing, and we are forwarding * packets on this interface, send a message to the * routing daemon. */ /* have to make sure this is a valid mif */ - if (mifi < nummifs && mif6table[mifi].m6_ifp) - if (V_pim6 && (m->m_flags & M_LOOP) == 0) { - /* - * Check the M_LOOP flag to avoid an - * unnecessary PIM assert. - * XXX: M_LOOP is an ad-hoc hack... - */ - static struct sockaddr_in6 sin6 = - { sizeof(sin6), AF_INET6 }; + if (mifp->m6_ifp && V_pim6 && (m->m_flags & M_LOOP) == 0) { + /* + * Check the M_LOOP flag to avoid an + * unnecessary PIM assert. + * XXX: M_LOOP is an ad-hoc hack... + */ + static struct sockaddr_in6 sin6 = + { sizeof(sin6), AF_INET6 }; - struct mbuf *mm; - struct mrt6msg *im; + struct mbuf *mm; + struct mrt6msg *im; #ifdef MRT6_OINIT - struct omrt6msg *oim; + struct omrt6msg *oim; #endif - mm = m_copym(m, 0, sizeof(struct ip6_hdr), - M_NOWAIT); - if (mm && - (!M_WRITABLE(mm) || - mm->m_len < sizeof(struct ip6_hdr))) - mm = m_pullup(mm, sizeof(struct ip6_hdr)); - if (mm == NULL) - return (ENOBUFS); + mm = m_copym(m, 0, sizeof(struct ip6_hdr), + M_NOWAIT); + if (mm && + (!M_WRITABLE(mm) || + mm->m_len < sizeof(struct ip6_hdr))) + mm = m_pullup(mm, sizeof(struct ip6_hdr)); + if (mm == NULL) + return (ENOBUFS); #ifdef MRT6_OINIT - oim = NULL; + oim = NULL; #endif - im = NULL; - switch (V_ip6_mrouter_ver) { + im = NULL; + switch (V_ip6_mrouter_ver) { #ifdef MRT6_OINIT - case MRT6_OINIT: - oim = mtod(mm, struct omrt6msg *); - oim->im6_msgtype = MRT6MSG_WRONGMIF; - oim->im6_mbz = 0; - break; + case MRT6_OINIT: + oim = mtod(mm, struct omrt6msg *); + oim->im6_msgtype = MRT6MSG_WRONGMIF; + oim->im6_mbz = 0; + break; #endif - case MRT6_INIT: - im = mtod(mm, struct mrt6msg *); - im->im6_msgtype = MRT6MSG_WRONGMIF; - im->im6_mbz = 0; - break; - default: - m_freem(mm); - return (EINVAL); - } + case MRT6_INIT: + im = mtod(mm, struct mrt6msg *); + im->im6_msgtype = MRT6MSG_WRONGMIF; + im->im6_mbz = 0; + break; + default: + m_freem(mm); + return (EINVAL); + } - for (mifp = mif6table, iif = 0; - iif < nummifs && mifp && - mifp->m6_ifp != ifp; - mifp++, iif++) - ; + for (mifp = mif6table, iif = 0; + iif < nummifs && mifp->m6_ifp != ifp; + mifp++, iif++) + ; - switch (V_ip6_mrouter_ver) { + switch (V_ip6_mrouter_ver) { #ifdef MRT6_OINIT - case MRT6_OINIT: - oim->im6_mif = iif; - sin6.sin6_addr = oim->im6_src; - break; + case MRT6_OINIT: + oim->im6_mif = iif; + sin6.sin6_addr = oim->im6_src; + break; #endif - case MRT6_INIT: - im->im6_mif = iif; - sin6.sin6_addr = im->im6_src; - break; - } + case MRT6_INIT: + im->im6_mif = iif; + sin6.sin6_addr = im->im6_src; + break; + } - MRT6STAT_INC(mrt6s_upcalls); + MRT6STAT_INC(mrt6s_upcalls); - if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) { - MRT6_DLOG(DEBUG_ANY, - "ip6_mrouter socket queue full"); - MRT6STAT_INC(mrt6s_upq_sockfull); - return (ENOBUFS); - } /* if socket Q full */ - } /* if PIM */ + if (socket_send(V_ip6_mrouter, mm, &sin6) < 0) { + MRT6_DLOG(DEBUG_ANY, + "ip6_mrouter socket queue full"); + MRT6STAT_INC(mrt6s_upq_sockfull); + return (ENOBUFS); + } + } return (0); - } /* if wrong iif */ + } /* If I sourced this packet, it counts as output, else it was input. */ if (m->m_pkthdr.rcvif == NULL) { From nobody Tue Feb 10 13:51:19 2026 X-Original-To: dev-commits-src-main@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 4f9NJS2xpLz6RLFy for ; Tue, 10 Feb 2026 13:51:20 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9NJR3jg0z3m8Q for ; Tue, 10 Feb 2026 13:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770731479; 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=ace5se/afSM9/WUfM0Gin6mYJO8Pv/DQy3hhC5xbeLs=; b=bxwP52vO+DVLaiYz+BrqQxQbM5D1MLTu+E9xDSwhlvJIqwhwaeW0S0+4fKiztKvSOvg5Q2 LGQotV5rrodrl+3nhLpNTRM/ev1tNdAjVfKKxO6inKJ0Tn2Z0+Pwl3If8MxxKfwfJpaKho VK1w8WNva87uEfbSawH1vz8LkV6AyFJSyHvah/uPsGk8pnBlEmczzD43MIK9DtjFrubnvI ntfiyB+8SOCFdK3RmgnLhmT/PUyHh5zKjFuBmAwxVrePX5j57EMs3jfx+FL8StGEYe9xUQ UPgOdn1VdDL4muoEgUO33IFJOCgzzQ9KWY7SHkkzMDTl4JXryIVh/yU3ySztQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770731479; a=rsa-sha256; cv=none; b=VVGC4/3RfkmEaluqf89mxWrc6e+KWAjEitQGwAuI9mY19z2ju4VoG/ZRePQPhFb65bLpuI 1/+y6UvxgkA9r5fghH7n02Wz/J2vsj72kV0Nl69vEfPZWAAG/oll3IPUJgnR0MLG008o7N A0ZlpaXi1zn4p/G7uDIxTWC1XYqnNHV1+XOKCHj/vGM9XA4LZowPtbUlyQnYqVkC/x59Kr nZfb9Oz4IlBCXAq7UCLDrRhnQKT+mT53+Lw+kzqQT9ooH92wRLs4WdB3dj1Xu9Lt67tg0I xGCwXNnqcbvl9vYEDLlAp1Q4SclI7CUsoF6Dn8fF0r+K8QFLz+e7mvx4Kg+M4w== 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=1770731479; 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=ace5se/afSM9/WUfM0Gin6mYJO8Pv/DQy3hhC5xbeLs=; b=niHN1F0bZC3cZ+dHuafMABMWmwoO2w1SM76pWQO4jqWfLvcVRJ5eSK4ULfijIV54YYkwYH J09FDgpmS0alLeHmosuDIW9aVEbFxhVOaZa4N4gy+6RgiKgyLSlhXfVwOLqCLRO04ymRFu kGMbKpwUnbkmzuaZayWL60MjFvEM+wRF6UlGglo6PILyUGKV50k2vePWSMA+HLCe6ORNd8 mx41lSwSxJNFrDkvSVDb2NoCh+cUZaviPQqi4F1dWvBi9lzsALdG1xZvfhTGtw4k1SmeqD TK/SYjcGAxQ0SvGjPu51CY+yqFtDZWC4KlFnIz8cxSNTUrC+FTsGZGEe5TWXaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9NJR2bJ0z1Khf for ; Tue, 10 Feb 2026 13:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3df05 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 13:51:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 93075bdb813a - main - net: Remove the IFF_RENAMING flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93075bdb813a9956e66c711eda2c83fb596711fd Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 13:51:19 +0000 Message-Id: <698b37d7.3df05.72afd60d@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=93075bdb813a9956e66c711eda2c83fb596711fd commit 93075bdb813a9956e66c711eda2c83fb596711fd Author: Mark Johnston AuthorDate: 2026-02-09 23:24:02 +0000 Commit: Mark Johnston CommitDate: 2026-02-10 13:45:06 +0000 net: Remove the IFF_RENAMING flag This used to be needed when interface renames were broadcast using the ifnet_departure_event eventhandler, but since commit 349fcf079ca3 ("net: add ifnet_rename_event EVENTHANDLER(9) for interface renaming"), it has no purpose. Remove it. Reviewed by: pouria, zlei Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55171 --- sbin/ifconfig/ifconfig_netlink.c | 2 +- share/man/man9/ifnet.9 | 3 --- sys/compat/linux/linux_netlink.c | 1 - sys/net/if.c | 10 ---------- sys/net/if.h | 1 - sys/net/if_bridge.c | 2 -- sys/net/if_lagg.c | 3 --- sys/net/if_vlan.c | 3 --- sys/net/if_vxlan.c | 2 -- sys/netipsec/ipsec_offload.c | 2 -- 10 files changed, 1 insertion(+), 28 deletions(-) diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index b5badfd585b8..b1467fde4c93 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -78,7 +78,7 @@ static const char *IFFBITS[] = { "STATICARP", /* 19:0x80000 IFF_STATICARP*/ "STICKYARP", /* 20:0x100000 IFF_STICKYARP*/ "DYING", /* 21:0x200000 IFF_DYING*/ - "RENAMING", /* 22:0x400000 IFF_RENAMING*/ + "", /* 22:0x400000 */ "PALLMULTI", /* 23:0x800000 IFF_PALLMULTI*/ "LOWER_UP", /* 24:0x1000000 IFF_NETLINK_1*/ }; diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index e81c2990c13c..e0a4dae9c1e4 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -761,9 +761,6 @@ Set when the structure of this interface is being released and still has .Va if_refcount references. -.It Dv IFF_RENAMING -.Aq D -Set when this interface is being renamed. .El .Ss "Interface Capabilities Flags" Interface capabilities are specialized features an interface may diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 6dd2ad7ad8b0..256f188385ce 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -340,7 +340,6 @@ rtnl_if_flags_to_linux(unsigned int if_flags) case IFF_STATICARP: case IFF_STICKYARP: case IFF_DYING: - case IFF_RENAMING: /* No Linux analogue */ break; case IFF_MULTICAST: diff --git a/sys/net/if.c b/sys/net/if.c index 047ccd2ecda7..5c4b1e17f77d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -3022,14 +3022,6 @@ if_rename(struct ifnet *ifp, char *new_name) if (ifunit(new_name) != NULL) return (EEXIST); - /* - * XXX: Locking. Nothing else seems to lock if_flags, - * and there are numerous other races with the - * ifunit() checks not being atomic with namespace - * changes (renames, vmoves, if_attach, etc). - */ - ifp->if_flags |= IFF_RENAMING; - if_printf(ifp, "changing name to '%s'\n", new_name); IF_ADDR_WLOCK(ifp); @@ -3058,8 +3050,6 @@ if_rename(struct ifnet *ifp, char *new_name) EVENTHANDLER_INVOKE(ifnet_rename_event, ifp, old_name); - ifp->if_flags &= ~IFF_RENAMING; - snprintf(strbuf, sizeof(strbuf), "name=%s", new_name); devctl_notify("IFNET", old_name, "RENAME", strbuf); diff --git a/sys/net/if.h b/sys/net/if.h index 0bbd9906f5cf..7c0a476708d6 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -159,7 +159,6 @@ struct if_data { #define IFF_STATICARP 0x80000 /* (n) static ARP */ #define IFF_STICKYARP 0x100000 /* (n) sticky ARP */ #define IFF_DYING 0x200000 /* (n) interface is winding down */ -#define IFF_RENAMING 0x400000 /* (n) interface is being renamed */ #define IFF_PALLMULTI 0x800000 /* (n) user-requested allmulti mode */ #define IFF_NETLINK_1 0x1000000 /* (n) used by netlink */ diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 5bdd8613245e..0cd71a20fa35 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2291,8 +2291,6 @@ bridge_ifdetach(void *arg __unused, struct ifnet *ifp) if (bif) sc = bif->bif_sc; - if (ifp->if_flags & IFF_RENAMING) - return; if (V_bridge_cloner == NULL) { /* * This detach handler can be called after diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index c30af5bfcc4e..7a8f82286c02 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -1164,9 +1164,6 @@ lagg_port_ifdetach(void *arg __unused, struct ifnet *ifp) if ((lp = ifp->if_lagg) == NULL) return; - /* If the ifnet is just being renamed, don't do anything. */ - if (ifp->if_flags & IFF_RENAMING) - return; sc = lp->lp_softc; diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index afc3fa3fc79e..f74e3cb209fe 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -761,9 +761,6 @@ vlan_ifdetach(void *arg __unused, struct ifnet *ifp) struct ifvlan *ifv; struct ifvlantrunk *trunk; - /* If the ifnet is just being renamed, don't do anything. */ - if (ifp->if_flags & IFF_RENAMING) - return; VLAN_XLOCK(); trunk = ifp->if_vlantrunk; if (trunk == NULL) { diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index f3a8410a2258..3d51c3c421ff 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -3616,8 +3616,6 @@ vxlan_ifdetach_event(void *arg __unused, struct ifnet *ifp) struct vxlan_socket *vso; struct vxlan_softc *sc, *tsc; - if (ifp->if_flags & IFF_RENAMING) - return; if ((ifp->if_flags & IFF_MULTICAST) == 0) return; diff --git a/sys/netipsec/ipsec_offload.c b/sys/netipsec/ipsec_offload.c index 3583fc50f51b..632e99b8cfce 100644 --- a/sys/netipsec/ipsec_offload.c +++ b/sys/netipsec/ipsec_offload.c @@ -829,8 +829,6 @@ ipsec_accel_on_ifdown_impl(struct ifnet *ifp) static void ipsec_accel_ifdetach_event(void *arg __unused, struct ifnet *ifp) { - if ((ifp->if_flags & IFF_RENAMING) != 0) - return; ipsec_accel_on_ifdown_impl(ifp); } From nobody Tue Feb 10 14:02:54 2026 X-Original-To: dev-commits-src-main@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 4f9NYp5wGPz6RM28 for ; Tue, 10 Feb 2026 14:02:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9NYp51kxz3pG1 for ; Tue, 10 Feb 2026 14:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770732174; 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=KDccAI87A/XdG0INtJ5muLz+6pdHk+peniNPYxVTXf8=; b=HptxxiRBH2dH6bgusa9k7HcBCdnjvkazS1IH9iplsS45CeDYb5SHCkh+xrq3rWCYeL+918 d8q+RUTpH2T5/8qFjJhjo0fIzU4u+YLync8BLXzVeCi8NxqduoBUvQlMejNrMW3BmrXod4 xjk7IS9v6AfCt5UuZRuj7isimedLMnY6+hbVLUQIkcqIXj7Oofo1Wzz0ECGxYMVfci5XQl AVzF6pt9AZQaj4XNKxdA7u8IgsL2Lm7ZHaZUGK7ish11YaKBF7EbRG3aC5q2NoKmVnaKZE SXXQwqC3M2MWDYaG8rlWjBjn8yeIbe8UjXclq/a3rI9AtsDkg0Bv70PDLlHuMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770732174; a=rsa-sha256; cv=none; b=X0sUtTZ0tiia00oy30142m2XGy/J9OMmcrHVByXKuJ9IIl+cpRK1n6yVEE41wqrdkk24v2 cvZXRkVhQvoDCqZsJJCxgMNn/6rN82RM42ORrZBkiPTrKU0CSBSJw9cIpMf4FEfSrkO6Q4 jqonl3KtfVyODnSFwlqppmb6HPsvhdb/6XQWAxsVGrWaHnpnv4z0IkeOarRFjoYJsVJtJf sXmWGkagZU+U+BiFcJOrHShtKo2vpBPZyRiLV+lAFvcg1AXCbPMmf3ABIzUmBGXbr1w32C h9gmLObj/Si1MS8w8tvuqnMXBN4M1CS1pSCMwYGyh0mRatPoinS1Fu57oKqxbQ== 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=1770732174; 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=KDccAI87A/XdG0INtJ5muLz+6pdHk+peniNPYxVTXf8=; b=IxqzPVaMmlezntNi/cM7A+PBQVyvkqjGtkakzLbcxH64zkvnt6df2WD++Cq2nLuq1QymEk tatP+ZM2kpOutLZEGQZwW5YmqpcJmDz3GNgDe7M8zj4A6FV8Ypn5+A7hObNlPBWG5YcIFX C21yeafvG929QBtbIZbyjQrvUoqJVeejQSzhI7pAuTCDruxh7xUHv3JLY4oNIslnvsLDzo JkkkCC3J5qmSCgXWc3rHQ0BISHzrcsdEa0oEqZJQLG/aV5vBBqnEHG8h1W+2bBKPZDHska 4s/bYSWP1Z3D1JKhNp0O8CjOQq6c+yvk9eBz0QFxcPbaDGbWFT1eRvQNM68ezA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9NYp4Q9mz1LQw for ; Tue, 10 Feb 2026 14:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d6b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 14:02:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 47fb51847fde - main - ipfilter: Interface name must not extend beyond end of buffer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 14:02:54 +0000 Message-Id: <698b3a8e.3d6b9.3be1dc3a@gitrepo.freebsd.org> The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0 commit 47fb51847fdea3f1cce841b5f2bbbcd6f8a04ee0 Author: Cy Schubert AuthorDate: 2026-01-08 17:41:53 +0000 Commit: Cy Schubert CommitDate: 2026-02-10 14:02:18 +0000 ipfilter: Interface name must not extend beyond end of buffer sifpidx (an interface name) cannot extend beyond the end of the fr_names buffer. We do the validation for fr_sifpidx here because it is a union that contains an offset only when fr_sifpidx points to an interface name, an offset into fr_names. The union is an offset into fr_names in this case only. interr_tbl now becomes a static variable outside a function to facilitate its use by two functions within fil.c Note that sifpidx is only used in ipf_sync() which implments ipf -y. Reported by: Ilja Van Sprundel MFC after: 1 week --- sys/netpfil/ipfilter/netinet/fil.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c index 24ac91c69fc8..657097ca7b85 100644 --- a/sys/netpfil/ipfilter/netinet/fil.c +++ b/sys/netpfil/ipfilter/netinet/fil.c @@ -236,6 +236,11 @@ static const struct optlist secopt[] = { { IPSO_CLASS_RES1, 0x80 } }; +/* + * Internal errors set by ipf_check_names_string(). + */ +static const int interr_tbl[3] = { 152, 156, 153 }; + char ipfilter_version[] = IPL_VERSION; int ipf_features = 0 @@ -3906,7 +3911,7 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) frentry_t *frt, *start = fr; frdest_t *fdp; char *name; - int error; + int error, interr; void *ifa; int v, i; @@ -3933,6 +3938,21 @@ ipf_synclist(ipf_main_softc_t *softc, frentry_t *fr, void *ifp) } if ((fr->fr_type & ~FR_T_BUILTIN) == FR_T_IPF) { + /* + * We do the validation for fr_sifpidx here because + * it is a union that contains an offset only when + * fr_sifpidx points to an interface name, an offset + * into fr_names. The union is an offset into + * fr_names in this case only. + * + * Note that sifpidx is only used in ipf_sync() which + * implments ipf -y. + */ + if ((interr = ipf_check_names_string(fr->fr_names, fr->fr_namelen, fr->fr_sifpidx)) != 0) { + IPFERROR(interr_tbl[interr-1]); + error = EINVAL; + goto unwind; + } if (fr->fr_satype != FRI_NORMAL && fr->fr_satype != FRI_LOOKUP) { ifa = ipf_resolvenic(softc, fr->fr_names + @@ -4404,7 +4424,6 @@ frrequest(ipf_main_softc_t *softc, int unit, ioctlcmd_t req, caddr_t data, int set, int makecopy) { int error = 0, in, family, need_free = 0, interr, i; - int interr_tbl[3] = { 152, 156, 153}; enum { OP_ADD, /* add rule */ OP_REM, /* remove rule */ OP_ZERO /* zero statistics and counters */ } From nobody Tue Feb 10 14:29:28 2026 X-Original-To: dev-commits-src-main@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 4f9P8T2cC1z6RPgw for ; Tue, 10 Feb 2026 14:29:29 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9P8S4vT0z3t0F for ; Tue, 10 Feb 2026 14:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770733768; 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=BgPmITt4rH4penjKm6SoNSD85qmtI4llGzUUzoCYxsM=; b=oMuqnMbskWFbs1/mCGmsPDl5TQ3KyzP0aPVhHRShIH/YB+2iaCrmGLyLCdhfJHo8nsdF03 jwtIVaNi8Y3KwfxVVhYHGnndMWx4hD8TMdMFcrdnPzQo1ihxKBdEtt6CVIxYEbzGyeH10s bZFlxP0UEWrbJtvBpT1hA9s2bNWRn67SsDm7PvZoz0TaRhLFi9Fuk8O3Co/G3Yt77yjLFG F44QJ4o527g90ASRzFbk9dmC3BpRCg2X3U+vm+s3FJsdXCXQKs4aywRsShoVZjkcyunb3S CK3JYwt35iw144gtDXORoun3ns2s5e36fvXUU6WOaeRvd35Ow6UxkE05A3NB2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770733768; a=rsa-sha256; cv=none; b=d4r5MqT2AZsD8SoKs0gDWKrvJolls8cd82NO+vt7wsSzzWtOZ+L4nsspbFFpcU3bgTvPRp cZTSVwyLUtot144wFweM3k5xjgSA9zf97Hwzq0qHjuv2Im9/Q+FdJUxEOHbRdWG8JFvU2m wUEeTDXbq79UDC71wLkWKQaiXAox9P0WnPKpB+3xhmiE1UI9ZKQKO7fGfs0OCnFz0lNqBx TQpHz7S+eDSjcOSOIrSW+tBcBG05nFHY1UroB/hK9v+LFPWfMZzABRDcc9r4z5zsu4J32V 7st5x3gAOVNjg54uwqhZRZB0Dl8qZQ7P/p+pZflS/LlgP/uVyEHhH+mMMDBXLA== 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=1770733768; 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=BgPmITt4rH4penjKm6SoNSD85qmtI4llGzUUzoCYxsM=; b=ZPi3rcmLJKLenLvJ5OS0e2je71z46CT5ZIQhEMZdKD+C/ZJbNr4NCItucv87e2eoZbSfEL eMY1f5DU1UA5JVqUWejDL1v01DxT6uMaXDmPwuwqXUxbhysrCRIZyyp5VlVjccNbeyqZ6o KsX68PWzSrpkLw2EQP0vXRiUy9aDS2AumQm/gNlWVB1xOpxxLlrgZd1+jT0rGXxrHpmGRY LmNFZJJLbG1c4Z5AMVRKx0K0Xky6A7TnQJ7eG/w8aZLyrXkGe3Tl10+YMuvoHyjMZ7oT7/ TI7FlW1tB0lFVMqI7oKASMym69QzDz2oB5Od6ox/4JC+ieWAEppCSWm7R5ybBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9P8S46Q0z1LnJ for ; Tue, 10 Feb 2026 14:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 400ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 14:29:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 2df923c5d2d0 - main - pwd: Clean up and adopt POSIX semantics List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2df923c5d2d02350abc29f61b603c5b9615b225c Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 14:29:28 +0000 Message-Id: <698b40c8.400ae.2f2225b4@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2df923c5d2d02350abc29f61b603c5b9615b225c commit 2df923c5d2d02350abc29f61b603c5b9615b225c Author: Dag-Erling Smørgrav AuthorDate: 2026-02-10 14:29:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:29:04 +0000 pwd: Clean up and adopt POSIX semantics According to POSIX, the default should be -L. Based on code history, whoever first wrote BSD pwd(1) could not figure out how to implement -L and therefore made -P the default (and only) option. Support for -L was later added, but the default was never changed. Clean up the code, make -L the default, and rewrite getcwd_logical() to reject paths that contain dot or dot-dot, as required by POSIX. MFC after: 1 week Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D55146 --- bin/pwd/pwd.1 | 4 +-- bin/pwd/pwd.c | 99 +++++++++++++++++++++++++++++++---------------------------- 2 files changed, 54 insertions(+), 49 deletions(-) diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1 index ce81e443d98e..8b03d060bc8e 100644 --- a/bin/pwd/pwd.1 +++ b/bin/pwd/pwd.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 22, 2023 +.Dd Februrary 6, 2026 .Dt PWD 1 .Os .Sh NAME @@ -60,7 +60,7 @@ Display the physical current working directory (all symbolic links resolved). .El .Pp If no options are specified, the -.Fl P +.Fl L option is assumed. .Sh ENVIRONMENT Environment variables used by diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index a49c638b1dee..f626a2236c02 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -3,6 +3,7 @@ * * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. + * Copyright (c) 2026 Dag-Erling Smørgrav * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,40 +32,74 @@ #include #include -#include #include -#include +#include #include #include #include -static char *getcwd_logical(void); -void usage(void); +static char * +getcwd_logical(void) +{ + struct stat log, phy; + char *pwd, *p, *q; + + /* $PWD is set and absolute */ + if ((pwd = getenv("PWD")) == NULL || *pwd != '/') + return (NULL); + /* $PWD does not contain /./ or /../ */ + for (p = pwd; *p; p = q) { + for (q = ++p; *q && *q != '/'; q++) + /* nothing */; + if ((*p == '.' && q == ++p) || + (*p == '.' && q == ++p)) + return (NULL); + } + /* $PWD refers to the current directory */ + if (stat(pwd, &log) != 0 || stat(".", &phy) != 0 || + log.st_dev != phy.st_dev || log.st_ino != phy.st_ino) + return (NULL); + return (pwd); +} + +static char * +getcwd_physical(void) +{ + static char pwd[MAXPATHLEN]; + + return (getcwd(pwd, sizeof(pwd))); +} + +static void +usage(void) +{ + (void)fprintf(stderr, "usage: pwd [-L | -P]\n"); + exit(1); +} int main(int argc, char *argv[]) { - int physical; - int ch; - char *p; + char *pwd; + int opt; + bool logical; - physical = 1; - while ((ch = getopt(argc, argv, "LP")) != -1) - switch (ch) { + logical = true; + while ((opt = getopt(argc, argv, "LP")) != -1) { + switch (opt) { case 'L': - physical = 0; + logical = true; break; case 'P': - physical = 1; + logical = false; break; - case '?': default: usage(); } + } argc -= optind; argv += optind; - if (argc != 0) usage(); @@ -72,40 +107,10 @@ main(int argc, char *argv[]) * If we're trying to find the logical current directory and that * fails, behave as if -P was specified. */ - if ((!physical && (p = getcwd_logical()) != NULL) || - (p = getcwd(NULL, 0)) != NULL) - printf("%s\n", p); + if ((logical && (pwd = getcwd_logical()) != NULL) || + (pwd = getcwd_physical()) != NULL) + printf("%s\n", pwd); else err(1, "."); - exit(0); } - -void __dead2 -usage(void) -{ - - (void)fprintf(stderr, "usage: pwd [-L | -P]\n"); - exit(1); -} - -static char * -getcwd_logical(void) -{ - struct stat lg, phy; - char *pwd; - - /* - * Check that $PWD is an absolute logical pathname referring to - * the current working directory. - */ - if ((pwd = getenv("PWD")) != NULL && *pwd == '/') { - if (stat(pwd, &lg) == -1 || stat(".", &phy) == -1) - return (NULL); - if (lg.st_dev == phy.st_dev && lg.st_ino == phy.st_ino) - return (pwd); - } - - errno = ENOENT; - return (NULL); -} From nobody Tue Feb 10 14:29:29 2026 X-Original-To: dev-commits-src-main@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 4f9P8V2cBFz6RPWZ for ; Tue, 10 Feb 2026 14:29:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9P8T5rG9z3sqt for ; Tue, 10 Feb 2026 14:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770733769; 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=gvZDA5u7si3JAmeA6YNOog5V/o4k32jaIdr8GBreYuI=; b=xYjp7Tjym6m6Y06j6jkFF0rRWv8oMhAcau2QR/W4xpdw7yk5RhOWO3ci+HnCoMk8TBvBnj uv5zbr7TlLVJtqOPOiRQMbkIFxFZqgf/4SkuUXFIyIoY4G637OuJoNYHDqkOIdNzgDChhI BV4Fh9HKfczANGPtY6xV3yrDgUfjVqWen1BH210K4tScBR5PLilD0NDELcZgxD/ICcB7pY CjmflT/vNxaVLFWFgDgvvLxis0tR6G2nXWbezfgc6vhM0iNB/dIpPAahHau1FqDVWe7EBO 9ZMi78nRsXWy8jD7JHyxebONYNN0kbT5KxJ8sxxn9vZxeS4Mn+/nmVSCjF789Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770733769; a=rsa-sha256; cv=none; b=ez9XufXHUxjrtceVNsYW8ND77P3T+mESmQJez3rPkvLZ6awJsYavbXsVOViyJ/4nYyl0qO UCRgoRogIbUDTR/56xnr7qHSzpn10bVJ6deK1PjIEHM4fUWNQXwB6NJF4sedbblHDggD6b e1bI9ACrNiyvmmCKlrfHo6JesYbHHJhAgKhAJH0zsGbhmBWp9bZx06Tf8ipIUeCNE66LbT SSbXJho8lG6sXfJ/qf34BM07+mpbh18HpVItejNqu9cG+f1r0vaP4XIX+r/r/DN7HfweJ4 9cbVt/5tMjn+6KvE3gcdu3+QhhgLkfj4v6nNYHuDMQMUhjZ84k0s91g4IP8mZA== 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=1770733769; 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=gvZDA5u7si3JAmeA6YNOog5V/o4k32jaIdr8GBreYuI=; b=uDR1hSMeRkgXlS/CkUvVaHagxZgMVBvgcLSECqlB3MeFqk4/UPsqaxbeI0MiSeuIntdu6a vn5A1unbYS+IxJPKHNfsTtNy0bj5XiabA/7KkABCxpWp6FKGz2A8rOuc2oL7cqu+i/Qkyq zVUzAk9Naf3FRWvbNFZZTjkK+hoEm6wlC8kWLqsFXy9N6VOj0DK1XYbS2V1XRfp8IUoBOF ntLtkvIYcViG1/qXUWaUDdO+EIFIVlhEW8g4mfJwJVMql4gWRKSqXguF9K3UZZcRer0ZJj wzhoOStyuZZX+0x+rZiFEb1w5/rSU0QUcjPEJUOr39eRxfRp5rj6yjp8521KPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9P8T4vmWz1Lkg for ; Tue, 10 Feb 2026 14:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe94 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 14:29:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 36ec2b1c104f - main - pwd: Add tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36ec2b1c104f9e5383a160e21109e1308fce0364 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 14:29:29 +0000 Message-Id: <698b40c9.3fe94.79612a37@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=36ec2b1c104f9e5383a160e21109e1308fce0364 commit 36ec2b1c104f9e5383a160e21109e1308fce0364 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-10 14:29:08 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-10 14:29:08 +0000 pwd: Add tests MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55153 --- bin/pwd/Makefile | 8 ++++-- bin/pwd/tests/Makefile | 4 +++ bin/pwd/tests/pwd_test.sh | 73 +++++++++++++++++++++++++++++++++++++++++++++++ etc/mtree/BSD.tests.dist | 2 ++ 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile index f6065e1d5b9f..cda245fadc94 100644 --- a/bin/pwd/Makefile +++ b/bin/pwd/Makefile @@ -1,4 +1,8 @@ -PACKAGE=runtime -PROG= pwd +.include + +PACKAGE= runtime +PROG= pwd +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests .include diff --git a/bin/pwd/tests/Makefile b/bin/pwd/tests/Makefile new file mode 100644 index 000000000000..8ce05fc4ae6f --- /dev/null +++ b/bin/pwd/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= pwd_test + +.include diff --git a/bin/pwd/tests/pwd_test.sh b/bin/pwd/tests/pwd_test.sh new file mode 100644 index 000000000000..e418e56a89fa --- /dev/null +++ b/bin/pwd/tests/pwd_test.sh @@ -0,0 +1,73 @@ +# +# Copyright (c) 2026 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case logical +logical_head() +{ + atf_set "descr" "Cases where pwd prints the " \ + "logical working directory" +} +logical_body() +{ + root=$(realpath $PWD) + atf_check mkdir -p phy/baz + atf_check ln -s phy log + cd log/baz + + # explicitly request logical + export PWD="$root/log/baz" + atf_check -o inline:"$root/log/baz\n" pwd -L + atf_check -o inline:"$root/log/baz\n" pwd -P -L + + # logical is also the default + export PWD="$root/log/baz" + atf_check -o inline:"$root/log/baz\n" pwd +} + +atf_test_case physical +physical_head() +{ + atf_set "descr" "Cases where pwd prints the " \ + "physical working directory" +} +physical_body() +{ + root=$(realpath $PWD) + atf_check mkdir -p phy/baz + atf_check ln -s phy log + cd log/baz + + # explicitly request physical + export PWD="$root/log/baz" + atf_check -o inline:"$root/phy/baz\n" pwd -P + atf_check -o inline:"$root/phy/baz\n" pwd -L -P + + # request logical but $PWD is relative + export PWD="log/baz" + atf_check -o inline:"$root/phy/baz\n" pwd -L + + # request logical but $PWD contains dot + export PWD="$root/log/./baz" + atf_check -o inline:"$root/phy/baz\n" pwd -L + + # request logical but $PWD contains dot-dot + export PWD="$root/log/../log/baz" + atf_check -o inline:"$root/phy/baz\n" pwd -L + + # request logical but $PWD does not exist + export PWD="$root/baz" + atf_check -o inline:"$root/phy/baz\n" pwd -L + + # request logical but $PWD does not match + export PWD="$root/log" + atf_check -o inline:"$root/phy/baz\n" pwd -L +} + +atf_init_test_cases() +{ + atf_add_test_case logical + atf_add_test_case physical +} diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 97b3bdefe8d4..1895877c82eb 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -49,6 +49,8 @@ .. pwait .. + pwd + .. rm .. rmdir From nobody Tue Feb 10 14:34:12 2026 X-Original-To: dev-commits-src-main@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 4f9PFw3JzQz6RPwC for ; Tue, 10 Feb 2026 14:34:12 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9PFw2Y3mz3vWD for ; Tue, 10 Feb 2026 14:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770734052; 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=C3EPzijKKudf06TsZzbNfoRJa6SZVut9IS9glEKAJus=; b=mJEF3NlwpmO0506ep3Ew6T1Y5yu3x+enTlItRdcapoc4fB2fdQBlXSnBaqJ9T+cJe5csVs pILkYG2onTpfov9nD4gHRB/TItE5Hd7S1ZoZe7qAcAkzLGHYHue+EMTPKdizQo65uLqr6Z Y5uB2VZsW7VKFwNwpv166tnRwH+9nHJNbPQi+A5U7Zq66t/rZgVQNgEvNb+4Mtd0AaJNkP W/jjW4NZSqZpFscfosy0fzvWtfN/Zxxxc9/tBYDC9pl1mCx1WyyB8F7xylqVlNn8ltKXES q2CrWi7aMVrtjeL1ZgFBVrgKwcN8M1TN4wrEsf7JLURWPgIWqHFzqQn+amjGMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770734052; a=rsa-sha256; cv=none; b=b9EIxYbEm02w+2y+Si89vFZEhgOz1pbj2d51G1iJV7GbQ/jux3rqtGEAcqHkwZzn7q1RaG qGCBaKVCfJPdhEzWYkbQENuustSxSxcR9lrL3Nxm0MWOb+B5UK0iIz9ywxIdtjfBI825b+ cLU9vETIV9hFvl9OTTjhc9fJwu0OBzlelV1RSld/sK6crQlBhEBHMxSwdxvEng3wgorNrB VxWGhROq6gNDJYTr8wgV5KaJYGiUSucRi5P7lbLS0JiDD8nfNecdvC1UCBQhiFKg919+i0 yOdicLEfSyCyqakDPmUgLwQvmqPSDsn8rjp3RakFDGFSCl4YUx8P1bFIpffIVw== 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=1770734052; 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=C3EPzijKKudf06TsZzbNfoRJa6SZVut9IS9glEKAJus=; b=g3JAscOHb9eIHDkhYEVluj11PEJXi5PammRI0zp0TccxAXVWN34xe35zeSVfq7to59kzVH yoNGUI3pvuL+X287w72RGuTL+MXwPh9nSzRSlDyUr3FUYzxcwGFNFeRtGqml8wLlFBe9a9 UfCaJIT4j5RoifOiB/gl2jJ3mJoDGNjUh5T0gqCdFmifm0fDRnhEeA0td2idRlK4pf0CWK GZcHNKp+PCjWFeWBoEL30VMFT0vf5mE46wWJYBB0jSyjr8zHfiFfF66dl5wZJj/8RMSc1C YQnKllhkbIKG4ABABY1zoaUx6fTv30bEspLAaPQuZbAgUHH569Gmx6hQk+zUqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9PFw23Fdz1Lyl for ; Tue, 10 Feb 2026 14:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41324 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 14:34:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 212272a43767 - main - mtree: stop creating /usr/share/doc/ncurses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 212272a43767c3d7be3ddb87605612f6164774c1 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 14:34:12 +0000 Message-Id: <698b41e4.41324.7fe9cdff@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=212272a43767c3d7be3ddb87605612f6164774c1 commit 212272a43767c3d7be3ddb87605612f6164774c1 Author: Dimitry Andric AuthorDate: 2026-02-10 14:32:52 +0000 Commit: Dimitry Andric CommitDate: 2026-02-10 14:34:03 +0000 mtree: stop creating /usr/share/doc/ncurses In base 68ad2b0d7af2a the ncurses html documentation was removed, and entries added to ObsoleteFiles.inc to get rid of /usr/share/doc/ncurses, but the directory was still being re-created via BSD.usr.dist. Remove it from there too. Fixes: 68ad2b0d7af2a MFC after: 1 month --- etc/mtree/BSD.usr.dist | 2 -- 1 file changed, 2 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index e371efd95350..3366bf939948 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -246,8 +246,6 @@ clang tags=package=clang .. .. - ncurses - .. ntp drivers icons From nobody Tue Feb 10 15:09:27 2026 X-Original-To: dev-commits-src-main@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 4f9Q2c2KLpz6RS65 for ; Tue, 10 Feb 2026 15:09:28 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Q2c08Snz42tZ for ; Tue, 10 Feb 2026 15:09:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770736168; 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=IsUz8+X+M9BSRdvJlrEBFX+/VvpFp13s9HNWNEj2L1c=; b=Gf/3IreWZwN5vwAyOcMc9h0p1hfFUb73b8McTr+zMggc4LRi9BSBynMgnp477xfos4jLL4 fDCp0wDQ+fV5EmvskYRF3TKfH/GxL7ZYfDGLENEl1/yYOymity4i/glT/Z4REYL+bL75Nl taf4jeH0IiOnTvueQwTR+zNJD2eXeuG22lnhxp4eKl61joNMVmeRq1OYtiW1Jx9tzIBwPH Qxtc0052Y3Pwv8H5OW+kVOWHuBq4cfARcsyZNARF38dmTrHncSUwcwP3LXfqPlhPfbV6eN x3DfIiardDP4p2PYpwN5nDx/RjLvsFdplCKK9oF1zJo1gd0G825It9VC9q4mIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770736168; a=rsa-sha256; cv=none; b=S2HsWDRj+NjvSf2w8cKarKTCenbrg+1apd9p+WbXBlsc+UvZUXqy65p5VzMLSof4m0g+ak B1XogX/I476McmKOPYEuNLp/C4kP/XUx88CLxMfqeURaEAj98giobZVhLw4D8JmLApP4Kl +vn/ND8A1L7cVsAFexym4HHUizVIm1H2CoUYWqHLBVDIstUpU0sZPqMaJ604TQkrk5HKoW lFV30fM9um3xX/tXSO697h9elnjPRkMXIsPdtmWu/2xQ78c4JI1RtP9riJMe7BXv28vHtm B1EZN4ohfoQXYur+oNS0L69Vt/jpmmuJzdDjOF/cVO3HQUzJL4nhqfeYap9ilA== 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=1770736168; 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=IsUz8+X+M9BSRdvJlrEBFX+/VvpFp13s9HNWNEj2L1c=; b=k+KHG74xAmnywx273xyAQWDD6RVwSGjwYYqh9zbpXYbpIJA8IKEJMp+GwUc9408uLixg4J 6WC+dLaVCxGkoXIWBVx8cOcva77EJZeQWN1A1CkWHl+So6sLNxfwa9nkfsFwc5T2Ykc6DV I9m/RmTCEnWt6V2FjQjSAfazu0S322FtqgFagjBLCMwdJ1CJwN+NGWMNgKRoQZRSWQjUrr CxMnwUrsO3OnbDpuHcv3uwgPkXLOB06qO7bxZwnb+wK6TjxmcM8d0MiypgDMxWa5sLt3yW lve0n4uO5VJqaWFQldwkuZjFDmnqXk5c2IAEJTjv0mMZrwRFq/X6ieDSGgE1rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Q2b5qkzz1MVH for ; Tue, 10 Feb 2026 15:09:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43b9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:09:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: a485399f8834 - main - tcp: restrict flowtype copying to specific RSS TCP types List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a485399f88348efbe52aad2fa9b14af8b9ae55c7 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:09:27 +0000 Message-Id: <698b4a27.43b9f.2290244f@gitrepo.freebsd.org> The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=a485399f88348efbe52aad2fa9b14af8b9ae55c7 commit a485399f88348efbe52aad2fa9b14af8b9ae55c7 Author: Cheng Cui AuthorDate: 2026-02-09 22:39:50 +0000 Commit: Cheng Cui CommitDate: 2026-02-10 15:08:57 +0000 tcp: restrict flowtype copying to specific RSS TCP types Reviewed by: gallatin, tuexen Differential Revision: https://reviews.freebsd.org/D55196 --- sys/netinet/tcp_syncache.c | 4 ++-- sys/sys/mbuf.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index 4b501b221bcb..1d628bce0d80 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1173,7 +1173,7 @@ syncache_expand(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, return (-1); /* Do not send RST */ } #endif /* TCP_SIGNATURE */ - if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + if (m != NULL && M_HASHTYPE_ISHASH_TCP(m)) { sc->sc_flowid = m->m_pkthdr.flowid; sc->sc_flowtype = M_HASHTYPE_GET(m); } @@ -1771,7 +1771,7 @@ syncache_add(struct in_conninfo *inc, struct tcpopt *to, struct tcphdr *th, sc->sc_flowlabel = htonl(sc->sc_flowlabel) & IPV6_FLOWLABEL_MASK; } #endif - if (m != NULL && M_HASHTYPE_GET(m) != M_HASHTYPE_NONE) { + if (m != NULL && M_HASHTYPE_ISHASH_TCP(m)) { sc->sc_flowid = m->m_pkthdr.flowid; sc->sc_flowtype = M_HASHTYPE_GET(m); } diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h index 1f1b05857ebf..1e09891d259f 100644 --- a/sys/sys/mbuf.h +++ b/sys/sys/mbuf.h @@ -579,6 +579,10 @@ m_epg_pagelen(const struct mbuf *m, int pidx, int pgoff) #define M_HASHTYPE_TEST(m, v) (M_HASHTYPE_GET(m) == (v)) #define M_HASHTYPE_ISHASH(m) \ (((m)->m_pkthdr.rsstype & M_HASHTYPE_HASHPROP) != 0) +#define M_HASHTYPE_ISHASH_TCP(m) \ + (((m)->m_pkthdr.rsstype & (M_HASHTYPE_RSS_TCP_IPV4 | \ + M_HASHTYPE_RSS_TCP_IPV6 | \ + M_HASHTYPE_RSS_TCP_IPV6_EX)) != 0) #define M_HASHTYPE_SETINNER(m) do { \ (m)->m_pkthdr.rsstype |= M_HASHTYPE_INNER; \ } while (0) From nobody Tue Feb 10 15:10:56 2026 X-Original-To: dev-commits-src-main@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 4f9Q4K0ft3z6RSrx for ; Tue, 10 Feb 2026 15:10:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Q4J64hqz43CY for ; Tue, 10 Feb 2026 15:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770736256; 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=Ao4UQ69IHDzQ7j0Ng4DeH7UYXpOlMF7Mqo3gj7f4Ieo=; b=jTZjtkjaP4dB/Ba+bgtFgkYRnlGjUp0GaAz/I2f2fJzhG5zrlEhLC67yp/o0N4ebvd95tN KTRPyVhtrb79yv6Q08rmwt0anpN/8o+phYekjiiQepZg6EEZ+16HsalgtRYAH0b6+DBPsz u6cTVR3TtGE4bJySAZC1eGPXVu8Rm7KVNXzf5S7je7cqMB74AZIcCV0Zjl2ewg4f4bIxIv Yrh2Y/8jaczNciSbM4OldZyAz0b9p/dQRCnItH5emZ80vM7DoXvUlNOpYHCphQT1NpDeXa vMqi2H1RfH8AnNhjR/EniU7uV+7dDipziIXj6DssfilM3+woYWQNJeSmHtmtBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770736256; a=rsa-sha256; cv=none; b=Td19qXM/FpeG4QrSAovutJJji5jTcbz3WOuzLv86yiGsv5eb5K5r6QmjVNYUSZeuAjgrOc WwHHXcOMWhV+D0nMRDFWHAdd9skR4uWcOxVsQvZTdjP6kzdoF8ZZ1im5Gi5XUGbrSvjS5Y Qkp3aqAoKH55uMqpMEe4duSrQh+FuWj7Q3t7aI6btqhqthNlWgxoUC8vci54C4vlAnZnQx wnduqspaTMh5MYjCYttsMZd7vsTv+gjB5HLjP+GMl6LNzUitAWZiAVFIcQhJlGjlTMfFhW 8RBYXMF3uj0/eK9/gt3rgFfIo69XrKs026K3crcW2Lxk/jTyXKjLsAuMBf3r5Q== 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=1770736256; 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=Ao4UQ69IHDzQ7j0Ng4DeH7UYXpOlMF7Mqo3gj7f4Ieo=; b=vFTZIRlGMn2gC33reulxmfvGAEm4DPUABIY5X/pcYOfV4iqseF2q8Jlk0qvzHOX/Em4nAG OWQrIuGjBt2WmMTAG90tUY+aEOTl9sFSr6VClCHxSw/TvRFCw5AeVLaDLPoLK4MEh9t7ps NunnJs+tOZ0PXAbBDtqdOkhC7nNXyqBAGEZlUTRuAJ8BgRCQSW7z8DTI3xIbJ2VtUHOUzK 0unlAlrPQ2Q5ezP4FVSVfGmEnpfB+BUQDBh+0xF4Iu8cHefQRPP9ROqPOZrZZmqxFXorqT tgN2Z00tldPWSIn1Wl82F365aJS8T94mEL9lT4rJ8z8ckzFd87JeFIkk9IrSNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Q4J5S37z1Mln for ; Tue, 10 Feb 2026 15:10:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44429 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:10:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 4c23a98ba3af - main - asan: Use memset_early() to fill shadow memory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c23a98ba3af3a00004fd7ef54e6330b4d665d55 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:10:56 +0000 Message-Id: <698b4a80.44429.ff2105c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4c23a98ba3af3a00004fd7ef54e6330b4d665d55 commit 4c23a98ba3af3a00004fd7ef54e6330b4d665d55 Author: Mark Johnston AuthorDate: 2026-02-10 13:53:52 +0000 Commit: Mark Johnston CommitDate: 2026-02-10 15:10:39 +0000 asan: Use memset_early() to fill shadow memory __builtin_memset() calls are replaced with calls to memset(), but that can't be used before ifunc relocations are processed if the implementation is selected at boot time. Meanwhile, the sanitizer may emit calls to __asan_set_shadow_*() as soon as locore jumps into C code, before ifuncs are selected. Just unconditionally use memset_early() to work around this. Reported by: andrew MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55079 --- sys/kern/subr_asan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index fee6c1a844e2..867d232198b9 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -241,7 +241,7 @@ kasan_shadow_Nbyte_fill(const void *addr, size_t size, uint8_t code) shad = (void *)kasan_md_addr_to_shad((uintptr_t)addr); size = size >> KASAN_SHADOW_SCALE_SHIFT; - __builtin_memset(shad, code, size); + memset_early(shad, code, size); } /* @@ -1168,7 +1168,7 @@ __asan_handle_no_return(void) void __asan_set_shadow_##byte(void *, size_t); \ void __asan_set_shadow_##byte(void *addr, size_t size) \ { \ - __builtin_memset((void *)addr, 0x##byte, size); \ + memset_early((void *)addr, 0x##byte, size); \ } ASAN_SET_SHADOW(00); From nobody Tue Feb 10 15:13:25 2026 X-Original-To: dev-commits-src-main@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 4f9Q793g3rz6RTB6 for ; Tue, 10 Feb 2026 15:13:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Q793Chgz44CK for ; Tue, 10 Feb 2026 15:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770736405; 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=846d05Fw75Ejj0aVlgFZls+Cx5vAqYYtcXlv4bFN9jo=; b=fik7YRZ+287XRkwaM2SPKD2KAlBCgtgQqGu4OJkvWLBc88upqodcrv5/dTd6oh88Bovw4o oHREeoW7uADfOXaarJpJVQn/NXnXKI0JtCRhrvdjkMgLKNVCO9IaUGpHk/BzEf0AhZWt/2 fU1aCyd8sYo410XWyjRsj4RouvW/J6Uy9KbAowbTTtAAtKDcUQmnj+xGVOJXn/Zeu9/Zv8 qImvCjtQxp4LmWKWmDBCeIJKM8LIOEuSTC8Pdaf0421UHxOVtjD5Ydj4XQcAq3G6JeKtnQ feFEK5RAPKvFzGUivbsBnnDcjFC0Vi/fDkBDLYtRHwMcQog1q1y0T+InS5XigA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770736405; a=rsa-sha256; cv=none; b=qIWAB9jO/ykSmQVwguD5on2Mqan2aT3dwqbNojetCuET3wnzsv5ZioO++4wCSIGGjGa00U aiA0iRO2cfCSw5ePuoPYbcTSPY4RKs00kpUOi9PeHYyUq9uj3h8KonVz90mPRTysKTYx9J 6tz3Y7yWFQ3HhY359xGipZa/J1q+LBkAZabJomy28fCErQsaSoBzJwIqXL8vq9SmUrXpdo Tp7CfsyDY9kV6fS2iZgkWkIJQ4HU4AAaazfWZD6YytGvsSR6SMDvz/czEJGo3YlCs6nIDG oFvweva05Dh4FEZqMU5WFbYRIU274JXHhspb9NDEN8jvl/Zx1Ohc2yFlYHdGrw== 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=1770736405; 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=846d05Fw75Ejj0aVlgFZls+Cx5vAqYYtcXlv4bFN9jo=; b=FlzZAvv8lo2kTu4/1i/8rLMNkbvi009U7K3ET6HaiDRvBguy5x4boax0xknmogwbzES0f8 2+BlqPJtZAuzii6hU5zKc43iLL4EodEKKHHiJkY5r5iP9vwkT/4gQsJyi0SoiG74i4MwLj PiOKChi91VMJ0MQt6+D+f5wNXdiLXtsZZoIIZIdSkWnxNJprOpctOt/racNMK78f6f/j8y 9v+Ldu1xsfHa8lZK4pKetLEfNHG6wN5LqCPi1pq1YmpRCh6S9e6UUU7wlzmpUxURLjm+GU V1ZPbjaZuMJOaL42NEhfukGkGUei3oT56NTrAdd9MUx9O8I+OAqpCoianmb/Qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Q792kbNz1Mm9 for ; Tue, 10 Feb 2026 15:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4207f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:13:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 083f8f33304a - main - ath10k: update Atheros/QCA's ath10k driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 083f8f33304ab105d0b556bdc244c9fa73068b67 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:13:25 +0000 Message-Id: <698b4b15.4207f.4214c64e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=083f8f33304ab105d0b556bdc244c9fa73068b67 commit 083f8f33304ab105d0b556bdc244c9fa73068b67 Merge: 4c23a98ba3af 91a3131f2f8e Author: Bjoern A. Zeeb AuthorDate: 2026-02-10 15:12:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 15:12:28 +0000 ath10k: update Atheros/QCA's ath10k driver This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b ( tag: v6.19 ). Sponsored by: The FreeBSD Foundation MFC after: 3 days sys/contrib/dev/athk/ath10k/ce.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --cc sys/contrib/dev/athk/ath10k/ce.c index 719957ac87e4,000000000000..d53ecebcf992 mode 100644,000000..100644 --- a/sys/contrib/dev/athk/ath10k/ce.c +++ b/sys/contrib/dev/athk/ath10k/ce.c @@@ -1,1975 -1,0 +1,1975 @@@ +// SPDX-License-Identifier: ISC +/* + * Copyright (c) 2005-2011 Atheros Communications Inc. + * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. + * Copyright (c) 2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. + */ + +#include +#include "hif.h" +#include "ce.h" +#include "debug.h" + +/* + * Support for Copy Engine hardware, which is mainly used for + * communication between Host and Target over a PCIe interconnect. + */ + +/* + * A single CopyEngine (CE) comprises two "rings": + * a source ring + * a destination ring + * + * Each ring consists of a number of descriptors which specify + * an address, length, and meta-data. + * + * Typically, one side of the PCIe/AHB/SNOC interconnect (Host or Target) + * controls one ring and the other side controls the other ring. + * The source side chooses when to initiate a transfer and it + * chooses what to send (buffer address, length). The destination + * side keeps a supply of "anonymous receive buffers" available and + * it handles incoming data as it arrives (when the destination + * receives an interrupt). + * + * The sender may send a simple buffer (address/length) or it may + * send a small list of buffers. When a small list is sent, hardware + * "gathers" these and they end up in a single destination buffer + * with a single interrupt. + * + * There are several "contexts" managed by this layer -- more, it + * may seem -- than should be needed. These are provided mainly for + * maximum flexibility and especially to facilitate a simpler HIF + * implementation. There are per-CopyEngine recv, send, and watermark + * contexts. These are supplied by the caller when a recv, send, + * or watermark handler is established and they are echoed back to + * the caller when the respective callbacks are invoked. There is + * also a per-transfer context supplied by the caller when a buffer + * (or sendlist) is sent and when a buffer is enqueued for recv. + * These per-transfer contexts are echoed back to the caller when + * the buffer is sent/received. + */ + +static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar, + struct ath10k_ce_pipe *ce_state) +{ + u32 ce_id = ce_state->id; + u32 addr = 0; + + switch (ce_id) { + case 0: + addr = 0x00032000; + break; + case 3: + addr = 0x0003200C; + break; + case 4: + addr = 0x00032010; + break; + case 5: + addr = 0x00032014; + break; + case 7: + addr = 0x0003201C; + break; + default: + ath10k_warn(ar, "invalid CE id: %d", ce_id); + break; + } + return addr; +} + +static inline unsigned int +ath10k_set_ring_byte(unsigned int offset, + const struct ath10k_hw_ce_regs_addr_map *addr_map) +{ + return ((offset << addr_map->lsb) & addr_map->mask); +} + +static inline u32 ath10k_ce_read32(struct ath10k *ar, u32 offset) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + return ce->bus_ops->read32(ar, offset); +} + +static inline void ath10k_ce_write32(struct ath10k *ar, u32 offset, u32 value) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + ce->bus_ops->write32(ar, offset, value); +} + +static inline void ath10k_ce_dest_ring_write_index_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dst_wr_index_addr, n); +} + +static inline u32 ath10k_ce_dest_ring_write_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + return ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dst_wr_index_addr); +} + +static inline void ath10k_ce_src_ring_write_index_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_wr_index_addr, n); +} + +static inline u32 ath10k_ce_src_ring_write_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + return ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_wr_index_addr); +} + +static inline u32 ath10k_ce_src_ring_read_index_from_ddr(struct ath10k *ar, + u32 ce_id) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + return ce->vaddr_rri[ce_id] & CE_DDR_RRI_MASK; +} + +static inline u32 ath10k_ce_src_ring_read_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + u32 ce_id = COPY_ENGINE_ID(ce_ctrl_addr); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 index; + + if (ar->hw_params.rri_on_ddr && + (ce_state->attr_flags & CE_ATTR_DIS_INTR)) + index = ath10k_ce_src_ring_read_index_from_ddr(ar, ce_id); + else + index = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->current_srri_addr); + + return index; +} + +static inline void +ath10k_ce_shadow_src_ring_write_index_set(struct ath10k *ar, + struct ath10k_ce_pipe *ce_state, + unsigned int value) +{ + ath10k_ce_write32(ar, shadow_sr_wr_ind_addr(ar, ce_state), value); +} + +static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar, + u32 ce_id, + u64 addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id); + u32 addr_lo = lower_32_bits(addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_base_addr_lo, addr_lo); + + if (ce_state->ops->ce_set_src_ring_base_addr_hi) { + ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr, + addr); + } +} + +static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar, + u32 ce_ctrl_addr, + u64 addr) +{ + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK; + + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_base_addr_hi, addr_hi); +} + +static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->sr_size_addr, n); +} + +static inline void ath10k_ce_src_ring_dmax_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; + + u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ctrl_regs->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ctrl_regs->addr, + (ctrl1_addr & ~(ctrl_regs->dmax->mask)) | + ath10k_set_ring_byte(n, ctrl_regs->dmax)); +} + +static inline void ath10k_ce_src_ring_byte_swap_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; + + u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ctrl_regs->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ctrl_regs->addr, + (ctrl1_addr & ~(ctrl_regs->src_ring->mask)) | + ath10k_set_ring_byte(n, ctrl_regs->src_ring)); +} + +static inline void ath10k_ce_dest_ring_byte_swap_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_ctrl1 *ctrl_regs = ar->hw_ce_regs->ctrl1_regs; + + u32 ctrl1_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ctrl_regs->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ctrl_regs->addr, + (ctrl1_addr & ~(ctrl_regs->dst_ring->mask)) | + ath10k_set_ring_byte(n, ctrl_regs->dst_ring)); +} + +static inline + u32 ath10k_ce_dest_ring_read_index_from_ddr(struct ath10k *ar, u32 ce_id) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + + return (ce->vaddr_rri[ce_id] >> CE_DDR_DRRI_SHIFT) & + CE_DDR_RRI_MASK; +} + +static inline u32 ath10k_ce_dest_ring_read_index_get(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + u32 ce_id = COPY_ENGINE_ID(ce_ctrl_addr); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 index; + + if (ar->hw_params.rri_on_ddr && + (ce_state->attr_flags & CE_ATTR_DIS_INTR)) + index = ath10k_ce_dest_ring_read_index_from_ddr(ar, ce_id); + else + index = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->current_drri_addr); + + return index; +} + +static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k *ar, + u32 ce_id, + u64 addr) +{ + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id]; + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id); + u32 addr_lo = lower_32_bits(addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_base_addr_lo, addr_lo); + + if (ce_state->ops->ce_set_dest_ring_base_addr_hi) { + ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr, + addr); + } +} + +static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar, + u32 ce_ctrl_addr, + u64 addr) +{ + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK; + u32 reg_value; + + reg_value = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_base_addr_hi); + reg_value &= ~CE_DESC_ADDR_HI_MASK; + reg_value |= addr_hi; + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_base_addr_hi, reg_value); +} + +static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + ath10k_ce_write32(ar, ce_ctrl_addr + + ar->hw_ce_regs->dr_size_addr, n); +} + +static inline void ath10k_ce_src_ring_highmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm->addr, + (addr & ~(srcr_wm->wm_high->mask)) | + (ath10k_set_ring_byte(n, srcr_wm->wm_high))); +} + +static inline void ath10k_ce_src_ring_lowmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_dst_src_wm_regs *srcr_wm = ar->hw_ce_regs->wm_srcr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + srcr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + srcr_wm->addr, + (addr & ~(srcr_wm->wm_low->mask)) | + (ath10k_set_ring_byte(n, srcr_wm->wm_low))); +} + +static inline void ath10k_ce_dest_ring_highmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm->addr, + (addr & ~(dstr_wm->wm_high->mask)) | + (ath10k_set_ring_byte(n, dstr_wm->wm_high))); +} + +static inline void ath10k_ce_dest_ring_lowmark_set(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int n) +{ + const struct ath10k_hw_ce_dst_src_wm_regs *dstr_wm = ar->hw_ce_regs->wm_dstr; + u32 addr = ath10k_ce_read32(ar, ce_ctrl_addr + dstr_wm->addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + dstr_wm->addr, + (addr & ~(dstr_wm->wm_low->mask)) | + (ath10k_set_ring_byte(n, dstr_wm->wm_low))); +} + +static inline void ath10k_ce_copy_complete_inter_enable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + const struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie; + + u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->host_ie_addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ar->hw_ce_regs->host_ie_addr, + host_ie_addr | host_ie->copy_complete->mask); +} + +static inline void ath10k_ce_copy_complete_intr_disable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + const struct ath10k_hw_ce_host_ie *host_ie = ar->hw_ce_regs->host_ie; + + u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->host_ie_addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ar->hw_ce_regs->host_ie_addr, + host_ie_addr & ~(host_ie->copy_complete->mask)); +} + +static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs; + + u32 host_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr + + ar->hw_ce_regs->host_ie_addr); + + ath10k_ce_write32(ar, ce_ctrl_addr + ar->hw_ce_regs->host_ie_addr, + host_ie_addr & ~(wm_regs->wm_mask)); +} + +static inline void ath10k_ce_error_intr_disable(struct ath10k *ar, + u32 ce_ctrl_addr) +{ + const struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs; + + u32 misc_ie_addr = ath10k_ce_read32(ar, + ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr); + + ath10k_ce_write32(ar, + ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr, + misc_ie_addr & ~(misc_regs->err_mask)); +} + +static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar, + u32 ce_ctrl_addr, + unsigned int mask) +{ + const struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs; + + ath10k_ce_write32(ar, ce_ctrl_addr + wm_regs->addr, mask); +} + +/* + * Guts of ath10k_ce_send. + * The caller takes responsibility for any needed locking. + */ +static int _ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce_ring *src_ring = ce_state->src_ring; + struct ce_desc *desc, sdesc; + unsigned int nentries_mask = src_ring->nentries_mask; + unsigned int sw_index = src_ring->sw_index; + unsigned int write_index = src_ring->write_index; + u32 ctrl_addr = ce_state->ctrl_addr; + u32 desc_flags = 0; + int ret = 0; + + if (nbytes > ce_state->src_sz_max) + ath10k_warn(ar, "%s: send more we can (nbytes: %d, max: %d)\n", + __func__, nbytes, ce_state->src_sz_max); + + if (unlikely(CE_RING_DELTA(nentries_mask, + write_index, sw_index - 1) <= 0)) { + ret = -ENOSR; + goto exit; + } + + desc = CE_SRC_RING_TO_DESC(src_ring->base_addr_owner_space, + write_index); + + desc_flags |= SM(transfer_id, CE_DESC_FLAGS_META_DATA); + + if (flags & CE_SEND_FLAG_GATHER) + desc_flags |= CE_DESC_FLAGS_GATHER; + if (flags & CE_SEND_FLAG_BYTE_SWAP) + desc_flags |= CE_DESC_FLAGS_BYTE_SWAP; + + sdesc.addr = __cpu_to_le32(buffer); + sdesc.nbytes = __cpu_to_le16(nbytes); + sdesc.flags = __cpu_to_le16(desc_flags); + + *desc = sdesc; + + src_ring->per_transfer_context[write_index] = per_transfer_context; + + /* Update Source Ring Write Index */ + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + + /* WORKAROUND */ + if (!(flags & CE_SEND_FLAG_GATHER)) + ath10k_ce_src_ring_write_index_set(ar, ctrl_addr, write_index); + + src_ring->write_index = write_index; +exit: + return ret; +} + +static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce_ring *src_ring = ce_state->src_ring; + struct ce_desc_64 *desc, sdesc; + unsigned int nentries_mask = src_ring->nentries_mask; + unsigned int sw_index; + unsigned int write_index = src_ring->write_index; + u32 ctrl_addr = ce_state->ctrl_addr; + __le32 *addr; + u32 desc_flags = 0; + int ret = 0; + + if (test_bit(ATH10K_FLAG_CRASH_FLUSH, &ar->dev_flags)) + return -ESHUTDOWN; + + if (nbytes > ce_state->src_sz_max) + ath10k_warn(ar, "%s: send more we can (nbytes: %d, max: %d)\n", + __func__, nbytes, ce_state->src_sz_max); + + if (ar->hw_params.rri_on_ddr) + sw_index = ath10k_ce_src_ring_read_index_from_ddr(ar, ce_state->id); + else + sw_index = src_ring->sw_index; + + if (unlikely(CE_RING_DELTA(nentries_mask, + write_index, sw_index - 1) <= 0)) { + ret = -ENOSR; + goto exit; + } + + desc = CE_SRC_RING_TO_DESC_64(src_ring->base_addr_owner_space, + write_index); + + desc_flags |= SM(transfer_id, CE_DESC_FLAGS_META_DATA); + + if (flags & CE_SEND_FLAG_GATHER) + desc_flags |= CE_DESC_FLAGS_GATHER; + + if (flags & CE_SEND_FLAG_BYTE_SWAP) + desc_flags |= CE_DESC_FLAGS_BYTE_SWAP; + + addr = (__le32 *)&sdesc.addr; + + flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK; + addr[0] = __cpu_to_le32(buffer); + addr[1] = __cpu_to_le32(flags); + if (flags & CE_SEND_FLAG_GATHER) + addr[1] |= __cpu_to_le32(CE_WCN3990_DESC_FLAGS_GATHER); + else + addr[1] &= ~(__cpu_to_le32(CE_WCN3990_DESC_FLAGS_GATHER)); + + sdesc.nbytes = __cpu_to_le16(nbytes); + sdesc.flags = __cpu_to_le16(desc_flags); + + *desc = sdesc; + + src_ring->per_transfer_context[write_index] = per_transfer_context; + + /* Update Source Ring Write Index */ + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + + if (!(flags & CE_SEND_FLAG_GATHER)) { + if (ar->hw_params.shadow_reg_support) + ath10k_ce_shadow_src_ring_write_index_set(ar, ce_state, + write_index); + else + ath10k_ce_src_ring_write_index_set(ar, ctrl_addr, + write_index); + } + + src_ring->write_index = write_index; +exit: + return ret; +} + +int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + return ce_state->ops->ce_send_nolock(ce_state, per_transfer_context, + buffer, nbytes, transfer_id, flags); +} +EXPORT_SYMBOL(ath10k_ce_send_nolock); + +void __ath10k_ce_send_revert(struct ath10k_ce_pipe *pipe) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *src_ring = pipe->src_ring; + u32 ctrl_addr = pipe->ctrl_addr; + + lockdep_assert_held(&ce->ce_lock); + + /* + * This function must be called only if there is an incomplete + * scatter-gather transfer (before index register is updated) + * that needs to be cleaned up. + */ + if (WARN_ON_ONCE(src_ring->write_index == src_ring->sw_index)) + return; + + if (WARN_ON_ONCE(src_ring->write_index == + ath10k_ce_src_ring_write_index_get(ar, ctrl_addr))) + return; + + src_ring->write_index--; + src_ring->write_index &= src_ring->nentries_mask; + + src_ring->per_transfer_context[src_ring->write_index] = NULL; +} +EXPORT_SYMBOL(__ath10k_ce_send_revert); + +int ath10k_ce_send(struct ath10k_ce_pipe *ce_state, + void *per_transfer_context, + dma_addr_t buffer, + unsigned int nbytes, + unsigned int transfer_id, + unsigned int flags) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int ret; + + spin_lock_bh(&ce->ce_lock); + ret = ath10k_ce_send_nolock(ce_state, per_transfer_context, + buffer, nbytes, transfer_id, flags); + spin_unlock_bh(&ce->ce_lock); + + return ret; +} +EXPORT_SYMBOL(ath10k_ce_send); + +int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int delta; + + spin_lock_bh(&ce->ce_lock); + delta = CE_RING_DELTA(pipe->src_ring->nentries_mask, + pipe->src_ring->write_index, + pipe->src_ring->sw_index - 1); + spin_unlock_bh(&ce->ce_lock); + + return delta; +} +EXPORT_SYMBOL(ath10k_ce_num_free_src_entries); + +int __ath10k_ce_rx_num_free_bufs(struct ath10k_ce_pipe *pipe) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + unsigned int sw_index = dest_ring->sw_index; + + lockdep_assert_held(&ce->ce_lock); + + return CE_RING_DELTA(nentries_mask, write_index, sw_index - 1); +} +EXPORT_SYMBOL(__ath10k_ce_rx_num_free_bufs); + +static int __ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, + dma_addr_t paddr) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + unsigned int sw_index = dest_ring->sw_index; + struct ce_desc *base = dest_ring->base_addr_owner_space; + struct ce_desc *desc = CE_DEST_RING_TO_DESC(base, write_index); + u32 ctrl_addr = pipe->ctrl_addr; + + lockdep_assert_held(&ce->ce_lock); + + if ((pipe->id != 5) && + CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0) + return -ENOSPC; + + desc->addr = __cpu_to_le32(paddr); + desc->nbytes = 0; + + dest_ring->per_transfer_context[write_index] = ctx; + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index); + dest_ring->write_index = write_index; + + return 0; +} + +static int __ath10k_ce_rx_post_buf_64(struct ath10k_ce_pipe *pipe, + void *ctx, + dma_addr_t paddr) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + unsigned int sw_index = dest_ring->sw_index; + struct ce_desc_64 *base = dest_ring->base_addr_owner_space; + struct ce_desc_64 *desc = + CE_DEST_RING_TO_DESC_64(base, write_index); + u32 ctrl_addr = pipe->ctrl_addr; + + lockdep_assert_held(&ce->ce_lock); + + if (CE_RING_DELTA(nentries_mask, write_index, sw_index - 1) == 0) + return -ENOSPC; + + desc->addr = __cpu_to_le64(paddr); + desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK); + + desc->nbytes = 0; + + dest_ring->per_transfer_context[write_index] = ctx; + write_index = CE_RING_IDX_INCR(nentries_mask, write_index); + ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index); + dest_ring->write_index = write_index; + + return 0; +} + +void ath10k_ce_rx_update_write_idx(struct ath10k_ce_pipe *pipe, u32 nentries) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce_ring *dest_ring = pipe->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int write_index = dest_ring->write_index; + u32 ctrl_addr = pipe->ctrl_addr; + u32 cur_write_idx = ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr); + + /* Prevent CE ring stuck issue that will occur when ring is full. + * Make sure that write index is 1 less than read index. + */ + if (((cur_write_idx + nentries) & nentries_mask) == dest_ring->sw_index) + nentries -= 1; + + write_index = CE_RING_IDX_ADD(nentries_mask, write_index, nentries); + ath10k_ce_dest_ring_write_index_set(ar, ctrl_addr, write_index); + dest_ring->write_index = write_index; +} +EXPORT_SYMBOL(ath10k_ce_rx_update_write_idx); + +int ath10k_ce_rx_post_buf(struct ath10k_ce_pipe *pipe, void *ctx, + dma_addr_t paddr) +{ + struct ath10k *ar = pipe->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int ret; + + spin_lock_bh(&ce->ce_lock); + ret = pipe->ops->ce_rx_post_buf(pipe, ctx, paddr); + spin_unlock_bh(&ce->ce_lock); + + return ret; +} +EXPORT_SYMBOL(ath10k_ce_rx_post_buf); + +/* + * Guts of ath10k_ce_completed_recv_next. + * The caller takes responsibility for any necessary locking. + */ +static int + _ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + unsigned int *nbytesp) +{ + struct ath10k_ce_ring *dest_ring = ce_state->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int sw_index = dest_ring->sw_index; + + struct ce_desc *base = dest_ring->base_addr_owner_space; + struct ce_desc *desc = CE_DEST_RING_TO_DESC(base, sw_index); + struct ce_desc sdesc; + u16 nbytes; + + /* Copy in one go for performance reasons */ + sdesc = *desc; + + nbytes = __le16_to_cpu(sdesc.nbytes); + if (nbytes == 0) { + /* + * This closes a relatively unusual race where the Host + * sees the updated DRRI before the update to the + * corresponding descriptor has completed. We treat this + * as a descriptor that is not yet done. + */ + return -EIO; + } + + desc->nbytes = 0; + + /* Return data from completed destination descriptor */ + *nbytesp = nbytes; + + if (per_transfer_contextp) + *per_transfer_contextp = + dest_ring->per_transfer_context[sw_index]; + + /* Copy engine 5 (HTT Rx) will reuse the same transfer context. + * So update transfer context all CEs except CE5. + */ + if (ce_state->id != 5) + dest_ring->per_transfer_context[sw_index] = NULL; + + /* Update sw_index */ + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + dest_ring->sw_index = sw_index; + + return 0; +} + +static int +_ath10k_ce_completed_recv_next_nolock_64(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + unsigned int *nbytesp) +{ + struct ath10k_ce_ring *dest_ring = ce_state->dest_ring; + unsigned int nentries_mask = dest_ring->nentries_mask; + unsigned int sw_index = dest_ring->sw_index; + struct ce_desc_64 *base = dest_ring->base_addr_owner_space; + struct ce_desc_64 *desc = + CE_DEST_RING_TO_DESC_64(base, sw_index); + struct ce_desc_64 sdesc; + u16 nbytes; + + /* Copy in one go for performance reasons */ + sdesc = *desc; + + nbytes = __le16_to_cpu(sdesc.nbytes); + if (nbytes == 0) { + /* This closes a relatively unusual race where the Host + * sees the updated DRRI before the update to the + * corresponding descriptor has completed. We treat this + * as a descriptor that is not yet done. + */ + return -EIO; + } + + desc->nbytes = 0; + + /* Return data from completed destination descriptor */ + *nbytesp = nbytes; + + if (per_transfer_contextp) + *per_transfer_contextp = + dest_ring->per_transfer_context[sw_index]; + + /* Copy engine 5 (HTT Rx) will reuse the same transfer context. + * So update transfer context all CEs except CE5. + */ + if (ce_state->id != 5) + dest_ring->per_transfer_context[sw_index] = NULL; + + /* Update sw_index */ + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + dest_ring->sw_index = sw_index; + + return 0; +} + +int ath10k_ce_completed_recv_next_nolock(struct ath10k_ce_pipe *ce_state, + void **per_transfer_ctx, + unsigned int *nbytesp) +{ + return ce_state->ops->ce_completed_recv_next_nolock(ce_state, + per_transfer_ctx, + nbytesp); +} +EXPORT_SYMBOL(ath10k_ce_completed_recv_next_nolock); + +int ath10k_ce_completed_recv_next(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + unsigned int *nbytesp) +{ + struct ath10k *ar = ce_state->ar; + struct ath10k_ce *ce = ath10k_ce_priv(ar); + int ret; + + spin_lock_bh(&ce->ce_lock); + ret = ce_state->ops->ce_completed_recv_next_nolock(ce_state, + per_transfer_contextp, + nbytesp); + + spin_unlock_bh(&ce->ce_lock); + + return ret; +} +EXPORT_SYMBOL(ath10k_ce_completed_recv_next); + +static int _ath10k_ce_revoke_recv_next(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + dma_addr_t *bufferp) +{ + struct ath10k_ce_ring *dest_ring; + unsigned int nentries_mask; + unsigned int sw_index; + unsigned int write_index; + int ret; + struct ath10k *ar; + struct ath10k_ce *ce; + + dest_ring = ce_state->dest_ring; + + if (!dest_ring) + return -EIO; + + ar = ce_state->ar; + ce = ath10k_ce_priv(ar); + + spin_lock_bh(&ce->ce_lock); + + nentries_mask = dest_ring->nentries_mask; + sw_index = dest_ring->sw_index; + write_index = dest_ring->write_index; + if (write_index != sw_index) { + struct ce_desc *base = dest_ring->base_addr_owner_space; + struct ce_desc *desc = CE_DEST_RING_TO_DESC(base, sw_index); + + /* Return data from completed destination descriptor */ + *bufferp = __le32_to_cpu(desc->addr); + + if (per_transfer_contextp) + *per_transfer_contextp = + dest_ring->per_transfer_context[sw_index]; + + /* sanity */ + dest_ring->per_transfer_context[sw_index] = NULL; + desc->nbytes = 0; + + /* Update sw_index */ + sw_index = CE_RING_IDX_INCR(nentries_mask, sw_index); + dest_ring->sw_index = sw_index; + ret = 0; + } else { + ret = -EIO; + } + + spin_unlock_bh(&ce->ce_lock); + + return ret; +} + +static int _ath10k_ce_revoke_recv_next_64(struct ath10k_ce_pipe *ce_state, + void **per_transfer_contextp, + dma_addr_t *bufferp) +{ + struct ath10k_ce_ring *dest_ring; + unsigned int nentries_mask; + unsigned int sw_index; + unsigned int write_index; + int ret; + struct ath10k *ar; + struct ath10k_ce *ce; + + dest_ring = ce_state->dest_ring; + + if (!dest_ring) + return -EIO; + + ar = ce_state->ar; + ce = ath10k_ce_priv(ar); + + spin_lock_bh(&ce->ce_lock); + *** 1025 LINES SKIPPED *** From nobody Tue Feb 10 15:43:30 2026 X-Original-To: dev-commits-src-main@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 4f9Qnv5D5fz6RWp3 for ; Tue, 10 Feb 2026 15:43:31 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Qnv0nLmz3LrJ for ; Tue, 10 Feb 2026 15:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770738211; h=from:from: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; bh=VHBGG/+2QTaNCsK7T9nXsghPGnXZhd5lq2BZSf82LfE=; b=GLx5mcmSftvQ4E4NU2Qse5JIR298duhu67GwLSIv8IzHCacdMS0aDPuipHUtzKgZjFrHV+ R/k8adGAkT6P8N+b5/TfFA/rdbHwr9hAvl+p/hFWB9JhbdegThJlCcPyHXSPIDezeL+i3r mZ8MnO723OH7xC941bbK8WYqbGrNVT7NOhohG5hfmi31M6UG216yiq1aI6cOdjSqU9XUlw VDJvUh93rM1vOdIxbdjW3ur8Z3advad6SUSPSAmY++9aHvNWcLWb5MZsaODY/PnQUb/WAE YEhL55VS1+yrWh7W//VJ8taIsgny1Ao5SrPFoqclRWz+RApja6Ici+9e7zVY6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770738211; a=rsa-sha256; cv=none; b=V0JmUb7rWDJqi8dy952oLnKcK01z3TJ+BVlRdg0lg6rgyZpN4rUt8C5+GNEDdVAjqJkoyg nKZdJLbpSHEnMxMSm3Aftr2Ck8OW0Qy/s80e+uupoAAnVCoOkTjsmUv7rNd/NbAYU4rKgo 9X7wIdUQxFtZrSMwqaHZ/hyZe54Ptcuk13r3AKHvhTihSiAuujzP9waO7OOYoKIa0nqfyi enfLSCIzqdQ0jfeQ7UmasjHzwDMyyc0X2bPvg2a5PJp6cKgB2lrMSYX6ZY8o37LisKr5eA RLrVGVGlefxz92CT/rd4zSurdqOexsR/eCElfujcM7+RQIjReBZ6WhV7Dlsk0Q== 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=1770738211; h=from:from: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; bh=VHBGG/+2QTaNCsK7T9nXsghPGnXZhd5lq2BZSf82LfE=; b=sDyj0za7/fxipCACs1r34SnnD/PFsF0b2HeP00wKpNny86hDfxGG9ELrztQpUEEZg3XDDK LA3Zx0eH7toKOq2XBpZmG++BfWb+z5D++mYvDK/JaJHJsd2hqkCTqFXrrgah8rn4L36OSE Aewdwt61ippD8RdrVRykGYkzhXT0Pz4nR3Iwnt0z3ub36Ioi1JYs6MrErOHgibZV5P+4X9 BCOKsdMEvUZ5U1MXlj4Ano36WIrSsRzBtWaP4t/aMaOgNE+FEvK+syz/Dw1UMyLEY5V8g5 SIvr8eVjwDmlw1U3m94QTXBtnF8rRgF4kxgFIvGbaQeY41fGq1szdS6Ix3LAmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Qnv01Dlz1Ncg for ; Tue, 10 Feb 2026 15:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47a13 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:43:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 18af5a180b29 - main - arm64: Enable MOPS usage in the kernel List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18af5a180b29f425b8427263be5517d3573ca220 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:43:30 +0000 Message-Id: <698b5222.47a13.1abb34e1@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=18af5a180b29f425b8427263be5517d3573ca220 commit 18af5a180b29f425b8427263be5517d3573ca220 Author: Sarah Walker AuthorDate: 2026-02-09 20:39:53 +0000 Commit: Andrew Turner CommitDate: 2026-02-10 15:39:56 +0000 arm64: Enable MOPS usage in the kernel Support handling kernel-side MOE exceptions. Reported by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54943 --- sys/arm64/arm64/trap.c | 123 +++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 3de56187657c..b3c68fa4826f 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -480,6 +480,66 @@ fpe_trap(struct thread *td, void *addr, uint32_t exception) } #endif +static void +handle_moe(struct thread *td, struct trapframe *frame, uint64_t esr) +{ + uint64_t src; + uint64_t dest; + uint64_t size; + int src_reg; + int dest_reg; + int size_reg; + int format_option; + + format_option = esr & ISS_MOE_FORMAT_OPTION_MASK; + dest_reg = (esr & ISS_MOE_DESTREG_MASK) >> ISS_MOE_DESTREG_SHIFT; + size_reg = (esr & ISS_MOE_SIZEREG_MASK) >> ISS_MOE_SIZEREG_SHIFT; + dest = frame->tf_x[dest_reg]; + size = frame->tf_x[size_reg]; + + /* + * Put the registers back in the original format suitable for a + * prologue instruction, using the generic return routine from the + * Arm ARM (DDI 0487I.a) rules CNTMJ and MWFQH. + */ + if (esr & ISS_MOE_MEMINST) { + /* SET* instruction */ + if (format_option == ISS_MOE_FORMAT_OPTION_A || + format_option == ISS_MOE_FORMAT_OPTION_A2) { + /* Format is from Option A; forward set */ + frame->tf_x[dest_reg] = dest + size; + frame->tf_x[size_reg] = -size; + } + } else { + /* CPY* instruction */ + src_reg = (esr & ISS_MOE_SRCREG_MASK) >> ISS_MOE_SRCREG_SHIFT; + src = frame->tf_x[src_reg]; + + if (format_option == ISS_MOE_FORMAT_OPTION_B || + format_option == ISS_MOE_FORMAT_OPTION_B2) { + /* Format is from Option B */ + if (frame->tf_spsr & PSR_N) { + /* Backward copy */ + frame->tf_x[dest_reg] = dest - size; + frame->tf_x[src_reg] = src + size; + } + } else { + /* Format is from Option A */ + if (frame->tf_x[size_reg] & (1UL << 63)) { + /* Forward copy */ + frame->tf_x[dest_reg] = dest + size; + frame->tf_x[src_reg] = src + size; + frame->tf_x[size_reg] = -size; + } + } + } + + if (esr & ISS_MOE_FROM_EPILOGUE) + frame->tf_elr -= 8; + else + frame->tf_elr -= 4; +} + /* * See the comment above data_abort(). */ @@ -589,6 +649,9 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) print_gp_register("far", far); panic("Branch Target exception"); break; + case EXCP_MOE: + handle_moe(td, frame, esr); + break; default: print_registers(frame); print_gp_register("far", far); @@ -597,66 +660,6 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) } } -static void -handle_moe(struct thread *td, struct trapframe *frame, uint64_t esr) -{ - uint64_t src; - uint64_t dest; - uint64_t size; - int src_reg; - int dest_reg; - int size_reg; - int format_option; - - format_option = esr & ISS_MOE_FORMAT_OPTION_MASK; - dest_reg = (esr & ISS_MOE_DESTREG_MASK) >> ISS_MOE_DESTREG_SHIFT; - size_reg = (esr & ISS_MOE_SIZEREG_MASK) >> ISS_MOE_SIZEREG_SHIFT; - dest = frame->tf_x[dest_reg]; - size = frame->tf_x[size_reg]; - - /* - * Put the registers back in the original format suitable for a - * prologue instruction, using the generic return routine from the - * Arm ARM (DDI 0487I.a) rules CNTMJ and MWFQH. - */ - if (esr & ISS_MOE_MEMINST) { - /* SET* instruction */ - if (format_option == ISS_MOE_FORMAT_OPTION_A || - format_option == ISS_MOE_FORMAT_OPTION_A2) { - /* Format is from Option A; forward set */ - frame->tf_x[dest_reg] = dest + size; - frame->tf_x[size_reg] = -size; - } - } else { - /* CPY* instruction */ - src_reg = (esr & ISS_MOE_SRCREG_MASK) >> ISS_MOE_SRCREG_SHIFT; - src = frame->tf_x[src_reg]; - - if (format_option == ISS_MOE_FORMAT_OPTION_B || - format_option == ISS_MOE_FORMAT_OPTION_B2) { - /* Format is from Option B */ - if (frame->tf_spsr & PSR_N) { - /* Backward copy */ - frame->tf_x[dest_reg] = dest - size; - frame->tf_x[src_reg] = src + size; - } - } else { - /* Format is from Option A */ - if (frame->tf_x[size_reg] & (1UL << 63)) { - /* Forward copy */ - frame->tf_x[dest_reg] = dest + size; - frame->tf_x[src_reg] = src + size; - frame->tf_x[size_reg] = -size; - } - } - } - - if (esr & ISS_MOE_FROM_EPILOGUE) - frame->tf_elr -= 8; - else - frame->tf_elr -= 4; -} - void do_el0_sync(struct thread *td, struct trapframe *frame) { From nobody Tue Feb 10 15:43:32 2026 X-Original-To: dev-commits-src-main@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 4f9Qnw2zdpz6RWmy for ; Tue, 10 Feb 2026 15:43:32 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Qnw1W0zz3LgY for ; Tue, 10 Feb 2026 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770738212; h=from:from: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; bh=j+HgNSTh5wd5BGgo+zhv8OMG3nZKFpBRSziBDi5tAbI=; b=dgGpuMKPZDRNGnvSaNGXp3hKuFlOvu2b/jw1B3EAm4ow6k6kOpdZRFjAnCjvcqaV2VoG7A OoqlI1ClyysSDHkkc/IWpiDiBHmoTvMQWZX+azfkz0qWpZiqPogWDn2wSKp8ToKNeRub/i PT8kzfg+GfO/R6MRKWXY42p/1YZx2oWTBd57BwV7wYetGBuUo02/sbke+yG6JnTLM5yZSl cUO7ICoMe/th/Pq1idjfuMFWj3xLIvBGyh7ZF8VkiHNnGIDP+JnBB4nT9k7CpvjEktbGom PcbC+eWkc3TIjrAX9NafdfIpU3gY74qmLUx+TQJdxLyVWmz4xnwECOwgAStCJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770738212; a=rsa-sha256; cv=none; b=U0jZo5UIlE+YyEZwX41aFxpqCZubBwlex+MfQP50GNKF9ZLveIFGo9XDvx6BSBMX7gfpgP g3j+0ORWY5CTIyWDzkBiyWUP9invhsgy2Hsm+eVIcVkS8Y0xIQUwyOxaSjBU+my69Bgdwh aGU2GVzRN28LrMdt+R0L07ZcMB96I+jjl2uRjpdREMgdKODXoznwjzf3NSPfxT2mPAvskk qmGGQ9kgsugFRe4zx9tPpvqVd/SzJqrTk6UgmeveFjIpZSqwDVHY7JaL7hj3BdHJ3yFEOl U6SHZKLIn7+lCzKK0kpS+MM8H+OApEwfGuaMaCaGRpD2jFhSgPq9/c5LMNxCcQ== 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=1770738212; h=from:from: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; bh=j+HgNSTh5wd5BGgo+zhv8OMG3nZKFpBRSziBDi5tAbI=; b=RkS1W74PzA/27y0R+BBPDGMSwvObR4JYlaVzmEzfEILKF4PTeOSVHuCbwLp9oMf+rrwhER ti5DKSGYZV6wk5/6Sre9RpFiek5eXOepukYGXLsZ1yfy9YZqo2xiTAfEekB28jXikTY8Xf vp+Srna3XvfOw3ZWh7kaygx+gSWLFE3p9gI8RJSg00GdIgs/49QNqpOTt2T5S7UKlTC7gE wZmxidchC72vrcMIREzp0Y/405Wgw1wWNEibWUBOVzNKVKAiveBj3XBRzQvgfyuGeq/JAZ eXUsES2Myy6kysqCE6CSCf9KK6A7XmSiNhWDUFE7qoxNPs7EzgoHNAPEK+e2iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Qnw0x11z1Nlw for ; Tue, 10 Feb 2026 15:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47b1b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:43:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 2ccbf06c0285 - main - arm64: Add MOPS implementations of memset(), memcpy() and memmove() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ccbf06c0285ca1c06681e7212da8e7d1e87fe19 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:43:32 +0000 Message-Id: <698b5224.47b1b.86c86bb@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2ccbf06c0285ca1c06681e7212da8e7d1e87fe19 commit 2ccbf06c0285ca1c06681e7212da8e7d1e87fe19 Author: Sarah Walker AuthorDate: 2026-01-28 16:22:50 +0000 Commit: Andrew Turner CommitDate: 2026-02-10 15:39:56 +0000 arm64: Add MOPS implementations of memset(), memcpy() and memmove() Enable the use of MOPS implementations of memset, memcpy and memmove within the kernel. Fix pre-ifunc resolution uses of these functions. Reported by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55051 --- sys/arm64/arm64/identcpu.c | 5 +++-- sys/arm64/arm64/machdep.c | 38 ++++++++++++++++++++++++++++++++++++-- sys/arm64/arm64/machdep_boot.c | 2 +- sys/arm64/arm64/memcpy.S | 24 ++++++++++++++++++++---- sys/arm64/arm64/memset.S | 12 ++++++++++-- sys/arm64/arm64/pmap.c | 10 +++++----- sys/arm64/include/cpu.h | 7 ++++++- 7 files changed, 81 insertions(+), 17 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 91078a411b88..e2f09fcb7f52 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2675,14 +2675,15 @@ update_special_regs(u_int cpu) if (cpu == 0) { /* Create a user visible cpu description with safe values */ - memset(&user_cpu_desc, 0, sizeof(user_cpu_desc)); + memset_early(&user_cpu_desc, 0, sizeof(user_cpu_desc)); /* Safe values for these registers */ user_cpu_desc.id_aa64pfr0 = ID_AA64PFR0_AdvSIMD_NONE | ID_AA64PFR0_FP_NONE | ID_AA64PFR0_EL1_64 | ID_AA64PFR0_EL0_64; user_cpu_desc.id_aa64dfr0 = ID_AA64DFR0_DebugVer_8; /* Create the Linux user visible cpu description */ - memcpy(&l_user_cpu_desc, &user_cpu_desc, sizeof(user_cpu_desc)); + memcpy_early(&l_user_cpu_desc, &user_cpu_desc, + sizeof(user_cpu_desc)); } desc = get_cpu_desc(cpu); diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 5e6a39381e84..ffe9acb0cfa4 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -80,6 +80,7 @@ #include #include #include +#include #include #include #include @@ -807,6 +808,9 @@ initarm(struct arm64_bootparams *abp) update_special_regs(0); + sched_instance_select(); + link_elf_ireloc(); + /* Set the pcpu data, this is needed by pmap_bootstrap */ pcpup = &pcpu0; pcpu_init(pcpup, 0, sizeof(struct pcpu)); @@ -823,8 +827,6 @@ initarm(struct arm64_bootparams *abp) PCPU_SET(curthread, &thread0); PCPU_SET(midr, get_midr()); - sched_instance_select(); - link_elf_ireloc(); #ifdef FDT try_load_dtb(); #endif @@ -1076,3 +1078,35 @@ DB_SHOW_COMMAND(vtop, db_show_vtop) db_printf("show vtop \n"); } #endif + +#undef memset +#undef memmove +#undef memcpy + +void *memset_std(void *buf, int c, size_t len); +void *memset_mops(void *buf, int c, size_t len); +void *memmove_std(void * _Nonnull dst, const void * _Nonnull src, + size_t len); +void *memmove_mops(void * _Nonnull dst, const void * _Nonnull src, + size_t len); +void *memcpy_std(void * _Nonnull dst, const void * _Nonnull src, + size_t len); +void *memcpy_mops(void * _Nonnull dst, const void * _Nonnull src, + size_t len); + +DEFINE_IFUNC(, void *, memset, (void *, int, size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? memset_mops : memset_std); +} + +DEFINE_IFUNC(, void *, memmove, (void * _Nonnull, const void * _Nonnull, + size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? memmove_mops : memmove_std); +} + +DEFINE_IFUNC(, void *, memcpy, (void * _Nonnull, const void * _Nonnull, + size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? memcpy_mops : memcpy_std); +} diff --git a/sys/arm64/arm64/machdep_boot.c b/sys/arm64/arm64/machdep_boot.c index 1c5e8189e436..0ccfd1b67a39 100644 --- a/sys/arm64/arm64/machdep_boot.c +++ b/sys/arm64/arm64/machdep_boot.c @@ -115,7 +115,7 @@ fake_preload_metadata(void *dtb_ptr, size_t dtb_size) PRELOAD_PUSH_VALUE(uint32_t, MODINFO_METADATA | MODINFOMD_DTBP); PRELOAD_PUSH_VALUE(uint32_t, sizeof(uint64_t)); PRELOAD_PUSH_VALUE(uint64_t, (uint64_t)lastaddr); - memmove((void *)lastaddr, dtb_ptr, dtb_size); + memmove_early((void *)lastaddr, dtb_ptr, dtb_size); lastaddr += dtb_size; lastaddr = roundup(lastaddr, sizeof(int)); } diff --git a/sys/arm64/arm64/memcpy.S b/sys/arm64/arm64/memcpy.S index 01daa8e1c228..3c408d2836aa 100644 --- a/sys/arm64/arm64/memcpy.S +++ b/sys/arm64/arm64/memcpy.S @@ -57,8 +57,8 @@ The loop tail is handled by always copying 64 bytes from the end. */ -EENTRY(memmove) -ENTRY(memcpy) +EENTRY(memmove_std) +ENTRY(memcpy_std) add srcend, src, count add dstend, dstin, count cmp count, 128 @@ -239,7 +239,23 @@ L(copy64_from_start): stp B_l, B_h, [dstin, 16] stp C_l, C_h, [dstin] ret -END(memcpy) -EEND(memmove) +END(memcpy_std) +EEND(memmove_std) + +ENTRY(memcpy_mops) + mov x3, x0 + .inst 0x19010443 /* cpyfp [x3]!, [x1]!, x2! */ + .inst 0x19410443 /* cpyfm [x3]!, [x1]!, x2! */ + .inst 0x19810443 /* cpyfe [x3]!, [x1]!, x2! */ + ret +END(memcpy_mops) + +ENTRY(memmove_mops) + mov x3, x0 + .inst 0x1d010443 /* cpyp [x3]!, [x1]!, x2! */ + .inst 0x1d410443 /* cpym [x3]!, [x1]!, x2! */ + .inst 0x1d810443 /* cpye [x3]!, [x1]!, x2! */ + ret +END(memmove_mops) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/arm64/memset.S b/sys/arm64/arm64/memset.S index f52bfd62cc54..f226e8de1e95 100644 --- a/sys/arm64/arm64/memset.S +++ b/sys/arm64/arm64/memset.S @@ -51,7 +51,7 @@ #define dst x8 #define tmp3w w9 -ENTRY(memset) +ENTRY(memset_std) mov dst, dstin /* Preserve return value. */ ands A_lw, val, #255 @@ -196,6 +196,14 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -END(memset) +END(memset_std) + +ENTRY(memset_mops) + mov x3, x0 + .inst 0x19c10443 /* setp [x3]!, x2!, x1 */ + .inst 0x19c14443 /* setm [x3]!, x2!, x1 */ + .inst 0x19c18443 /* sete [x3]!, x2!, x1 */ + ret +END(memset_mops) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 680209efd881..e865569ac377 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1015,7 +1015,7 @@ pmap_bootstrap_l0_table(struct pmap_bootstrap_state *state) /* Create a new L0 table entry */ state->l1 = (pt_entry_t *)state->freemempos; - memset(state->l1, 0, PAGE_SIZE); + memset_early(state->l1, 0, PAGE_SIZE); state->freemempos += PAGE_SIZE; l1_pa = pmap_early_vtophys((vm_offset_t)state->l1); @@ -1063,7 +1063,7 @@ pmap_bootstrap_l1_table(struct pmap_bootstrap_state *state) /* Create a new L1 table entry */ state->l2 = (pt_entry_t *)state->freemempos; - memset(state->l2, 0, PAGE_SIZE); + memset_early(state->l2, 0, PAGE_SIZE); state->freemempos += PAGE_SIZE; l2_pa = pmap_early_vtophys((vm_offset_t)state->l2); @@ -1107,7 +1107,7 @@ pmap_bootstrap_l2_table(struct pmap_bootstrap_state *state) /* Create a new L2 table entry */ state->l3 = (pt_entry_t *)state->freemempos; - memset(state->l3, 0, PAGE_SIZE); + memset_early(state->l3, 0, PAGE_SIZE); state->freemempos += PAGE_SIZE; l3_pa = pmap_early_vtophys((vm_offset_t)state->l3); @@ -1406,7 +1406,7 @@ pmap_bootstrap(void) #define alloc_pages(var, np) \ (var) = bs_state.freemempos; \ bs_state.freemempos += (np * PAGE_SIZE); \ - memset((char *)(var), 0, ((np) * PAGE_SIZE)); + memset_early((char *)(var), 0, ((np) * PAGE_SIZE)); /* Allocate dynamic per-cpu area. */ alloc_pages(dpcpu, DPCPU_SIZE / PAGE_SIZE); @@ -1444,7 +1444,7 @@ pmap_bootstrap_allocate_san_l2(vm_paddr_t start_pa, vm_paddr_t end_pa, continue; } - bzero((void *)PHYS_TO_DMAP(pa), L2_SIZE); + bzero_early((void *)PHYS_TO_DMAP(pa), L2_SIZE); physmem_exclude_region(pa, L2_SIZE, EXFLAG_NOALLOC); pmap_store(l2, PHYS_TO_PTE(pa) | PMAP_SAN_PTE_BITS | L2_BLOCK); } diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 9f1db23744d4..05844ad63036 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -328,7 +328,12 @@ ADDRESS_TRANSLATE_FUNC(s1e1r) ADDRESS_TRANSLATE_FUNC(s1e1w) #endif /* !__ASSEMBLER__ */ -#endif + +#define MEMSET_EARLY_FUNC memset_std +#define MEMCPY_EARLY_FUNC memcpy_std +#define MEMMOVE_EARLY_FUNC memmove_std + +#endif /* _KERNEL */ #endif /* !_MACHINE_CPU_H_ */ From nobody Tue Feb 10 15:43:33 2026 X-Original-To: dev-commits-src-main@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 4f9Qnx6bZmz6RW6y for ; Tue, 10 Feb 2026 15:43:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Qnx2wqcz3LrY for ; Tue, 10 Feb 2026 15:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770738213; h=from:from: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; bh=dXHljT7EPcDV/gf0Gt9WEuaFvBZgGZg/+9XNEFwpr28=; b=h0QVUAYLbCacYBAsjnrZyShS86TheavHe6nJ18/3ak9Z3gnS0Z2mWAAIVZOq5SaX+uzsHm L/evuUWlpVL9/5bpYrhftqB0gFWTV51qy9//1D45x9kzHL9dpWcFCSSdII7ufkzpMVdknZ A8nPHkODLytf6nDRNir6pe6htRTgjkEIPnCxCVlwlOgLgJixw9wAdMkTlJ1S2XX7frZoVt aDNR9PXo9dbmRF/2UV4RcxwTfpA9R1cSYp4+gTfRPfmD3E339vEJpvn/ZxZFk5qggJAgaE J7Nu+YwJ50DBXq2jLWj5oLlVPQvfVA/7YQBaJhzo/xVwhoD8AeIFsMZhle/Mmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770738213; a=rsa-sha256; cv=none; b=psz7tVV9O8hvc+5/Zp62Mvhj2LeFzyb4KnlE/C+Y019OBSknvQvhSFIF1W7GpMk0y2IZ5b eG+aMfJuUIVt/PQDxZ5BEzzAtf6xATc3pnbm3w3wBjBj/okBfZMrZEcbKLuR1e2Hh4gdO0 3ySMbi3sTP4PLeUlWibhCBJTWFNQsmJ+1dxv6zklGC/k+cN3dQVtzYdFpJU8ysLmguihVb gy3W1ucXzw3dVg21ocWqOaZJpJPo0N1vCCE86RX1WneH7CyX4Ue6BIheMmnKPkgW8Ij+to JFoMnYf/o4W78MOVi/ejUj+W8hvexNPtq4cKRE1rNrmKEfSNabXmP9IA9ogEwg== 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=1770738213; h=from:from: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; bh=dXHljT7EPcDV/gf0Gt9WEuaFvBZgGZg/+9XNEFwpr28=; b=FJRPtJvPBmXFNBrwBAr2tS37Wev3NHeVbm5zLJWjq/UQ7ulKiwy1BcihMBpHRuEYZ9Y/Hp VX/EKgqXqUsO/+N3DGvlyxXejHFjeSChZnapxR7UsVK9XL07am20RnnHNuCx2CaR58YlGk B8ZCpFGZcC3BoRBFLDLRHfiDseh1XpTpe1Dlua45EsWs5foyEk/iDjPbXW62jYkFeW4S2c DlMadMYOLPPskIdcR85UU9fSYOrEEXddjtwgyDrXWmB01s/9k22L6N+O1p8I5hvcCqx5ce VhduW3Vdbt6EE6MqufMnU6y47Syz7vHHeR8/TEbzkxQwR83LXpLp4hLyO2acCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Qnx2JZbz1NTS for ; Tue, 10 Feb 2026 15:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46b58 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:43:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 7d7295df9b13 - main - arm64: Add MOPS implementation of pagezero() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d7295df9b13b98ac395b206667e7586c602862b Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:43:33 +0000 Message-Id: <698b5225.46b58.1276b6c3@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=7d7295df9b13b98ac395b206667e7586c602862b commit 7d7295df9b13b98ac395b206667e7586c602862b Author: Sarah Walker AuthorDate: 2026-01-29 17:43:45 +0000 Commit: Andrew Turner CommitDate: 2026-02-10 15:39:56 +0000 arm64: Add MOPS implementation of pagezero() Reimplement pagezero() as ifunc. As pagezero() is only used in pmap.c, move ifunc to that file. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54946 --- sys/arm64/arm64/machdep.c | 10 ---------- sys/arm64/arm64/pmap.c | 22 ++++++++++++++++++++++ sys/arm64/arm64/support.S | 12 ++++++++++++ sys/arm64/include/machdep.h | 1 - 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index ffe9acb0cfa4..2addc5af9568 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -155,13 +155,6 @@ uintptr_t socdev_va __read_mostly; vm_paddr_t efi_systbl_phys; static struct efi_map_header *efihdr; -/* pagezero_* implementations are provided in support.S */ -void pagezero_simple(void *); -void pagezero_cache(void *); - -/* pagezero_simple is default pagezero */ -void (*pagezero)(void *p) = pagezero_simple; - int (*apei_nmi)(void); #if defined(PERTHREAD_SSP_WARNING) @@ -720,9 +713,6 @@ cache_setup(void) /* Same as with above calculations */ dczva_line_shift = DCZID_BS_SIZE(dczid_el0); dczva_line_size = sizeof(int) << dczva_line_shift; - - /* Change pagezero function */ - pagezero = pagezero_cache; } } diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index e865569ac377..0cfc8ae80d70 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -147,6 +147,8 @@ #include #include +#include +#include #include #include #include @@ -529,6 +531,7 @@ static void *bti_dup_range(void *ctx, void *data); static void bti_free_range(void *ctx, void *node); static int pmap_bti_copy(pmap_t dst_pmap, pmap_t src_pmap); static void pmap_bti_deassign_all(pmap_t pmap); +static void pagezero(void *); /* * These load the old table data and store the new value. @@ -10207,3 +10210,22 @@ SYSCTL_OID(_vm_pmap, OID_AUTO, kernel_maps, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_SKIP, NULL, 0, sysctl_kmaps, "A", "Dump kernel address layout"); + + +void pagezero_simple(void *); +void pagezero_cache(void *); +void pagezero_mops(void *); + +DEFINE_IFUNC(static, void, pagezero, (void *)) +{ + uint32_t dczid_el0; + + dczid_el0 = READ_SPECIALREG(dczid_el0); + + if (elf_hwcap2 & HWCAP2_MOPS) + return (pagezero_mops); + else if ((dczid_el0 & DCZID_DZP) == 0) + return (pagezero_cache); + else + return (pagezero_simple); +} diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index bf6fc931e4b0..cee0e3b51aaf 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -397,4 +397,16 @@ ENTRY(pagezero_cache) END(pagezero_cache) +/* + * pagezero, MOPS implementation + */ +ENTRY(pagezero_mops) + mov x1, #PAGE_SIZE + .inst 0x19df0420 /* setp [x0]!, x1!, xzr */ + .inst 0x19df4420 /* setm [x0]!, x1!, xzr */ + .inst 0x19df8420 /* sete [x0]!, x1!, xzr */ + ret + +END(pagezero_mops) + GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/arm64/include/machdep.h b/sys/arm64/include/machdep.h index 4fa80219da42..3606690eb9ba 100644 --- a/sys/arm64/include/machdep.h +++ b/sys/arm64/include/machdep.h @@ -54,7 +54,6 @@ vm_offset_t parse_boot_param(struct arm64_bootparams *abp); void parse_fdt_bootargs(void); #endif int memory_mapping_mode(vm_paddr_t pa); -extern void (*pagezero)(void *); #ifdef SOCDEV_PA /* From nobody Tue Feb 10 15:43:34 2026 X-Original-To: dev-commits-src-main@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 4f9Qny5jwrz6RW73 for ; Tue, 10 Feb 2026 15:43:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Qny32Klz3M13 for ; Tue, 10 Feb 2026 15:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770738214; h=from:from: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; bh=khwu9DUTlAQ1T4DsluWfe7Gru7DIVEEZYV7BhGeh2Qs=; b=i4IC5TtpX2gdawBYfPlO2IssfvjqKY+Ycb7+a+0cy448brt2fbWraxxNHOw1ewxFdfsJgf +onLSAdC9E40X1ZgkHwDkQQuR5pDCyuxb81ujjafcZp3D2HjAKoETALPshhqC9DK4NI/Zm /feE9NRoQ/zGit/jYaLs/2B0KhPBNUinCyFjYKt3U3JgnWi8JT8CdfUglJa8gA1jRzyVC7 nZHCxmIxB02dByx8mVjCVGKtBtfrUPibSEWtVNGlvxEjG/0M+uQx4R3yoCedSj9dWbZZXE AiLRdyXDwcR+mcTscDmZlOtITZoyQpXP0l0Ypjkf8gLH3MVgOIv/2UL70fnt0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770738214; a=rsa-sha256; cv=none; b=ayq820wRI2CAhwZKQslyzO6zcH7xCs0kq7jp+3p/MCys4ef6BcmOBpEq8NBLGits7U5TuY YN6fBeNNndcdvZ3MeaWBwxIcWEXHdp4QDU9AMtARS1Rxf1/DuNO6zam06w3tfmI3QcgpDs UrG0ORuXbW6wcPCNwtkvT4R5d41H90CxgPlJUQ3hY4v/ioRp2cJpQ/ev54nMhZR7n88m13 BtDTe7JznZR05rsw2LG1icCQ6tFr5trYH8/TowembSF9Hfl5/MwHjmSDIYlCgVhQoDzb68 897N7CMA9iqSIMnxs8m6rDNfav0CTQdph47RDJ2jp68sFXHhb7PygmLrkGon9g== 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=1770738214; h=from:from: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; bh=khwu9DUTlAQ1T4DsluWfe7Gru7DIVEEZYV7BhGeh2Qs=; b=QebiUFg/va8T2Grkrry89x6FDBFl5IF1tJG807PpyQnFJxcwUXHQxVZE23bYOACRCIw0dl jkWDKn/qasrOV8OfG/WkYMr5gizMCJ7wfqxn9D4Tc8mi/9C+6lSV5v0aOovVmJj0wXovAt hx7xXphTJiqB1662WpZNyme49GYrrXHGxL16PSs2uINmHhCu/BUy4kZagfJ/aTxh3yoSwi /5fyimsuVruEYt9fJzEoLy6KQuXI3e1jCnXPptw6EV98/lWccQlzFih+pTFvw1g0L6R41c 4pu2jAjA6tAO2cpYD7IKhoPnNlLbzQstFrnCKI9hv3HjhgfXCQ6u2x3QbzfGDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Qny2TMHz1NYn for ; Tue, 10 Feb 2026 15:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46fea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 15:43:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: 1224347817c4 - main - arm64: Add MOPS implementations of copyin/copyout List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1224347817c450596797ae6bcbfcc81927cb1f88 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 15:43:34 +0000 Message-Id: <698b5226.46fea.1d53d6e5@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1224347817c450596797ae6bcbfcc81927cb1f88 commit 1224347817c450596797ae6bcbfcc81927cb1f88 Author: Sarah Walker AuthorDate: 2026-01-29 18:08:49 +0000 Commit: Andrew Turner CommitDate: 2026-02-10 15:39:56 +0000 arm64: Add MOPS implementations of copyin/copyout Reimplement copyin() & copyout() as ifuncs. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D54947 --- sys/arm64/arm64/copyinout.S | 58 +++++++++++++++++++++++++++++++++++---- sys/arm64/arm64/copyinout_ifunc.c | 50 +++++++++++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + 3 files changed, 103 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/copyinout.S b/sys/arm64/arm64/copyinout.S index e41c4b5f6734..8c6fee63f410 100644 --- a/sys/arm64/arm64/copyinout.S +++ b/sys/arm64/arm64/copyinout.S @@ -65,9 +65,9 @@ END(copyio_fault) /* * Copies from a kernel to user address * - * int copyout(const void *kaddr, void *udaddr, size_t len) + * int copyout_std(const void *kaddr, void *udaddr, size_t len) */ -ENTRY(copyout) +ENTRY(copyout_std) cbz x2, 1f check_user_access 1, 2, copyio_fault_nopcb @@ -76,14 +76,37 @@ ENTRY(copyout) 1: mov x0, xzr /* return 0 */ ret -END(copyout) +END(copyout_std) + +/* + * Copies from a kernel to user address + * + * int copyout_mops(const void *kaddr, void *udaddr, size_t len) + */ +ENTRY(copyout_mops) + cbz x2, 1f + check_user_access 1, 2, copyio_fault_nopcb + + adr x6, copyio_fault /* Get the handler address */ + SET_FAULT_HANDLER(x6, x7) /* Set the handler */ + + .inst 0x19001441 /* cpyfpwt [x1]!, [x0]!, x2! */ + .inst 0x19401441 /* cpyfmwt [x1]!, [x0]!, x2! */ + .inst 0x19801441 /* cpyfewt [x1]!, [x0]!, x2! */ + + SET_FAULT_HANDLER(xzr, x7) /* Clear the handler */ + +1: mov x0, xzr /* return 0 */ + ret + +END(copyout_mops) /* * Copies from a user to kernel address * - * int copyin(const void *uaddr, void *kdaddr, size_t len) + * int copyin_std(const void *uaddr, void *kdaddr, size_t len) */ -ENTRY(copyin) +ENTRY(copyin_std) cbz x2, 1f check_user_access 0, 2, copyio_fault_nopcb @@ -92,7 +115,30 @@ ENTRY(copyin) 1: mov x0, xzr /* return 0 */ ret -END(copyin) +END(copyin_std) + +/* + * Copies from a user to kernel address + * + * int copyin_mops(const void *uaddr, void *kdaddr, size_t len) + */ +ENTRY(copyin_mops) + cbz x2, 1f + check_user_access 0, 2, copyio_fault_nopcb + + adr x6, copyio_fault /* Get the handler address */ + SET_FAULT_HANDLER(x6, x7) /* Set the handler */ + + .inst 0x19002441 /* cpyfprt [x1]!, [x0]!, x2! */ + .inst 0x19402441 /* cpyfmrt [x1]!, [x0]!, x2! */ + .inst 0x19802441 /* cpyfert [x1]!, [x0]!, x2! */ + + SET_FAULT_HANDLER(xzr, x7) /* Clear the handler */ + +1: mov x0, xzr /* return 0 */ + ret + +END(copyin_mops) /* * Copies a string from a user to kernel address diff --git a/sys/arm64/arm64/copyinout_ifunc.c b/sys/arm64/arm64/copyinout_ifunc.c new file mode 100644 index 000000000000..33d9f11fc7e6 --- /dev/null +++ b/sys/arm64/arm64/copyinout_ifunc.c @@ -0,0 +1,50 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2026 ARM Ltd + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include + +#include +#include +#include +#include + +int copyout_std(const void *kaddr, void *udaddr, size_t len); +int copyout_mops(const void *kaddr, void *udaddr, size_t len); +int copyin_std(const void *uaddr, void *kdaddr, size_t len); +int copyin_mops(const void *uaddr, void *kdaddr, size_t len); + +DEFINE_IFUNC(, int, copyout, (const void *, void *, size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? copyout_mops : copyout_std); +} + +DEFINE_IFUNC(, int, copyin, (const void *, void *, size_t)) +{ + return ((elf_hwcap2 & HWCAP2_MOPS) != 0 ? copyin_mops : copyin_std); +} diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 5439cc5edde0..3b12999a6c87 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -36,6 +36,7 @@ arm64/arm64/busdma_bounce.c standard arm64/arm64/busdma_machdep.c standard arm64/arm64/clock.c standard arm64/arm64/copyinout.S standard +arm64/arm64/copyinout_ifunc.c standard arm64/arm64/cpu_errata.c standard arm64/arm64/cpu_feat.c standard arm64/arm64/cpufunc_asm.S standard From nobody Tue Feb 10 16:55:12 2026 X-Original-To: dev-commits-src-main@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 4f9SNd22p0z6RcgM for ; Tue, 10 Feb 2026 16:55:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9SNd15b1z3X0K for ; Tue, 10 Feb 2026 16:55:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770742513; 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=3qyoLDiGgXH6BwhDQN2PyME5CcuFhcAGKlXemLX8Ews=; b=eokkN2QBP2HFC+BLtIB6D1Ohntjz93vpcibhDHIw5PFeKsoKHfc6B59F5aVpBqc14aKTIz Hwn4S24IUAI1IMGDeGlw42BIP889VpEgt9E9p9TwJj1SjaamM5QcnJxNVjRiWv0iWmCtVq xcw25fCvlQb42D7M0qyWSf8DKoS3ktN27vk1g2v39kJjVtlMTdVBtMUaTsHK6yMGdl1Kfx OtbD9HEzXXz1MCdzcfU0H152rirKmtJL8VEAcES1cT4dGi7iybM6p01Wrwzmr2Fzd5KJ9+ nHBm5mUF7wWADXQe4yiApvqXcAh6Qs6Vb6nJdXAnNf+rZU3mOaLoKUlnam+9XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770742513; a=rsa-sha256; cv=none; b=uNNab4xTvqTdidTwi0lIKhPRDMdD7y5LRrIvetnVXk6YwAhrgrNFm/0GdvNP7UQk3IICUG nJVWsuOAjKF8hs/E9zQZ91OP1Mp33HenlkXy/+lob88WaI/WYVUdmXZB4LCNi1mnIQs90M DmkmElqJOZ9YceHw2OK+qjmKARpiZ4MObREKovNq0/pnuLKxC+W6L4lF6f0TQHKB+1DJvc cmGm00kyzxcHHUgNnDTXNqiNDQeIoPdZsbgl1myD1bO91lIaXSitkMbQoDUsoaXLA1AT+v 8U2K0Eb1xGasxTiUYneuHTvKuEGSEJnvZEzna/88Z34EGlJkOu9Cazl0pRK6zQ== 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=1770742513; 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=3qyoLDiGgXH6BwhDQN2PyME5CcuFhcAGKlXemLX8Ews=; b=lRyWr2gbpdIiGJxctr9es3qC39rlPTz8E9DsfNg1fDmwHA81e8Zp3GpN9lEnpLHxHBQSW3 PrESJvblGpQ+0QSiL2tFPYvA7icMAJfj6WLaRwdAoGiOjHvOz+wZm32tbj8/515zwWGIWb hvuzABZu9XlpgiuUkU/PB2R038oMPQEk7wb0mmWfXYfKdrsAqqAR+DLGwP+Y5sejEucAbT LMGzfb+Z5ZuwR30hzNevRaSIvPZHXY0KfKxvtXxtGm+k3T1XU+vGkYH3R4FVtIZgT+eroW YpeZC3MuHUJPHXmzmKAuyEm4G9sTfRv3R+YuwuFsIfUMU+npkWDrXfUtZPorwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9SNd0Kmxz1QP0 for ; Tue, 10 Feb 2026 16:55:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 210c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 16:55:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7e5f4bb3a1c9 - main - kernel dump: dumpsys_gen_pa_next(): Fix "no more chunks" condition detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e5f4bb3a1c999d1893528faa75559f37365de47 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 16:55:12 +0000 Message-Id: <698b62f0.210c1.487fedd9@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7e5f4bb3a1c999d1893528faa75559f37365de47 commit 7e5f4bb3a1c999d1893528faa75559f37365de47 Author: Olivier Certner AuthorDate: 2026-02-04 13:04:20 +0000 Commit: Olivier Certner CommitDate: 2026-02-10 16:50:27 +0000 kernel dump: dumpsys_gen_pa_next(): Fix "no more chunks" condition detection In the (improbable) cases where either: - All entries in dump_map[] are used, so there is no guard entry filled with zeros. - Some dump region has size 0. We would respectively access dump_map[] out-of-bounds or omit further dump regions when iterating. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation --- sys/kern/kern_dump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_dump.c b/sys/kern/kern_dump.c index 67c5844013be..f1354157abf1 100644 --- a/sys/kern/kern_dump.c +++ b/sys/kern/kern_dump.c @@ -82,7 +82,8 @@ dumpsys_gen_pa_next(struct dump_pa *mdp) return (&dump_map[0]); mdp++; - if (mdp->pa_size == 0) + if (mdp - dump_map >= nitems(dump_map) || + (mdp->pa_start == 0 && mdp->pa_size == 0)) mdp = NULL; return (mdp); } From nobody Tue Feb 10 17:07:16 2026 X-Original-To: dev-commits-src-main@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 4f9SfY0vwvz6RdYl for ; Tue, 10 Feb 2026 17:07:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9SfY0MkJz3YKy for ; Tue, 10 Feb 2026 17:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770743237; 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=3UeyIZaj7Ut/lcqI69/u7NlCeH15457l6zlvxK6v+rQ=; b=LXyEVZOYdrvZwExlFw763EQmLTW+JN5BU/V6LLTDk/ClQSyCQj1cpqgQh25nqFi85zeDLa VF/kRo0YnDmlaD7cj2ZOztRbd2bgade36QnxOJaDoJT27JdxcEiYKjVxYuELgfvUrG2lV0 X7Ou6gaIb7zy8zFDB5I6lnLSL5gXdz4K+tivc6K1jjP+jP3X1sYi84nMqRnnFFX/h1dGep 0R1niRXGVDVNN7MZZB6r9ctoOiMDDM+s0SZ7ZOcuK7b1rS13/G2VrxeInmC0tAOcm7o7UP hsP+SbtBmvwekK7+CvahvOAUQZWyvMe0XDthFVBBzCov/bDF+SOByIsQF5EAUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770743237; a=rsa-sha256; cv=none; b=a9LwBb3nVgBicco8c2t2uGyYxnmA16KWhVq4xQYYJf/KmZUv8TB1QJ0y7ssuejCU2RB2qs dGyRvAoubH5RiAU8wJUu2X2KGO+Ve8LrZ6YOLbm3TQapt0k2VjlJkKc3HkuaSRyzFuJvyZ ryhRJeZ42hWyhP+5MloaD9waLNMmbhNk/iUT2++Ft1nwdg4O1dUogCzNWdMeYsjbdNqoVm 1zn89rv1b34piTwyZhObAYGmdB+Yvfwl5KBxt6KxDu75qobmUo9GWPIc2Wtf6uV7QZpD2h +VJZd+UgNpvWWvkpH75zUcZeFMDT+VcM+KgBRHJErsouJCeMyNJRpRZ2c8IHvA== 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=1770743237; 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=3UeyIZaj7Ut/lcqI69/u7NlCeH15457l6zlvxK6v+rQ=; b=F2cxBNLE4gCxEjL/cXzmXo9rgpyr8bnHdrGmJhG6wA/93J4sLSLBgi1+JhgBMFzLSGxS8c CYNII5QfgIJvlj23PBhNglezjEDwdsL09ELWTa1c5XH+27g+tRq63/Vg6RsvC+LdDQbr2p dFFxGecgeOq/a4jTsRjdKaja+ldhH42U+ijYy4IHzMNig0W+mZF/jE/Ky3InPDQhSL2ZUR yrF64WH4ubI/SNWCAOh9EyMxn58Yfz4WJ5vBfEa9eLbmb0RW7x7xbkVdd84u8MgSHwKyT2 cn+HpAAfwYk/7wo0uRhMxfAfvaV0u2vOli56L55bbeatjDqURaYjfQIK3btwWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9SfX6xCWz1R79 for ; Tue, 10 Feb 2026 17:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2198b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 17:07:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 1ea0721e1a56 - main - vtgpu: Support virtio gpu on Parallels Desktop List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ea0721e1a566fdb552b0a919c22667844a894d9 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 17:07:16 +0000 Message-Id: <698b65c4.2198b.4fc2ec98@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1ea0721e1a566fdb552b0a919c22667844a894d9 commit 1ea0721e1a566fdb552b0a919c22667844a894d9 Author: Andrew Turner AuthorDate: 2026-02-10 17:06:31 +0000 Commit: Andrew Turner CommitDate: 2026-02-10 17:06:31 +0000 vtgpu: Support virtio gpu on Parallels Desktop The Parallels Desktop Virtio GPU implementation doesn't handle enqueuing the VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING request and memory list together. Work around this by splitting them before sending them to be enqueued. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D55147 --- sys/dev/virtio/gpu/virtio_gpu.c | 51 ++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c index 668eb170304a..b95bae9fe286 100644 --- a/sys/dev/virtio/gpu/virtio_gpu.c +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -445,21 +445,33 @@ vtgpu_alloc_virtqueue(struct vtgpu_softc *sc) } static int -vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, - void *resp, size_t resplen) +vtgpu_req_resp2(struct vtgpu_softc *sc, void *req1, size_t req1len, + void *req2, size_t req2len, void *resp, size_t resplen) { struct sglist sg; - struct sglist_seg segs[2]; - int error; + struct sglist_seg segs[3]; + int error, rcount; - sglist_init(&sg, 2, segs); + sglist_init(&sg, 3, segs); - error = sglist_append(&sg, req, reqlen); + rcount = 1; + error = sglist_append(&sg, req1, req1len); if (error != 0) { device_printf(sc->vtgpu_dev, - "Unable to append the request to the sglist: %d\n", error); + "Unable to append the request to the sglist: %d\n", + error); return (error); } + if (req2 != NULL) { + error = sglist_append(&sg, req2, req2len); + if (error != 0) { + device_printf(sc->vtgpu_dev, + "Unable to append the request to the sglist: %d\n", + error); + return (error); + } + rcount++; + } error = sglist_append(&sg, resp, resplen); if (error != 0) { device_printf(sc->vtgpu_dev, @@ -467,7 +479,7 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, error); return (error); } - error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, 1, 1); + error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, rcount, 1); if (error != 0) { device_printf(sc->vtgpu_dev, "Enqueue failed: %d\n", error); return (error); @@ -479,6 +491,13 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, return (0); } +static int +vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, + void *resp, size_t resplen) +{ + return (vtgpu_req_resp2(sc, req, reqlen, NULL, 0, resp, resplen)); +} + static int vtgpu_get_display_info(struct vtgpu_softc *sc) { @@ -559,9 +578,15 @@ static int vtgpu_attach_backing(struct vtgpu_softc *sc) { struct { + /* + * Split the backing and mem request arguments as some + * hypervisors, e.g. Parallels Desktop, don't work when + * they are enqueued together. + */ struct { struct virtio_gpu_resource_attach_backing backing; - struct virtio_gpu_mem_entry mem[1]; + char pad; + struct virtio_gpu_mem_entry mem; } req; char pad; struct virtio_gpu_ctrl_hdr resp; @@ -577,11 +602,11 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID); s.req.backing.nr_entries = htole32(1); - s.req.mem[0].addr = htole64(sc->vtgpu_fb_info.fb_pbase); - s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size); + s.req.mem.addr = htole64(sc->vtgpu_fb_info.fb_pbase); + s.req.mem.length = htole32(sc->vtgpu_fb_info.fb_size); - error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, - sizeof(s.resp)); + error = vtgpu_req_resp2(sc, &s.req.backing, sizeof(s.req.backing), + &s.req.mem, sizeof(s.req.mem), &s.resp, sizeof(s.resp)); if (error != 0) return (error); From nobody Tue Feb 10 17:11:04 2026 X-Original-To: dev-commits-src-main@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 4f9Skw449qz6Rdkc for ; Tue, 10 Feb 2026 17:11:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Skw2mrDz3Z0W for ; Tue, 10 Feb 2026 17:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770743464; 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=a7ZQduOEBP9/pO9IAI+CKPcYjqDNEcQIxmh01nHWuDs=; b=c5IgJEYO7dDy/f5ZY75JAKMIwda297P9ewNS5keBBcuKsiLkXVicDcmz/MhQSOgL/H9JdN R6QjBcxG9UCun7+GOfm45aZK6o/5DMr5q0wYOtq5GAlNjGNfaq+dQ38zDHwoGh/aw5frpa GdpiMYPkDctP7v2Pk136d+s0zZ1C7waOS0KDmDkxjUjcWHVNYgetPCT/mX/hbOqfR0COVg cDoCdXakDhlch1QhSb67NbQ21TzPVqVYFdD52pKPSonJRDrYEwy2821JcjkkmwILk9UyVM pLoxTuBMm79/S5UO8ecGfJ6W8JRvU2NjrF88WNRUGVgB+j8kcMIiypZZ5uTOew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770743464; a=rsa-sha256; cv=none; b=Z6UBQLIPthUpkUcnYkKUlM0+Y+u5s0o5E4MQN9rPs79MPYXq0VsLSCv+rxdb9ukijpGKFn H/RdCd3dkSd95MzKtDaMuYTg58gbTVs82HLx/ImabRrHF6IzLcLoGHwZuC7HdVAxMWlYcU diId96eYKx3USmRrq8qtO8rsnO6qnkgHrNoJMlM2b3F0JcdFW2nwbaIOk7yTviqed2brin f9TrAp4k6yvelDxfjOv0igyVZKUcD4eAg+MT7NGa25dsHdBKx5Cku1yt3G0dqVCIOrfrWG Ubdc2SLZ2jrFmuWZ2brEeloGc1m6JkyQdR5tdpzqZg7o/KUCizfgmSBbRBctpw== 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=1770743464; 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=a7ZQduOEBP9/pO9IAI+CKPcYjqDNEcQIxmh01nHWuDs=; b=ipsKsO7ZgWqbNGxSgTc/0k/i0q/ZYEPsgiPfDABIW5hEKTg7WD0oG9QIP4Xow4QYs+no9A Ie8MOnOwh3MgtOBtIgDY3/TY2YyS/zo0xlIfqj8A1oWky9bjxt6Yma9rhLRdGZbbVtDphR WjJ3xHPMTHm1rmhEepbsM9u0ZeZkqOYQmT/QBju7IMaPJZ+n4cLziqUjImF+eIOTadwpHc ZvRlsgXywuYYUsbXghXr5F4ty2gpjoQfJKdycR4KRDtgNMqFYH/q0XoJxly8CThNvsvm48 g0Y8zxSXHlwtd7eL26h5sW1LDB64B+HQGxzM4YhS6NvJhw8wD8wgpfdzFVX0RA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9Skw2FfKz1QRs for ; Tue, 10 Feb 2026 17:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22be5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 17:11:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 950dedcd87af - main - pf: remove unused variable from pf_test_ctx List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 950dedcd87afc6beb8e38956273072ca0d02c964 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 17:11:04 +0000 Message-Id: <698b66a8.22be5.2d49093e@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=950dedcd87afc6beb8e38956273072ca0d02c964 commit 950dedcd87afc6beb8e38956273072ca0d02c964 Author: Kristof Provost AuthorDate: 2026-02-09 20:13:30 +0000 Commit: Kristof Provost CommitDate: 2026-02-10 17:09:34 +0000 pf: remove unused variable from pf_test_ctx Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 68616a7de5e4..21302b70552b 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1441,7 +1441,6 @@ struct pf_test_ctx { int rewrite; int limiter_drop; u_short reason; - struct pf_src_node *sns[PF_SN_MAX]; struct pf_krule_slist *match_rules; struct pf_krule_item *last_match_rule; struct pf_krule *nr; From nobody Tue Feb 10 17:13:58 2026 X-Original-To: dev-commits-src-main@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 4f9SpG5cKGz6Rdng for ; Tue, 10 Feb 2026 17:13:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9SpG52zsz3ZZ4 for ; Tue, 10 Feb 2026 17:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770743638; 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=R1im8pfANff7KmTXggYZwWaY3OANBmO8cENbAaBIgq4=; b=AEnBXrI0mXOdZLO0FIWjUKTGG2PPSRmQspaw/96LMR1VTa8Us6h02nUsllUD2v9hdgVD1y rzIUpY7FQnb0yVyDlaUk9bUycChfdrOGmLL9KBvr/XTesQwd5BJ6ZWeVoEnPENSSqinJpp kohMWlaxIT4KqksIO7WcF3fQUujk20709py7Chp5T/OQIZw0mlS+OC4bpWF5LeP8KNTjU0 ON7OXK7Q2JZ77vDDJY6u7YNzHsLnwgvsyb54cKt21pOOy11EzZEyg2Zg1txg9DZYuhZvjs pDZCJK+P3jgaYPMkHDPlLkIQD1U3nrn2JnLf3PC+mfHqATbterSobcoQwvc6UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770743638; a=rsa-sha256; cv=none; b=T0Zn78Z4g9BHLHI5l82l3aPEc88yC8rNVCLPCTH05s03x7cuZURsNEhR2jhs4wx3Myk9Bo wWmoZORpuAWNRbkP/nxXDR3uPycnpbMP6cUTEZL9E4ZqVEYx8EVRCCb4dsfN8RWUrXy6kI vMd09GSCqpbPoqjGXRR4iINDW6swU/1n9MY+qs+9jKr6LKinhZUHk3DQWeUw7tbQ3q3Pth Dx/W+ErfOSJoqgEqYn/vwui9dfdFgtHKsPmWp+QcRnpwjKmDkpDzYFoQBOc8drP63uooTI xTS1srDjxz2afrwkl0NgbSoxv4obrd4VIy+AW1RCyTQoeEgUsRznYg4RW2ZKGQ== 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=1770743638; 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=R1im8pfANff7KmTXggYZwWaY3OANBmO8cENbAaBIgq4=; b=TK1fsC9p//XAjxOERElJOTHUeZdlwMNGrfedPhWF/sXUgInf1cfP6I8vTOeaCZtWlTvHs+ rd+wd44O4zgg1IfwvVSiA36A4vzxw3ztUL0GN3QKBmzpAP/Yuu5lvmdsPOjnCzkrLSaWMi gZq/x7PgEIu2MqYpuA6YpwifVTeRGi8kAtPeH+wt2zGymTt3Th4wxaToHgEAwLdoiLPh2v eI4GlsLSU5Dw/B7TC1oKYWol/MsbRoOivmg7tilqVTx14Q+YjeiY5QJ0ctuy32gGQtcvZk cS5dQTIPElseEpYXn4YVtnMT+YGzmoRWafo6hGuMD6tEKH5Za1yOWuOJAxvbig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9SpG4dTwz1RL7 for ; Tue, 10 Feb 2026 17:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 17:13:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 378577393e40 - main - ure: improve receive checksum offloading List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 378577393e407fa2cd9677392da2287e37b4dd33 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 17:13:58 +0000 Message-Id: <698b6756.1fe70.6a0f73b1@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=378577393e407fa2cd9677392da2287e37b4dd33 commit 378577393e407fa2cd9677392da2287e37b4dd33 Author: Michael Tuexen AuthorDate: 2026-02-10 17:08:07 +0000 Commit: Michael Tuexen CommitDate: 2026-02-10 17:13:48 +0000 ure: improve receive checksum offloading Let the receive checksum offload for TCP/IPv6 and UDP/IPv6 be controlled by ifconfig rxcsum6 and not by ifconfig rxcsum. While there, make the code more compact and improve stlye.9 conformity. Reviewed by: Timo Völker MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55188 --- sys/dev/usb/net/if_ure.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/sys/dev/usb/net/if_ure.c b/sys/dev/usb/net/if_ure.c index 92160fe9b1d2..257051e6e379 100644 --- a/sys/dev/usb/net/if_ure.c +++ b/sys/dev/usb/net/if_ure.c @@ -2131,41 +2131,33 @@ ure_rtl8152_nic_reset(struct ure_softc *sc) static void ure_rxcsum(int capenb, struct ure_rxpkt *rp, struct mbuf *m) { - int flags; uint32_t csum, misc; - int tcp, udp; m->m_pkthdr.csum_flags = 0; - if (!(capenb & IFCAP_RXCSUM)) - return; - csum = le32toh(rp->ure_csum); misc = le32toh(rp->ure_misc); - tcp = udp = 0; - - flags = 0; - if (csum & URE_RXPKT_IPV4_CS) - flags |= CSUM_IP_CHECKED; - else if (csum & URE_RXPKT_IPV6_CS) - flags = 0; - - tcp = rp->ure_csum & URE_RXPKT_TCP_CS; - udp = rp->ure_csum & URE_RXPKT_UDP_CS; + if ((capenb & IFCAP_RXCSUM) == 0 && + (csum & URE_RXPKT_IPV4_CS) != 0) + return; + if ((capenb & IFCAP_RXCSUM_IPV6) == 0 && + (csum & URE_RXPKT_IPV6_CS) != 0) + return; - if (__predict_true((flags & CSUM_IP_CHECKED) && - !(misc & URE_RXPKT_IP_F))) { - flags |= CSUM_IP_VALID; + if ((csum & URE_RXPKT_IPV4_CS) != 0) { + m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED; + if (__predict_true((misc & URE_RXPKT_IP_F) == 0)) + m->m_pkthdr.csum_flags |= CSUM_IP_VALID; } if (__predict_true( - (tcp && !(misc & URE_RXPKT_TCP_F)) || - (udp && !(misc & URE_RXPKT_UDP_F)))) { - flags |= CSUM_DATA_VALID|CSUM_PSEUDO_HDR; + ((rp->ure_csum & URE_RXPKT_TCP_CS) != 0 && + (misc & URE_RXPKT_TCP_F) == 0) || + ((rp->ure_csum & URE_RXPKT_UDP_CS) != 0 && + (misc & URE_RXPKT_UDP_F) == 0))) { + m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | CSUM_PSEUDO_HDR; m->m_pkthdr.csum_data = 0xFFFF; } - - m->m_pkthdr.csum_flags = flags; } /* From nobody Tue Feb 10 18:12:18 2026 X-Original-To: dev-commits-src-main@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 4f9V5k2tmCz6RkLS for ; Tue, 10 Feb 2026 18:12:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9V5j5qjpz3jhf for ; Tue, 10 Feb 2026 18:12:25 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4806dffc64cso51822655e9.1 for ; Tue, 10 Feb 2026 10:12:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770747144; x=1771351944; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=P0U2UboXA2xldpc0KZlSAds3v1XH+ltTNVKPlk+h9wM=; b=P+dSe5Pnb/TTSkTD7uk5JN3mn0tZXKR/g8ehlJmOrzqHU3jNolt6hmRSJDt3/FHJFH n9xaIMT0DAHlVsYk4d8p1GaGkkvfbmJlWiWVj/4ItD3axLZPB3oDSimsomdm2tnbCPWq 2D3ScRAqygTx2xSjN0P2EghiGm4FVbsb2k4rG7aQemHYdqqrc5tPscTd8WSlzkZI2z7k tbRGtpJGEB+QQ/+RyY2MZ/JsFpfDONO5mPkhyCP9w0oPRC3Nv++4tsYosHXmeWgosTIE U97ugEAe7hua96+j42gad+DKKy/l8zG/nP34LdZztYxhp10aWpsIYD/30lVvKN4SYIV/ bTag== X-Forwarded-Encrypted: i=1; AJvYcCXToAsucfCCYfy5LQR61p43lDv+1u4QIPIsjoW5r2Vx5TeUPOlnxxFugFDIv9C1Nf4+ghNk1+n6Jv59z1Ao6szODrwG6w==@freebsd.org X-Gm-Message-State: AOJu0YyeXG4QB6k3R+kBYK4P6tVUHAOlgt+h9UDdCqhXh2sQL0p9TMVI vXlwUYLcX24I3UCOM3vXHmVipfbkgOL+vsYZO8gC9tUS/9Cnd1JtBI6yeYFgBqSBm/U= X-Gm-Gg: AZuq6aJTV+FZKkIf+DmG0R4HN63MHweb4nz3oRxoK+C0nDOPnyBsrE8vLrlKMDgH80t EYKkG+LrOPcoG6ZXT6W15C9silCABJloml7H9Dkw8ovFBxcFseV4q8UW19rAlpwNIsATz9pNVzJ zFiQSI+egvL3E+GdjRKHgLjwEPk8lGxo/3zo7msfWmX1i+0IagFOxmwU5/VQn5E5nahPh2C7+lY AVqkqEznchodcnILol+Y+9AJvVqsLgG6HuyLz97TKM0ffbhBphmLvy9bxW2WqWYk5IDE6T477mg 0ek2uuRMvSsp9eSxz8dNtqCdirPcWtUHvYp6VvlJE0ziFt1HkClWocp72MGjLow/J57vpZ74mIy lysCu28wPKTiKZTa0EYZLMEzkhOgYCGZu0bkQWuWZCWvI0FF0Szd8g/HiRfJP54KXjJVtAbUj5p E9561j3q5b9uFETGahmPzmCm1YTEvateIcP20Gn9l/1HMRjAWTZo3xufAFaA0B+AhL4w== X-Received: by 2002:a05:600c:314e:b0:47e:e8c2:905f with SMTP id 5b1f17b1804b1-48320928e3fmr216098215e9.8.1770747143935; Tue, 10 Feb 2026 10:12:23 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-483209e0c4fsm119910825e9.18.2026.02.10.10.12.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Feb 2026 10:12:22 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: 2ccbf06c0285 - main - arm64: Add MOPS implementations of memset(), memcpy() and memmove() From: Jessica Clarke In-Reply-To: <698b5224.47b1b.86c86bb@gitrepo.freebsd.org> Date: Tue, 10 Feb 2026 18:12:18 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Sarah Walker Content-Transfer-Encoding: quoted-printable Message-Id: <5F843E5F-5827-4AFC-B843-4812C0D907FC@freebsd.org> References: <698b5224.47b1b.86c86bb@gitrepo.freebsd.org> To: Andrew Turner X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4f9V5j5qjpz3jhf X-Spamd-Bar: ---- On 10 Feb 2026, at 15:43, Andrew Turner wrote: > The branch main has been updated by andrew: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ccbf06c0285ca1c06681e7212da8e7d= 1e87fe19 >=20 > commit 2ccbf06c0285ca1c06681e7212da8e7d1e87fe19 > Author: Sarah Walker > AuthorDate: 2026-01-28 16:22:50 +0000 > Commit: Andrew Turner > CommitDate: 2026-02-10 15:39:56 +0000 >=20 > arm64: Add MOPS implementations of memset(), memcpy() and memmove() >=20 > Enable the use of MOPS implementations of memset, memcpy and = memmove within > the kernel. Fix pre-ifunc resolution uses of these functions. And what happens if the compiler inserts calls to these functions prior to IFUNC resolution? Jessica From nobody Tue Feb 10 18:20:08 2026 X-Original-To: dev-commits-src-main@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 4f9VGr3nS8z6RkSJ for ; Tue, 10 Feb 2026 18:20:20 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic312-24.consmr.mail.gq1.yahoo.com (sonic312-24.consmr.mail.gq1.yahoo.com [98.137.69.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9VGr0RLSz3kky for ; Tue, 10 Feb 2026 18:20:19 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1770747612; bh=CZmvQy++hIM+lCaViDWNtq2MyzXtBez4W9dvQeqA1vE=; h=Date:Subject:To:References:From:In-Reply-To:From:Subject:Reply-To; b=Buuj2Lj/zSClN8dFQ3tBaW35ASSrUlG6QfFV9doolzpr3r9N+KzkmwdC9td4nOcyfY4/ixjOCOo5ssrGFu0HHZG9GAnBC70Z6eXu5fXYz0dqlvDFZ8IwFuGQO+6s8Gei6d6j6Nzf+ple0gZGIaVC5zb/ZkPT89/fwMKirUG6jdAKS4GtR1CZ3G8I3GymCx2Dp1FeJNDecseaOXfgWMBExRL75vWLLskB7P2jKwOzbrT3uKPdf9zuqw/k+rvW/EJQAlOjUVNrGvuDI02EMfCnw8iGh8IHAVo7DZgFDU4qVhSjhmsIY3BeZ04g/wVsogrAYCx+RrvA/kV9DTtZ/fa+gw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1770747612; bh=45OEqtshGzbmA70N0JRNrn2B9sI591ePoWdgKMb2QRB=; h=X-Sonic-MF:Date:Subject:To:From:From:Subject; b=UKQm6GPzKEFVJjgu6dQf82fvW3eP5KMiflySdeC46AzEkw+mIaANHT60lOp1T58PXgIv1RFSNzcpI/CA78Ad/HsNgfvUe4wpNNFY9b9rsDFPreTBeWjSgffl475f0FXUr4nHE/hQ9F+DRAq4WxwKNI1/tGDs9MbA0kPRvX/7iDZOfEh/BOG8DglQwjdBqPbOUCNr8BE9kAXL2OW+ZEFkj5GbGdlqKdEyi9Qkyq1jwxINONsqrdU1Rt6ijqz1hNzRWa/d/vl6Q1nbWnYZiTyWP4G1F7QLekHgw51kvXvE3bNE+RZJMoGpuR0sECZ5rQTQVT450N+U/UbQBegB3hgpiw== X-YMail-OSG: ho0YrY0VM1l.RZPfoAiusccekhTxg_EovMav3OmfDF6Dl12viuZLychA.ugmHl9 mRagbUoQTVKmUgo9c1kV6dxnQXxkTNQvW0hSrm1r72deoEcJIkGNw6W7.8DG4fa_OCPCxyiuLqvj bGsZ9C18kEf7Et3QJm9WTAb.d9dBFsraeluISoIpP0qQ40Iqxt7FEd8y6gf.6b4ohDGhIeyGJtP6 vfZheM3IG1A.lF.TuP6BNcRAGwn9SbHUGboGBhC_g3re4bOHenzM2teryCMniuxcVjHToOaE5fwa yzdiIuWHPYgKgrEmTwabR8QgZeaJEvLVJr4uwreb0oObzIUoUh9slUD2N3HDSqJHeJrIbauhvhZz 8trjqTpPpnipQogDyLGf52A2BsdrYj3h63dmTDzllHFvTG2m_HgG11PjsBH98.uZXrq9tGw5.eeu wIXZ0_TRivGh.gltbkUERuYTgckr0tZjI8be.lju3PvfLfd.Fh1128tKW8JEkzFVFnr7t0Y4J87o zOLvzNPEIS3ebzj2dtsvhhpvz_ocwR7EkQwSyRje6R26xL91wFdM.WaWf3sdJ55vrvSY8oa9Q.96 7_0CsKJ40eEgjtPj5cWsDoklluTqL6eR8eqH_KwM5s1BTyOtEW5B6nrl_YLzzVO8QHNRJPFcmQjg lH3DSKM6g6n.uhsCuRpxxyLGyyyPXrH.qfQ.Lvrf3kTcM2LlWQyRpgVf83I5TIjntz1VU2jSe2s7 ZvBqmwhBqSKZjKHO7nrIbGS.34jFaZpQdnMzyaeuPjXYWow6Wdrt4T9xWsBMvtrlSxqW0OPb9hyf _i2A2M_HtTImype30eCPY__WsDQ_hc8Cr.X9XSzgQbtYDlR02c0wcb5xzRB3vGCf.jMlYFKzDwwM AskQu18iA9MgQfn4ifeu.7t25tycYlB3RXM.gzZuRcL20bgsIYz8STCljSAFvR8LdccQtrAcYopo _U8UW5GEuBMglVyZ_j0pex6vRlr_TBsgTo4skjiKWSYAe0HD9PezfdXcp1BdQ8N3vQihey2EDSQf RopWpPGJnpdbvmVk3o3VAsvEEtwnJ3dAuW_Crn8yTCFgLbfcevS6Sekm2FhMev9Bx5h4SRzYa6ef j1hjhk4UyucxPjEPz5O3CVehWQf56LoNS0gbpio.yQac5_LEYv1NWb.q2nKBgctDTv0SWQUujW5c YcE2nW.ss7UnX4_5bozEN0td8ElUuDIBjE4yPkwJX2iidT50G7VS5PZ_CQO2sLsaIBaEwbgqp2pM cIhhsBSxIeah334dE5YFffuuACwPsyPjkDAwRUUd3DAlIxgYXXZ08xVqURrkL9TkDOlN_7cTeXXl F6a.zdl0kMHPLHlIngbqn1kpcQx9eYa9HOPLUAB9Pg6SDA5_VqxYU8H1c9qjgAdWScfUFLiTnWnT RVcjiXVWfedxV9CT7OjqB95bvYr3.HyvA7ALhx9mYSCVg5nBL87xlExoqo6jdxKc.xVuyfIkQ7gE jxva622Jcj1cdfH76l2XVAGmKo7vdmbaBWdNEfzJbqlIHXB6AoSxa6dUJoFvoYk.v6LYuWr_vwRH JoGOpjnWnV81MlbLC6rVLljeNLzAesn0i8tTKgkEHMQCb.gsFg8GjWSOjdNk7OCAS6QqJFYqP8GA 0Dxg2HFDw8iL5O3.re.r998DlhmW1ocnx48Zc0FR0MS1VGVe_L7NxEbuFaQ.SeXHhGNtzjP6jLLm qw80YZcqMAOurTp5JbRPwYHT659KopwsJ2pKKtLb8lCUmaNmdmGc0W5zFfKjC_K237pWKEAeac79 R5oCrTX1QYIrLZ34eFdUsVzPF5UUNQjVInLJ3evvbctWKsg1O6kZw3KIVBt6dpgDBgLqpLSmUY6e NDBfSHRFZcbiBIOsauDYu0ZZN9EqK3HJOSQExdXUcMvGVndgTF3G0ODm2L5GzY0ZWo8NXjpmiHhs jLqpfDhjhhH7eDNQjA0TMeySsp1Ns3_sovfvHczdJKW0R5vwagqdU.Y7Y0beFwRbSonIoXPo6L7S cWE6MFpyLucR3OcaRJrSIecH07aEyU1J1KnEJQ.S6sZt3w8FAAkRti3Xk0KCltRoaP9qAUS9ICLZ d2AEEoQcQtVwCkpbJvm5U0H4EX.MfE2L3Xa6Kou5Bd4cjOJyRZWK7mfRwZBKwbctREl3r3V5nbBy 3vtjpqbR0qe8nlv0Lnhvw8eDhb0w7Ii4RfpkKUAQ080aS0dQpjsw_yvEEiyjwLHunuLUmeCC5u6h Z2A9LPMgEpA8YLAqzlVXt63KRBMK3qPbn7n8vyfLV4bI3dJ_XgdWxJcoYIx3_5t1xUhxsCl.x9p. KwMK5M4guhX6rGPYO6lTD_GU9oYViR6amQPzzA_6N X-Sonic-MF: X-Sonic-ID: 78ebb1e3-5879-4745-aa4f-3c559eda13e8 Received: from sonic.gate.mail.ne1.yahoo.com by sonic312.consmr.mail.gq1.yahoo.com with HTTP; Tue, 10 Feb 2026 18:20:12 +0000 Received: by hermes--production-gq1-86969b76cd-nvz7p (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 05e64bcf316f54c9a98c4621e06c8b8d; Tue, 10 Feb 2026 18:20:09 +0000 (UTC) Message-ID: <5ac3abe1-0a95-414b-9c5e-9f2ba03854eb@yahoo.com> Date: Tue, 10 Feb 2026 10:20:08 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 1ea0721e1a56 - main - vtgpu: Support virtio gpu on Parallels Desktop To: Andrew Turner , dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <698b65c4.2198b.4fc2ec98@gitrepo.freebsd.org> Content-Language: en-US From: Mark Millard In-Reply-To: <698b65c4.2198b.4fc2ec98@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailer: WebService/1.1.25178 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4f9VGr0RLSz3kky X-Spamd-Bar: ---- On 2/10/26 09:07, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1ea0721e1a566fdb552b0a919c22667844a894d9 > > commit 1ea0721e1a566fdb552b0a919c22667844a894d9 > Author: Andrew Turner > AuthorDate: 2026-02-10 17:06:31 +0000 > Commit: Andrew Turner > CommitDate: 2026-02-10 17:06:31 +0000 > > vtgpu: Support virtio gpu on Parallels Desktop > > The Parallels Desktop Virtio GPU implementation doesn't handle > enqueuing the VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING request and > memory list together. > > Work around this by splitting them before sending them to be enqueued. > > Sponsored by: Arm Ltd > Differential Revision: https://reviews.freebsd.org/D55147 > --- > sys/dev/virtio/gpu/virtio_gpu.c | 51 ++++++++++++++++++++++++++++++----------- > 1 file changed, 38 insertions(+), 13 deletions(-) > > diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c > index 668eb170304a..b95bae9fe286 100644 > --- a/sys/dev/virtio/gpu/virtio_gpu.c > +++ b/sys/dev/virtio/gpu/virtio_gpu.c > @@ -445,21 +445,33 @@ vtgpu_alloc_virtqueue(struct vtgpu_softc *sc) > } > > static int > -vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, > - void *resp, size_t resplen) > +vtgpu_req_resp2(struct vtgpu_softc *sc, void *req1, size_t req1len, > + void *req2, size_t req2len, void *resp, size_t resplen) > { > struct sglist sg; > - struct sglist_seg segs[2]; > - int error; > + struct sglist_seg segs[3]; > + int error, rcount; > > - sglist_init(&sg, 2, segs); > + sglist_init(&sg, 3, segs); > > - error = sglist_append(&sg, req, reqlen); > + rcount = 1; > + error = sglist_append(&sg, req1, req1len); > if (error != 0) { > device_printf(sc->vtgpu_dev, > - "Unable to append the request to the sglist: %d\n", error); > + "Unable to append the request to the sglist: %d\n", > + error); > return (error); > } > + if (req2 != NULL) { > + error = sglist_append(&sg, req2, req2len); > + if (error != 0) { > + device_printf(sc->vtgpu_dev, > + "Unable to append the request to the sglist: %d\n", > + error); > + return (error); > + } > + rcount++; > + } > error = sglist_append(&sg, resp, resplen); > if (error != 0) { > device_printf(sc->vtgpu_dev, > @@ -467,7 +479,7 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, > error); > return (error); > } > - error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, 1, 1); > + error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, rcount, 1); > if (error != 0) { > device_printf(sc->vtgpu_dev, "Enqueue failed: %d\n", error); > return (error); > @@ -479,6 +491,13 @@ vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, > return (0); > } > > +static int > +vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, > + void *resp, size_t resplen) > +{ > + return (vtgpu_req_resp2(sc, req, reqlen, NULL, 0, resp, resplen)); > +} > + > static int > vtgpu_get_display_info(struct vtgpu_softc *sc) > { > @@ -559,9 +578,15 @@ static int > vtgpu_attach_backing(struct vtgpu_softc *sc) > { > struct { > + /* > + * Split the backing and mem request arguments as some > + * hypervisors, e.g. Parallels Desktop, don't work when > + * they are enqueued together. > + */ > struct { > struct virtio_gpu_resource_attach_backing backing; > - struct virtio_gpu_mem_entry mem[1]; > + char pad; > + struct virtio_gpu_mem_entry mem; > } req; > char pad; > struct virtio_gpu_ctrl_hdr resp; > @@ -577,11 +602,11 @@ vtgpu_attach_backing(struct vtgpu_softc *sc) > s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID); > s.req.backing.nr_entries = htole32(1); > > - s.req.mem[0].addr = htole64(sc->vtgpu_fb_info.fb_pbase); > - s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size); > + s.req.mem.addr = htole64(sc->vtgpu_fb_info.fb_pbase); > + s.req.mem.length = htole32(sc->vtgpu_fb_info.fb_size); > > - error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, > - sizeof(s.resp)); > + error = vtgpu_req_resp2(sc, &s.req.backing, sizeof(s.req.backing), > + &s.req.mem, sizeof(s.req.mem), &s.resp, sizeof(s.resp)); > if (error != 0) > return (error); > > > Up to now, for the aarch64 macOS context, I've been using the below /boot/device.hints to only get the console that results from the change. since virtio_pci1 was not working. That has been sufficient for my context: Mostly I ssh in and do not use the console for much. (The long "virtio_pci1:" comment line below will wrap twice.) # cat /boot/device.hints # This is for virtio_gpu --for avoiding its use under Parallels: # dmesg -a | grep -i "virtio.*gpu" # virtio_pci1: mem 0x10000000-0x17ffffff,0x18008000-0x18008fff,0x18000000-0x18003fff at device 10.0 on pci0 hint.virtio_pci.1.disabled="1" Should the change committed mean that things would likely work if I then comment out the hint.virtio_pci.1.disabled assignment (once I manage to upgrade)? -- === Mark Millard marklmi at yahoo.com From nobody Tue Feb 10 18:52:43 2026 X-Original-To: dev-commits-src-main@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 4f9W0C66NMz6RnlG for ; Tue, 10 Feb 2026 18:52:43 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9W0C5Spsz44ZL for ; Tue, 10 Feb 2026 18:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770749563; 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=uPuVSOuJ4CUf7WD8JA2FJv+UR86lyV8ECogEhlrF9lQ=; b=NsbsRJGqX2rbEqF9aUARCdOwMPJ6d10tOQ79Qqkak8CfCPD2BzwaJd8Q3MBYA4VoEn4qR+ 3muIsq3wyWaNMirJLm7D8lIPEw2fKKBpTAH+bEmlqsVZo8pnEjVVhnNdWFHbIvlFa8PP7f yQYEd7C3NooN/hcgQhRTXqxg/eu3Gqg4kX29ns8bN6KALJ3rsaBPlCtFA5N5BnG5Jfx/QU OmDECUYk4vvYgvBn9eZejrE2A+NRonmwEbDHgVdcy0sL1bvPlDGaN2c0hmFRq9E0lYir8H 3Dd1SBYCj2Bz5YSEu8fQSvYmpk9mPkSYH9gODB5PRtiz06bPYIcmq/LFQ7Kz3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770749563; a=rsa-sha256; cv=none; b=VRHKE/qnHagUqCTX089BAoP+Tz9g74gVVlkNs2sr+y5Q+icZ1xTxd9s3C86ehxx5iJc/PX lr+goMe4kCZjb8AeC5C+JmKiC8GPgQkuJg2zxPMz3wTZWTgRbA6wZGceZ21xBAukdQz4TF X76yfUVnpxXZGJ22IeigfPCLG8+Nv+DtBBvYgb3J/o3NXYWI/utZ6IHbXSDUdi9KGJlc6s AO2GBXX2o+nQpmYCA0ojuWx5fjagxl8dOgFEPtolfgrdnnsWEApVjF9Ah1o58j11xzCke+ zaf2WayALAia0SNiX0ASHUmfyw4zBWWRlafWwGAhVbsdPj420oJQibgpkPeRKw== 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=1770749563; 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=uPuVSOuJ4CUf7WD8JA2FJv+UR86lyV8ECogEhlrF9lQ=; b=wRRqG3qn2yb398vfVHM5m/jimpqfIBiFNgnfzSyQej59T+CskuWWkaf21GhJRV7Wq8H4Od 62GQph5zdshWL5dzWyAsn1V4niwI1xbEAwPe73Yh4Um60LaMutOldrVsJZAWtv/ep5E6yk M4oir6eSJNfOxnn/JNHg9ECZkinciOuyFObl9/3HvQF9rvAuJd634RXqZaxK3w27ymu3h8 rUmv2CB/P4YlXxq2zUVOGv1EeazpeKESFDc2itnLuRT/XALr66ZCy98/gN41ToISUi2UiP YhWEYnmwrzuhDHbfN0DGyp5WuojjWXv6lCNiBDmn5uoLKR8S0Vl4A/6pF1u/Kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9W0C4yzPz1GS for ; Tue, 10 Feb 2026 18:52:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 334af by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 18:52:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 69c64e3fb575 - main - git-arc.1: Fix patch options List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69c64e3fb575e0db0e2f0c1fc56f466624940ded Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 18:52:43 +0000 Message-Id: <698b7e7b.334af.28acb94e@gitrepo.freebsd.org> The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=69c64e3fb575e0db0e2f0c1fc56f466624940ded commit 69c64e3fb575e0db0e2f0c1fc56f466624940ded Author: Joseph Mingrone AuthorDate: 2026-02-10 18:31:04 +0000 Commit: Joseph Mingrone CommitDate: 2026-02-10 18:49:46 +0000 git-arc.1: Fix patch options Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55228 --- tools/tools/git/git-arc.1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/tools/git/git-arc.1 b/tools/tools/git/git-arc.1 index f3fd6ea11adb..6dfec53a84ad 100644 --- a/tools/tools/git/git-arc.1 +++ b/tools/tools/git/git-arc.1 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 29, 2025 +.Dd February 10, 2026 .Dt GIT-ARC 1 .Os .Sh NAME @@ -41,9 +41,8 @@ .Nm .Cm list Ar commit-ref Op Ar commit-ref ... .Nm -.Op Fl bcrs .Cm patch -.Op Fl c +.Op Fl bcrs .Ar diff1 Op Cm Ar diff2 Op Ar ... .Nm .Cm stage From nobody Tue Feb 10 19:45:09 2026 X-Original-To: dev-commits-src-main@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 4f9X8p6lPxz6Rtym; Tue, 10 Feb 2026 19:45:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9X8p65Smz4K3f; Tue, 10 Feb 2026 19:45:14 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770752714; h=from:from: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=SnS4ZARunDtoeGxp324gSCergHYqz9Hye8oBvsi2Ixk=; b=khZ5Lz+ap0BgGP9WCmcSkyc1bNSP+8L70dVqE+Y55STE7s9RvAeR+oVhewLajLYAbmHwu1 sGkn2P9qAr0Di1+vpekNfnh3cLVXpvy8bs6z17AMED5eRi0sRhYNDbhE04MrAQaDTJZFtk wV/XfKYXzQbEavNATJhzD5C2AWUZ9BjM6S3uU/1RVLrBzLr2/32pTqOyL9NFnzoCh2r5Vm hzFTJ6IqOpKjCdfSb2+zz4DOg0jJ/JRoz8JbNJInLdVkC5aIDPaMAltTj69GPQEhUKD1r2 lj8g3dVSIanmh0HgLyN23cjuJDFz2pYDXU0pO7Y+Dh18pVNM3k1/eS0u2qYsfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770752714; a=rsa-sha256; cv=none; b=H8uc/dUwbRuI3dt1uxavyiPMjfdQm0y0LiqLt6aKINOTvHQwI9qTrsz2p6Q4nSBoePlYCV OuBJ13u8cZcQLp4Fws/g944l/6cy6skLTspPBsGu0AFpky1UXzTN4hITHQGx/RIBJ4ZceH 7Z/H7kKhpGvgr5KuLCW0SxGn8IQAI1Cy+E0+95HFEBynckESXf2r6DNEQQM41pqXzHLo8b rlOVb2tHuI84gpCLZA1lyh3Q2KKVGguLTbS8Tyl878KxaLAO721U7YlcS0J/bvddnAtZ5K kTrhGwnWD4UsPyw7pxxPFnToDL7YaIHS2nH9Ohyk5WqtqnFLw/vsQeRWuqPT8w== 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=1770752714; h=from:from: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=SnS4ZARunDtoeGxp324gSCergHYqz9Hye8oBvsi2Ixk=; b=dogyiLilUt8tkU7m8TYxjZHgBCsB8Ke/mRTOgUshqwmXCOruNdg9F8Y7I5/+dDsL6QjUCT t5eCOkO8FK9Q0R6fuBaYvYrX/O9GpGd6nCPpis6ymgBrv8mvQ2ZR7v/1fuERbLYzcN+6Zl wcIKzBlHb4Zc7Zw+5ZbEY8kVoimle2NDfMaW9PYp8ih54XuP/5RL2aggRrceopF7G5qIfT lIE4WMWKCYZpHUML+F24eVaZeKUH1ru2sQiLJRSFvO4kcXjhyjTpUbE8goRRn5we5XCn9+ WBbhO0P7aIOJoqihu0cYUzzaL3J2lmcqshma6vBupK9fXtnI2aAAiCOb15wdDA== Received: from [IPV6:2a05:b400:110:12fe::a4] (user-12fe-a4.svr-vpn-1.vpn.cl.cam.ac.uk [IPv6:2a05:b400:110:12fe::a4]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f9X8n4Y4hzrGB; Tue, 10 Feb 2026 19:45:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0bf02b0d-4115-4d10-93c0-e75a8733f75a@FreeBSD.org> Date: Tue, 10 Feb 2026 14:45:09 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Content-Language: en-US To: Konstantin Belousov , Minsoo Choo Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/9/26 12:49, Konstantin Belousov wrote: > On Mon, Feb 09, 2026 at 04:55:41PM +0000, Minsoo Choo wrote: >> On Monday, February 9th, 2026 at 11:45 AM, John Baldwin wrote: >> >>> On 2/9/26 10:56, Minsoo Choo wrote: >>> >>>> On Monday, February 9th, 2026 at 10:12 AM, John Baldwin jhb@FreeBSD.org wrote: >>>> >>>>> On 2/8/26 23:18, Konstantin Belousov wrote: >>>>> >>>>>> The branch main has been updated by kib: >>>>>> >>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 >>>>>> >>>>>> commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 >>>>>> Author: Minsoo Choo minsoochoo0122@proton.me >>>>>> AuthorDate: 2026-02-06 20:03:53 +0000 >>>>>> Commit: Konstantin Belousov kib@FreeBSD.org >>>>>> CommitDate: 2026-02-09 04:17:16 +0000 >>>>>> >>>>>> pcb.h: mark struct pcb to be preserved >>>>>> >>>>>> There are programs that depend on this structure (e.g. kernel debuggers) >>>>>> that breaks when the ABI changes. >>>>>> >>>>>> Signed-off-by: Minsoo Choo minsoochoo0122@proton.me >>>>>> Reviewed by: kib >>>>>> MFC after: 1 week >>>>>> Differential Revision: https://reviews.freebsd.org/D55149 >>>>> >>>>> Hmmm, I think it is useful to know which fields debuggers use (typically just >>>>> registers) vs which ones can be safely changed without impacting debuggers. >>>>> >>>>> -- >>>>> John Baldwin >>>> >>>> In the review, kib said: >>>> >>>>> I had to add and preserve the padding fields pcb_pad in the amd64 structure to be compatible with kgdb at least. This makes me sure that the whole pcb layout is fixed by ABI. >>> >>> >>> It is no longer needed and hasn't been needed in a decade. Back when the field was >>> first added, kgdb did indeed assume a fixed size for `struct pcb`. However, back in >>> 2015 I added a pcb_size variable that debuggers can use to determine this size >>> (to properly index the stoppcbs[] array) even if debug symbols weren't present: >>> >>> commit 645743ea99829e6d578cca5a580cf0a4102fb7dd >>> Author: John Baldwin jhb@FreeBSD.org >>> >>> Date: Thu Nov 12 22:00:59 2015 +0000 >>> >>> Export various helper variables describing the layout and size of >>> certain kernel structures for use by debuggers. This mostly aids >>> in examining cores from a kernel without debug symbols as a debugger >>> can infer these values if debug symbols are available. >>> >>> One set of variables describes the layout of 'struct linker_file' to >>> walk the list of loaded kernel modules. >>> >>> A second set of variables describes the layout of 'struct proc' and >>> 'struct thread' to walk the list of processes in the kernel and the >>> threads in each process. >>> >>> The 'pcb_size' variable is used to index into the stoppcbs[] array. >>> >>> The 'vm_maxuser_address' is used to distinguish kernel virtual addresses >>> from user addresses. This doesn't have to be perfect, and >>> 'vm_maxuser_address' is a cheap and simple way to differentiate kernel >>> pointers from simple values like TIDs and PIDs. >>> >>> While here, annotate the fields in struct pcb used by kgdb on amd64 >>> and i386 to note that their ABI should be preserved. Annotations for >>> other platforms will be added in the future. >>> >>> This was even the commit that added the annotations just removed, so a simple >>> blame for why the annotations were present would have turned this up. >>> >>> -- >>> John Baldwin >> >> If this is correct, we should revert this commit. I want to hear kib@ thoughts on this and once he confirms someone with commit access can revert this change. >> >> My original patch was marking pcb fields as stable for all architectures (lldb aarch64 kernel debugger was broken because of this). I'll create new revision with original patch once revert is pushed. > > First, I do not mind reverting this, will do in a hour unless we get to some > other conclusion in the thread. > > Second, I want to discuss something related to the struct pcb. Right now > the structure is used for three quite unrelated purposes: > - as effectively part of the struct thread, despite being a separate > allocation when the thread is created > - as wakepcb for saving some part of BSP state suspend/resume > - as dumppcb for saving all CPUs state for vmcore > With these consumers, it seems that fields are only added to the struct, > and never removed. For instance, I do not see any use of pcb_sfmask. > > I really want to split pcb into 'thread pcb' and 'kpcb', and define > that kpcb is KBI, while thread pcb would be only stable on the stable > branches. kgdb and possibly klldb need kpcb for starting frame information > on CPUs when kernel dump does not have dwarf, am I right? It's not really bout lack of dwarf, it is more that you need a starting point. The pcb's serve a similar purpose to NT_PRSTATUS / struct reg for userspace debugging. It is how you get the initial PC and stack pointer (along with a few other registers). Some day I have a dream of outputting kernel crash dumps as an ELF core file (with some extensions to handle our page table bits) and would output per-thread register notes instead of having to grovel around in the proc and thread lists to find td_pcb pointers. However, the live kernel case (kgdb against /dev/mem) and remote hypervisor (gdb connected to bhyve or qemu's gdbserver stub) will still need to grovel around in proc and thread lists to enumerate threads and locate the initial register state of each thread. I would be fine with having a substructure as the first member of `struct pcb` (which ideally would be renamed to `struct tcb` if that wasn't too disruptive) that is the set of stable fields. -- John Baldwin From nobody Tue Feb 10 21:24:34 2026 X-Original-To: dev-commits-src-main@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 4f9ZMR06rFz6S4F5 for ; Tue, 10 Feb 2026 21:24:35 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9ZMQ6kYmz3NTs for ; Tue, 10 Feb 2026 21:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770758674; 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=gKadPGtJKBk0MJ6+O183JYy975MRNvtlWu5kNVLdH2c=; b=dUPJ4IWsGRZHPVNivxDZ6XkFXytUs1oOxN1Wwgc4IsFcuH+Y73lykSEnm0UszjQZCb9+ET KklLFIMjp7tnEfpyOF0YVFOSnWgwIV1a/Ko1UhOKycoQ/SMIIBT2Mk6TsQ9oJ7cHrQ/+q7 WLSP7WUg8DG1ZPumPxEa05BtWkL+YuRKKoOmThNiksCsPRemtOVDHZxvcv3H+6+vWDjbU/ aLe7hNj3W8JX9lttqmKSE91UXAgcS9F4eYsAsfEy5j7oWQqIGJzk2vjm+Jue0mQCs0I2FB 76n4z52DEIFdKvbnEhTnpljYO0O7CwBJtLqTrCnXVGx3Hge7lNSuW80yv6TzbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770758674; a=rsa-sha256; cv=none; b=Bk1lmiHNqqlt0Vcnu89fxVA5Xe3DraO4hOUswFMNgsEV5dpqnInNZKwsfosaYoSieDA7Gv tGW+x9VCHeJE1LCECv2Q0Q60yEQ3xlMVi0LuTOENCeoHsu52ob1ZIqJV3jciQ7yhnNuSoJ NNHkFAso55A2K58R046M7HhDlu7+gFLiGR/bqwm4GQdg76lE0q2lqLzbGvdP0aODrhhzNU 7IEbRnJ/CsWD9qFT7RoC3tw9TkECJ6XJmb1Et9iFyq6q0/R51A5SivgJTzdh/exb2CkCGv Kg+0K06+rh3gTvtwPGqxCehp9TCCrsdX3w3rFW2wNRVurFICu4nwEIp4Lw4OMA== 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=1770758674; 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=gKadPGtJKBk0MJ6+O183JYy975MRNvtlWu5kNVLdH2c=; b=isjG9avIa73sAFcEbyaR+4Qr/sJ3tsdVPnh/ZLTGW56feq85yTXZkBub62gUwVfJu8sv+d EZv5Qy4SwifgZG1cwXEhaITVPb+zAvS8KvQzmN7b+rcYHnCwLyXZfehtLEre02vGhiaBl0 GE9oLqHwHIR2EDygN4QRxH6BEDmZf04GhuCHik2mNcqVhxOndjnTATWPdfOSqGJTT5SN5A kwrwxQgeCLZP4qJ1oPWmg6GQCAJRHl0faomdcSmxaOucpg81jAUHHHTH891ZlUf/LJSCei fw5NbLduqeAMt/W3G//TQ1v50j/G/XzQyDncVVoxUzbhwXseixsnV78eA/tl2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9ZMQ686nz4l0 for ; Tue, 10 Feb 2026 21:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ceca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 21:24:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b4c3e9b5b09c - main - brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b4c3e9b5b09c829b4135aff738bd2893ed052377 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 21:24:34 +0000 Message-Id: <698ba212.1ceca.11654b2c@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b4c3e9b5b09c829b4135aff738bd2893ed052377 commit b4c3e9b5b09c829b4135aff738bd2893ed052377 Merge: 69c64e3fb575 1eabd3ed89eb Author: Bjoern A. Zeeb AuthorDate: 2026-02-10 21:22:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 21:22:49 +0000 brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). We are likely only going to use the brcmfmac driver but given they come nicely packaged in a directory structure and bwn(9) still uses GPL-only phy files we could use some of the information from brcmsmac and fix that (should it ever still be relevant). git-subtree-dir: sys/contrib/dev/broadcom/brcm80211 git-subtree-mainline: 69c64e3fb575e0db0e2f0c1fc56f466624940ded git-subtree-split: 1eabd3ed89eb4bb5c69e90eeaeda1a6dd31e8bab sys/contrib/dev/broadcom/brcm80211/Makefile | 13 + .../dev/broadcom/brcm80211/brcmfmac/Makefile | 62 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c | 51 + .../dev/broadcom/brcm80211/brcmfmac/bca/Makefile | 12 + .../dev/broadcom/brcm80211/brcmfmac/bca/core.c | 39 + .../dev/broadcom/brcm80211/brcmfmac/bca/module.c | 28 + .../dev/broadcom/brcm80211/brcmfmac/bca/vops.h | 11 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c | 490 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h | 20 + .../dev/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1269 + .../dev/broadcom/brcm80211/brcmfmac/btcoex.c | 481 + .../dev/broadcom/brcm80211/brcmfmac/btcoex.h | 18 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h | 342 + .../dev/broadcom/brcm80211/brcmfmac/cfg80211.c | 8477 ++++++ .../dev/broadcom/brcm80211/brcmfmac/cfg80211.h | 498 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c | 1472 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h | 92 + .../dev/broadcom/brcm80211/brcmfmac/common.c | 637 + .../dev/broadcom/brcm80211/brcmfmac/common.h | 95 + .../dev/broadcom/brcm80211/brcmfmac/commonring.c | 236 + .../dev/broadcom/brcm80211/brcmfmac/commonring.h | 62 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c | 1576 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h | 228 + .../dev/broadcom/brcm80211/brcmfmac/cyw/Makefile | 12 + .../dev/broadcom/brcm80211/brcmfmac/cyw/core.c | 373 + .../broadcom/brcm80211/brcmfmac/cyw/fwil_types.h | 87 + .../dev/broadcom/brcm80211/brcmfmac/cyw/module.c | 28 + .../dev/broadcom/brcm80211/brcmfmac/cyw/vops.h | 11 + .../dev/broadcom/brcm80211/brcmfmac/debug.c | 56 + .../dev/broadcom/brcm80211/brcmfmac/debug.h | 143 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c | 215 + .../dev/broadcom/brcm80211/brcmfmac/feature.c | 385 + .../dev/broadcom/brcm80211/brcmfmac/feature.h | 131 + .../dev/broadcom/brcm80211/brcmfmac/firmware.c | 859 + .../dev/broadcom/brcm80211/brcmfmac/firmware.h | 95 + .../dev/broadcom/brcm80211/brcmfmac/flowring.c | 508 + .../dev/broadcom/brcm80211/brcmfmac/flowring.h | 74 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c | 514 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h | 401 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c | 432 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h | 224 + .../dev/broadcom/brcm80211/brcmfmac/fwil_types.h | 1239 + .../dev/broadcom/brcm80211/brcmfmac/fwsignal.c | 2514 ++ .../dev/broadcom/brcm80211/brcmfmac/fwsignal.h | 48 + .../dev/broadcom/brcm80211/brcmfmac/fwvid.c | 200 + .../dev/broadcom/brcm80211/brcmfmac/fwvid.h | 88 + .../dev/broadcom/brcm80211/brcmfmac/msgbuf.c | 1687 ++ .../dev/broadcom/brcm80211/brcmfmac/msgbuf.h | 43 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c | 155 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h | 14 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c | 2546 ++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h | 179 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c | 2785 ++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h | 14 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c | 595 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h | 72 + .../dev/broadcom/brcm80211/brcmfmac/proto.c | 71 + .../dev/broadcom/brcm80211/brcmfmac/proto.h | 155 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c | 4650 +++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h | 370 + .../dev/broadcom/brcm80211/brcmfmac/tracepoint.c | 32 + .../dev/broadcom/brcm80211/brcmfmac/tracepoint.h | 144 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c | 1604 ++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h | 42 + .../dev/broadcom/brcm80211/brcmfmac/vendor.c | 118 + .../dev/broadcom/brcm80211/brcmfmac/vendor.h | 53 + .../dev/broadcom/brcm80211/brcmfmac/wcc/Makefile | 12 + .../dev/broadcom/brcm80211/brcmfmac/wcc/core.c | 40 + .../dev/broadcom/brcm80211/brcmfmac/wcc/module.c | 28 + .../dev/broadcom/brcm80211/brcmfmac/wcc/vops.h | 11 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c | 84 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h | 31 + .../dev/broadcom/brcm80211/brcmsmac/Makefile | 47 + .../dev/broadcom/brcm80211/brcmsmac/aiutils.c | 707 + .../dev/broadcom/brcm80211/brcmsmac/aiutils.h | 221 + .../dev/broadcom/brcm80211/brcmsmac/ampdu.c | 1097 + .../dev/broadcom/brcm80211/brcmsmac/ampdu.h | 53 + .../dev/broadcom/brcm80211/brcmsmac/antsel.c | 309 + .../dev/broadcom/brcm80211/brcmsmac/antsel.h | 27 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h | 102 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 92 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h | 110 + .../brcm80211/brcmsmac/brcms_trace_events.c | 23 + .../brcm80211/brcmsmac/brcms_trace_events.h | 40 + .../dev/broadcom/brcm80211/brcmsmac/channel.c | 771 + .../dev/broadcom/brcm80211/brcmsmac/channel.h | 47 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h | 1902 ++ .../dev/broadcom/brcm80211/brcmsmac/debug.c | 246 + .../dev/broadcom/brcm80211/brcmsmac/debug.h | 75 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c | 1556 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h | 124 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h | 38 + .../dev/broadcom/brcm80211/brcmsmac/mac80211_if.c | 1738 ++ .../dev/broadcom/brcm80211/brcmsmac/mac80211_if.h | 113 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c | 8065 ++++++ sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h | 670 + .../dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2497 ++ .../dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 241 + .../dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h | 1113 + .../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 5151 ++++ .../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h | 110 + .../dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 28572 +++++++++++++++++++ .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 298 + .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h | 31 + .../broadcom/brcm80211/brcmsmac/phy/phy_radio.h | 1522 + .../dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h | 156 + .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 3170 ++ .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h | 44 + .../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 10099 +++++++ .../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h | 39 + .../dev/broadcom/brcm80211/brcmsmac/phy_shim.c | 215 + .../dev/broadcom/brcm80211/brcmsmac/phy_shim.h | 172 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c | 165 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h | 26 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h | 341 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c | 514 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h | 245 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h | 67 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c | 437 + sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h | 36 + .../dev/broadcom/brcm80211/brcmsmac/types.h | 294 + .../dev/broadcom/brcm80211/brcmsmac/ucode_loader.c | 109 + .../dev/broadcom/brcm80211/brcmsmac/ucode_loader.h | 56 + .../dev/broadcom/brcm80211/brcmutil/Makefile | 10 + sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c | 247 + .../dev/broadcom/brcm80211/brcmutil/utils.c | 327 + .../dev/broadcom/brcm80211/include/brcm_hw_ids.h | 116 + .../dev/broadcom/brcm80211/include/brcmu_d11.h | 156 + .../dev/broadcom/brcm80211/include/brcmu_utils.h | 216 + .../dev/broadcom/brcm80211/include/brcmu_wifi.h | 247 + .../dev/broadcom/brcm80211/include/chipcommon.h | 311 + sys/contrib/dev/broadcom/brcm80211/include/defs.h | 94 + sys/contrib/dev/broadcom/brcm80211/include/soc.h | 25 + 133 files changed, 116023 insertions(+) diff --cc sys/contrib/dev/broadcom/brcm80211/Makefile index 000000000000,000000000000..88115d072624 new file mode 100644 --- /dev/null +++ b/sys/contrib/dev/broadcom/brcm80211/Makefile @@@ -1,0 -1,0 +1,13 @@@ ++# SPDX-License-Identifier: ISC ++# ++# Makefile fragment for Broadcom 802.11 Networking Device Driver ++# ++# Copyright (c) 2010 Broadcom Corporation ++# ++ ++# common flags ++subdir-ccflags-$(CONFIG_BRCMDBG) += -DDEBUG ++ ++obj-$(CONFIG_BRCMUTIL) += brcmutil/ ++obj-$(CONFIG_BRCMFMAC) += brcmfmac/ ++obj-$(CONFIG_BRCMSMAC) += brcmsmac/ diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile index 000000000000,e5ca0f511822..e5ca0f511822 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c index 000000000000,c4a54861bfb4..c4a54861bfb4 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile index 000000000000,5e37c638f966..5e37c638f966 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c index 000000000000,f471c962104a..f471c962104a mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c index 000000000000,1e1c79b18c5b..1e1c79b18c5b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h index 000000000000,7897e6b6eefb..7897e6b6eefb mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c index 000000000000,9ec0c60b6da1..9ec0c60b6da1 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h index 000000000000,b051d2860cd1..b051d2860cd1 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c index 000000000000,8ab7d1e34a6e..8ab7d1e34a6e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c index 000000000000,67c0c5a92f99..67c0c5a92f99 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h index 000000000000,418b9424a179..418b9424a179 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h index 000000000000,fe31051a9e11..fe31051a9e11 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c index 000000000000,8af402555b5e..8af402555b5e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h index 000000000000,273c80f2d483..273c80f2d483 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c index 000000000000,9074ab49e806..9074ab49e806 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h index 000000000000,d69f101f5834..d69f101f5834 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c index 000000000000,688f16c51319..688f16c51319 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h index 000000000000,3bdb6984b2dd..3bdb6984b2dd mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c index 000000000000,e44236cb210e..e44236cb210e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h index 000000000000,7fb11f4823e4..7fb11f4823e4 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c index 000000000000,862a0336a0b5..862a0336a0b5 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h index 000000000000,399b6810e394..399b6810e394 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile index 000000000000,33e86724ba14..33e86724ba14 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c index 000000000000,4f0ea4347840..4f0ea4347840 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h index 000000000000,669564382e32..669564382e32 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c index 000000000000,ce5fcfd42a7e..ce5fcfd42a7e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h index 000000000000,870b5bead436..870b5bead436 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c index 000000000000,eecf8a38d94a..eecf8a38d94a mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h index 000000000000,9bb5f709d41a..9bb5f709d41a mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c index 000000000000,c3a602197662..c3a602197662 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c index 000000000000,488364ef8ff2..488364ef8ff2 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h index 000000000000,31f8695ca417..31f8695ca417 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c index 000000000000,83f8ed7d00f9..83f8ed7d00f9 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h index 000000000000,4002d326fd21..4002d326fd21 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c index 000000000000,e1127d7e086d..e1127d7e086d mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h index 000000000000,818882b0fd01..818882b0fd01 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c index 000000000000,c2d98ee6652f..c2d98ee6652f mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h index 000000000000,e327dd58d29c..e327dd58d29c mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c index 000000000000,6385a7db7f7d..6385a7db7f7d mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h index 000000000000,ab3d6cfcb02b..ab3d6cfcb02b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h index 000000000000,e74a23e11830..e74a23e11830 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c index 000000000000,b70d20128f98..b70d20128f98 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h index 000000000000,f9c36cd8f1de..f9c36cd8f1de mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c index 000000000000,41eafcda77f7..41eafcda77f7 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h index 000000000000,f3e011d090f2..f3e011d090f2 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c index 000000000000,45fbcbdc7d9e..45fbcbdc7d9e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h index 000000000000,6a849f4a94dd..6a849f4a94dd mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c index 000000000000,1681ad00f82e..1681ad00f82e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h index 000000000000,ae124c73fc3b..ae124c73fc3b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c index 000000000000,0dc9d28cd77b..0dc9d28cd77b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h index 000000000000,d2ecee565bf2..d2ecee565bf2 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c index 000000000000,6327f4eca500..6327f4eca500 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h index 000000000000,8e6c227e8315..8e6c227e8315 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c index 000000000000,05f66ab13bed..05f66ab13bed mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h index 000000000000,25d406019ac3..25d406019ac3 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c index 000000000000,2e911d4874af..2e911d4874af mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h index 000000000000,bd08d3aaa8f4..bd08d3aaa8f4 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c index 000000000000,8a0bad5119a0..8a0bad5119a0 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h index 000000000000,0d18ed15b403..0d18ed15b403 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c index 000000000000,814fcc7538d5..814fcc7538d5 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h index 000000000000,96032322b165..96032322b165 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c index 000000000000,f0129d10d2b9..f0129d10d2b9 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h index 000000000000,e000ef78928c..e000ef78928c mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c index 000000000000,d07e7c7355d9..d07e7c7355d9 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h index 000000000000,418f33ea6fd3..418f33ea6fd3 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile index 000000000000,3db4cce44f42..3db4cce44f42 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c index 000000000000,05d7c2a4fba5..05d7c2a4fba5 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c index 000000000000,cfe01ca63ba6..cfe01ca63ba6 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h index 000000000000,3aec44f80600..3aec44f80600 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c index 000000000000,08841b9a5b81..08841b9a5b81 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h index 000000000000,b2c7ae8966a1..b2c7ae8966a1 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile index 000000000000,ffdd17eabe1d..ffdd17eabe1d mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c index 000000000000,0cb64fc56783..0cb64fc56783 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h index 000000000000,e791dd07ca78..e791dd07ca78 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c index 000000000000,e1d707a7c964..e1d707a7c964 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h index 000000000000,03bdcf29bd50..03bdcf29bd50 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c index 000000000000,f411bc6d795d..f411bc6d795d mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h index 000000000000,a3d487ab1964..a3d487ab1964 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h index 000000000000,53b3dba50737..53b3dba50737 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h index 000000000000,908ce3c864fe..908ce3c864fe mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h index 000000000000,24ac34fa0207..24ac34fa0207 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c index 000000000000,52fc9eeb5fa5..52fc9eeb5fa5 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h index 000000000000,cbf2f06436fc..cbf2f06436fc mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c index 000000000000,3878c4124e25..3878c4124e25 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h index 000000000000,39dd3a5b2979..39dd3a5b2979 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h index 000000000000,0c685eeaed33..0c685eeaed33 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c index 000000000000,81df41c7fbb5..81df41c7fbb5 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h index 000000000000,d30a9fa30f1b..d30a9fa30f1b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c index 000000000000,c739bf7463b3..c739bf7463b3 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h index 000000000000,7905fd081721..7905fd081721 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h index 000000000000,2a5cbeb9e783..2a5cbeb9e783 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c index 000000000000,aadcff1e2b5d..aadcff1e2b5d mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h index 000000000000,eaf926a96a88..eaf926a96a88 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c index 000000000000,c1a9c1e442ee..c1a9c1e442ee mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h index 000000000000,b7ca0d9891c4..b7ca0d9891c4 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c index 000000000000,ce6ce2dea39c..ce6ce2dea39c mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h index 000000000000,cab08f0669d1..cab08f0669d1 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h index 000000000000,4e80f4d27949..4e80f4d27949 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c index 000000000000,b4bba67a45ec..b4bba67a45ec mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h index 000000000000,ae0e8d5df339..ae0e8d5df339 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c index 000000000000,b03d5a1f1a93..b03d5a1f1a93 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c index 000000000000,45dcd277a89f..45dcd277a89f mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h index 000000000000,5d0083a87fd0..5d0083a87fd0 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h index 000000000000,706ab03c8346..706ab03c8346 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h index 000000000000,f49a10c452e9..f49a10c452e9 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c index 000000000000,5331b5468e14..5331b5468e14 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h index 000000000000,b49580c654fb..b49580c654fb mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c index 000000000000,396d005f4d16..396d005f4d16 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h index 000000000000,28208aba4af2..28208aba4af2 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c index 000000000000,8b852581c4e4..8b852581c4e4 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h index 000000000000,27d0934e600e..27d0934e600e mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c index 000000000000,c9a29e626daa..c9a29e626daa mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h index 000000000000,a014bbc4f935..a014bbc4f935 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h index 000000000000,bfc63b2f0537..bfc63b2f0537 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c index 000000000000,0a0c0ad4f96f..0a0c0ad4f96f mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h index 000000000000,5bb88b78ed64..5bb88b78ed64 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h index 000000000000,d65561227da0..d65561227da0 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c index 000000000000,79d4a7a4da8b..79d4a7a4da8b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h index 000000000000,af86c7fc5112..af86c7fc5112 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h index 000000000000,12a0df5b4e98..12a0df5b4e98 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c index 000000000000,80e3ccf865e3..80e3ccf865e3 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h index 000000000000,c87dd89bcb78..c87dd89bcb78 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile index 000000000000,f9b40cab766c..f9b40cab766c mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c index 000000000000,1e2b1e487eb7..1e2b1e487eb7 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c index 000000000000,fe94db0ba3f3..fe94db0ba3f3 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h index 000000000000,b39c5c1ee18b..b39c5c1ee18b mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h index 000000000000,f6344023855c..f6344023855c mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h index 000000000000,946532328667..946532328667 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h index 000000000000,7552bdb91991..7552bdb91991 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h diff --cc sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h index 000000000000,0340bba96868..0340bba96868 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h diff --cc sys/contrib/dev/broadcom/brcm80211/include/defs.h index 000000000000,9e7e6116eb74..9e7e6116eb74 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/defs.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/defs.h diff --cc sys/contrib/dev/broadcom/brcm80211/include/soc.h index 000000000000,824921191366..824921191366 mode 000000,100644..100644 --- a/sys/contrib/dev/broadcom/brcm80211/include/soc.h +++ b/sys/contrib/dev/broadcom/brcm80211/include/soc.h From nobody Tue Feb 10 21:38:16 2026 X-Original-To: dev-commits-src-main@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 4f9Zgb3xhNz6S5SY for ; Tue, 10 Feb 2026 21:38:35 +0000 (UTC) (envelope-from bT.lyhhs0x1ebcepn5=ap72pddu6fud=57kxyiwyf01put@em790814.fubar.geek.nz) Received: from e2i504.smtp2go.com (e2i504.smtp2go.com [103.2.141.248]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9Zgb37vMz3QHf for ; Tue, 10 Feb 2026 21:38:35 +0000 (UTC) (envelope-from bT.lyhhs0x1ebcepn5=ap72pddu6fud=57kxyiwyf01put@em790814.fubar.geek.nz) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=mgy720.a1-4.dyn; x=1770760415; h=Feedback-ID: X-Smtpcorp-Track:To:Date:Subject:Message-Id:From:Reply-To:Sender: List-Unsubscribe:List-Unsubscribe-Post; bh=Pwkdj4/Wk6IQBGJveEb0ZHR3VVJQCON/TSAYmnNvBLU=; b=cChzez5lrNDK6td0KiB6mlBRNb 0+4EZrOnWEG+oPbelvTnnCAyUKRApG4EUxstg3pShv/rn+Ym3WE08X3UI7mdD5bkbxnJmvbTbo1Gp IcSFz6ApdBc6HHOyQvGoZB/8yGZhx/cCibbJq2Q/v2zTWRxkbE5kxx0w+J/pjXn4poks1kcHeTOjd AZbQp5cfOyhLlr++xZZfLGoSNqdBKvD5PgSDgtHCaYZgklUPrGVfpa5OoB/VwwvvikOwyuMyQkbs7 g31AGxygQxC561NDP7oC6MzV422nkWQ71p0zXJuDTtNvK41k+Sbb1w+JlUT0S8TTNwO+50hefiDdA 4/uFvaFg==; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fubar.geek.nz; i=@fubar.geek.nz; q=dns/txt; s=s790814; t=1770759515; h=from : subject : to : message-id : date; bh=Pwkdj4/Wk6IQBGJveEb0ZHR3VVJQCON/TSAYmnNvBLU=; b=GTnuJBEVmeJDA/1aKhcicS7V58mkYkJ5TPYIYV/ILPGO7SnNoirRuL1Q093PSOGHqs7py jeDu+4IugSczUjSn5hmmo+xAYvolnvyeFJSHnuHmnumu8WIuTEyik5DnvLWMzpOWrbi0P53 smOZE7nTEbYropSpdXa6RNxKEN/Ulau6VgPG9drudHxoXOzgbCfyJ2eQXNePClN2A4nDk1W hMZaefiFhJ3+R8o3Jcg42CNpsrzSpV4fx4m+ViozvK9BUgRYHMoN6wnUxPyJj++hH+BXgAW cyCxfY+kYjL5pJFXFuQKBLCOZgzpcWKkGQCS0v1SkgmVzR6lA6HOspznLjvw== Received: from [10.172.233.45] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2-S2G) (envelope-from ) id 1vpvRE-TRk08c-RO; Tue, 10 Feb 2026 21:38:28 +0000 Received: from [10.99.243.232] (helo=morbo.fubar.geek.nz) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.99.1-S2G) (envelope-from ) id 1vpvRE-AIkwcC8r7vH-J5zf; Tue, 10 Feb 2026 21:38:28 +0000 Received: from smtpclient.apple (unknown [IPv6:2a02:8012:a6a8:0:9451:ccff:785d:4efe]) by morbo.fubar.geek.nz (Postfix) with ESMTPSA id 63CE718E5D; Tue, 10 Feb 2026 21:38:27 +0000 (UTC) From: Andrew Turner Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_20A3D70A-F0EC-411C-BB13-D970F14A703E" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.700.81\)) Subject: Re: git: 2ccbf06c0285 - main - arm64: Add MOPS implementations of memset(), memcpy() and memmove() Date: Tue, 10 Feb 2026 21:38:16 +0000 In-Reply-To: <5F843E5F-5827-4AFC-B843-4812C0D907FC@freebsd.org> Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , Sarah Walker To: Jessica Clarke References: <698b5224.47b1b.86c86bb@gitrepo.freebsd.org> <5F843E5F-5827-4AFC-B843-4812C0D907FC@freebsd.org> X-Mailer: Apple Mail (2.3826.700.81) X-Smtpcorp-Track: dKtqcOu6fPli.vcSApW5IHT-E.tokHZgvHcb1 Feedback-ID: 790814m:790814amQcrys:790814sRgHHasmC2 X-Report-Abuse: Please forward a copy of this message, including all headers, to X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:23352, ipnet:103.2.140.0/22, country:US] X-Rspamd-Queue-Id: 4f9Zgb37vMz3QHf X-Spamd-Bar: ---- --Apple-Mail=_20A3D70A-F0EC-411C-BB13-D970F14A703E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On 10 Feb 2026, at 18:12, Jessica Clarke wrote: >=20 > On 10 Feb 2026, at 15:43, Andrew Turner > wrote: >=20 >> The branch main has been updated by andrew: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ccbf06c0285ca1c06681e7212da8e7d= 1e87fe19 >>=20 >> commit 2ccbf06c0285ca1c06681e7212da8e7d1e87fe19 >> Author: Sarah Walker >> AuthorDate: 2026-01-28 16:22:50 +0000 >> Commit: Andrew Turner >> CommitDate: 2026-02-10 15:39:56 +0000 >>=20 >> arm64: Add MOPS implementations of memset(), memcpy() and memmove() >>=20 >> Enable the use of MOPS implementations of memset, memcpy and = memmove within >> the kernel. Fix pre-ifunc resolution uses of these functions. >=20 > And what happens if the compiler inserts calls to these functions = prior > to IFUNC resolution? Probably as well as if the compiler inserted calls to = memset/memcpy/memmove before ifunc resolution on amd64 given it has had = it for these functions since 2018. Andrew= --Apple-Mail=_20A3D70A-F0EC-411C-BB13-D970F14A703E Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On 10 Feb 2026, at 18:12, Jessica Clarke = <jrtc27@freebsd.org> wrote:

On 10 Feb 2026, at 15:43, Andrew Turner = <andrew@FreeBSD.org> = wrote:

The branch main has been updated by = andrew:

URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ccbf06c0285ca1c06681e7212da8e7d= 1e87fe19

commit = 2ccbf06c0285ca1c06681e7212da8e7d1e87fe19
Author: =     Sarah Walker = <sarah.walker2@arm.com>
AuthorDate: 2026-01-28 16:22:50 = +0000
Commit:     Andrew Turner = <andrew@FreeBSD.org>
CommitDate: 2026-02-10 15:39:56 = +0000

  arm64: Add MOPS implementations of memset(), = memcpy() and memmove()

  Enable the use of MOPS = implementations of memset, memcpy and memmove within
  the = kernel. Fix pre-ifunc resolution uses of these = functions.

And = what happens if the compiler inserts calls to these functions = prior
to IFUNC = resolution?

Probably as well as if the = compiler inserted calls to memset/memcpy/memmove before ifunc resolution = on amd64 given it has had it for these functions since = 2018.

Andrew
= --Apple-Mail=_20A3D70A-F0EC-411C-BB13-D970F14A703E-- From nobody Tue Feb 10 21:54:30 2026 X-Original-To: dev-commits-src-main@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 4f9b1z1GLvz6S6R4 for ; Tue, 10 Feb 2026 21:54:31 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9b1y6WsYz3RQf for ; Tue, 10 Feb 2026 21:54:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770760470; 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=G1+ses7Wojh21pxxBNSaVW1oj8Yk5FEkSLVVL2uQHII=; b=BRSaVsPosBYcspYcRhwFQEpR+GHYO3CcQHIoNCQF+enf13wTWgQEFREgl6Nm3+8lld/you y9iuO9hUXZgDaiSKeS5jXtb9zbOd8SGrhFwiFY9Ytx+IMzJ5/rVZ+c0xhvAYcSxSQC9+rx N0TtvUw2c6Cd094I1YOZytuD2+Y53aNVLq9WxEjtVsaD0plGM5el61+xkBnLfLM2LKH6Q3 zQLvQHowGS/ugGqlDuKLmIZEEOwExjEaZCfWRThGh7V3cIPQG/Ct/gw+gXfN2UmsiDLyqV tH9YGipjbOKmn2D/BUuj6rs/FrmlImpnB3pwPc8t0i6poG3RUBfMvxNic9tFbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770760470; a=rsa-sha256; cv=none; b=iXK8HLNfiXh9h0NNx1y7vwZ5eq23SK7B8W8k2r5nBdI/Fa5Pu2ThieW25pTV9YQVugEbYe Y+xrlJEF4fKUoNY6IRPaHPrwRhZ7FCGcMkWugsTCkAC+lvUggXcelHIu5pcQBKsOIww+3+ z+H3bvbX/0hN/BQrdjJYU+GYcGidAvqo0A9VJ/0IFbI34AxHILN/GiMqNz+c31HeLnqTba zb9ye5IIEKs0IGlUQ/ietl5HH8oMxTMA38yeU2D3IB/hwwv4wwdB/0rrMjh0AjHGE4v2Dd E0I0RXHlasiNV6gjC51YJi0TS1A38PMgJ8ZDeCTzAdUMQ+T2I0OEm3FbFZ4Lgg== 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=1770760470; 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=G1+ses7Wojh21pxxBNSaVW1oj8Yk5FEkSLVVL2uQHII=; b=xrfX2oYPvrgFZY6yc7uaz0+Ti0zfyb3yFHV5oaz4YxzKCfSIOJ5FZ6ZjDmjMvGoqNMQAGD yiUvpspKqMbd3nh29LuTsorLjFivhuV0wRysg/ElvP66ZeD6XXEoVW66jTskTCV3i9N/HV UdGuS9zSSDl65k4Xix/RTxrupyUbA8FPD0bNO5T3TMiF6gEsOB2dnTlOh0mCc6qPEfDT+L UDFFAeEhJshwz8G8L3lOWYJjfnZH45kc6uQNX4yUzLjT7goqLc67B7XRtW5tomG+kDCA3w ZfBfIm2kg+Y8s1OhkNevAw0FrbrG698qGIiFcnMfBMCNW1JbzZ9+DJA98Rxu6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9b1y5q1Vz6RN for ; Tue, 10 Feb 2026 21:54:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20633 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 21:54:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 902136e0fe11 - main - brcm80211: add LinuxKPI files and module Makefiles List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 902136e0fe112383ec64d2ef43a446063b5e6417 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 21:54:30 +0000 Message-Id: <698ba916.20633.6c0b8523@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=902136e0fe112383ec64d2ef43a446063b5e6417 commit 902136e0fe112383ec64d2ef43a446063b5e6417 Author: Bjoern A. Zeeb AuthorDate: 2026-02-10 21:33:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 21:36:29 +0000 brcm80211: add LinuxKPI files and module Makefiles sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). Currently only PCIe is made to compile. It does load firmware (if needed, e.g., on arm64 with an alignment issue fixed), and starts to come up. To make it work there is a cfg80211 layer and netdevice integration to do, so do not hold your breath just yet. --- .../linuxkpi/common/include/linux/bcm47xx_nvram.h | 21 +++ .../linuxkpi/common/include/linux/bcma/bcma.h | 29 ++++ .../linuxkpi/common/include/linux/bcma/bcma_regs.h | 17 ++ .../common/include/linux/platform_data/brcmfmac.h | 185 ++++++++++++++++++++ .../linuxkpi/common/include/linux/ssb/ssb_regs.h | 25 +++ .../dev/broadcom/brcm80211/brcmfmac/cfg80211.c | 190 +++++++++++++++++++++ .../dev/broadcom/brcm80211/brcmfmac/common.c | 35 ++++ .../dev/broadcom/brcm80211/brcmfmac/commonring.c | 15 ++ .../dev/broadcom/brcm80211/brcmfmac/debug.c | 8 + .../dev/broadcom/brcm80211/brcmfmac/debug.h | 24 +++ .../dev/broadcom/brcm80211/brcmfmac/firmware.c | 24 +++ .../dev/broadcom/brcm80211/brcmfmac/flowring.c | 24 +++ .../dev/broadcom/brcm80211/brcmfmac/flowring.h | 8 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c | 8 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h | 4 + .../dev/broadcom/brcm80211/brcmfmac/fwvid.c | 18 ++ .../dev/broadcom/brcm80211/brcmfmac/msgbuf.c | 34 ++++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c | 23 +++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c | 117 +++++++++++++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c | 21 +++ .../dev/broadcom/brcm80211/brcmfmac/proto.h | 16 ++ .../dev/broadcom/brcm80211/brcmfmac/tracepoint.h | 18 ++ .../dev/broadcom/brcm80211/brcmfmac/vendor.c | 9 + sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c | 4 + .../dev/broadcom/brcm80211/brcmutil/utils.c | 9 + sys/modules/brcm80211/Makefile | 4 + sys/modules/brcm80211/brcmfmac/Makefile | 89 ++++++++++ sys/modules/brcm80211/brcmutil/Makefile | 28 +++ 28 files changed, 1007 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/bcm47xx_nvram.h b/sys/compat/linuxkpi/common/include/linux/bcm47xx_nvram.h new file mode 100644 index 000000000000..744101a2f8b1 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/bcm47xx_nvram.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_LINUX_BCM47XX_NVRAM_H +#define _LINUXKPI_LINUX_BCM47XX_NVRAM_H + +static inline char * +bcm47xx_nvram_get_contents(size_t *x __unused) +{ + return (NULL); +}; + +static inline void +bcm47xx_nvram_release_contents(const char *x __unused) +{ +}; + +#endif /* _LINUXKPI_LINUX_BCM47XX_NVRAM_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/bcma/bcma.h b/sys/compat/linuxkpi/common/include/linux/bcma/bcma.h new file mode 100644 index 000000000000..3840c3a420e5 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/bcma/bcma.h @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_LINUX_BCMA_BCMA_H +#define _LINUXKPI_LINUX_BCMA_BCMA_H + +#define BCMA_CORE_80211 0x812 +#define BCMA_CORE_ARM_CA7 0x847 +#define BCMA_CORE_ARM_CM3 0x82A +#define BCMA_CORE_ARM_CR4 0x83E +#define BCMA_CORE_CHIPCOMMON 0x800 +#define BCMA_CORE_GCI 0x840 +#define BCMA_CORE_INTERNAL_MEM 0x80E +#define BCMA_CORE_PCIE2 0x83C +#define BCMA_CORE_PMU 0x827 +#define BCMA_CORE_SDIO_DEV 0x829 +#define BCMA_CORE_SYS_MEM 0x849 + +/* XXX not sure where these belong. */ +#define BCMA_CC_CAP_EXT_AOB_PRESENT 0x00000040 +#define BCMA_CC_PMU_CTL_RES_SHIFT 13 +#define BCMA_CC_PMU_CTL_RES_RELOAD 0x2 +#define BCMA_CC_SROM_CONTROL_OTPSEL 0x00000010 +#define BCMA_CC_SROM_CONTROL_OTP_PRESENT 0x00000020 + +#endif /* _LINUXKPI_LINUX_BCMA_BCMA_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/bcma/bcma_regs.h b/sys/compat/linuxkpi/common/include/linux/bcma/bcma_regs.h new file mode 100644 index 000000000000..0a4cdddf7a73 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/bcma/bcma_regs.h @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_LINUX_BCMA_BCMA_REGS_H +#define _LINUXKPI_LINUX_BCMA_BCMA_REGS_H + +#define BCMA_IOCTL 0x0408 +#define BCMA_IOCTL_CLK 0x0001 +#define BCMA_IOCTL_FGC 0x0002 + +#define BCMA_RESET_CTL 0x0800 +#define BCMA_RESET_CTL_RESET 0x0001 + +#endif /* _LINUXKPI_LINUX_BCMA_BCMA_REGS_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h b/sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h new file mode 100644 index 000000000000..ec99b7b73d1d --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/platform_data/brcmfmac.h @@ -0,0 +1,185 @@ +/* + * Copyright (c) 2016 Broadcom Corporation + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef _LINUX_BRCMFMAC_PLATFORM_H +#define _LINUX_BRCMFMAC_PLATFORM_H + + +#define BRCMFMAC_PDATA_NAME "brcmfmac" + +#define BRCMFMAC_COUNTRY_BUF_SZ 4 + + +/* + * Platform specific driver functions and data. Through the platform specific + * device data functions and data can be provided to help the brcmfmac driver to + * operate with the device in combination with the used platform. + */ + + +/** + * Note: the brcmfmac can be loaded as module or be statically built-in into + * the kernel. If built-in then do note that it uses module_init (and + * module_exit) routines which equal device_initcall. So if you intend to + * create a module with the platform specific data for the brcmfmac and have + * it built-in to the kernel then use a higher initcall then device_initcall + * (see init.h). If this is not done then brcmfmac will load without problems + * but will not pickup the platform data. + * + * When the driver does not "detect" platform driver data then it will continue + * without reporting anything and just assume there is no data needed. Which is + * probably true for most platforms. + */ + +/** + * enum brcmf_bus_type - Bus type identifier. Currently SDIO, USB and PCIE are + * supported. + */ +enum brcmf_bus_type { + BRCMF_BUSTYPE_SDIO, + BRCMF_BUSTYPE_USB, + BRCMF_BUSTYPE_PCIE +}; + + +/** + * struct brcmfmac_sdio_pd - SDIO Device specific platform data. + * + * @txglomsz: SDIO txglom size. Use 0 if default of driver is to be + * used. + * @drive_strength: is the preferred drive_strength to be used for the SDIO + * pins. If 0 then a default value will be used. This is + * the target drive strength, the exact drive strength + * which will be used depends on the capabilities of the + * device. + * @oob_irq_supported: does the board have support for OOB interrupts. SDIO + * in-band interrupts are relatively slow and for having + * less overhead on interrupt processing an out of band + * interrupt can be used. If the HW supports this then + * enable this by setting this field to true and configure + * the oob related fields. + * @oob_irq_nr, + * @oob_irq_flags: the OOB interrupt information. The values are used for + * registering the irq using request_irq function. + * @broken_sg_support: flag for broken sg list support of SDIO host controller. + * Set this to true if the SDIO host controller has higher + * align requirement than 32 bytes for each scatterlist + * item. + * @sd_head_align: alignment requirement for start of data buffer. + * @sd_sgentry_align: length alignment requirement for each sg entry. + * @reset: This function can get called if the device communication + * broke down. This functionality is particularly useful in + * case of SDIO type devices. It is possible to reset a + * dongle via sdio data interface, but it requires that + * this is fully functional. This function is chip/module + * specific and this function should return only after the + * complete reset has completed. + */ +struct brcmfmac_sdio_pd { + int txglomsz; + unsigned int drive_strength; + bool oob_irq_supported; + unsigned int oob_irq_nr; + unsigned long oob_irq_flags; + bool broken_sg_support; + unsigned short sd_head_align; + unsigned short sd_sgentry_align; + void (*reset)(void); +}; + +/** + * struct brcmfmac_pd_cc_entry - Struct for translating user space country code + * (iso3166) to firmware country code and + * revision. + * + * @iso3166: iso3166 alpha 2 country code string. + * @cc: firmware country code string. + * @rev: firmware country code revision. + */ +struct brcmfmac_pd_cc_entry { + char iso3166[BRCMFMAC_COUNTRY_BUF_SZ]; + char cc[BRCMFMAC_COUNTRY_BUF_SZ]; + s32 rev; +}; + +/** + * struct brcmfmac_pd_cc - Struct for translating country codes as set by user + * space to a country code and rev which can be used by + * firmware. + * + * @table_size: number of entries in table (> 0) + * @table: array of 1 or more elements with translation information. + */ +struct brcmfmac_pd_cc { + int table_size; + struct brcmfmac_pd_cc_entry table[]; +}; + +/** + * struct brcmfmac_pd_device - Device specific platform data. (id/rev/bus_type) + * is the unique identifier of the device. + * + * @id: ID of the device for which this data is. In case of SDIO + * or PCIE this is the chipid as identified by chip.c In + * case of USB this is the chipid as identified by the + * device query. + * @rev: chip revision, see id. + * @bus_type: The type of bus. Some chipid/rev exist for different bus + * types. Each bus type has its own set of settings. + * @feature_disable: Bitmask of features to disable (override), See feature.c + * in brcmfmac for details. + * @country_codes: If available, pointer to struct for translating country + * codes. + * @bus: Bus specific (union) device settings. Currently only + * SDIO. + */ +struct brcmfmac_pd_device { + unsigned int id; + unsigned int rev; + enum brcmf_bus_type bus_type; + unsigned int feature_disable; + struct brcmfmac_pd_cc *country_codes; + union { + struct brcmfmac_sdio_pd sdio; + } bus; +}; + +/** + * struct brcmfmac_platform_data - BRCMFMAC specific platform data. + * + * @power_on: This function is called by the brcmfmac driver when the module + * gets loaded. This can be particularly useful for low power + * devices. The platform spcific routine may for example decide to + * power up the complete device. If there is no use-case for this + * function then provide NULL. + * @power_off: This function is called by the brcmfmac when the module gets + * unloaded. At this point the devices can be powered down or + * otherwise be reset. So if an actual power_off is not supported + * but reset is supported by the devices then reset the devices + * when this function gets called. This can be particularly useful + * for low power devices. If there is no use-case for this + * function then provide NULL. + */ +struct brcmfmac_platform_data { + void (*power_on)(void); + void (*power_off)(void); + char *fw_alternative_path; + int device_count; + struct brcmfmac_pd_device devices[]; +}; + + +#endif /* _LINUX_BRCMFMAC_PLATFORM_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/ssb/ssb_regs.h b/sys/compat/linuxkpi/common/include/linux/ssb/ssb_regs.h new file mode 100644 index 000000000000..e1c18b6b632a --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/ssb/ssb_regs.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2025 Bjoern A. Zeeb + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef _LINUXKPI_LINUX_SSB_SSB_REGS_H +#define _LINUXKPI_LINUX_SSB_SSB_REGS_H + +#define SSB_IDHIGH_RCHI 0x00007000 +#define SSB_IDHIGH_RCHI_SHIFT 8 +#define SSB_IDHIGH_RCLO 0x0000000F +#define SSB_IDLOW_INITIATOR 0x00000080 +#define SSB_IMSTATE_BUSY 0x01800000 +#define SSB_IMSTATE_IBE 0x00020000 +#define SSB_IMSTATE_REJECT 0x02000000 +#define SSB_IMSTATE_TO 0x00040000 +#define SSB_TMSHIGH_BUSY 0x00000004 +#define SSB_TMSHIGH_SERR 0x00000001 +#define SSB_TMSLOW_CLOCK 0x00010000 +#define SSB_TMSLOW_FGC 0x00020000 +#define SSB_TMSLOW_REJECT 0x00000002 +#define SSB_TMSLOW_RESET 0x00000001 + +#endif /* _LINUXKPI_LINUX_SSB_SSB_REGS_H */ diff --git a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c index 8af402555b5e..35f68b370714 100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -5,13 +5,21 @@ /* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */ +#if defined(__FreeBSD__) +#include +#endif #include #include #include #include +#if defined(__linux__) #include +#endif #include #include +#if defined(__FreeBSD__) +#include +#endif #include #include @@ -36,6 +44,24 @@ #define BRCMF_SCAN_IE_LEN_MAX 2048 +#if defined(__FreeBSD__) +#ifdef WPA_OUI +#undef WPA_OUI +#endif +#ifdef WPA_OUI_TYPE +#undef WPA_OUI_TYPE +#endif +#ifdef RSN_OUI +#undef RSN_OUI +#endif +#ifdef WME_OUI_TYPE +#undef WME_OUI_TYPE +#endif +#ifdef WPS_OUI_TYPE +#undef WPS_OUI_TYPE +#endif +#endif + #define WPA_OUI "\x00\x50\xF2" /* WPA OUI */ #define WPA_OUI_TYPE 1 #define RSN_OUI "\x00\x0F\xAC" /* RSN OUI */ @@ -257,7 +283,11 @@ struct brcmf_vs_tlv { }; struct parsed_vndr_ie_info { +#if defined(__linux__) u8 *ie_ptr; +#elif defined(__FreeBSD__) + const u8 *ie_ptr; +#endif u32 ie_len; /* total length including id & length field */ struct brcmf_vs_tlv vndrie; }; @@ -429,7 +459,11 @@ brcmf_parse_tlvs(const void *buf, int buflen, uint key) if ((elt->id == key) && (totlen >= (len + TLV_HDR_LEN))) return elt; +#if defined(__linux__) elt = (struct brcmf_tlv *)((u8 *)elt + (len + TLV_HDR_LEN)); +#elif defined(__FreeBSD__) + elt = (const struct brcmf_tlv *)((const u8 *)elt + (len + TLV_HDR_LEN)); +#endif totlen -= (len + TLV_HDR_LEN); } @@ -462,7 +496,11 @@ brcmf_tlv_has_ie(const u8 *ie, const u8 **tlvs, u32 *tlvs_len, return false; } +#if defined(__linux__) static struct brcmf_vs_tlv * +#elif defined(__FreeBSD__) +static const struct brcmf_vs_tlv * +#endif brcmf_find_wpaie(const u8 *parse, u32 len) { const struct brcmf_tlv *ie; @@ -470,20 +508,34 @@ brcmf_find_wpaie(const u8 *parse, u32 len) while ((ie = brcmf_parse_tlvs(parse, len, WLAN_EID_VENDOR_SPECIFIC))) { if (brcmf_tlv_has_ie((const u8 *)ie, &parse, &len, WPA_OUI, TLV_OUI_LEN, WPA_OUI_TYPE)) +#if defined(__linux__) return (struct brcmf_vs_tlv *)ie; +#elif defined(__FreeBSD__) + return (const struct brcmf_vs_tlv *)ie; +#endif } return NULL; } +#if defined(__linux__) static struct brcmf_vs_tlv * +#elif defined(__FreeBSD__) +static const struct brcmf_vs_tlv * +#endif brcmf_find_wpsie(const u8 *parse, u32 len) { const struct brcmf_tlv *ie; while ((ie = brcmf_parse_tlvs(parse, len, WLAN_EID_VENDOR_SPECIFIC))) { +#if defined(__linux__) if (brcmf_tlv_has_ie((u8 *)ie, &parse, &len, WPA_OUI, TLV_OUI_LEN, WPS_OUI_TYPE)) return (struct brcmf_vs_tlv *)ie; +#elif defined(__FreeBSD__) + if (brcmf_tlv_has_ie((const u8 *)ie, &parse, &len, + WPA_OUI, TLV_OUI_LEN, WPS_OUI_TYPE)) + return (const struct brcmf_vs_tlv *)ie; +#endif } return NULL; } @@ -1239,8 +1291,13 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg, reqid = brcmf_pno_find_reqid_by_bucket(cfg->pno, bucket); if (!aborted) { +#if defined(__linux__) brcmf_dbg(SCAN, "report results: reqid=%llu\n", reqid); +#elif defined(__FreeBSD__) + brcmf_dbg(SCAN, "report results: reqid=%ju\n", + (uintmax_t)reqid); +#endif cfg80211_sched_scan_results(cfg_to_wiphy(cfg), reqid); } @@ -2413,7 +2470,11 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, ie = NULL; ie_len = 0; /* find the WPA_IE */ +#if defined(__linux__) wpa_ie = brcmf_find_wpaie((u8 *)sme->ie, sme->ie_len); +#elif defined(__FreeBSD__) + wpa_ie = brcmf_find_wpaie(sme->ie, sme->ie_len); +#endif if (wpa_ie) { ie = wpa_ie; ie_len = wpa_ie->len + TLV_HDR_LEN; @@ -2450,7 +2511,11 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev, chanspec = 0; } +#if defined(__linux__) brcmf_dbg(INFO, "ie (%p), ie_len (%zd)\n", sme->ie, sme->ie_len); +#elif defined(__FreeBSD__) + brcmf_dbg(INFO, "ie (%p), ie_len (%u)\n", sme->ie, sme->ie_len); +#endif err = brcmf_set_wpa_version(ndev, sme); if (err) { @@ -2840,7 +2905,11 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, key = &ifp->vif->profile.key[key_idx]; memset(key, 0, sizeof(*key)); if ((ext_key) && (!is_multicast_ether_addr(mac_addr))) +#if defined(__linux__) memcpy((char *)&key->ea, (void *)mac_addr, ETH_ALEN); +#elif defined(__FreeBSD__) + memcpy((char *)&key->ea, mac_addr, ETH_ALEN); +#endif key->len = params->key_len; key->index = key_idx; memcpy(key->data, params->key, key->len); @@ -2849,9 +2918,15 @@ brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev, if (params->seq && params->seq_len == 6) { /* rx iv */ +#if defined(__linux__) u8 *ivptr; ivptr = (u8 *)params->seq; +#elif defined(__FreeBSD__) + const u8 *ivptr; + + ivptr = params->seq; +#endif key->rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) | (ivptr[3] << 8) | ivptr[2]; key->rxiv.lo = (ivptr[1] << 8) | ivptr[0]; @@ -3758,8 +3833,13 @@ brcmf_alloc_internal_escan_request(struct wiphy *wiphy, u32 n_netinfo) { req = kzalloc(req_size, GFP_KERNEL); if (req) { req->wiphy = wiphy; +#if defined(__linux__) req->ssids = (void *)(&req->channels[0]) + n_netinfo * sizeof(req->channels[0]); +#elif defined(__FreeBSD__) + req->ssids = (void *)((&req->channels[0]) + + n_netinfo * sizeof(req->channels[0])); +#endif } return req; } @@ -3902,7 +3982,11 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp, } netinfo_start = brcmf_get_netinfo_array(pfn_result); +#if defined(__linux__) datalen = e->datalen - ((void *)netinfo_start - (void *)pfn_result); +#elif defined(__FreeBSD__) + datalen = e->datalen - ((u8 *)netinfo_start - (u8 *)pfn_result); +#endif if (datalen < result_count * sizeof(*netinfo)) { bphy_err(drvr, "insufficient event data\n"); goto out_err; @@ -3992,7 +4076,11 @@ static __always_inline void brcmf_delay(u32 ms) cond_resched(); mdelay(ms); } else { +#if defined(__linux__) msleep(ms); +#elif defined(__FreeBSD__) + linux_msleep(ms); +#endif } } @@ -4529,7 +4617,11 @@ static s32 brcmf_configure_opensecurity(struct brcmf_if *ifp) return 0; } +#if defined(__linux__) static bool brcmf_valid_wpa_oui(u8 *oui, bool is_rsn_ie) +#elif defined(__FreeBSD__) +static bool brcmf_valid_wpa_oui(const u8 *oui, bool is_rsn_ie) +#endif { if (is_rsn_ie) return (memcmp(oui, RSN_OUI, TLV_OUI_LEN) == 0); @@ -4553,7 +4645,11 @@ brcmf_configure_wpaie(struct brcmf_if *ifp, u32 gval = 0; u32 wpa_auth = 0; u32 offset; +#if defined(__linux__) u8 *data; +#elif defined(__FreeBSD__) + const u8 *data; +#endif u16 rsn_cap; u32 wme_bss_disable; u32 mfp; @@ -4563,7 +4659,11 @@ brcmf_configure_wpaie(struct brcmf_if *ifp, goto exit; len = wpa_ie->len + TLV_HDR_LEN; +#if defined(__linux__) data = (u8 *)wpa_ie; +#elif defined(__FreeBSD__) + data = (const u8 *)wpa_ie; +#endif offset = TLV_HDR_LEN; if (!is_rsn_ie) offset += VS_IE_FIXED_HDR_LEN; @@ -4786,19 +4886,32 @@ static s32 brcmf_parse_vndr_ies(const u8 *vndr_ie_buf, u32 vndr_ie_len, struct parsed_vndr_ies *vndr_ies) { +#if defined(__linux__) struct brcmf_vs_tlv *vndrie; struct brcmf_tlv *ie; +#elif defined(__FreeBSD__) + const struct brcmf_vs_tlv *vndrie; + const struct brcmf_tlv *ie; +#endif struct parsed_vndr_ie_info *parsed_info; s32 remaining_len; remaining_len = (s32)vndr_ie_len; memset(vndr_ies, 0, sizeof(*vndr_ies)); +#if defined(__linux__) ie = (struct brcmf_tlv *)vndr_ie_buf; +#elif defined(__FreeBSD__) + ie = (const struct brcmf_tlv *)vndr_ie_buf; +#endif while (ie) { if (ie->id != WLAN_EID_VENDOR_SPECIFIC) goto next; +#if defined(__linux__) vndrie = (struct brcmf_vs_tlv *)ie; +#elif defined(__FreeBSD__) + vndrie = (const struct brcmf_vs_tlv *)ie; +#endif /* len should be bigger than OUI length + one */ if (vndrie->len < (VS_IE_FIXED_HDR_LEN - TLV_HDR_LEN + 1)) { brcmf_err("invalid vndr ie. length is too small %d\n", @@ -4816,7 +4929,11 @@ brcmf_parse_vndr_ies(const u8 *vndr_ie_buf, u32 vndr_ie_len, parsed_info = &vndr_ies->ie_info[vndr_ies->count]; /* save vndr ie information */ +#if defined(__linux__) parsed_info->ie_ptr = (char *)vndrie; +#elif defined(__FreeBSD__) + parsed_info->ie_ptr = (const char *)vndrie; +#endif parsed_info->ie_len = vndrie->len + TLV_HDR_LEN; memcpy(&parsed_info->vndrie, vndrie, sizeof(*vndrie)); @@ -4833,14 +4950,22 @@ next: if (remaining_len <= TLV_HDR_LEN) ie = NULL; else +#if defined(__linux__) ie = (struct brcmf_tlv *)(((u8 *)ie) + ie->len + +#elif defined(__FreeBSD__) + ie = (const struct brcmf_tlv *)(((const u8 *)ie) + ie->len + +#endif TLV_HDR_LEN); } return 0; } static u32 +#if defined(__linux__) brcmf_vndr_ie(u8 *iebuf, s32 pktflag, u8 *ie_ptr, u32 ie_len, s8 *add_del_cmd) +#elif defined(__FreeBSD__) +brcmf_vndr_ie(u8 *iebuf, s32 pktflag, const u8 *ie_ptr, u32 ie_len, s8 *add_del_cmd) +#endif { strscpy(iebuf, add_del_cmd, VNDR_IE_CMD_LEN); @@ -5085,11 +5210,19 @@ brcmf_parse_configure_security(struct brcmf_if *ifp, s32 err = 0; /* find the RSN_IE */ +#if defined(__linux__) rsn_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail, +#elif defined(__FreeBSD__) + rsn_ie = brcmf_parse_tlvs(settings->beacon.tail, +#endif settings->beacon.tail_len, WLAN_EID_RSN); /* find the WPA_IE */ +#if defined(__linux__) wpa_ie = brcmf_find_wpaie((u8 *)settings->beacon.tail, +#elif defined(__FreeBSD__) + wpa_ie = brcmf_find_wpaie(settings->beacon.tail, +#endif settings->beacon.tail_len); if (wpa_ie || rsn_ie) { @@ -5100,9 +5233,16 @@ brcmf_parse_configure_security(struct brcmf_if *ifp, if (err < 0) return err; } else { +#if defined(__linux__) struct brcmf_vs_tlv *tmp_ie; tmp_ie = (struct brcmf_vs_tlv *)rsn_ie; +#elif defined(__FreeBSD__) + const struct brcmf_vs_tlv *tmp_ie; + + tmp_ie = (const struct brcmf_vs_tlv *)rsn_ie; +#endif + /* RSN IE */ err = brcmf_configure_wpaie(ifp, tmp_ie, true); @@ -5155,7 +5295,11 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, &ifp->vif->is_11d)) { is_11d = supports_11d = false; } else { +#if defined(__linux__) country_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail, +#elif defined(__FreeBSD__) + country_ie = brcmf_parse_tlvs(settings->beacon.tail, +#endif settings->beacon.tail_len, WLAN_EID_COUNTRY); is_11d = country_ie ? 1 : 0; @@ -5166,7 +5310,11 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, if (settings->ssid == NULL || settings->ssid_len == 0) { ie_offset = DOT11_MGMT_HDR_LEN + DOT11_BCN_PRB_FIXED_LEN; ssid_ie = brcmf_parse_tlvs( +#if defined(__linux__) (u8 *)&settings->beacon.head[ie_offset], +#elif defined(__FreeBSD__) + &settings->beacon.head[ie_offset], +#endif settings->beacon.head_len - ie_offset, WLAN_EID_SSID); if (!ssid_ie || ssid_ie->len > IEEE80211_MAX_SSID_LEN) @@ -5382,7 +5530,11 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev, if (ifp->vif->wdev.iftype == NL80211_IFTYPE_AP) { /* Due to most likely deauths outstanding we sleep */ /* first to make sure they get processed by fw. */ +#if defined(__linux__) msleep(400); +#elif defined(__FreeBSD__) + linux_msleep(400); +#endif if (profile->use_fwauth != BIT(BRCMF_PROFILE_FWAUTH_NONE)) { struct cfg80211_crypto_settings crypto = {}; @@ -5504,10 +5656,18 @@ brcmf_cfg80211_change_station(struct wiphy *wiphy, struct net_device *ndev, if (params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED)) err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SCB_AUTHORIZE, +#if defined(__linux__) (void *)mac, ETH_ALEN); +#elif defined(__FreeBSD__) + __DECONST(u8 *, mac), ETH_ALEN); +#endif else err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SCB_DEAUTHORIZE, +#if defined(__linux__) (void *)mac, ETH_ALEN); +#elif defined(__FreeBSD__) + __DECONST(u8 *, mac), ETH_ALEN); +#endif if (err < 0) bphy_err(drvr, "Setting SCB (de-)authorize failed, %d\n", err); @@ -5623,8 +5783,13 @@ brcmf_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN], le16_to_cpu(action_frame->len)); +#if defined(__linux__) brcmf_dbg(TRACE, "Action frame, cookie=%lld, len=%d, channel=%d\n", *cookie, le16_to_cpu(action_frame->len), +#elif defined(__FreeBSD__) + brcmf_dbg(TRACE, "Action frame, cookie=%ju, len=%d, channel=%d\n", + (uintmax_t)*cookie, le16_to_cpu(action_frame->len), +#endif le32_to_cpu(af_params->channel)); ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg), @@ -5815,11 +5980,19 @@ brcmf_notify_tdls_peer_event(struct brcmf_if *ifp, break; case BRCMF_E_REASON_TDLS_PEER_CONNECTED: brcmf_dbg(TRACE, "TDLS Peer Connected\n"); +#if defined(__linux__) brcmf_proto_add_tdls_peer(ifp->drvr, ifp->ifidx, (u8 *)e->addr); +#elif defined(__FreeBSD__) + brcmf_proto_add_tdls_peer(ifp->drvr, ifp->ifidx, e->addr); +#endif break; case BRCMF_E_REASON_TDLS_PEER_DISCONNECTED: brcmf_dbg(TRACE, "TDLS Peer Disconnected\n"); +#if defined(__linux__) brcmf_proto_delete_peer(ifp->drvr, ifp->ifidx, (u8 *)e->addr); +#elif defined(__FreeBSD__) + brcmf_proto_delete_peer(ifp->drvr, ifp->ifidx, e->addr); +#endif break; } @@ -6553,7 +6726,11 @@ brcmf_notify_connect_status(struct brcmf_if *ifp, (e->event_code == BRCMF_E_DEAUTH_IND) || (e->event_code == BRCMF_E_DISASSOC_IND) || ((e->event_code == BRCMF_E_LINK) && (!e->flags))) { +#if defined(__linux__) brcmf_proto_delete_peer(ifp->drvr, ifp->ifidx, (u8 *)e->addr); +#elif defined(__FreeBSD__) + brcmf_proto_delete_peer(ifp->drvr, ifp->ifidx, e->addr); +#endif } if (brcmf_is_apmode(ifp->vif)) { @@ -6640,7 +6817,11 @@ brcmf_notify_mic_status(struct brcmf_if *ifp, else key_type = NL80211_KEYTYPE_PAIRWISE; +#if defined(__linux__) cfg80211_michael_mic_failure(ifp->ndev, (u8 *)&e->addr, key_type, -1, +#elif defined(__FreeBSD__) + cfg80211_michael_mic_failure(ifp->ndev, e->addr, key_type, -1, +#endif NULL, GFP_KERNEL); return 0; @@ -8183,7 +8364,11 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev, goto exit; /* Add 10 ms for IOVAR completion */ +#if defined(__linux__) msleep(ACS_MSRMNT_DELAY + 10); +#elif defined(__FreeBSD__) + linux_msleep(ACS_MSRMNT_DELAY + 10); +#endif /* Issue IOVAR to collect measurement results */ req.msrmnt_query = 1; @@ -8204,8 +8389,13 @@ brcmf_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *ndev, brcmf_dbg(INFO, "OBSS dump: channel %d: survey duration %d\n", ieee80211_frequency_to_channel(info->channel->center_freq), ACS_MSRMNT_DELAY); +#if defined(__linux__) brcmf_dbg(INFO, "noise(%d) busy(%llu) rx(%llu) tx(%llu)\n", info->noise, info->time_busy, info->time_rx, info->time_tx); +#elif defined(__FreeBSD__) + brcmf_dbg(INFO, "noise(%d) busy(%ju) rx(%ju) tx(%ju)\n", + info->noise, (uintmax_t)info->time_busy, (uintmax_t)info->time_rx, (uintmax_t)info->time_tx); +#endif exit: if (!brcmf_is_apmode(ifp->vif)) diff --git a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c index 688f16c51319..17e408b7fa23 100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c @@ -3,6 +3,10 @@ * Copyright (c) 2010 Broadcom Corporation */ +#if defined(__FreeBSD__) +#define LINUXKPI_PARAM_PREFIX brcmfmac_ +#endif + #include #include #include @@ -24,6 +28,12 @@ MODULE_AUTHOR("Broadcom Corporation"); MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver."); MODULE_LICENSE("Dual BSD/GPL"); +#if defined(__FreeBSD__) +MODULE_DEPEND(brcmfmac, brcmutil, 1, 1, 1); +MODULE_DEPEND(brcmfmac, linuxkpi, 1, 1, 1); +MODULE_DEPEND(brcmfmac, linuxkpi_wlan, 1, 1, 1); +MODULE_DEPEND(brcmfmac, lindebugfs, 1, 1, 1); /* XXX-BZ someone should fix this */ +#endif #define BRCMF_DEFAULT_SCAN_CHANNEL_TIME 40 #define BRCMF_DEFAULT_SCAN_UNASSOC_TIME 40 @@ -118,7 +128,11 @@ static int brcmf_c_download(struct brcmf_if *ifp, u16 flag, } static int brcmf_c_download_blob(struct brcmf_if *ifp, +#if defined(__linux__) const void *data, size_t size, +#elif defined(__FreeBSD__) + const u8 *data, size_t size, +#endif const char *loadvar, const char *statvar) { struct brcmf_pub *drvr = ifp->drvr; @@ -467,10 +481,22 @@ void __brcmf_err(struct brcmf_bus *bus, const char *func, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; +#if defined(__linux__) if (bus) dev_err(bus->dev, "%s: %pV", func, &vaf); else pr_err("%s: %pV", func, &vaf); +#elif defined(__FreeBSD__) + { + char *str; + vasprintf(&str, M_KMALLOC, vaf.fmt, args); + if (bus) + dev_err(bus->dev, "ERROR: %s: %s", func, str); + else + pr_err("ERROR: %s: %s", func, str); + free(str, M_KMALLOC); + } +#endif va_end(args); } @@ -487,7 +513,16 @@ void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...) va_start(args, fmt); vaf.va = &args; if (brcmf_msg_level & level) +#if defined(__linux__) pr_debug("%s %pV", func, &vaf); +#elif defined(__FreeBSD__) + { + char *str; + vasprintf(&str, M_KMALLOC, vaf.fmt, args); + pr_debug("%s %s", func, str); + free(str, M_KMALLOC); + } +#endif trace_brcmf_dbg(level, func, &vaf); va_end(args); } diff --git a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c index e44236cb210e..c0880fa12f57 100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c @@ -119,8 +119,13 @@ again: available = commonring->r_ptr - commonring->w_ptr; if (available > 1) { +#if defined(__linux__) ret_ptr = commonring->buf_addr + (commonring->w_ptr * commonring->item_len); +#elif defined(__FreeBSD__) + ret_ptr = (void *)((uintptr_t)commonring->buf_addr + + (commonring->w_ptr * commonring->item_len)); +#endif commonring->w_ptr++; if (commonring->w_ptr == commonring->depth) commonring->w_ptr = 0; @@ -155,8 +160,13 @@ again: available = commonring->r_ptr - commonring->w_ptr; if (available > 1) { +#if defined(__linux__) ret_ptr = commonring->buf_addr + (commonring->w_ptr * commonring->item_len); +#elif defined(__FreeBSD__) + ret_ptr = (void *)((uintptr_t)commonring->buf_addr + + (commonring->w_ptr * commonring->item_len)); +#endif *alloced = min_t(u16, n_items, available - 1); if (*alloced + commonring->w_ptr > commonring->depth) *alloced = commonring->depth - commonring->w_ptr; @@ -217,8 +227,13 @@ void *brcmf_commonring_get_read_ptr(struct brcmf_commonring *commonring, if (*n_items == 0) return NULL; +#if defined(__linux__) return commonring->buf_addr + (commonring->r_ptr * commonring->item_len); +#elif defined(__FreeBSD__) *** 1217 LINES SKIPPED *** From nobody Tue Feb 10 21:54:31 2026 X-Original-To: dev-commits-src-main@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 4f9b200sj6z6S6hX for ; Tue, 10 Feb 2026 21:54:32 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9b1z70Nhz3RcC for ; Tue, 10 Feb 2026 21:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770760472; 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=QYLWkF0dikc+3fPPBV2JGhdzundvaT7RQpf0tN1/RqI=; b=k86yxl+wBb0DzTLtktVCtyQKpKGAtBVSGgRpxey1BJzQb7lj3xQnyJ84rGOqzH5tA8V+sR 1e/FA6okr/XuvmqvXv5Z+gpjg1yLs+9pUS5VP6cBuUyRt73y04yZ36kWTZ3xyG4XpVsQFu 6izD7GpxybLElUq7hNAGGcMUM6SzXudnRFbImEfoft/Ndcn9E+WoJBvJnzshaZEPcLepCf dgwaHBI+H1nvbhvgP2eZzblczF31DfXu0Ebsivw71lqfYi5nXleHIqTRuZ060Hyv55klxQ Oq3Tev3MViJzTAfc/McZrPXa6QsavMNJdNN4SwS9fi8LoNMHJledn0M2wsU3Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770760472; a=rsa-sha256; cv=none; b=nEe/CxIjwmwDEYvAkQG0+2UIJXTnoAn3FapYLNo9xxQeeUDlXZGh0IQdqg4uZ9vIfcNYg8 HmGE0OzP1XAj5dUmESfyCl1GXuRH9wq6vUAProz7DdgO5EV8kI2NH6/XRqNXD/N41PXncr 3MnCtlB7VaG9QgkwcEpWu0/dU2pCcUO5PKiSgF8fmeVxYtFjXXdrjm2CLuVIu6lMYt2Ap0 wjT2oF5oMfc7nugLCK/l+nAfVTeukXWW3hyjCdpXkmM9XdMBdGIsZmftrHJji9yvcr9eRV 4BYhfu+vxKtuMzQDBeyF9vAdlSnv8DVNXQbEP+vzsLOKaHnI1G37erRu3a+U/A== 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=1770760472; 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=QYLWkF0dikc+3fPPBV2JGhdzundvaT7RQpf0tN1/RqI=; b=nmuCXAwBJuJwf0DlnGupbNm62n2kqAXDqZ4o3Dl/4+JqaQal4VEgZ3MiUCnkHVhYEdeqHu KX7h+V7ioDdHWceZePSLkmAZsfJsBVCkAKKCt2dopPGWZS2MlS0CmUyJiRxXwg1+PFcTNx C2SPpGA25O8VdmgvRR1rOfbx3gfZR+d879V0m8bKRJPHr28bFyDL+19p3Uly54hEggzuay 6dK1cbXGxAtdJOQShgbcqA8+UdB+/wHDMH6+FgcISOSSNnOfAkHH28WqQqSOyPDiMD21ao /9qrKYK+dAEe6aIKB4ZMBD025dFdSvYRZjIGTYawd5kma9wfiTWxOFtHdXVRhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9b1z68Hwz6RP for ; Tue, 10 Feb 2026 21:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20758 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 21:54:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 22741535bcf4 - main - brcmfmac: make USB parts compile (and not panic right away) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 22741535bcf4b003e41c0ecd22cca578359ba434 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 21:54:31 +0000 Message-Id: <698ba917.20758.26637122@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=22741535bcf4b003e41c0ecd22cca578359ba434 commit 22741535bcf4b003e41c0ecd22cca578359ba434 Author: Bjoern A. Zeeb AuthorDate: 2026-02-09 01:07:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 21:37:13 +0000 brcmfmac: make USB parts compile (and not panic right away) Fix casts and consts and add one extra error check for a NULL pointer. This will require [a future] linuxkpi_usb. There are very few dongles I know off: - the original Raspberry PI USB dongle [1] - Cisco Linksys AE1200 The reason for making USB compile despite the limited 11n 150/300 Mbit/s adapters is that it is the simplest way to work on cfg80211 while on the road, not requiring a full PCIe slot or another SoC for SDIO. Sponsored by: The FreeBSD Foundation Hardware donated by: Martin Husemann (martin NetBSD.org) [1] MFC after: 3 days --- sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c | 6 +++ sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c | 52 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c index 9ec0c60b6da1..7e846cbf5157 100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c @@ -387,12 +387,18 @@ brcmf_proto_bcdc_configure_addr_mode(struct brcmf_pub *drvr, int ifidx, static void brcmf_proto_bcdc_delete_peer(struct brcmf_pub *drvr, int ifidx, +#if defined(__FreeBSD__) + const +#endif u8 peer[ETH_ALEN]) { } static void brcmf_proto_bcdc_add_tdls_peer(struct brcmf_pub *drvr, int ifidx, +#if defined(__FreeBSD__) + const +#endif u8 peer[ETH_ALEN]) { } diff --git a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c index f0129d10d2b9..46b7cf4380e6 100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c @@ -8,6 +8,9 @@ #include #include #include +#if defined(__FreeBSD__) +#include +#endif #include #include @@ -255,7 +258,11 @@ brcmf_usb_send_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len) devinfo->ctl_out_pipe, (unsigned char *) &devinfo->ctl_write, buf, size, +#if defined(__linux__) (usb_complete_t)brcmf_usb_ctlwrite_complete, +#elif defined(__FreeBSD__) + brcmf_usb_ctlwrite_complete, +#endif devinfo); ret = usb_submit_urb(devinfo->ctl_urb, GFP_ATOMIC); @@ -289,7 +296,11 @@ brcmf_usb_recv_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len) devinfo->ctl_in_pipe, (unsigned char *) &devinfo->ctl_read, buf, size, +#if defined(__linux__) (usb_complete_t)brcmf_usb_ctlread_complete, +#elif defined(__FreeBSD__) + brcmf_usb_ctlread_complete, +#endif devinfo); ret = usb_submit_urb(devinfo->ctl_urb, GFP_ATOMIC); @@ -768,7 +779,11 @@ static int brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd, usb_rcvctrlpipe(devinfo->usbdev, 0), (unsigned char *) &devinfo->ctl_read, (void *) tmpbuf, size, +#if defined(__linux__) (usb_complete_t)brcmf_usb_sync_complete, devinfo); +#elif defined(__FreeBSD__) + brcmf_usb_sync_complete, devinfo); +#endif devinfo->ctl_completed = false; ret = usb_submit_urb(devinfo->ctl_urb, GFP_ATOMIC); @@ -873,7 +888,11 @@ brcmf_usb_dl_send_bulk(struct brcmf_usbdev_info *devinfo, void *buffer, int len) /* Prepare the URB */ usb_fill_bulk_urb(devinfo->bulk_urb, devinfo->usbdev, devinfo->tx_pipe, buffer, len, +#if defined(__linux__) (usb_complete_t)brcmf_usb_sync_complete, devinfo); +#elif defined(__FreeBSD__) + brcmf_usb_sync_complete, devinfo); +#endif devinfo->bulk_urb->transfer_flags |= URB_ZERO_PACKET; @@ -888,10 +907,19 @@ brcmf_usb_dl_send_bulk(struct brcmf_usbdev_info *devinfo, void *buffer, int len) } static int +#if defined(__linux__) brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen) +#elif defined(__FreeBSD__) +brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, const u8 *fw, int fwlen) +#endif { unsigned int sendlen, sent, dllen; +#if defined(__linux__) char *bulkchunk = NULL, *dlpos; +#elif defined(__FreeBSD__) + char *bulkchunk = NULL; + const u8 *dlpos; +#endif struct rdl_state_le state; u32 rdlstate, rdlbytes; int err = 0; @@ -973,7 +1001,11 @@ fail: return err; } +#if defined(__linux__) static int brcmf_usb_dlstart(struct brcmf_usbdev_info *devinfo, u8 *fw, int len) +#elif defined(__FreeBSD__) +static int brcmf_usb_dlstart(struct brcmf_usbdev_info *devinfo, const u8 *fw, int len) +#endif { int err; @@ -1049,7 +1081,11 @@ brcmf_usb_fw_download(struct brcmf_usbdev_info *devinfo) goto out; err = brcmf_usb_dlstart(devinfo, +#if defined(__linux__) (u8 *)devinfo->image, devinfo->image_len); +#elif defined(__FreeBSD__) + (const u8 *)devinfo->image, devinfo->image_len); +#endif if (err == 0) err = brcmf_usb_dlrun(devinfo); @@ -1080,12 +1116,20 @@ static void brcmf_usb_detach(struct brcmf_usbdev_info *devinfo) static int check_file(const u8 *headers) { +#if defined(__linux__) struct trx_header_le *trx; +#elif defined(__FreeBSD__) + const struct trx_header_le *trx; +#endif int actual_len = -1; brcmf_dbg(USB, "Enter\n"); /* Extract trx header */ +#if defined(__linux__) trx = (struct trx_header_le *) headers; +#elif defined(__FreeBSD__) + trx = (const struct trx_header_le *) headers; +#endif if (trx->magic != cpu_to_le32(TRX_MAGIC)) return -1; @@ -1187,6 +1231,10 @@ static void brcmf_usb_probe_phase2(struct device *dev, int ret, fw = fwreq->items[BRCMF_USB_FW_CODE].binary; kfree(fwreq); +#if defined(__FreeBSD__) + if (fw == NULL) + goto error; +#endif ret = check_file(fw->data); if (ret < 0) { @@ -1602,3 +1650,7 @@ int brcmf_usb_register(void) brcmf_dbg(USB, "Enter\n"); return usb_register(&brcmf_usbdrvr); } + +#if defined(__FreeBSD__) +MODULE_DEPEND(brcmfmac, linuxkpi_usb, 1, 1, 1); +#endif From nobody Tue Feb 10 21:54:32 2026 X-Original-To: dev-commits-src-main@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 4f9b213wCGz6S6n5 for ; Tue, 10 Feb 2026 21:54:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9b2108YYz3Rtm for ; Tue, 10 Feb 2026 21:54:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770760473; 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=jcjrWtzBCWJITcXHIpvgWmG8w/elo3wKKsLnDjewmKc=; b=G2plKxIQgkearOzqcMXrH/bocRNgMLRT+cpKVRIjrxS/TIILoKrIjZHxs7DH9z+Vnxpsg9 iLrHGeISLWvFDuKyDF9xFldn4wYlblw71eUwsaoozTQGyF+br+E6uFgehbcn8UTBeXcN2P ddxeJRrRlHkeHyF/e7VG+VNoJAudyxrIUZ6kZuvmCHvRFShcNX59tDgwyAs+dz/H7cA1n0 60815HnZtkXB0ZWL/QKvOWKI0rrNpdSGpZGVHOCQdnHmnRl6HSZaGZRa0HgJbHitG28Bx0 bDVz5VZjIwUgd/g1hDoqiwLk4FQHXR9FnVZON/0V90Ds45yEYfn2Zneti81wBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770760473; a=rsa-sha256; cv=none; b=Wte/rRVEPcINxU/7YGeStANB7VPgNMwU2yWHjg8Zm+4nJ1g/XNu6o6fI5Rbv0iewo6Ni+n QVUGCjyragC7WyVbnHp6qvoefrBbA+PmkmQ2XdRr8w4S7DXCqQcOKLHi4frWbqfntqapTd mVsHH9O4DYqwNSJ2f7+u0+cqvY3bomNocD9Wa4Q6y3ibGKVwOmPMXhwkDNCMmj6otJae8t dwyDmKkgcuBFtcPho2/wDkRofHVQ8F6gJ9PdOQHeY9ns35zOoqvqRQOM/+G1Z39XV3212y 3sZ7btXvMHygEorC0fHCG5y2Dz80LogZB4qjCFrqVonebDo3/bc3OR1C6jfJYQ== 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=1770760473; 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=jcjrWtzBCWJITcXHIpvgWmG8w/elo3wKKsLnDjewmKc=; b=K5xw5lDGOupCaM5SolZIrV/0DyBHYX98F/BLCen2G1aHT693velcSdn3hxE2E3iBCbY8aJ 1Q8orlLGd/eTzM5u7IbV8SvC3zXzSSGv2rbLfcZ7hATvQA6ZFVPHC34SEGt0QJ/6gi+TAx p7RBSUdW+wgNu1eMzlORacmOVOIVS5WDy/mTEh6mWE6YNoEA6ENlfj73bRsWDQJLF3xcdS x3oKZzBy7txzHAh748n/Wr0IKfBh/nQM4s//Lt1QRMT3bXMYMIhf0lLXsWjVMZQzxiTgVK BQIpHj5qi2tUMlQ41XN9Ea+OX7iB2zU8mqcg3MMwniZ/nBGHs7FbPvL7c7+EJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9b206bmsz6LT for ; Tue, 10 Feb 2026 21:54:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f93c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 21:54:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 98c44ccb01d9 - main - brcmfmac: deal with bus attachments to the module Makefile List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 98c44ccb01d9461da477ec8d784c763e4d03fb36 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 21:54:32 +0000 Message-Id: <698ba918.1f93c.38d101f2@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=98c44ccb01d9461da477ec8d784c763e4d03fb36 commit 98c44ccb01d9461da477ec8d784c763e4d03fb36 Author: Bjoern A. Zeeb AuthorDate: 2026-02-09 01:08:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-10 21:42:53 +0000 brcmfmac: deal with bus attachments to the module Makefile As with LinuxKPI-based wireless drivers, e.g., rtw88, PCI depends on PCI being compiled into the kernel, SDIO will depend on MMCCAM in the kernel once supported, and USB can always be loaded. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/modules/brcm80211/brcmfmac/Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/modules/brcm80211/brcmfmac/Makefile b/sys/modules/brcm80211/brcmfmac/Makefile index 67955c96db53..b0c4d75a3d17 100644 --- a/sys/modules/brcm80211/brcmfmac/Makefile +++ b/sys/modules/brcm80211/brcmfmac/Makefile @@ -3,7 +3,7 @@ DEVDIR= ${SRCTOP}/sys/contrib/dev/broadcom/brcm80211/brcmfmac .PATH: ${DEVDIR} # Should split this up into a core driver and 3 more -WITH_PCIE=1 +WITH_PCI=1 WITH_SDIO=0 WITH_USB=0 @@ -20,21 +20,24 @@ SRCS+= fweh.c fwil.c fwvid.c p2p.c pno.c proto.c vendor.c xtlv.c SRCS+= wcc/core.c cyw/core.c bca/core.c -.if defined(WITH_PCIE) && ${WITH_PCIE} > 0 -CFLAGS+= -DCONFIG_BRCMFMAC_PCIE=1 +# PCI parts; PCI needs to be compiled into the kernel and cannot be loaded. +.if defined(WITH_PCI) && ${WITH_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= pcie.c msgbuf.c commonring.c flowring.c +CFLAGS+= -DCONFIG_BRCMFMAC_PCIE=1 .endif -.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 -CFLAGS+= -DCONFIG_BRCMFMAC_SDIO=1 +# SDIO parts; SDIO depends on an MMCCAM kernel. +.if defined(WITH_SDIO) && ${WITH_SDIO} > 0 && ${KERN_OPTS:MMMCCAM} SRCS+= sdio.c bcmsdh.c SRCS+= sdio_if.h SRCS+= sdiodevs.h +CFLAGS+= -DCONFIG_BRCMFMAC_SDIO=1 .endif +# USB parts; USB can be loaded and is unconditional on any kernel config. .if defined(WITH_USB) && ${WITH_USB} > 0 -CFLAGS+= -DCONFIG_BRCMFMAC_USB=1 SRCS+= usb.c +CFLAGS+= -DCONFIG_BRCMFMAC_USB=1 .endif .if (defined(WITH_SDIO) && ${WITH_SDIO} > 0) || \ @@ -74,7 +77,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -ferror-limit=0 #CFLAGS+= -DCONFIG_BRCM_TRACING=${WITH_TRACING} -CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_MSGBUF=${WITH_PCIE} +CFLAGS+= -DCONFIG_BRCMFMAC_PROTO_MSGBUF=${WITH_PCI} CFLAGS+= -DCONFIG_BRCMDBG=${WITH_DEBUG} #CFLAGS+= -DCONFIG_DMI=${WITH_DMI} From nobody Tue Feb 10 22:59:51 2026 X-Original-To: dev-commits-src-main@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 4f9cTN0tYGz6SDPv for ; Tue, 10 Feb 2026 22:59:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9cTN0M94z3c0b for ; Tue, 10 Feb 2026 22:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770764392; 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=A3kEFpZQYSWck8YoG0NyyetNv4iyax/ZZFcH3JzD8iI=; b=okmbfFE1FmCLw0/BBUm7kQXfs0P0VrTWb7QCTHGNbcjtlv45APBQeDdiCL0fn71L0dUxyL uZo93aeJQi0Zf70HZafTD9AqHK+SGM9UPFtZDkHh39gtwx1zt7aoHODevrUUh6p2wH/cjb HEQg/c3dQwLQp5MLIinFFHsspEBCCmxlf4TqvWDfk0qnEq/WqGx73/xNpjpCcKF8WyJ1es P65OfX/yw3eAk3K1yi7jsId1/xJsYWaoJu9TshDMYyHis4O3X/R9ZLFLKXt3a5eFOSNjTK ILAU5IY6vQdOL2/kFXlwn6yGli5men9hQ0hvRTRiZXvr8nxy3/fKwxnSuyacmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770764392; a=rsa-sha256; cv=none; b=F6k77RagMbBU/n1O4HQvnnZ6A/ugBARqxoP9LjnALTaY26FPZtPogmTP8/Lqwkg9OWNPmp A06wY2IHPqokfbceuGEAAV5jWfchVA0dUf4K4X/vEvikkjjNbppT/BWR2Cgk0uPwSTYlnT +dA+va3iHT+y+Iolr+c0r8DQnrXuvuwalkPYIOK4fDYjR0n/L5IGKsudH5Rm6WK3OArM4b /j0ELdGnjCwylSJZWa6if4N57atOr84+B56SBj+/5Wz8mkG7wiDQuoibdBcfy/WY0Lk5u1 dWKyHjbrYHatiEljk5AALm662aQgJ+qTKH4UjDHgO+7vXNxR+aR1zGEx+C2hDQ== 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=1770764392; 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=A3kEFpZQYSWck8YoG0NyyetNv4iyax/ZZFcH3JzD8iI=; b=UfXZ5sXJEoiVeBEUTfHz8P3muDTpRlgs1Gd8eXeoHYpvqUoticbYN2fgKop3dTdLHxP0ih iCKieNJI53E79GYiMahEEh4WSv1cmt/3XFSjBKDWM+XGwrfKJbuvtxZE2QAt1X/NzQg47X ufDw1SAUXEfOCuMY23aFYU5/YIB2Ob5Kwe8hn3DV8I72T9hvN7+ZvgGYiHTXPjhLQeBi/h RhWkgsTbnPZTsD0YwvnW9pjGjKpXn7g/1yda67WoBag3QRA4D/IVI+oivO5J5tPOFdWzi6 1x7v9L/P2uyyMmjGU/gdNmsVAqayJ3nTD34Qz081SzRWm0THhNrx0Yrm+FOYhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9cTM6kDKz7lw for ; Tue, 10 Feb 2026 22:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 268bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 22:59:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 3d85dcd1a9aa - main - psm(4): Add middle button support for Elantech V4 touchpads List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d85dcd1a9aa2e1b903935062500cb15b1a700f8 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 22:59:51 +0000 Message-Id: <698bb867.268bf.772cc624@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=3d85dcd1a9aa2e1b903935062500cb15b1a700f8 commit 3d85dcd1a9aa2e1b903935062500cb15b1a700f8 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-10 22:59:06 +0000 psm(4): Add middle button support for Elantech V4 touchpads based on firmware version. PR: 291262 MFC after: 1 month --- sys/dev/atkbdc/psm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index d36396df0fa0..95acf43a3bc6 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -352,6 +352,8 @@ typedef struct elantechhw { int dptracey; int issemimt; int isclickpad; + int hassmbusnotify; + int has3buttons; int hascrc; int hastrackpoint; int haspressure; @@ -417,7 +419,7 @@ enum { ((pb)->ipacket[0] & 0x0c) == 0x0c && ((pb)->ipacket[3] & 0xce) == 0x0c) #define ELANTECH_PKT_IS_V4(pb, hascrc) ((hascrc) ? \ ((pb)->ipacket[3] & 0x08) == 0x00 : \ - ((pb)->ipacket[0] & 0x0c) == 0x04 && ((pb)->ipacket[3] & 0x1c) == 0x10) + ((pb)->ipacket[0] & 0x08) == 0x00 && ((pb)->ipacket[3] & 0x1c) == 0x10) typedef struct elantechaction { finger_t fingers[ELANTECH_MAX_FINGERS]; @@ -1930,8 +1932,11 @@ psm_register_elantech(device_t dev) evdev_support_key(evdev_a, BTN_TOUCH); evdev_support_nfingers(evdev_a, ELANTECH_MAX_FINGERS); evdev_support_key(evdev_a, BTN_LEFT); - if (!sc->elanhw.isclickpad) + if (!sc->elanhw.isclickpad) { evdev_support_key(evdev_a, BTN_RIGHT); + if (sc->elanhw.has3buttons) + evdev_support_key(evdev_a, BTN_MIDDLE); + } psm_support_abs_bulk(evdev_a, elantech_absinfo); error = evdev_register_mtx(evdev_a, &Giant); @@ -4755,6 +4760,9 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *ms, touchpad_button = ((pb->ipacket[0] & 0x01) ? MOUSE_BUTTON1DOWN : 0) | ((pb->ipacket[0] & 0x02) ? MOUSE_BUTTON3DOWN : 0); + if (sc->elanhw.has3buttons) + touchpad_button |= + ((pb->ipacket[0] & 0x04) ? MOUSE_BUTTON2DOWN : 0); } #ifdef EVDEV_SUPPORT @@ -7347,6 +7355,9 @@ enable_elantech(struct psm_softc *sc, enum probearg arg) elanhw.hwversion = hwversion; elanhw.issemimt = hwversion == 2; elanhw.isclickpad = (resp[1] & 0x10) != 0; + elanhw.hassmbusnotify = + icversion == 0x0f && (resp[1] & 0x20) != 0 && resp[2] != 0; + elanhw.has3buttons = elanhw.hassmbusnotify; elanhw.hascrc = (resp[1] & 0x40) != 0; elanhw.haspressure = elanhw.fwversion >= 0x020800; From nobody Tue Feb 10 22:59:52 2026 X-Original-To: dev-commits-src-main@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 4f9cTP3CWTz6SDVP for ; Tue, 10 Feb 2026 22:59:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9cTP0gqRz3bv6 for ; Tue, 10 Feb 2026 22:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770764393; 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=UZGZ79FM+F6KuxgKc6ubbLOCtq1eZvJDjgAdjj3WOYY=; b=c19n0FpwV+hduXTPzoPN2f4CoE76rMvteA5bbgoMF8bYdUhazZKWNyc2hhucinPZIHt2VV lPE0h2xfo/dUy5R5R8GJmE2lR/VMvhD1UOpPfBKb5WwZWeGNdn49clhiZfspsxeDCCF2h7 mZg7aRydDobE9IaJ8nD7d9flhF2WuZWz3IaVUHbIzZQgFY5VSf2lTBzCZgga8r88YEDoyK 6l7wX35ulQrthzJuPvmeoFgMoY09oyPKBljjuvL9bkaFbEf4Ypc6ttkANOraDEGTBMiOFA d0tvDMahwMlLGTHOaaxzBeyEuELCzkgK/xyS8qHJ49MLgfv/NGzEIoAK5ROO1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770764393; a=rsa-sha256; cv=none; b=HkMLQOsjcRPfO7O0fCJ37rX9sydnZz7Os+8FaRUKtxkrh7Fc9ZtPWDjs7hap9HApfcDq0u Es/MwMaDjf81C60x/LYmwW61D3GXwR/2wk3ZS/ml9UHGt84+0BTr9nOTaltt20Gn6UdMvR XRJ+RTma4bpnXcfDuaPj9AmSLrbkd7WyJuPAFQZ5EZH7XyE2IIFrUet3K+WLEmqGT6dnEZ N/FaaNuhDY7anlLOC0kd6TBFh8kA/Mw++jmQZYy6/+ByOPRgZy71i4P9VbA/K5gcEDFb5P wV4SUOT7XPzS1a1LQwKqRgBMS+ydQEPuz0ZKifk+NUPJuNOXmrc2e/xwWNh/9g== 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=1770764393; 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=UZGZ79FM+F6KuxgKc6ubbLOCtq1eZvJDjgAdjj3WOYY=; b=Qdakp4uGk81jOVmbhgQVUDl4Bmd5mirVxh7YoqajMqKQ+xe4Asl60BBzH/T6jFUefSl8ib 964CPdaljwzEEgOitKDSOD2hhYA/DXMm2Uqr5Jn5YkpWjhtPkCVjALtzInyRy3UqtvhYOi Bh4AzW7L/HuCAqJYDIhkWxjR+bRvZmUPf97ZIK3Ysm8SAFHdZ36Fzj4u/AdiMCqlc4AwXH mrf7ZQhdqY5c/3RA+z/g0l6vf8C3+hzvBsnH8GzL8A/3tEJGOHGrS1r7umxSACRyM6hP/i u4JKBWb5pO6eomgl6jyddtqoCFw+dspi1RNtNELyH4eVqTI3ubYCDbDS+JTzFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9cTN7552z7ly for ; Tue, 10 Feb 2026 22:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26527 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 22:59:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 20a3c611f53d - main - moused(8): Use KQUEUE_CPONFORK flag to pass kqueue fd through fork List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20a3c611f53dfad830f9907e24fa08b80b674860 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 22:59:52 +0000 Message-Id: <698bb868.26527.40e88a73@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=20a3c611f53dfad830f9907e24fa08b80b674860 commit 20a3c611f53dfad830f9907e24fa08b80b674860 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-10 22:59:06 +0000 moused(8): Use KQUEUE_CPONFORK flag to pass kqueue fd through fork and use libc daemon() instead of private rfork-based copy. --- usr.sbin/moused/moused/moused.c | 58 ++--------------------------------------- 1 file changed, 2 insertions(+), 56 deletions(-) diff --git a/usr.sbin/moused/moused/moused.c b/usr.sbin/moused/moused/moused.c index 36cb8cc27eab..7de6832a1eb8 100644 --- a/usr.sbin/moused/moused/moused.c +++ b/usr.sbin/moused/moused/moused.c @@ -492,7 +492,6 @@ static void usage(void); static void log_or_warn(int log_pri, int errnum, const char *fmt, ...) __printflike(3, 4); -static int r_daemon(void); static enum device_if r_identify_if(int fd); static enum device_type r_identify_evdev(int fd); static enum device_type r_identify_sysmouse(int fd); @@ -761,7 +760,7 @@ main(int argc, char *argv[]) if ((cfd = open("/dev/consolectl", O_RDWR, 0)) == -1) logerr(1, "cannot open /dev/consolectl"); - if ((kfd = kqueue()) == -1) + if ((kfd = kqueuex(KQUEUE_CPONFORK)) == -1) logerr(1, "cannot create kqueue"); if (portname == NULL && (dfd = connect_devd()) == -1) logwarnx("cannot open devd socket"); @@ -827,7 +826,7 @@ main(int argc, char *argv[]) logerrx(1, "moused already running, pid: %d", mpid); logwarn("cannot open pid file"); } - if (r_daemon()) { + if (daemon(0, 0)) { int saved_errno = errno; pidfile_remove(pfh); errno = saved_errno; @@ -1284,59 +1283,6 @@ log_or_warn(int log_pri, int errnum, const char *fmt, ...) va_end(ap); } -static int -r_daemon(void) -{ - struct sigaction osa, sa; - pid_t newgrp; - int oerrno; - int osa_ok; - int nullfd; - - /* A SIGHUP may be thrown when the parent exits below. */ - sigemptyset(&sa.sa_mask); - sa.sa_handler = SIG_IGN; - sa.sa_flags = 0; - osa_ok = sigaction(SIGHUP, &sa, &osa); - - /* Keep kqueue fd alive */ - switch (rfork(RFPROC)) { - case -1: - return (-1); - case 0: - break; - default: - /* - * A fine point: _exit(0), not exit(0), to avoid triggering - * atexit(3) processing - */ - _exit(0); - } - - newgrp = setsid(); - oerrno = errno; - if (osa_ok != -1) - sigaction(SIGHUP, &osa, NULL); - - if (newgrp == -1) { - errno = oerrno; - return (-1); - } - - (void)chdir("/"); - - nullfd = open("/dev/null", O_RDWR, 0); - if (nullfd != -1) { - (void)dup2(nullfd, STDIN_FILENO); - (void)dup2(nullfd, STDOUT_FILENO); - (void)dup2(nullfd, STDERR_FILENO); - } - if (nullfd > 2) - close(nullfd); - - return (0); -} - static inline int bit_find(bitstr_t *array, int start, int stop) { From nobody Tue Feb 10 22:59:54 2026 X-Original-To: dev-commits-src-main@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 4f9cTQ2760z6SDK8 for ; Tue, 10 Feb 2026 22:59:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9cTQ1DLgz3c9f for ; Tue, 10 Feb 2026 22:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770764394; 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=GEo15ZPS3Ku7C+VqTMQMqH79SErACTPC2x62RZ+P0XI=; b=H4438MfZliF0Eu+i+D8++T8CJFJ0fWzR+BxHITawQ5tR733CPGxj67s3dj/0rPsx/yRV+V nayq6djz55m/Sl1FLT4gadom/TxOhc0p1K4fvNxZLveSkQsfY6Chw13FqCcZyu0tSX9V+V 0S0YFH3kv7LHIUYKztEg5XCVcwDLJ5ZTa39PVE4Gze0ZWGFXmy2iU1WmTsONhgBgNeNB2K trhXVx+1xEyzfAnkIeR8uNP95e6hPIeIvdnLF68OKea+JgnjCsYp845TXOAMvU0nhr4THz 9rQ5areYM1Q+KAGkt3cMkTvMj7xnlFAAmsdJ8TncP8GW+k/lwX3gDxeCPtY/mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770764394; a=rsa-sha256; cv=none; b=qVlnkfkF22PKmOFDlcTVgNbnni1jlGs1Schx7oCxysrCHOe3U/lxyAAdUBylXbol9nlXjR 5SL4mpg3o2ur3dxeolYcdEZSee+B1UDZezYiBgcpJ8IGkTSys4v0moaKy7l+A/usvtRX1n ZLrdhV9BQup0oj1W4/VsSY8EZFTsygzxfGnQjbNTaWzAL1O2izwK2Ev1iKkiwrBIovYzNa N1ixml9lfLalZPcuI03bIAxwxapyhof1Sa9qCoaCLXciJPanTf6OgjMXp/yFszoSdsIbji 1uYI/LG5f6zhYQK5zULJba/dMbbV7h+ahqi2DhYv8UP30dCGHU/g2NOUhE+R2w== 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=1770764394; 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=GEo15ZPS3Ku7C+VqTMQMqH79SErACTPC2x62RZ+P0XI=; b=jzMl2Mz9v7GTYRGHNkOkauhX2ImaebC0kgVHWRQPQ3wd34lKylQ6x6bJsVxfzb7NC2lzaC l7nIS3QFxt2+r+cVJym1qM/b3pRRHPCT+Jz47rcqoTaysjmQA5UF1ddaPbQ3rX3wuFgxgt smHeyA/NIGPTXHDa371E0Ey4sHynHqcN02djm8q8B1ar4XOWLhmeH+Y5nwkutGXBCGMeM4 yl593gKwvuocZ5BJeiCMNVnlWB3rAGWsTc4TssSZ+X2F4U5s7JGnrwfNbdm6KrkQLcaHff I8YEV8fRQRAvrd/RKI1gy/fYauyQaTKERRjmx+tNCQBMKTE8XzPDg7qMKMgZXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9cTQ0pnSz7yF for ; Tue, 10 Feb 2026 22:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 270ae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 22:59:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 89aa8a94053f - main - evdev: Drop comments from input-event-codes.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89aa8a94053fdd22ed716fdf424a2d10e70b3188 Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 22:59:54 +0000 Message-Id: <698bb86a.270ae.206d80bb@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=89aa8a94053fdd22ed716fdf424a2d10e70b3188 commit 89aa8a94053fdd22ed716fdf424a2d10e70b3188 Author: Vladimir Kondratyev AuthorDate: 2026-02-10 22:59:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-02-10 22:59:06 +0000 evdev: Drop comments from input-event-codes.h They were copied intact from the Linux GPL-only file. Requested by: imp, glebius MFC after: 1 week --- sys/dev/evdev/input-event-codes.h | 485 ++++++++++++++------------------------ 1 file changed, 177 insertions(+), 308 deletions(-) diff --git a/sys/dev/evdev/input-event-codes.h b/sys/dev/evdev/input-event-codes.h index 81c88ec86b9b..4f1d0f96e400 100644 --- a/sys/dev/evdev/input-event-codes.h +++ b/sys/dev/evdev/input-event-codes.h @@ -28,26 +28,18 @@ #ifndef _EVDEV_INPUT_EVENT_CODES_H #define _EVDEV_INPUT_EVENT_CODES_H -/* - * Device properties and quirks - */ - -#define INPUT_PROP_POINTER 0x00 /* needs a pointer */ -#define INPUT_PROP_DIRECT 0x01 /* direct input devices */ -#define INPUT_PROP_BUTTONPAD 0x02 /* has button(s) under pad */ -#define INPUT_PROP_SEMI_MT 0x03 /* touch rectangle only */ -#define INPUT_PROP_TOPBUTTONPAD 0x04 /* softbuttons at top of pad */ -#define INPUT_PROP_POINTING_STICK 0x05 /* is a pointing stick */ -#define INPUT_PROP_ACCELEROMETER 0x06 /* has accelerometer */ -#define INPUT_PROP_PRESSUREPAD 0x07 /* pressure triggers clicks */ +#define INPUT_PROP_POINTER 0x00 +#define INPUT_PROP_DIRECT 0x01 +#define INPUT_PROP_BUTTONPAD 0x02 +#define INPUT_PROP_SEMI_MT 0x03 +#define INPUT_PROP_TOPBUTTONPAD 0x04 +#define INPUT_PROP_POINTING_STICK 0x05 +#define INPUT_PROP_ACCELEROMETER 0x06 +#define INPUT_PROP_PRESSUREPAD 0x07 #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) -/* - * Event types - */ - #define EV_SYN 0x00 #define EV_KEY 0x01 #define EV_REL 0x02 @@ -63,10 +55,6 @@ #define EV_MAX 0x1f #define EV_CNT (EV_MAX+1) -/* - * Synchronization events. - */ - #define SYN_REPORT 0 #define SYN_CONFIG 1 #define SYN_MT_REPORT 2 @@ -74,17 +62,6 @@ #define SYN_MAX 0xf #define SYN_CNT (SYN_MAX+1) -/* - * Keys and buttons - * - * Most of the keys/buttons are modeled after USB HUT 1.12 - * (see http://www.usb.org/developers/hidpage). - * Abbreviations in the comments: - * AC - Application Control - * AL - Application Launch Button - * SC - System Control - */ - #define KEY_RESERVED 0 #define KEY_ESC 1 #define KEY_1 2 @@ -201,11 +178,11 @@ #define KEY_MUTE 113 #define KEY_VOLUMEDOWN 114 #define KEY_VOLUMEUP 115 -#define KEY_POWER 116 /* SC System Power Down */ +#define KEY_POWER 116 #define KEY_KPEQUAL 117 #define KEY_KPPLUSMINUS 118 #define KEY_PAUSE 119 -#define KEY_SCALE 120 /* AL Compiz Scale (Expose) */ +#define KEY_SCALE 120 #define KEY_KPCOMMA 121 #define KEY_HANGEUL 122 @@ -216,40 +193,40 @@ #define KEY_RIGHTMETA 126 #define KEY_COMPOSE 127 -#define KEY_STOP 128 /* AC Stop */ +#define KEY_STOP 128 #define KEY_AGAIN 129 -#define KEY_PROPS 130 /* AC Properties */ -#define KEY_UNDO 131 /* AC Undo */ +#define KEY_PROPS 130 +#define KEY_UNDO 131 #define KEY_FRONT 132 -#define KEY_COPY 133 /* AC Copy */ -#define KEY_OPEN 134 /* AC Open */ -#define KEY_PASTE 135 /* AC Paste */ -#define KEY_FIND 136 /* AC Search */ -#define KEY_CUT 137 /* AC Cut */ -#define KEY_HELP 138 /* AL Integrated Help Center */ -#define KEY_MENU 139 /* Menu (show menu) */ -#define KEY_CALC 140 /* AL Calculator */ +#define KEY_COPY 133 +#define KEY_OPEN 134 +#define KEY_PASTE 135 +#define KEY_FIND 136 +#define KEY_CUT 137 +#define KEY_HELP 138 +#define KEY_MENU 139 +#define KEY_CALC 140 #define KEY_SETUP 141 -#define KEY_SLEEP 142 /* SC System Sleep */ -#define KEY_WAKEUP 143 /* System Wake Up */ -#define KEY_FILE 144 /* AL Local Machine Browser */ +#define KEY_SLEEP 142 +#define KEY_WAKEUP 143 +#define KEY_FILE 144 #define KEY_SENDFILE 145 #define KEY_DELETEFILE 146 #define KEY_XFER 147 #define KEY_PROG1 148 #define KEY_PROG2 149 -#define KEY_WWW 150 /* AL Internet Browser */ +#define KEY_WWW 150 #define KEY_MSDOS 151 -#define KEY_COFFEE 152 /* AL Terminal Lock/Screensaver */ +#define KEY_COFFEE 152 #define KEY_SCREENLOCK KEY_COFFEE -#define KEY_ROTATE_DISPLAY 153 /* Display orientation for e.g. tablets */ +#define KEY_ROTATE_DISPLAY 153 #define KEY_DIRECTION KEY_ROTATE_DISPLAY #define KEY_CYCLEWINDOWS 154 #define KEY_MAIL 155 -#define KEY_BOOKMARKS 156 /* AC Bookmarks */ +#define KEY_BOOKMARKS 156 #define KEY_COMPUTER 157 -#define KEY_BACK 158 /* AC Back */ -#define KEY_FORWARD 159 /* AC Forward */ +#define KEY_BACK 158 +#define KEY_FORWARD 159 #define KEY_CLOSECD 160 #define KEY_EJECTCD 161 #define KEY_EJECTCLOSECD 162 @@ -259,20 +236,20 @@ #define KEY_STOPCD 166 #define KEY_RECORD 167 #define KEY_REWIND 168 -#define KEY_PHONE 169 /* Media Select Telephone */ +#define KEY_PHONE 169 #define KEY_ISO 170 -#define KEY_CONFIG 171 /* AL Consumer Control Configuration */ -#define KEY_HOMEPAGE 172 /* AC Home */ -#define KEY_REFRESH 173 /* AC Refresh */ -#define KEY_EXIT 174 /* AC Exit */ +#define KEY_CONFIG 171 +#define KEY_HOMEPAGE 172 +#define KEY_REFRESH 173 +#define KEY_EXIT 174 #define KEY_MOVE 175 #define KEY_EDIT 176 #define KEY_SCROLLUP 177 #define KEY_SCROLLDOWN 178 #define KEY_KPLEFTPAREN 179 #define KEY_KPRIGHTPAREN 180 -#define KEY_NEW 181 /* AC New */ -#define KEY_REDO 182 /* AC Redo/Repeat */ +#define KEY_NEW 181 +#define KEY_REDO 182 #define KEY_F13 183 #define KEY_F14 184 @@ -291,14 +268,14 @@ #define KEY_PAUSECD 201 #define KEY_PROG3 202 #define KEY_PROG4 203 -#define KEY_ALL_APPLICATIONS 204 /* AC Desktop Show All Applications */ +#define KEY_ALL_APPLICATIONS 204 #define KEY_DASHBOARD KEY_ALL_APPLICATIONS #define KEY_SUSPEND 205 -#define KEY_CLOSE 206 /* AC Close */ +#define KEY_CLOSE 206 #define KEY_PLAY 207 #define KEY_FASTFORWARD 208 #define KEY_BASSBOOST 209 -#define KEY_PRINT 210 /* AC Print */ +#define KEY_PRINT 210 #define KEY_HP 211 #define KEY_CAMERA 212 #define KEY_SOUND 213 @@ -307,25 +284,24 @@ #define KEY_CHAT 216 #define KEY_SEARCH 217 #define KEY_CONNECT 218 -#define KEY_FINANCE 219 /* AL Checkbook/Finance */ +#define KEY_FINANCE 219 #define KEY_SPORT 220 #define KEY_SHOP 221 #define KEY_ALTERASE 222 -#define KEY_CANCEL 223 /* AC Cancel */ +#define KEY_CANCEL 223 #define KEY_BRIGHTNESSDOWN 224 #define KEY_BRIGHTNESSUP 225 #define KEY_MEDIA 226 -#define KEY_SWITCHVIDEOMODE 227 /* Cycle between available video - outputs (Monitor/LCD/TV-out/etc) */ +#define KEY_SWITCHVIDEOMODE 227 #define KEY_KBDILLUMTOGGLE 228 #define KEY_KBDILLUMDOWN 229 #define KEY_KBDILLUMUP 230 -#define KEY_SEND 231 /* AC Send */ -#define KEY_REPLY 232 /* AC Reply */ -#define KEY_FORWARDMAIL 233 /* AC Forward Msg */ -#define KEY_SAVE 234 /* AC Save */ +#define KEY_SEND 231 +#define KEY_REPLY 232 +#define KEY_FORWARDMAIL 233 +#define KEY_SAVE 234 #define KEY_DOCUMENTS 235 #define KEY_BATTERY 236 @@ -336,22 +312,18 @@ #define KEY_UNKNOWN 240 -#define KEY_VIDEO_NEXT 241 /* drive next video source */ -#define KEY_VIDEO_PREV 242 /* drive previous video source */ -#define KEY_BRIGHTNESS_CYCLE 243 /* brightness up, after max is min */ -#define KEY_BRIGHTNESS_AUTO 244 /* Set Auto Brightness: manual - brightness control is off, - rely on ambient */ +#define KEY_VIDEO_NEXT 241 +#define KEY_VIDEO_PREV 242 +#define KEY_BRIGHTNESS_CYCLE 243 +#define KEY_BRIGHTNESS_AUTO 244 #define KEY_BRIGHTNESS_ZERO KEY_BRIGHTNESS_AUTO -#define KEY_DISPLAY_OFF 245 /* display device to off state */ +#define KEY_DISPLAY_OFF 245 -#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ +#define KEY_WWAN 246 #define KEY_WIMAX KEY_WWAN -#define KEY_RFKILL 247 /* Key that controls all radios */ - -#define KEY_MICMUTE 248 /* Mute / unmute the microphone */ +#define KEY_RFKILL 247 -/* Code 255 is reserved for special needs of AT keyboard driver */ +#define KEY_MICMUTE 248 #define BTN_MISC 0x100 #define BTN_0 0x100 @@ -420,14 +392,14 @@ #define BTN_TOOL_FINGER 0x145 #define BTN_TOOL_MOUSE 0x146 #define BTN_TOOL_LENS 0x147 -#define BTN_TOOL_QUINTTAP 0x148 /* Five fingers on trackpad */ +#define BTN_TOOL_QUINTTAP 0x148 #define BTN_STYLUS3 0x149 #define BTN_TOUCH 0x14a #define BTN_STYLUS 0x14b #define BTN_STYLUS2 0x14c #define BTN_TOOL_DOUBLETAP 0x14d #define BTN_TOOL_TRIPLETAP 0x14e -#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */ +#define BTN_TOOL_QUADTAP 0x14f #define BTN_WHEEL 0x150 #define BTN_GEAR_DOWN 0x150 @@ -439,56 +411,56 @@ #define KEY_CLEAR 0x163 #define KEY_POWER2 0x164 #define KEY_OPTION 0x165 -#define KEY_INFO 0x166 /* AL OEM Features/Tips/Tutorial */ +#define KEY_INFO 0x166 #define KEY_TIME 0x167 #define KEY_VENDOR 0x168 #define KEY_ARCHIVE 0x169 -#define KEY_PROGRAM 0x16a /* Media Select Program Guide */ +#define KEY_PROGRAM 0x16a #define KEY_CHANNEL 0x16b #define KEY_FAVORITES 0x16c #define KEY_EPG 0x16d -#define KEY_PVR 0x16e /* Media Select Home */ +#define KEY_PVR 0x16e #define KEY_MHP 0x16f #define KEY_LANGUAGE 0x170 #define KEY_TITLE 0x171 #define KEY_SUBTITLE 0x172 #define KEY_ANGLE 0x173 -#define KEY_FULL_SCREEN 0x174 /* AC View Toggle */ +#define KEY_FULL_SCREEN 0x174 #define KEY_ZOOM KEY_FULL_SCREEN #define KEY_MODE 0x175 #define KEY_KEYBOARD 0x176 -#define KEY_ASPECT_RATIO 0x177 /* HUTRR37: Aspect */ +#define KEY_ASPECT_RATIO 0x177 #define KEY_SCREEN KEY_ASPECT_RATIO -#define KEY_PC 0x178 /* Media Select Computer */ -#define KEY_TV 0x179 /* Media Select TV */ -#define KEY_TV2 0x17a /* Media Select Cable */ -#define KEY_VCR 0x17b /* Media Select VCR */ -#define KEY_VCR2 0x17c /* VCR Plus */ -#define KEY_SAT 0x17d /* Media Select Satellite */ +#define KEY_PC 0x178 +#define KEY_TV 0x179 +#define KEY_TV2 0x17a +#define KEY_VCR 0x17b +#define KEY_VCR2 0x17c +#define KEY_SAT 0x17d #define KEY_SAT2 0x17e -#define KEY_CD 0x17f /* Media Select CD */ -#define KEY_TAPE 0x180 /* Media Select Tape */ +#define KEY_CD 0x17f +#define KEY_TAPE 0x180 #define KEY_RADIO 0x181 -#define KEY_TUNER 0x182 /* Media Select Tuner */ +#define KEY_TUNER 0x182 #define KEY_PLAYER 0x183 #define KEY_TEXT 0x184 -#define KEY_DVD 0x185 /* Media Select DVD */ +#define KEY_DVD 0x185 #define KEY_AUX 0x186 #define KEY_MP3 0x187 -#define KEY_AUDIO 0x188 /* AL Audio Browser */ -#define KEY_VIDEO 0x189 /* AL Movie Browser */ +#define KEY_AUDIO 0x188 +#define KEY_VIDEO 0x189 #define KEY_DIRECTORY 0x18a #define KEY_LIST 0x18b -#define KEY_MEMO 0x18c /* Media Select Messages */ +#define KEY_MEMO 0x18c #define KEY_CALENDAR 0x18d #define KEY_RED 0x18e #define KEY_GREEN 0x18f #define KEY_YELLOW 0x190 #define KEY_BLUE 0x191 -#define KEY_CHANNELUP 0x192 /* Channel Increment */ -#define KEY_CHANNELDOWN 0x193 /* Channel Decrement */ +#define KEY_CHANNELUP 0x192 +#define KEY_CHANNELDOWN 0x193 #define KEY_FIRST 0x194 -#define KEY_LAST 0x195 /* Recall Last */ +#define KEY_LAST 0x195 #define KEY_AB 0x196 #define KEY_NEXT 0x197 #define KEY_RESTART 0x198 @@ -499,40 +471,40 @@ #define KEY_DIGITS 0x19d #define KEY_TEEN 0x19e #define KEY_TWEN 0x19f -#define KEY_VIDEOPHONE 0x1a0 /* Media Select Video Phone */ -#define KEY_GAMES 0x1a1 /* Media Select Games */ -#define KEY_ZOOMIN 0x1a2 /* AC Zoom In */ -#define KEY_ZOOMOUT 0x1a3 /* AC Zoom Out */ -#define KEY_ZOOMRESET 0x1a4 /* AC Zoom */ -#define KEY_WORDPROCESSOR 0x1a5 /* AL Word Processor */ -#define KEY_EDITOR 0x1a6 /* AL Text Editor */ -#define KEY_SPREADSHEET 0x1a7 /* AL Spreadsheet */ -#define KEY_GRAPHICSEDITOR 0x1a8 /* AL Graphics Editor */ -#define KEY_PRESENTATION 0x1a9 /* AL Presentation App */ -#define KEY_DATABASE 0x1aa /* AL Database App */ -#define KEY_NEWS 0x1ab /* AL Newsreader */ -#define KEY_VOICEMAIL 0x1ac /* AL Voicemail */ -#define KEY_ADDRESSBOOK 0x1ad /* AL Contacts/Address Book */ -#define KEY_MESSENGER 0x1ae /* AL Instant Messaging */ -#define KEY_DISPLAYTOGGLE 0x1af /* Turn display (LCD) on and off */ +#define KEY_VIDEOPHONE 0x1a0 +#define KEY_GAMES 0x1a1 +#define KEY_ZOOMIN 0x1a2 +#define KEY_ZOOMOUT 0x1a3 +#define KEY_ZOOMRESET 0x1a4 +#define KEY_WORDPROCESSOR 0x1a5 +#define KEY_EDITOR 0x1a6 +#define KEY_SPREADSHEET 0x1a7 +#define KEY_GRAPHICSEDITOR 0x1a8 +#define KEY_PRESENTATION 0x1a9 +#define KEY_DATABASE 0x1aa +#define KEY_NEWS 0x1ab +#define KEY_VOICEMAIL 0x1ac +#define KEY_ADDRESSBOOK 0x1ad +#define KEY_MESSENGER 0x1ae +#define KEY_DISPLAYTOGGLE 0x1af #define KEY_BRIGHTNESS_TOGGLE KEY_DISPLAYTOGGLE -#define KEY_SPELLCHECK 0x1b0 /* AL Spell Check */ -#define KEY_LOGOFF 0x1b1 /* AL Logoff */ +#define KEY_SPELLCHECK 0x1b0 +#define KEY_LOGOFF 0x1b1 #define KEY_DOLLAR 0x1b2 #define KEY_EURO 0x1b3 -#define KEY_FRAMEBACK 0x1b4 /* Consumer - transport controls */ +#define KEY_FRAMEBACK 0x1b4 #define KEY_FRAMEFORWARD 0x1b5 -#define KEY_CONTEXT_MENU 0x1b6 /* GenDesc - system context menu */ -#define KEY_MEDIA_REPEAT 0x1b7 /* Consumer - transport control */ -#define KEY_10CHANNELSUP 0x1b8 /* 10 channels up (10+) */ -#define KEY_10CHANNELSDOWN 0x1b9 /* 10 channels down (10-) */ -#define KEY_IMAGES 0x1ba /* AL Image Browser */ -#define KEY_NOTIFICATION_CENTER 0x1bc /* Show/hide the notification center */ -#define KEY_PICKUP_PHONE 0x1bd /* Answer incoming call */ -#define KEY_HANGUP_PHONE 0x1be /* Decline incoming call */ -#define KEY_LINK_PHONE 0x1bf /* AL Phone Syncing */ +#define KEY_CONTEXT_MENU 0x1b6 +#define KEY_MEDIA_REPEAT 0x1b7 +#define KEY_10CHANNELSUP 0x1b8 +#define KEY_10CHANNELSDOWN 0x1b9 +#define KEY_IMAGES 0x1ba +#define KEY_NOTIFICATION_CENTER 0x1bc +#define KEY_PICKUP_PHONE 0x1bd +#define KEY_HANGUP_PHONE 0x1be +#define KEY_LINK_PHONE 0x1bf #define KEY_DEL_EOL 0x1c0 #define KEY_DEL_EOS 0x1c1 @@ -573,8 +545,8 @@ #define KEY_BRL_DOT9 0x1f9 #define KEY_BRL_DOT10 0x1fa -#define KEY_NUMERIC_0 0x200 /* used by phones, remote controls, */ -#define KEY_NUMERIC_1 0x201 /* and other keypads */ +#define KEY_NUMERIC_0 0x200 +#define KEY_NUMERIC_1 0x201 #define KEY_NUMERIC_2 0x202 #define KEY_NUMERIC_3 0x203 #define KEY_NUMERIC_4 0x204 @@ -585,15 +557,14 @@ #define KEY_NUMERIC_9 0x209 #define KEY_NUMERIC_STAR 0x20a #define KEY_NUMERIC_POUND 0x20b -#define KEY_NUMERIC_A 0x20c /* Phone key A - HUT Telephony 0xb9 */ +#define KEY_NUMERIC_A 0x20c #define KEY_NUMERIC_B 0x20d #define KEY_NUMERIC_C 0x20e #define KEY_NUMERIC_D 0x20f - #define KEY_CAMERA_FOCUS 0x210 -#define KEY_WPS_BUTTON 0x211 /* WiFi Protected Setup key */ +#define KEY_WPS_BUTTON 0x211 -#define KEY_TOUCHPAD_TOGGLE 0x212 /* Request switch touchpad on or off */ +#define KEY_TOUCHPAD_TOGGLE 0x212 #define KEY_TOUCHPAD_ON 0x213 #define KEY_TOUCHPAD_OFF 0x214 @@ -603,11 +574,10 @@ #define KEY_CAMERA_DOWN 0x218 #define KEY_CAMERA_LEFT 0x219 #define KEY_CAMERA_RIGHT 0x21a - #define KEY_ATTENDANT_ON 0x21b #define KEY_ATTENDANT_OFF 0x21c -#define KEY_ATTENDANT_TOGGLE 0x21d /* Attendant call on or off */ -#define KEY_LIGHTS_TOGGLE 0x21e /* Reading light on or off */ +#define KEY_ATTENDANT_TOGGLE 0x21d +#define KEY_LIGHTS_TOGGLE 0x21e #define BTN_DPAD_UP 0x220 #define BTN_DPAD_DOWN 0x221 @@ -619,94 +589,69 @@ #define BTN_GRIPL2 0x226 #define BTN_GRIPR2 0x227 -#define KEY_ALS_TOGGLE 0x230 /* Ambient light sensor */ -#define KEY_ROTATE_LOCK_TOGGLE 0x231 /* Display rotation lock */ -#define KEY_REFRESH_RATE_TOGGLE 0x232 /* Display refresh rate toggle */ - -#define KEY_BUTTONCONFIG 0x240 /* AL Button Configuration */ -#define KEY_TASKMANAGER 0x241 /* AL Task/Project Manager */ -#define KEY_JOURNAL 0x242 /* AL Log/Journal/Timecard */ -#define KEY_CONTROLPANEL 0x243 /* AL Control Panel */ -#define KEY_APPSELECT 0x244 /* AL Select Task/Application */ -#define KEY_SCREENSAVER 0x245 /* AL Screen Saver */ -#define KEY_VOICECOMMAND 0x246 /* Listening Voice Command */ -#define KEY_ASSISTANT 0x247 /* AL Context-aware desktop assistant */ -#define KEY_KBD_LAYOUT_NEXT 0x248 /* AC Next Keyboard Layout Select */ -#define KEY_EMOJI_PICKER 0x249 /* Show/hide emoji picker (HUTRR101) */ -#define KEY_DICTATE 0x24a /* Start or Stop Voice Dictation Session (HUTRR99) */ -#define KEY_CAMERA_ACCESS_ENABLE 0x24b /* Enables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_DISABLE 0x24c /* Disables programmatic access to camera devices. (HUTRR72) */ -#define KEY_CAMERA_ACCESS_TOGGLE 0x24d /* Toggles the current state of the camera access control. (HUTRR72) */ -#define KEY_ACCESSIBILITY 0x24e /* Toggles the system bound accessibility UI/command (HUTRR116) */ -#define KEY_DO_NOT_DISTURB 0x24f /* Toggles the system-wide "Do Not Disturb" control (HUTRR94)*/ - -#define KEY_BRIGHTNESS_MIN 0x250 /* Set Brightness to Minimum */ -#define KEY_BRIGHTNESS_MAX 0x251 /* Set Brightness to Maximum */ - -/* - * Keycodes for hotkeys toggling the electronic privacy screen found on some - * laptops on/off. Note when the embedded-controller turns on/off the eprivacy - * screen itself then the state should be reported through drm connecter props: - * https://www.kernel.org/doc/html/latest/gpu/drm-kms.html#standard-connector-properties - * Except when implementing the drm connecter properties API is not possible - * because e.g. the firmware does not allow querying the presence and/or status - * of the eprivacy screen at boot. - */ +#define KEY_ALS_TOGGLE 0x230 +#define KEY_ROTATE_LOCK_TOGGLE 0x231 +#define KEY_REFRESH_RATE_TOGGLE 0x232 + +#define KEY_BUTTONCONFIG 0x240 +#define KEY_TASKMANAGER 0x241 +#define KEY_JOURNAL 0x242 +#define KEY_CONTROLPANEL 0x243 +#define KEY_APPSELECT 0x244 +#define KEY_SCREENSAVER 0x245 +#define KEY_VOICECOMMAND 0x246 +#define KEY_ASSISTANT 0x247 +#define KEY_KBD_LAYOUT_NEXT 0x248 +#define KEY_EMOJI_PICKER 0x249 +#define KEY_DICTATE 0x24a +#define KEY_CAMERA_ACCESS_ENABLE 0x24b +#define KEY_CAMERA_ACCESS_DISABLE 0x24c +#define KEY_CAMERA_ACCESS_TOGGLE 0x24d +#define KEY_ACCESSIBILITY 0x24e +#define KEY_DO_NOT_DISTURB 0x24f + +#define KEY_BRIGHTNESS_MIN 0x250 +#define KEY_BRIGHTNESS_MAX 0x251 + #define KEY_EPRIVACY_SCREEN_ON 0x252 #define KEY_EPRIVACY_SCREEN_OFF 0x253 #define KEY_KBDINPUTASSIST_PREV 0x260 #define KEY_KBDINPUTASSIST_NEXT 0x261 -#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 -#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 -#define KEY_KBDINPUTASSIST_ACCEPT 0x264 -#define KEY_KBDINPUTASSIST_CANCEL 0x265 +#define KEY_KBDINPUTASSIST_PREVGROUP 0x262 +#define KEY_KBDINPUTASSIST_NEXTGROUP 0x263 +#define KEY_KBDINPUTASSIST_ACCEPT 0x264 +#define KEY_KBDINPUTASSIST_CANCEL 0x265 -/* Diagonal movement keys */ #define KEY_RIGHT_UP 0x266 #define KEY_RIGHT_DOWN 0x267 #define KEY_LEFT_UP 0x268 #define KEY_LEFT_DOWN 0x269 -#define KEY_ROOT_MENU 0x26a /* Show Device's Root Menu */ -/* Show Top Menu of the Media (e.g. DVD) */ +#define KEY_ROOT_MENU 0x26a #define KEY_MEDIA_TOP_MENU 0x26b #define KEY_NUMERIC_11 0x26c #define KEY_NUMERIC_12 0x26d -/* - * Toggle Audio Description: refers to an audio service that helps blind and - * visually impaired consumers understand the action in a program. Note: in - * some countries this is referred to as "Video Description". - */ #define KEY_AUDIO_DESC 0x26e #define KEY_3D_MODE 0x26f #define KEY_NEXT_FAVORITE 0x270 #define KEY_STOP_RECORD 0x271 #define KEY_PAUSE_RECORD 0x272 -#define KEY_VOD 0x273 /* Video on Demand */ +#define KEY_VOD 0x273 #define KEY_UNMUTE 0x274 #define KEY_FASTREVERSE 0x275 #define KEY_SLOWREVERSE 0x276 -/* - * Control a data application associated with the currently viewed channel, - * e.g. teletext or data broadcast application (MHEG, MHP, HbbTV, etc.) - */ #define KEY_DATA 0x277 #define KEY_ONSCREEN_KEYBOARD 0x278 -/* Electronic privacy screen control */ #define KEY_PRIVACY_SCREEN_TOGGLE 0x279 -/* Select an area of screen to be copied */ #define KEY_SELECTIVE_SCREENSHOT 0x27a -/* Move the focus to the next or previous user controllable element within a UI container */ #define KEY_NEXT_ELEMENT 0x27b #define KEY_PREVIOUS_ELEMENT 0x27c -/* Toggle Autopilot engagement */ #define KEY_AUTOPILOT_ENGAGE_TOGGLE 0x27d -/* Shortcut Keys */ #define KEY_MARK_WAYPOINT 0x27e #define KEY_SOS 0x27f #define KEY_NAV_CHART 0x280 @@ -720,21 +665,6 @@ #define KEY_NAV_INFO 0x288 #define KEY_BRIGHTNESS_MENU 0x289 -/* - * Some keyboards have keys which do not have a defined meaning, these keys - * are intended to be programmed / bound to macros by the user. For most - * keyboards with these macro-keys the key-sequence to inject, or action to - * take, is all handled by software on the host side. So from the kernel's - * point of view these are just normal keys. - * - * The KEY_MACRO# codes below are intended for such keys, which may be labeled - * e.g. G1-G18, or S1 - S30. The KEY_MACRO# codes MUST NOT be used for keys - * where the marking on the key does indicate a defined meaning / purpose. - * - * The KEY_MACRO# codes MUST also NOT be used as fallback for when no existing - * KEY_FOO define matches the marking / purpose. In this case a new KEY_FOO - * define MUST be added. - */ #define KEY_MACRO1 0x290 #define KEY_MACRO2 0x291 #define KEY_MACRO3 0x292 @@ -766,16 +696,6 @@ #define KEY_MACRO29 0x2ac #define KEY_MACRO30 0x2ad -/* - * Some keyboards with the macro-keys described above have some extra keys - * for controlling the host-side software responsible for the macro handling: - * -A macro recording start/stop key. Note that not all keyboards which emit - * KEY_MACRO_RECORD_START will also emit KEY_MACRO_RECORD_STOP if - * KEY_MACRO_RECORD_STOP is not advertised, then KEY_MACRO_RECORD_START - * should be interpreted as a recording start/stop toggle; - * -Keys for switching between different macro (pre)sets, either a key for - * cycling through the configured presets or keys to directly select a preset. - */ #define KEY_MACRO_RECORD_START 0x2b0 #define KEY_MACRO_RECORD_STOP 0x2b1 #define KEY_MACRO_PRESET_CYCLE 0x2b2 @@ -783,19 +703,12 @@ #define KEY_MACRO_PRESET2 0x2b4 #define KEY_MACRO_PRESET3 0x2b5 -/* - * Some keyboards have a buildin LCD panel where the contents are controlled - * by the host. Often these have a number of keys directly below the LCD - * intended for controlling a menu shown on the LCD. These keys often don't - * have any labeling so we just name them KEY_KBD_LCD_MENU# - */ #define KEY_KBD_LCD_MENU1 0x2b8 #define KEY_KBD_LCD_MENU2 0x2b9 #define KEY_KBD_LCD_MENU3 0x2ba #define KEY_KBD_LCD_MENU4 0x2bb #define KEY_KBD_LCD_MENU5 0x2bc -/* Performance Boost key (Alienware)/G-Mode key (Dell) */ #define KEY_PERFORMANCE 0x2bd #define BTN_TRIGGER_HAPPY 0x2c0 @@ -840,15 +753,10 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 -/* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff #define KEY_CNT (KEY_MAX+1) -/* - * Relative axes - */ - #define REL_X 0x00 #define REL_Y 0x01 #define REL_Z 0x02 @@ -859,23 +767,12 @@ #define REL_DIAL 0x07 #define REL_WHEEL 0x08 #define REL_MISC 0x09 -/* - * 0x0a is reserved and should not be used in input drivers. - * It was used by HID as REL_MISC+1 and userspace needs to detect if - * the next REL_* event is correct or is just REL_MISC + n. - * We define here REL_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define REL_RESERVED 0x0a #define REL_WHEEL_HI_RES 0x0b #define REL_HWHEEL_HI_RES 0x0c #define REL_MAX 0x0f #define REL_CNT (REL_MAX+1) -/* - * Absolute axes - */ - #define ABS_X 0x00 #define ABS_Y 0x01 #define ABS_Z 0x02 @@ -906,65 +803,49 @@ #define ABS_MISC 0x28 -/* - * 0x2e is reserved and should not be used in input drivers. - * It was used by HID as ABS_MISC+6 and userspace needs to detect if - * the next ABS_* event is correct or is just ABS_MISC + n. - * We define here ABS_RESERVED so userspace can rely on it and detect - * the situation described above. - */ #define ABS_RESERVED 0x2e -#define ABS_MT_SLOT 0x2f /* MT slot being modified */ -#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */ -#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */ -#define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */ -#define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */ -#define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */ -#define ABS_MT_POSITION_X 0x35 /* Center X touch position */ -#define ABS_MT_POSITION_Y 0x36 /* Center Y touch position */ -#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */ -#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */ -#define ABS_MT_TRACKING_ID 0x39 /* Unique ID of initiated contact */ -#define ABS_MT_PRESSURE 0x3a /* Pressure on contact area */ -#define ABS_MT_DISTANCE 0x3b /* Contact hover distance */ -#define ABS_MT_TOOL_X 0x3c /* Center X tool position */ -#define ABS_MT_TOOL_Y 0x3d /* Center Y tool position */ +#define ABS_MT_SLOT 0x2f +#define ABS_MT_TOUCH_MAJOR 0x30 +#define ABS_MT_TOUCH_MINOR 0x31 +#define ABS_MT_WIDTH_MAJOR 0x32 +#define ABS_MT_WIDTH_MINOR 0x33 +#define ABS_MT_ORIENTATION 0x34 +#define ABS_MT_POSITION_X 0x35 +#define ABS_MT_POSITION_Y 0x36 +#define ABS_MT_TOOL_TYPE 0x37 +#define ABS_MT_BLOB_ID 0x38 +#define ABS_MT_TRACKING_ID 0x39 +#define ABS_MT_PRESSURE 0x3a +#define ABS_MT_DISTANCE 0x3b +#define ABS_MT_TOOL_X 0x3c +#define ABS_MT_TOOL_Y 0x3d #define ABS_MAX 0x3f #define ABS_CNT (ABS_MAX+1) -/* - * Switch events - */ - -#define SW_LID 0x00 /* set = lid shut */ -#define SW_TABLET_MODE 0x01 /* set = tablet mode */ -#define SW_HEADPHONE_INSERT 0x02 /* set = inserted */ -#define SW_RFKILL_ALL 0x03 /* rfkill master switch, type "any" - set = radio enabled */ -#define SW_RADIO SW_RFKILL_ALL /* deprecated */ -#define SW_MICROPHONE_INSERT 0x04 /* set = inserted */ -#define SW_DOCK 0x05 /* set = plugged into dock */ -#define SW_LINEOUT_INSERT 0x06 /* set = inserted */ -#define SW_JACK_PHYSICAL_INSERT 0x07 /* set = mechanical switch set */ -#define SW_VIDEOOUT_INSERT 0x08 /* set = inserted */ -#define SW_CAMERA_LENS_COVER 0x09 /* set = lens covered */ -#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ -#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ -#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ -#define SW_LINEIN_INSERT 0x0d /* set = inserted */ -#define SW_MUTE_DEVICE 0x0e /* set = device disabled */ -#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MACHINE_COVER 0x10 /* set = cover closed */ -#define SW_USB_INSERT 0x11 /* set = USB audio device connected */ +#define SW_LID 0x00 +#define SW_TABLET_MODE 0x01 +#define SW_HEADPHONE_INSERT 0x02 +#define SW_RFKILL_ALL 0x03 +#define SW_RADIO SW_RFKILL_ALL +#define SW_MICROPHONE_INSERT 0x04 +#define SW_DOCK 0x05 +#define SW_LINEOUT_INSERT 0x06 +#define SW_JACK_PHYSICAL_INSERT 0x07 +#define SW_VIDEOOUT_INSERT 0x08 +#define SW_CAMERA_LENS_COVER 0x09 +#define SW_KEYPAD_SLIDE 0x0a +#define SW_FRONT_PROXIMITY 0x0b +#define SW_ROTATE_LOCK 0x0c +#define SW_LINEIN_INSERT 0x0d +#define SW_MUTE_DEVICE 0x0e +#define SW_PEN_INSERTED 0x0f +#define SW_MACHINE_COVER 0x10 +#define SW_USB_INSERT 0x11 #define SW_MAX 0x11 #define SW_CNT (SW_MAX+1) -/* - * Misc events - */ - #define MSC_SERIAL 0x00 #define MSC_PULSELED 0x01 #define MSC_GESTURE 0x02 @@ -974,10 +855,6 @@ #define MSC_MAX 0x07 #define MSC_CNT (MSC_MAX+1) -/* - * LEDs - */ - #define LED_NUML 0x00 #define LED_CAPSL 0x01 #define LED_SCROLLL 0x02 @@ -992,19 +869,11 @@ #define LED_MAX 0x0f #define LED_CNT (LED_MAX+1) -/* - * Autorepeat values - */ - #define REP_DELAY 0x00 #define REP_PERIOD 0x01 #define REP_MAX 0x01 #define REP_CNT (REP_MAX+1) -/* - * Sounds - */ - #define SND_CLICK 0x00 #define SND_BELL 0x01 #define SND_TONE 0x02 From nobody Wed Feb 11 00:47:34 2026 X-Original-To: dev-commits-src-main@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 4f9fsl5yHWz6RR9K for ; Wed, 11 Feb 2026 00:47:39 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9fsl3sqTz3q4Y for ; Wed, 11 Feb 2026 00:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770770859; 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=z/CL4WC3D8LWf0d86sVGU8Uo+zREmAigfttvabQpovI=; b=mkFeueCWpPrDcXaBDqTFWDO+jNYCPbHpUA0KuV7V3dc5fi7V0EtvWkiP5FF3T1TNBaJEYa Z0CFQZAZEY8DB64XEA19LfzE+lBR8Cqcfb1Dql/ZYWWialIVBykKVqvBi01AYd1U5Pe+J+ ehzMuxooRzPr0C83a+hc+me1LlwpoSqJDV1LuLs57P01alqeB38r+5q29UzwWNQgNJa9YT npOkMVk1lxaao1thC3iXzGH43Df2rcnBKf04t0uBYvPqglIvLmuYHorA/8dwpdxLCV3dH+ LAWgCMdBsUFD34Rr24Fg/iOLd9+HOAoAHjE4Rz6WboEOtyksil4XdkzVIQ6xWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770770859; a=rsa-sha256; cv=none; b=Fuoq0xtgvfxBCZz8Ik25sK4RxADsWwwP4AvWcim8j67fYgddVNSRQpOwqgPpVkF8lWnwW6 3/ddSK5tdx/NovezLqZLGhzbAcDu1DDG0p66mYvuVDDLo+vv6n4A4Sq8TbfU+MF0LufM4H zaSBIq+WmpdwuukGnsnOAAU5fSD5O6vBXrGLQC/92hGCNA/1xVvNuKLK6ytOjgp4sS+Bog Ls6QNih9L1ychK4b7XeZ1SRF2++3ev47Jhf4LCmcI05PSDkq5YdIPUmSw5n5C5cIRJBlQs 3GIMhPYe63HUf6r2N6t2PvV7mlBO2KHda+EQikWxHiczQ2TJOJPohydPX5iJ/Q== 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=1770770859; 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=z/CL4WC3D8LWf0d86sVGU8Uo+zREmAigfttvabQpovI=; b=HCeDt7OL95j3QZghIGt7TP8putjyZtuu9Q/u5CI+MH4rnMPRyExIKlxlsY/GS2ykTNZU3S 3K3P76YAdX2m6rF8sFPIbU73YzdAPGdK0549f0TsdpXH4MOFa+BEDhvOJNW8hoNtz57vgN qCowjzN2wEwydIHIyk1glPOM0KhLEdOb/zvisvZoqAJ4WEdZaYHO4r7aI47eFDVuqJoKdD 1dnokHztHJfbAwuvmilQ70xdItm0AF/th0PE9P0KuKLB3t0ie5edRSKQO2YOqEOCOnywYI B0wnOOMVVRuDLtPZ6DLCNzhwqNTtPT0q4Up9CwGZFLHM2Z+XgJSVW1jB4a86Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9fsl367MzBHy for ; Wed, 11 Feb 2026 00:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3abd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 00:47:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9375e11f079d - main - brcm80211: update Broadcom wireless brcmsmac and brcmfmac drivers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 9375e11f079d725d42c5b431de33044088ad14f7 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 00:47:34 +0000 Message-Id: <698bd1a6.3abd6.4afea11@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9375e11f079d725d42c5b431de33044088ad14f7 commit 9375e11f079d725d42c5b431de33044088ad14f7 Merge: 89aa8a94053f 127e3efc8501 Author: Bjoern A. Zeeb AuthorDate: 2026-02-10 23:56:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-11 00:46:40 +0000 brcm80211: update Broadcom wireless brcmsmac and brcmfmac drivers This version is based on git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 ( tag: v6.19-rc6 ). Sponsored by: The FreeBSD Foundation MFC after: 3 days .../dev/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- .../dev/broadcom/brcm80211/brcmfmac/cfg80211.c | 26 ++++++++++++++++++-- sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c | 4 ++-- sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c | 14 +++++++++++ .../dev/broadcom/brcm80211/brcmfmac/firmware.c | 14 +++++++---- sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c | 28 ++++++++-------------- sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h | 3 +-- sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c | 8 +++---- .../dev/broadcom/brcm80211/include/brcm_hw_ids.h | 1 - 9 files changed, 65 insertions(+), 35 deletions(-) diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c index 35f68b370714,bb96b87b2a6e..43afaa5249a6 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c @@@ -5783,17 -5623,11 +5783,16 @@@ brcmf_cfg80211_mgmt_tx(struct wiphy *wi memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN], le16_to_cpu(action_frame->len)); +#if defined(__linux__) brcmf_dbg(TRACE, "Action frame, cookie=%lld, len=%d, channel=%d\n", *cookie, le16_to_cpu(action_frame->len), +#elif defined(__FreeBSD__) + brcmf_dbg(TRACE, "Action frame, cookie=%ju, len=%d, channel=%d\n", + (uintmax_t)*cookie, le16_to_cpu(action_frame->len), +#endif le32_to_cpu(af_params->channel)); - ack = brcmf_p2p_send_action_frame(cfg, cfg_to_ndev(cfg), - af_params); + ack = brcmf_p2p_send_action_frame(vif->ifp, af_params); cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, ack, GFP_KERNEL); diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c index aa8f05e822a0,000000000000..0ad9abd67fd6 mode 100644,000000..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c @@@ -1,883 -1,0 +1,887 @@@ +// SPDX-License-Identifier: ISC +/* + * Copyright (c) 2013 Broadcom Corporation + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "debug.h" +#include "firmware.h" +#include "core.h" +#include "common.h" +#include "chip.h" + +#define BRCMF_FW_MAX_NVRAM_SIZE 64000 +#define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */ +#define BRCMF_FW_NVRAM_PCIEDEV_LEN 20 /* pcie/1/4/ + \0 */ +#define BRCMF_FW_DEFAULT_BOARDREV "boardrev=0xff" +#define BRCMF_FW_MACADDR_FMT "macaddr=%pM" +#define BRCMF_FW_MACADDR_LEN (7 + ETH_ALEN * 3) + +enum nvram_parser_state { + IDLE, + KEY, + VALUE, + COMMENT, + END +}; + +/** + * struct nvram_parser - internal info for parser. + * + * @state: current parser state. + * @data: input buffer being parsed. + * @nvram: output buffer with parse result. + * @nvram_len: length of parse result. + * @line: current line. + * @column: current column in line. + * @pos: byte offset in input buffer. + * @entry: start position of key,value entry. + * @multi_dev_v1: detect pcie multi device v1 (compressed). + * @multi_dev_v2: detect pcie multi device v2. + * @boardrev_found: nvram contains boardrev information. + * @strip_mac: strip the MAC address. + */ +struct nvram_parser { + enum nvram_parser_state state; + const u8 *data; + u8 *nvram; + u32 nvram_len; + u32 line; + u32 column; + u32 pos; + u32 entry; + bool multi_dev_v1; + bool multi_dev_v2; + bool boardrev_found; + bool strip_mac; +}; + +/* + * is_nvram_char() - check if char is a valid one for NVRAM entry + * + * It accepts all printable ASCII chars except for '#' which opens a comment. + * Please note that ' ' (space) while accepted is not a valid key name char. + */ +static bool is_nvram_char(char c) +{ + /* comment marker excluded */ + if (c == '#') + return false; + + /* key and value may have any other readable character */ + return (c >= 0x20 && c < 0x7f); +} + +static bool is_whitespace(char c) +{ + return (c == ' ' || c == '\r' || c == '\n' || c == '\t'); +} + +static enum nvram_parser_state brcmf_nvram_handle_idle(struct nvram_parser *nvp) +{ + char c; + + c = nvp->data[nvp->pos]; + if (c == '\n') + return COMMENT; + if (is_whitespace(c) || c == '\0') + goto proceed; + if (c == '#') + return COMMENT; + if (is_nvram_char(c)) { + nvp->entry = nvp->pos; + return KEY; + } + brcmf_dbg(INFO, "warning: ln=%d:col=%d: ignoring invalid character\n", + nvp->line, nvp->column); +proceed: + nvp->column++; + nvp->pos++; + return IDLE; +} + +static enum nvram_parser_state brcmf_nvram_handle_key(struct nvram_parser *nvp) +{ + enum nvram_parser_state st = nvp->state; + char c; + + c = nvp->data[nvp->pos]; + if (c == '=') { + /* ignore RAW1 by treating as comment */ + if (strncmp(&nvp->data[nvp->entry], "RAW1", 4) == 0) + st = COMMENT; + else + st = VALUE; + if (strncmp(&nvp->data[nvp->entry], "devpath", 7) == 0) + nvp->multi_dev_v1 = true; + if (strncmp(&nvp->data[nvp->entry], "pcie/", 5) == 0) + nvp->multi_dev_v2 = true; + if (strncmp(&nvp->data[nvp->entry], "boardrev", 8) == 0) + nvp->boardrev_found = true; + /* strip macaddr if platform MAC overrides */ + if (nvp->strip_mac && + strncmp(&nvp->data[nvp->entry], "macaddr", 7) == 0) + st = COMMENT; + } else if (!is_nvram_char(c) || c == ' ') { + brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n", + nvp->line, nvp->column); + return COMMENT; + } + + nvp->column++; + nvp->pos++; + return st; +} + +static enum nvram_parser_state +brcmf_nvram_handle_value(struct nvram_parser *nvp) +{ + char c; +#if defined(__linux__) + char *skv; + char *ekv; +#elif defined(__FreeBSD__) + const char *skv; + const char *ekv; +#endif + u32 cplen; + + c = nvp->data[nvp->pos]; + if (!is_nvram_char(c)) { + /* key,value pair complete */ +#if defined(__linux__) + ekv = (u8 *)&nvp->data[nvp->pos]; + skv = (u8 *)&nvp->data[nvp->entry]; +#elif defined(__FreeBSD__) + ekv = &nvp->data[nvp->pos]; + skv = &nvp->data[nvp->entry]; +#endif + cplen = ekv - skv; + if (nvp->nvram_len + cplen + 1 >= BRCMF_FW_MAX_NVRAM_SIZE) + return END; + /* copy to output buffer */ + memcpy(&nvp->nvram[nvp->nvram_len], skv, cplen); + nvp->nvram_len += cplen; + nvp->nvram[nvp->nvram_len] = '\0'; + nvp->nvram_len++; + return IDLE; + } + nvp->pos++; + nvp->column++; + return VALUE; +} + +static enum nvram_parser_state +brcmf_nvram_handle_comment(struct nvram_parser *nvp) +{ +#if defined(__linux__) + char *eoc, *sol; + + sol = (char *)&nvp->data[nvp->pos]; +#elif defined(__FreeBSD__) + const char *eoc, *sol; + + sol = &nvp->data[nvp->pos]; +#endif + eoc = strchr(sol, '\n'); + if (!eoc) { + eoc = strchr(sol, '\0'); + if (!eoc) + return END; + } + + /* eat all moving to next line */ + nvp->line++; + nvp->column = 1; + nvp->pos += (eoc - sol) + 1; + return IDLE; +} + +static enum nvram_parser_state brcmf_nvram_handle_end(struct nvram_parser *nvp) +{ + /* final state */ + return END; +} + +static enum nvram_parser_state +(*nv_parser_states[])(struct nvram_parser *nvp) = { + brcmf_nvram_handle_idle, + brcmf_nvram_handle_key, + brcmf_nvram_handle_value, + brcmf_nvram_handle_comment, + brcmf_nvram_handle_end +}; + +static int brcmf_init_nvram_parser(struct nvram_parser *nvp, + const u8 *data, size_t data_len) +{ + size_t size; + + memset(nvp, 0, sizeof(*nvp)); + nvp->data = data; + /* Limit size to MAX_NVRAM_SIZE, some files contain lot of comment */ + if (data_len > BRCMF_FW_MAX_NVRAM_SIZE) + size = BRCMF_FW_MAX_NVRAM_SIZE; + else + size = data_len; + /* Add space for properties we may add */ + size += strlen(BRCMF_FW_DEFAULT_BOARDREV) + 1; + size += BRCMF_FW_MACADDR_LEN + 1; + /* Alloc for extra 0 byte + roundup by 4 + length field */ + size += 1 + 3 + sizeof(u32); + nvp->nvram = kzalloc(size, GFP_KERNEL); + if (!nvp->nvram) + return -ENOMEM; + + nvp->line = 1; + nvp->column = 1; + return 0; +} + +/* brcmf_fw_strip_multi_v1 :Some nvram files contain settings for multiple + * devices. Strip it down for one device, use domain_nr/bus_nr to determine + * which data is to be returned. v1 is the version where nvram is stored + * compressed and "devpath" maps to index for valid entries. + */ +static void brcmf_fw_strip_multi_v1(struct nvram_parser *nvp, u16 domain_nr, + u16 bus_nr) +{ + /* Device path with a leading '=' key-value separator */ + char pci_path[20]; + size_t pci_len; + char pcie_path[20]; + size_t pcie_len; + + u32 i, j; + bool found; + u8 *nvram; + u8 id; + + nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL); + if (!nvram) + goto fail; + + /* min length: devpath0=pcie/1/4/ + 0:x=y */ + if (nvp->nvram_len < BRCMF_FW_NVRAM_DEVPATH_LEN + 6) + goto fail; + + /* First search for the devpathX and see if it is the configuration + * for domain_nr/bus_nr. Search complete nvp + */ + snprintf(pci_path, sizeof(pci_path), "=pci/%d/%d", domain_nr, + bus_nr); + pci_len = strlen(pci_path); + snprintf(pcie_path, sizeof(pcie_path), "=pcie/%d/%d", domain_nr, + bus_nr); + pcie_len = strlen(pcie_path); + found = false; + i = 0; + while (i < nvp->nvram_len - BRCMF_FW_NVRAM_DEVPATH_LEN) { + /* Format: devpathX=pcie/Y/Z/ + * Y = domain_nr, Z = bus_nr, X = virtual ID + */ + if (strncmp(&nvp->nvram[i], "devpath", 7) == 0 && + (!strncmp(&nvp->nvram[i + 8], pci_path, pci_len) || + !strncmp(&nvp->nvram[i + 8], pcie_path, pcie_len))) { + id = nvp->nvram[i + 7] - '0'; + found = true; + break; + } + while (nvp->nvram[i] != 0) + i++; + i++; + } + if (!found) + goto fail; + + /* Now copy all valid entries, release old nvram and assign new one */ + i = 0; + j = 0; + while (i < nvp->nvram_len) { + if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) { + i += 2; + if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0) + nvp->boardrev_found = true; + while (nvp->nvram[i] != 0) { + nvram[j] = nvp->nvram[i]; + i++; + j++; + } + nvram[j] = 0; + j++; + } + while (nvp->nvram[i] != 0) + i++; + i++; + } + kfree(nvp->nvram); + nvp->nvram = nvram; + nvp->nvram_len = j; + return; + +fail: + kfree(nvram); + nvp->nvram_len = 0; +} + +/* brcmf_fw_strip_multi_v2 :Some nvram files contain settings for multiple + * devices. Strip it down for one device, use domain_nr/bus_nr to determine + * which data is to be returned. v2 is the version where nvram is stored + * uncompressed, all relevant valid entries are identified by + * pcie/domain_nr/bus_nr: + */ +static void brcmf_fw_strip_multi_v2(struct nvram_parser *nvp, u16 domain_nr, + u16 bus_nr) +{ + char prefix[BRCMF_FW_NVRAM_PCIEDEV_LEN]; + size_t len; + u32 i, j; + u8 *nvram; + + nvram = kzalloc(nvp->nvram_len + 1 + 3 + sizeof(u32), GFP_KERNEL); + if (!nvram) { + nvp->nvram_len = 0; + return; + } + + /* Copy all valid entries, release old nvram and assign new one. + * Valid entries are of type pcie/X/Y/ where X = domain_nr and + * Y = bus_nr. + */ + snprintf(prefix, sizeof(prefix), "pcie/%d/%d/", domain_nr, bus_nr); + len = strlen(prefix); + i = 0; + j = 0; + while (i < nvp->nvram_len - len) { + if (strncmp(&nvp->nvram[i], prefix, len) == 0) { + i += len; + if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0) + nvp->boardrev_found = true; + while (nvp->nvram[i] != 0) { + nvram[j] = nvp->nvram[i]; + i++; + j++; + } + nvram[j] = 0; + j++; + } + while (nvp->nvram[i] != 0) + i++; + i++; + } + kfree(nvp->nvram); + nvp->nvram = nvram; + nvp->nvram_len = j; +} + +static void brcmf_fw_add_defaults(struct nvram_parser *nvp) +{ + if (nvp->boardrev_found) + return; + + memcpy(&nvp->nvram[nvp->nvram_len], &BRCMF_FW_DEFAULT_BOARDREV, + strlen(BRCMF_FW_DEFAULT_BOARDREV)); + nvp->nvram_len += strlen(BRCMF_FW_DEFAULT_BOARDREV); + nvp->nvram[nvp->nvram_len] = '\0'; + nvp->nvram_len++; +} + +static void brcmf_fw_add_macaddr(struct nvram_parser *nvp, u8 *mac) +{ + int len; + + len = scnprintf(&nvp->nvram[nvp->nvram_len], BRCMF_FW_MACADDR_LEN + 1, + BRCMF_FW_MACADDR_FMT, mac); + WARN_ON(len != BRCMF_FW_MACADDR_LEN); + nvp->nvram_len += len + 1; +} + +/* brcmf_nvram_strip :Takes a buffer of "=\n" lines read from a fil + * and ending in a NUL. Removes carriage returns, empty lines, comment lines, + * and converts newlines to NULs. Shortens buffer as needed and pads with NULs. + * End of buffer is completed with token identifying length of buffer. + */ +static void *brcmf_fw_nvram_strip(const u8 *data, size_t data_len, + u32 *new_length, u16 domain_nr, u16 bus_nr, + struct device *dev) +{ + struct nvram_parser nvp; + u32 pad; + u32 token; + __le32 token_le; + u8 mac[ETH_ALEN]; + + if (brcmf_init_nvram_parser(&nvp, data, data_len) < 0) + return NULL; + + if (eth_platform_get_mac_address(dev, mac) == 0) + nvp.strip_mac = true; + + while (nvp.pos < data_len) { + nvp.state = nv_parser_states[nvp.state](&nvp); + if (nvp.state == END) + break; + } + if (nvp.multi_dev_v1) { + nvp.boardrev_found = false; + brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr); + } else if (nvp.multi_dev_v2) { + nvp.boardrev_found = false; + brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr); + } + + if (nvp.nvram_len == 0) { + kfree(nvp.nvram); + return NULL; + } + + brcmf_fw_add_defaults(&nvp); + + if (nvp.strip_mac) + brcmf_fw_add_macaddr(&nvp, mac); + + pad = nvp.nvram_len; + *new_length = roundup(nvp.nvram_len + 1, 4); + while (pad != *new_length) { + nvp.nvram[pad] = 0; + pad++; + } + + token = *new_length / 4; + token = (~token << 16) | (token & 0x0000FFFF); + token_le = cpu_to_le32(token); + + memcpy(&nvp.nvram[*new_length], &token_le, sizeof(token_le)); + *new_length += sizeof(token_le); + + return nvp.nvram; +} + +void brcmf_fw_nvram_free(void *nvram) +{ + kfree(nvram); +} + +struct brcmf_fw { + struct device *dev; + struct brcmf_fw_request *req; + u32 curpos; + unsigned int board_index; + void (*done)(struct device *dev, int err, struct brcmf_fw_request *req); +}; + +#ifdef CONFIG_EFI +/* In some cases the EFI-var stored nvram contains "ccode=ALL" or "ccode=XV" + * to specify "worldwide" compatible settings, but these 2 ccode-s do not work + * properly. "ccode=ALL" causes channels 12 and 13 to not be available, + * "ccode=XV" causes all 5GHz channels to not be available. So we replace both + * with "ccode=X2" which allows channels 12+13 and 5Ghz channels in + * no-Initiate-Radiation mode. This means that we will never send on these + * channels without first having received valid wifi traffic on the channel. + */ +static void brcmf_fw_fix_efi_nvram_ccode(char *data, unsigned long data_len) +{ + char *ccode; + + ccode = strnstr((char *)data, "ccode=ALL", data_len); + if (!ccode) + ccode = strnstr((char *)data, "ccode=XV\r", data_len); + if (!ccode) + return; + + ccode[6] = 'X'; + ccode[7] = '2'; + ccode[8] = '\r'; +} + +static u8 *brcmf_fw_nvram_from_efi(size_t *data_len_ret) +{ + efi_guid_t guid = EFI_GUID(0x74b00bd9, 0x805a, 0x4d61, 0xb5, 0x1f, + 0x43, 0x26, 0x81, 0x23, 0xd1, 0x13); + unsigned long data_len = 0; + efi_status_t status; + u8 *data = NULL; + + if (!efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE)) + return NULL; + + status = efi.get_variable(L"nvram", &guid, NULL, &data_len, NULL); + if (status != EFI_BUFFER_TOO_SMALL) + goto fail; + + data = kmalloc(data_len, GFP_KERNEL); + if (!data) + goto fail; + + status = efi.get_variable(L"nvram", &guid, NULL, &data_len, data); + if (status != EFI_SUCCESS) + goto fail; + + brcmf_fw_fix_efi_nvram_ccode(data, data_len); + brcmf_info("Using nvram EFI variable\n"); + + *data_len_ret = data_len; + return data; +fail: + kfree(data); + return NULL; +} +#else +static inline u8 *brcmf_fw_nvram_from_efi(size_t *data_len) { return NULL; } +#endif + +static void brcmf_fw_free_request(struct brcmf_fw_request *req) +{ + struct brcmf_fw_item *item; + int i; + + for (i = 0, item = &req->items[0]; i < req->n_items; i++, item++) { + if (item->type == BRCMF_FW_TYPE_BINARY) + release_firmware(item->binary); + else if (item->type == BRCMF_FW_TYPE_NVRAM) + brcmf_fw_nvram_free(item->nv_data.data); + } + kfree(req); +} + +static int brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) +{ + struct brcmf_fw *fwctx = ctx; + struct brcmf_fw_item *cur; + bool free_bcm47xx_nvram = false; + bool kfree_nvram = false; + u32 nvram_length = 0; + void *nvram = NULL; +#if defined(__linux__) + u8 *data = NULL; +#elif defined(__FreeBSD__) + const u8 *data = NULL; +#endif + size_t data_len; + + brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(fwctx->dev)); + + cur = &fwctx->req->items[fwctx->curpos]; + + if (fw && fw->data) { +#if defined(__linux__) + data = (u8 *)fw->data; +#elif defined(__FreeBSD__) + data = fw->data; +#endif + data_len = fw->size; + } else { - if ((data = bcm47xx_nvram_get_contents(&data_len))) ++ data = bcm47xx_nvram_get_contents(&data_len); ++ if (data) { + free_bcm47xx_nvram = true; - else if ((data = brcmf_fw_nvram_from_efi(&data_len))) - kfree_nvram = true; - else if (!(cur->flags & BRCMF_FW_REQF_OPTIONAL)) - goto fail; ++ } else { ++ data = brcmf_fw_nvram_from_efi(&data_len); ++ if (data) ++ kfree_nvram = true; ++ else if (!(cur->flags & BRCMF_FW_REQF_OPTIONAL)) ++ goto fail; ++ } + } + + if (data) + nvram = brcmf_fw_nvram_strip(data, data_len, &nvram_length, + fwctx->req->domain_nr, + fwctx->req->bus_nr, + fwctx->dev); + + if (free_bcm47xx_nvram) + bcm47xx_nvram_release_contents(data); + if (kfree_nvram) + kfree(data); + + release_firmware(fw); + if (!nvram && !(cur->flags & BRCMF_FW_REQF_OPTIONAL)) + goto fail; + + brcmf_dbg(TRACE, "nvram %p len %d\n", nvram, nvram_length); + cur->nv_data.data = nvram; + cur->nv_data.len = nvram_length; + return 0; + +fail: + return -ENOENT; +} + +static int brcmf_fw_complete_request(const struct firmware *fw, + struct brcmf_fw *fwctx) +{ + struct brcmf_fw_item *cur = &fwctx->req->items[fwctx->curpos]; + int ret = 0; + + brcmf_dbg(TRACE, "firmware %s %sfound\n", cur->path, fw ? "" : "not "); + + switch (cur->type) { + case BRCMF_FW_TYPE_NVRAM: + ret = brcmf_fw_request_nvram_done(fw, fwctx); + break; + case BRCMF_FW_TYPE_BINARY: + if (fw) + cur->binary = fw; + else + ret = -ENOENT; + break; + default: + /* something fishy here so bail out early */ + brcmf_err("unknown fw type: %d\n", cur->type); + release_firmware(fw); + ret = -EINVAL; + } + + return (cur->flags & BRCMF_FW_REQF_OPTIONAL) ? 0 : ret; +} + +static char *brcm_alt_fw_path(const char *path, const char *board_type) +{ + char base[BRCMF_FW_NAME_LEN]; + const char *suffix; + char *ret; + + if (!board_type) + return NULL; + + suffix = strrchr(path, '.'); + if (!suffix || suffix == path) + return NULL; + + /* strip extension at the end */ + strscpy(base, path, BRCMF_FW_NAME_LEN); + base[suffix - path] = 0; + + ret = kasprintf(GFP_KERNEL, "%s.%s%s", base, board_type, suffix); + if (!ret) + brcmf_err("out of memory allocating firmware path for '%s'\n", + path); + + brcmf_dbg(TRACE, "FW alt path: %s\n", ret); + + return ret; +} + +static int brcmf_fw_request_firmware(const struct firmware **fw, + struct brcmf_fw *fwctx) +{ + struct brcmf_fw_item *cur = &fwctx->req->items[fwctx->curpos]; + unsigned int i; + int ret; + + /* Files can be board-specific, first try board-specific paths */ + for (i = 0; i < ARRAY_SIZE(fwctx->req->board_types); i++) { + char *alt_path; + + if (!fwctx->req->board_types[i]) + goto fallback; + alt_path = brcm_alt_fw_path(cur->path, + fwctx->req->board_types[i]); + if (!alt_path) + goto fallback; + + ret = firmware_request_nowarn(fw, alt_path, fwctx->dev); + kfree(alt_path); + if (ret == 0) + return ret; + } + +fallback: + return request_firmware(fw, cur->path, fwctx->dev); +} + +static void brcmf_fw_request_done(const struct firmware *fw, void *ctx) +{ + struct brcmf_fw *fwctx = ctx; + int ret; + + ret = brcmf_fw_complete_request(fw, fwctx); + + while (ret == 0 && ++fwctx->curpos < fwctx->req->n_items) { + brcmf_fw_request_firmware(&fw, fwctx); + ret = brcmf_fw_complete_request(fw, ctx); + } + + if (ret) { + brcmf_fw_free_request(fwctx->req); + fwctx->req = NULL; + } + fwctx->done(fwctx->dev, ret, fwctx->req); + kfree(fwctx); +} + +static void brcmf_fw_request_done_alt_path(const struct firmware *fw, void *ctx) +{ + struct brcmf_fw *fwctx = ctx; + struct brcmf_fw_item *first = &fwctx->req->items[0]; + const char *board_type, *alt_path; + int ret = 0; + + if (fw) { + brcmf_fw_request_done(fw, ctx); + return; + } + + /* Try next board firmware */ + if (fwctx->board_index < ARRAY_SIZE(fwctx->req->board_types)) { + board_type = fwctx->req->board_types[fwctx->board_index++]; + if (!board_type) + goto fallback; + alt_path = brcm_alt_fw_path(first->path, board_type); + if (!alt_path) + goto fallback; + + ret = request_firmware_nowait(THIS_MODULE, true, alt_path, + fwctx->dev, GFP_KERNEL, fwctx, + brcmf_fw_request_done_alt_path); + kfree(alt_path); + + if (ret < 0) + brcmf_fw_request_done(fw, ctx); + return; + } + +fallback: + /* Fall back to canonical path if board firmware not found */ + ret = request_firmware_nowait(THIS_MODULE, true, first->path, + fwctx->dev, GFP_KERNEL, fwctx, + brcmf_fw_request_done); + + if (ret < 0) + brcmf_fw_request_done(fw, ctx); +} + +static bool brcmf_fw_request_is_valid(struct brcmf_fw_request *req) +{ + struct brcmf_fw_item *item; + int i; + + if (!req->n_items) + return false; + + for (i = 0, item = &req->items[0]; i < req->n_items; i++, item++) { + if (!item->path) + return false; + } + return true; +} + +int brcmf_fw_get_firmwares(struct device *dev, struct brcmf_fw_request *req, + void (*fw_cb)(struct device *dev, int err, + struct brcmf_fw_request *req)) +{ + struct brcmf_fw_item *first = &req->items[0]; + struct brcmf_fw *fwctx; + char *alt_path = NULL; + int ret; + + brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev)); + if (!fw_cb) + return -EINVAL; + + if (!brcmf_fw_request_is_valid(req)) + return -EINVAL; + + fwctx = kzalloc(sizeof(*fwctx), GFP_KERNEL); + if (!fwctx) + return -ENOMEM; + + fwctx->dev = dev; + fwctx->req = req; + fwctx->done = fw_cb; + + /* First try alternative board-specific path if any */ + if (fwctx->req->board_types[0]) + alt_path = brcm_alt_fw_path(first->path, + fwctx->req->board_types[0]); + if (alt_path) { + fwctx->board_index++; + ret = request_firmware_nowait(THIS_MODULE, true, alt_path, + fwctx->dev, GFP_KERNEL, fwctx, + brcmf_fw_request_done_alt_path); + kfree(alt_path); + } else { + ret = request_firmware_nowait(THIS_MODULE, true, first->path, + fwctx->dev, GFP_KERNEL, fwctx, + brcmf_fw_request_done); + } + if (ret < 0) + brcmf_fw_request_done(NULL, fwctx); + + return 0; +} + +struct brcmf_fw_request * +brcmf_fw_alloc_request(u32 chip, u32 chiprev, + const struct brcmf_firmware_mapping mapping_table[], + u32 table_size, struct brcmf_fw_name *fwnames, + u32 n_fwnames) +{ + struct brcmf_fw_request *fwreq; + char chipname[12]; + const char *mp_path; + size_t mp_path_len; + u32 i, j; + char end = '\0'; + + if (chiprev >= BITS_PER_TYPE(u32)) { + brcmf_err("Invalid chip revision %u\n", chiprev); + return NULL; + } + + for (i = 0; i < table_size; i++) { + if (mapping_table[i].chipid == chip && + mapping_table[i].revmask & BIT(chiprev)) + break; + } + + brcmf_chip_name(chip, chiprev, chipname, sizeof(chipname)); + + if (i == table_size) { + brcmf_err("Unknown chip %s\n", chipname); + return NULL; + } + + fwreq = kzalloc(struct_size(fwreq, items, n_fwnames), GFP_KERNEL); + if (!fwreq) + return NULL; + + brcmf_info("using %s for chip %s\n", + mapping_table[i].fw_base, chipname); + + mp_path = brcmf_mp_global.firmware_path; + mp_path_len = strnlen(mp_path, BRCMF_FW_ALTPATH_LEN); + if (mp_path_len) + end = mp_path[mp_path_len - 1]; + + fwreq->n_items = n_fwnames; + + for (j = 0; j < n_fwnames; j++) { + fwreq->items[j].path = fwnames[j].path; + fwnames[j].path[0] = '\0'; + /* check if firmware path is provided by module parameter */ + if (brcmf_mp_global.firmware_path[0] != '\0') { + strscpy(fwnames[j].path, mp_path, + BRCMF_FW_NAME_LEN); + + if (end != '/') { + strlcat(fwnames[j].path, "/", + BRCMF_FW_NAME_LEN); + } + } + strlcat(fwnames[j].path, mapping_table[i].fw_base, + BRCMF_FW_NAME_LEN); + strlcat(fwnames[j].path, fwnames[j].extension, + BRCMF_FW_NAME_LEN); + fwreq->items[j].path = fwnames[j].path; + } + + return fwreq; +} diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c index e34ba5756af1,000000000000..21237fa7e229 mode 100644,000000..100644 --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c @@@ -1,2569 -1,0 +1,2561 @@@ +// SPDX-License-Identifier: ISC +/* + * Copyright (c) 2012 Broadcom Corporation + */ +#include +#include +#include +#include +#include +#if defined(__FreeBSD__) +#include +#endif + +#include +#include +#include +#include "core.h" +#include "debug.h" +#include "fwil.h" +#include "fwil_types.h" +#include "p2p.h" +#include "cfg80211.h" +#include "feature.h" + +/* parameters used for p2p escan */ +#define P2PAPI_SCAN_NPROBES 1 +#define P2PAPI_SCAN_DWELL_TIME_MS 80 +#define P2PAPI_SCAN_SOCIAL_DWELL_TIME_MS 40 +#define P2PAPI_SCAN_HOME_TIME_MS 60 *** 2550 LINES SKIPPED *** From nobody Wed Feb 11 00:48:43 2026 X-Original-To: dev-commits-src-main@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 4f9ftz6dDjz6RRFr for ; Wed, 11 Feb 2026 00:48:43 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9ftz5Kjxz3qPq for ; Wed, 11 Feb 2026 00:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770770923; 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=yxuM6JoDwktvjxUavjmx8jo7xwHC/yIJZIdzDCN5mVQ=; b=KLf7FuxFhevj8NtDuw+GYwt+1vW9meA67uXIEqXmaGG/KVQLatrPrpB0Hzo2V2uw/sdGlq ygcuowp5vzcKfo9dvKJB473VFOqlrtn7CbGNCTIGKWWVezbty495iiDDqKulqS2+FgCO3t tKinY7RbI7vEK94vHvL3LwvjDCBVC+YduIyHdNbIMzL7uI3PT+72C4DeHFetkYp4iYTY1s 616E79CYNOoNG5/yrHGAymXSPcXtLqo/OS9tGOwXVrmX/YJYmpTo2lVp/uqItn2gLjn82z PcJ2gTEB1Ri2YHxrCEQN1G4O9AHwP8A1mQekp/hcSk2dlUjMplq07nc6ojIo7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770770923; a=rsa-sha256; cv=none; b=aITuyVXxXMHnqRYRg/O7Lk7z7O/x7e9zBgyV4PeSD/oR7s/R/g+BolCyn0+UqgacTJsEAb DAYOfVjmnfkcUgGkbShqZ36eSBny+2C0BoejA7NOwO2pKfzAbH74pvxSVeCqBh+dBLbyBg 4CWOy24Ws4xsqyyeLUGQ1RqlULoXwrZ8GVrKj0oIaUDVK2xqjq8S9ayaQ9VRApGkZ72sGw mGq26aTtE+UdGeNv8JZ0cO6tg1cuUs5oXnBPHuHBRgYiwWJh5LTcoWVbXxej2zGTFVZSCt eyFHGyeJO2AhRMZCODu0CadVRFLIa8yo5MJpEnfUuO+cxH6jw1bjCy2V6bpvbA== 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=1770770923; 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=yxuM6JoDwktvjxUavjmx8jo7xwHC/yIJZIdzDCN5mVQ=; b=fa5NC3IegC+vLNwiOBxJH2XNIvw+MESagAZAacwvhNKKtB35tRVMskL0TVLO73AD8lGgJ8 eEg02Lz2dSTJb9LBfrmb64S5NmmvtNlVoescsjvaylK2uaGGDUDkZ2TbtXiEN2qjPVagAa iOwG49qLj0+UvIZoQbDQWkgvex6TzsiLzlxRDRASmc1IONke7OCjnOHlBhqvxszkJJntpg HvoARquAVSEjsbOXHW6B5fiPrzn8b8wphAxqAVp3j5L5i+/2pwDOCrQSqszWBGKU/7L68N ySkkJTYi0pINlw7rz1xe7OGys5n6nfId+5r917Zzilm/DJb0K0rrB3IUtecJMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9ftz4sm2zBRr for ; Wed, 11 Feb 2026 00:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39ae8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 00:48:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: b02def7c4a10 - main - LinuxKPI: 802.11: add cfg80211 (*change_bss) and related structs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b02def7c4a10fa3e2b05ebec379c5c634b87484d Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 00:48:43 +0000 Message-Id: <698bd1eb.39ae8.181a19aa@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b02def7c4a10fa3e2b05ebec379c5c634b87484d commit b02def7c4a10fa3e2b05ebec379c5c634b87484d Author: Bjoern A. Zeeb AuthorDate: 2026-02-11 00:44:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-11 00:48:18 +0000 LinuxKPI: 802.11: add cfg80211 (*change_bss) and related structs Needed by brcmfmac v6.19. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 94d34fb9dc0c..5c8c914bdee7 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1021,6 +1021,14 @@ struct survey_info { /* net80211::struct ieee80211_channel_survey */ struct linuxkpi_ieee80211_channel *channel; }; +enum wiphy_bss_param_flags { + WIPHY_BSS_PARAM_AP_ISOLATE = BIT(0), +}; + +struct bss_parameters { + int ap_isolate; +}; + enum wiphy_vendor_cmd_need_flags { WIPHY_VENDOR_CMD_NEED_NETDEV = 0x01, WIPHY_VENDOR_CMD_NEED_RUNNING = 0x02, @@ -1142,6 +1150,8 @@ struct wiphy { int n_radio; const struct wiphy_radio *radio; + uint32_t bss_param_support; /* enum wiphy_bss_param_flags */ + int features, hw_version; int interface_modes, max_match_sets, max_remain_on_channel_duration, max_scan_ssids, max_sched_scan_ie_len, max_sched_scan_plan_interval, max_sched_scan_plan_iterations, max_sched_scan_plans, max_sched_scan_reqs, max_sched_scan_ssids; int num_iftype_ext_capab; @@ -1224,7 +1234,7 @@ struct cfg80211_ops { int (*dump_survey)(struct wiphy *, struct net_device *, int, struct survey_info *); int (*external_auth)(struct wiphy *, struct net_device *, struct cfg80211_external_auth_params *); int (*set_cqm_rssi_range_config)(struct wiphy *, struct net_device *, int, int); - + int (*change_bss)(struct wiphy *, struct net_device *, struct bss_parameters *); }; From nobody Wed Feb 11 02:07:06 2026 X-Original-To: dev-commits-src-main@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 4f9hdQ6vsDz6RZC8 for ; Wed, 11 Feb 2026 02:07:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9hdQ4Tkzz3xyb for ; Wed, 11 Feb 2026 02:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770775626; 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=//6G8dyRKAy2MJoi6eRfOehdHM/qY7Lm/KEOwnYIego=; b=NGvdGZxp+pyjLTHxqz1w0DwIa19JxnDqnE6oar6q8uqT7psUvzj80soOWXx2mHbKMvrDkG tF1gNPQiuIaO92kFzJMdzkpi/JeGGogHSyiZSpXO4sAgIBCMHTHCfcJ8y/QyOvADF0uhiB xJa1cgSWgb50YKjhoOT/wRuBhzokZz8AnR7tuFdFoeJomO81yTTaz3/965n57U1VLCcGy2 RxPg37etbg88MeJUlL8y4TBu365orqwHeojeDgSlzQFIIHSuLX7TTqKQ18MdTxvDHZ5AeH 5wplDmHhBSMXaDOXza7CD0vfw0Zq8cMVE9zYgmz74c+nYappkioGHLkLT3+q2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770775626; a=rsa-sha256; cv=none; b=QxQYcO+yiWHyxQSbdI4rPJqzYjTeB1z0gRnqBvrapw34/kCqjJ+08LkoIcpwYQkOaLbxqO pBVZt1gHNhKnhTcMW/xIZ43NMM6B4N2YL8c1882sinBQ0VsECNkKg1+UfsfYvc7TU63jkk Wr4ounCqGypfIBFhgyO/GhCTzXPLEbtVUvajZKthIFlT53LGvMDF8o5FKauY8ywe4jANzA 1WIuCjcHPLPdAsNwj1RGWziRuyQVxp2IB//NMsM9xJtyvMohgYfSDPDCwG2IZZaBCAncbu sMmDr2uUoreHlPZQfxqfFgS/zm9WXLYLZEBOsv7d27rwWnh0G0MJM3uYg0zwvQ== 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=1770775626; 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=//6G8dyRKAy2MJoi6eRfOehdHM/qY7Lm/KEOwnYIego=; b=W8LvEFrXahrtqUzZ5qPM/TAE+6MVA9BxwUWVasLS0XoGt9VMy3yT98o5xrOtjRDN/pG7QX Qj247BI7f+x5w1QFZW7TClac/wKtChYu0zxh0iwDo2Zwr8WASK/xPg0Y2bmr5vlS2KOgzv 7Zlr16gBBTtfaggnIqEWxXJnujBllkPNb8drLBdJRDAavbi9XkiJSA4O9Oo1oHj/g2inJh G8XfdKzvvySUAx7D7675rX99++nmOH7bA/jwppYXtApxWDZtYxv45DkKN2qzyqOdg+i6D+ sFZfq1E1R8noNobyEHWYKhMwsQLWrlENrzvRh7LlH2NVWlGigm0fxJ72UQ219w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9hdQ3wYlzTgT for ; Wed, 11 Feb 2026 02:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41eae by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 02:07:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 5b398611607b - main - pwd: Error out if writing to stdout failed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b398611607b0dab2f2550ef73f62d41dab6fac5 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 02:07:06 +0000 Message-Id: <698be44a.41eae.119893e7@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=5b398611607b0dab2f2550ef73f62d41dab6fac5 commit 5b398611607b0dab2f2550ef73f62d41dab6fac5 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 02:06:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 02:06:56 +0000 pwd: Error out if writing to stdout failed POSIX requires us to print a diagnostic and return a non-zero exit code if writing to stdout failed. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55227 --- bin/pwd/pwd.c | 2 ++ bin/pwd/tests/pwd_test.sh | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/bin/pwd/pwd.c b/bin/pwd/pwd.c index f626a2236c02..2bbf5457ec17 100644 --- a/bin/pwd/pwd.c +++ b/bin/pwd/pwd.c @@ -112,5 +112,7 @@ main(int argc, char *argv[]) printf("%s\n", pwd); else err(1, "."); + if (fflush(stdout) != 0) + err(1, "stdout"); exit(0); } diff --git a/bin/pwd/tests/pwd_test.sh b/bin/pwd/tests/pwd_test.sh index e418e56a89fa..a8805582cc4d 100644 --- a/bin/pwd/tests/pwd_test.sh +++ b/bin/pwd/tests/pwd_test.sh @@ -66,8 +66,29 @@ physical_body() atf_check -o inline:"$root/phy/baz\n" pwd -L } +atf_test_case stdout +stdout_head() +{ + atf_set descr "error writing to stdout" +} +stdout_body() +{ + pwd=$(which pwd) + [ -f "$pwd" ] || atf_skip "unable to distinguish binary from builtin" + ( + trap "" PIPE + # Give true(1) some time to exit. + sleep 1 + $pwd 2>stderr + echo $? >result + ) | true + atf_check -o inline:"1\n" cat result + atf_check -o match:"stdout" cat stderr +} + atf_init_test_cases() { atf_add_test_case logical atf_add_test_case physical + atf_add_test_case stdout } From nobody Wed Feb 11 03:55:28 2026 X-Original-To: dev-commits-src-main@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 4f9l2d0T60z6Rlvm; Wed, 11 Feb 2026 03:55:37 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4f9l2c5TpTz3GhB; Wed, 11 Feb 2026 03:55:36 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61B3tS1X015685; Wed, 11 Feb 2026 05:55:31 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61B3tS1X015685 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61B3tSqC015684; Wed, 11 Feb 2026 05:55:28 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 11 Feb 2026 05:55:28 +0200 From: Konstantin Belousov To: John Baldwin Cc: Minsoo Choo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> <0bf02b0d-4115-4d10-93c0-e75a8733f75a@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0bf02b0d-4115-4d10-93c0-e75a8733f75a@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4f9l2c5TpTz3GhB X-Spamd-Bar: ---- On Tue, Feb 10, 2026 at 02:45:09PM -0500, John Baldwin wrote: > On 2/9/26 12:49, Konstantin Belousov wrote: > > On Mon, Feb 09, 2026 at 04:55:41PM +0000, Minsoo Choo wrote: > > > On Monday, February 9th, 2026 at 11:45 AM, John Baldwin wrote: > > > > > > > On 2/9/26 10:56, Minsoo Choo wrote: > > > > > > > > > On Monday, February 9th, 2026 at 10:12 AM, John Baldwin jhb@FreeBSD.org wrote: > > > > > > > > > > > On 2/8/26 23:18, Konstantin Belousov wrote: > > > > > > > > > > > > > The branch main has been updated by kib: > > > > > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > > > > > > > > > > > > > commit 8f23665fed2fbaf4481359b4d2fcdd7b9feb40e3 > > > > > > > Author: Minsoo Choo minsoochoo0122@proton.me > > > > > > > AuthorDate: 2026-02-06 20:03:53 +0000 > > > > > > > Commit: Konstantin Belousov kib@FreeBSD.org > > > > > > > CommitDate: 2026-02-09 04:17:16 +0000 > > > > > > > > > > > > > > pcb.h: mark struct pcb to be preserved > > > > > > > > > > > > > > There are programs that depend on this structure (e.g. kernel debuggers) > > > > > > > that breaks when the ABI changes. > > > > > > > > > > > > > > Signed-off-by: Minsoo Choo minsoochoo0122@proton.me > > > > > > > Reviewed by: kib > > > > > > > MFC after: 1 week > > > > > > > Differential Revision: https://reviews.freebsd.org/D55149 > > > > > > > > > > > > Hmmm, I think it is useful to know which fields debuggers use (typically just > > > > > > registers) vs which ones can be safely changed without impacting debuggers. > > > > > > > > > > > > -- > > > > > > John Baldwin > > > > > > > > > > In the review, kib said: > > > > > > > > > > > I had to add and preserve the padding fields pcb_pad in the amd64 structure to be compatible with kgdb at least. This makes me sure that the whole pcb layout is fixed by ABI. > > > > > > > > > > > > It is no longer needed and hasn't been needed in a decade. Back when the field was > > > > first added, kgdb did indeed assume a fixed size for `struct pcb`. However, back in > > > > 2015 I added a pcb_size variable that debuggers can use to determine this size > > > > (to properly index the stoppcbs[] array) even if debug symbols weren't present: > > > > > > > > commit 645743ea99829e6d578cca5a580cf0a4102fb7dd > > > > Author: John Baldwin jhb@FreeBSD.org > > > > > > > > Date: Thu Nov 12 22:00:59 2015 +0000 > > > > > > > > Export various helper variables describing the layout and size of > > > > certain kernel structures for use by debuggers. This mostly aids > > > > in examining cores from a kernel without debug symbols as a debugger > > > > can infer these values if debug symbols are available. > > > > > > > > One set of variables describes the layout of 'struct linker_file' to > > > > walk the list of loaded kernel modules. > > > > > > > > A second set of variables describes the layout of 'struct proc' and > > > > 'struct thread' to walk the list of processes in the kernel and the > > > > threads in each process. > > > > > > > > The 'pcb_size' variable is used to index into the stoppcbs[] array. > > > > > > > > The 'vm_maxuser_address' is used to distinguish kernel virtual addresses > > > > from user addresses. This doesn't have to be perfect, and > > > > 'vm_maxuser_address' is a cheap and simple way to differentiate kernel > > > > pointers from simple values like TIDs and PIDs. > > > > > > > > While here, annotate the fields in struct pcb used by kgdb on amd64 > > > > and i386 to note that their ABI should be preserved. Annotations for > > > > other platforms will be added in the future. > > > > > > > > This was even the commit that added the annotations just removed, so a simple > > > > blame for why the annotations were present would have turned this up. > > > > > > > > -- > > > > John Baldwin > > > > > > If this is correct, we should revert this commit. I want to hear kib@ thoughts on this and once he confirms someone with commit access can revert this change. > > > > > > My original patch was marking pcb fields as stable for all architectures (lldb aarch64 kernel debugger was broken because of this). I'll create new revision with original patch once revert is pushed. > > > > First, I do not mind reverting this, will do in a hour unless we get to some > > other conclusion in the thread. > > > > Second, I want to discuss something related to the struct pcb. Right now > > the structure is used for three quite unrelated purposes: > > - as effectively part of the struct thread, despite being a separate > > allocation when the thread is created > > - as wakepcb for saving some part of BSP state suspend/resume > > - as dumppcb for saving all CPUs state for vmcore > > With these consumers, it seems that fields are only added to the struct, > > and never removed. For instance, I do not see any use of pcb_sfmask. > > > > I really want to split pcb into 'thread pcb' and 'kpcb', and define > > that kpcb is KBI, while thread pcb would be only stable on the stable > > branches. kgdb and possibly klldb need kpcb for starting frame information > > on CPUs when kernel dump does not have dwarf, am I right? > > It's not really bout lack of dwarf, it is more that you need a starting point. > The pcb's serve a similar purpose to NT_PRSTATUS / struct reg for userspace > debugging. It is how you get the initial PC and stack pointer (along with > a few other registers). Noted, thanks. > Some day I have a dream of outputting kernel crash > dumps as an ELF core file (with some extensions to handle our page table > bits) and would output per-thread register notes instead of having to > grovel around in the proc and thread lists to find td_pcb pointers. However, > the live kernel case (kgdb against /dev/mem) and remote hypervisor (gdb > connected to bhyve or qemu's gdbserver stub) will still need to grovel > around in proc and thread lists to enumerate threads and locate the initial > register state of each thread. > > I would be fine with having a substructure as the first member of `struct pcb` > (which ideally would be renamed to `struct tcb` if that wasn't too disruptive) > that is the set of stable fields. Ok. BTW, since we are talking about gdb. What blocks updating the gdb port to 17.1? We are already two versions behind. If it is kgdb, then could gdb port be split into userspace gdb and kgdb, and have ugdb updated on each GNU release? From nobody Wed Feb 11 06:05:17 2026 X-Original-To: dev-commits-src-main@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 4f9nwG483kz6Rypx for ; Wed, 11 Feb 2026 06:05:18 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9nwG14hGz3gvC for ; Wed, 11 Feb 2026 06:05:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770789918; 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=eyE/owEf92X9Y4RQVhXVJqOWVIp3/1kGf3iUbywcCic=; b=biFTufLZLL27pokjMniXOYJaJl54Rs92g2lahKIG00eAKget1X0/SifOGs4B2TYkuZ5p6l P+s6g5105YJ2yZIb2M8+pYom3WASd+yGYzz3PdfBgzebNPiHMnGYJcqx8bpzpoQFudsv4S 7ZykVHvOj1vyMByKcDN91QLq15c2i26fDw8VZO7oLIhBn2Ye7vAkfFJwkE8S90UfeoBsz2 lleuGulSNrBk2ux1dgNr5euA4Pawh/2zrR8brm9FBHvc7CxIWz2fEwFBpcZCCpSAIZivIa xT8PTQcitzl/RHw/xTsTN7gQEN6JUfc6WHAr8Yz7lWJYi1XCzj8GzzBi6EFATQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770789918; a=rsa-sha256; cv=none; b=Jn1no2ka/SrsxLhyafj6c09JZffxvjdM1b6PxTuosec2HGk0tXTMdOxDrxfB+n6Sc43PTg pnY1q0PX+E5c/zL27XNp3qvQYJErtPPNJbVzOupZh8clEbq9uitmYXNRHQ/I37Q3WRmUfi 2JCQJg55nxaFrvv2KKr3sSVEPhURYuejp8cakjy+FhqXyQwe28v8i9Kz0/ftL98dm56V0o TOm905j9DC9EmSZ4rAmdsWIUBmGZmUMQirnZFABLXHX6vpbHcUk9PhIcjAWAAUgtRWiCxF 0cdgzEPB7f0viD1bmikM3vIUicIP73iIsZzHfer/xDjsbj7T2mqLbDB5ifqL/g== 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=1770789918; 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=eyE/owEf92X9Y4RQVhXVJqOWVIp3/1kGf3iUbywcCic=; b=KXC6/aNix6HyR3lmgU3xkM558J14YvaYTop622wq2eFcdNkyD+nkQDzq+L6p+WSU16X988 RhSbLGxDXtafVUUNxpt4zVu9NmV4o3lqdKi5rgkoyekwhiisxEjc5Sn6Dm0jzMft23koy2 lG1jF+67kYzY6W3i+vU7XBpqA0uQDAN/Sn+J81UBbsHUdo3N6XfkGbeOSdL1W6jiS4mKVh rNPwonogKNus9EsWoG8AYsWds0XgspEEUb2xk3mLaVSZXGljYTBgHHHJ2v9i7Vge4F7bhg wV0mS4y8t3CkcM930WS2veNxLKBUz8a5KT4X+S//BKzRPucyrHRH3Hjyyd/f9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9nwF75D4zdQY for ; Wed, 11 Feb 2026 06:05:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33c24 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 06:05:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 7a5288a023ba - main - net80211: clean up time comparison in HT code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a5288a023baeac2f0c3128506178f89fda3cc0d Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 06:05:17 +0000 Message-Id: <698c1c1d.33c24.2fc0493d@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=7a5288a023baeac2f0c3128506178f89fda3cc0d commit 7a5288a023baeac2f0c3128506178f89fda3cc0d Author: Adrian Chadd AuthorDate: 2025-12-15 03:45:36 +0000 Commit: Adrian Chadd CommitDate: 2026-02-11 06:02:49 +0000 net80211: clean up time comparison in HT code There's at least one place where the time comparison is wrong, leading to some bad beahaviour around deciding to try and establish/reestablish AMPDU TX sessions. Start addressing these! Differential Revision: https://reviews.freebsd.org/D54390 --- sys/net80211/ieee80211_ht.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c index 88e614e266a1..38568674a792 100644 --- a/sys/net80211/ieee80211_ht.c +++ b/sys/net80211/ieee80211_ht.c @@ -1130,7 +1130,8 @@ again: */ if (rap->rxa_qframes != 0) { /* XXX honor batimeout? */ - if (ticks - rap->rxa_age > ieee80211_ampdu_age) { + if (ieee80211_time_after(ticks - rap->rxa_age, + ieee80211_ampdu_age)) { /* * Too long since we received the first * frame; flush the reorder buffer. @@ -1392,7 +1393,8 @@ ieee80211_ht_node_age(struct ieee80211_node *ni) * See above for more details on what's happening here. */ /* XXX honor batimeout? */ - if (ticks - rap->rxa_age > ieee80211_ampdu_age) { + if (ieee80211_time_after(ticks - rap->rxa_age, + ieee80211_ampdu_age)) { /* * Too long since we received the first * frame; flush the reorder buffer. @@ -2824,7 +2826,7 @@ ieee80211_ampdu_request(struct ieee80211_node *ni, /* defer next try so we don't slam the driver with requests */ tap->txa_attempts = ieee80211_addba_maxtries; /* NB: check in case driver wants to override */ - if (tap->txa_nextrequest <= ticks) + if (ieee80211_time_before_eq(tap->txa_nextrequest, ticks)) tap->txa_nextrequest = ticks + ieee80211_addba_backoff; return 0; } From nobody Wed Feb 11 06:05:19 2026 X-Original-To: dev-commits-src-main@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 4f9nwH3FgKz6Ryq4 for ; Wed, 11 Feb 2026 06:05:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9nwH1QtXz3gr2 for ; Wed, 11 Feb 2026 06:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770789919; 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=L1h6QYbBTdbbfV3FeMsdDvWftVJOPj+t97I9nsJVkug=; b=ot0av1rQkXQbjL9JGCDBi0sjmp+p0eKQFptD/94t+V/cnWqCrm7xVJfBvW7WXpu1eOPjoI pRQKuUDFa3af1aHo1YL5S0Sa8m0M2EAYduZ7M68B6vrHdbwKRXQsN8260T+8oNrtHZcpgq nbYRDdhc2tq+Fdg8MhTpR66EjQ+qszWtlCSrJFsQWhCh/Y82TJ28va5csLKZ97DMJCIRo4 AsV6jnaQhy/fWGUQeKrBUg7pVao67v6WTeCCaxvLbzR9dUUGP4r+Pi0zNjah9ypKcJfNHv ECp5Ktdzl4NGX8cuu10N0NdheN4q8eKJ7XYEtTMnZLufL5qUT3KwBq8lJcurDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770789919; a=rsa-sha256; cv=none; b=xJFaJS5obmd4kqLA7Z6AiUBLhiXBn40Ieu9U29z4EemWb8V6k79hwUOMVZG9j3maf7F53h hvAvr0x4zsZbIMU03W3eeIqiKqyaUQKe9cHuIS/SaOFlKcJuYn3Xh/eM8CmD2+bD1Dm8jk 4gN+viQBagJL2GX1dohsA7FBVqiHJyP1TW/32VvgH7ruV4Yn6x73oibKqbb6+oSwKkTO5n R8GD5n/9bNK6VPxh66zd9eOHIzzCdB6j2WbqIBoc7WsWk8XiEofBGw9U8b/xkkABdd+jEy T4IsVZaSl+0DK2mQoPKRjM7sYfibNg2pQTRSgfLDYMs6XJbKxtMp/DM1SG1g0A== 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=1770789919; 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=L1h6QYbBTdbbfV3FeMsdDvWftVJOPj+t97I9nsJVkug=; b=F7oehPiiJk14sUCnx2GTSmANMBAyv7mnjxhj7CfYHqTImjpGTkYayHuZN37vOxH1rst38R 1R6YlYLeIQssIZWM8C05TIPzETpaYJK3gIrtzxJBeu9zCyIwkc092X8HMKC+SiPrQWPUu4 +0x0Yd/tXQ2yx9aPtXkBc2lGWS8w/tE9oEIqALEDfUzPvOSSWhPc/AT7qCNpQBkIE7vRM8 1MtYV6JXvF7PTmJWs8L7QzLCbUu9TM7dT+e9fapB5FqGJIsAIcQp3hTX4d2f4BN2kHtz1z W6rpBEJkEWIW5pE6FGEY/jkltM2rS8Ud+txBFNYQq8hNASidbeNGiDlI9jk9vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9nwH0pXlzdK8 for ; Wed, 11 Feb 2026 06:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33351 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 06:05:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: f064d44badfa - main - run: rum: migrate to new net80211 encryption key API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f064d44badfa9eee3e62d2d7dacd77a968f0a6dd Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 06:05:19 +0000 Message-Id: <698c1c1f.33351.fd5dc2c@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f064d44badfa9eee3e62d2d7dacd77a968f0a6dd commit f064d44badfa9eee3e62d2d7dacd77a968f0a6dd Author: Adrian Chadd AuthorDate: 2025-12-29 18:55:52 +0000 Commit: Adrian Chadd CommitDate: 2026-02-11 06:03:53 +0000 run: rum: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Locally tested: * STA mode - run0: MAC/BBP RT2860 (rev 0x0101), RF RT2820 (MIMO 2T2R), address 00:0e:2e:e5:ae:3a Differential Revision: https://reviews.freebsd.org/D54462 --- sys/dev/usb/wlan/if_rum.c | 26 ++++++++++++++++---------- sys/dev/usb/wlan/if_run.c | 15 ++++++++++----- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c index b822766f0ba5..4a4a150146a1 100644 --- a/sys/dev/usb/wlan/if_rum.c +++ b/sys/dev/usb/wlan/if_rum.c @@ -193,8 +193,8 @@ static uint32_t rum_read(struct rum_softc *, uint16_t); static void rum_read_multi(struct rum_softc *, uint16_t, void *, int); static usb_error_t rum_write(struct rum_softc *, uint16_t, uint32_t); -static usb_error_t rum_write_multi(struct rum_softc *, uint16_t, void *, - size_t); +static usb_error_t rum_write_multi(struct rum_softc *, uint16_t, + const void *, size_t); static usb_error_t rum_setbits(struct rum_softc *, uint16_t, uint32_t); static usb_error_t rum_clrbits(struct rum_softc *, uint16_t, uint32_t); static usb_error_t rum_modbits(struct rum_softc *, uint16_t, uint32_t, @@ -1460,7 +1460,8 @@ rum_tx_crypto_flags(struct rum_softc *sc, struct ieee80211_node *ni, if (!(k->wk_flags & IEEE80211_KEY_SWCRYPT)) { cipher = k->wk_cipher->ic_cipher; pos = k->wk_keyix; - mode = rum_crypto_mode(sc, cipher, k->wk_keylen); + mode = rum_crypto_mode(sc, cipher, + ieee80211_crypto_get_key_len(k)); if (mode == 0) return 0; @@ -1843,7 +1844,8 @@ rum_write(struct rum_softc *sc, uint16_t reg, uint32_t val) } static usb_error_t -rum_write_multi(struct rum_softc *sc, uint16_t reg, void *buf, size_t len) +rum_write_multi(struct rum_softc *sc, uint16_t reg, const void *buf, + size_t len) { struct usb_device_request req; usb_error_t error; @@ -1858,7 +1860,8 @@ rum_write_multi(struct rum_softc *sc, uint16_t reg, void *buf, size_t len) USETW(req.wIndex, reg + offset); USETW(req.wLength, MIN(len - offset, 64)); - error = rum_do_request(sc, &req, (char *)buf + offset); + error = rum_do_request(sc, &req, __DECONST(char *, buf) + + offset); if (error != 0) { device_printf(sc->sc_dev, "could not multi write MAC register: %s\n", @@ -2859,15 +2862,16 @@ rum_common_key_set(struct rum_softc *sc, struct ieee80211_key *k, uint16_t base) { - if (rum_write_multi(sc, base, k->wk_key, k->wk_keylen)) + if (rum_write_multi(sc, base, ieee80211_crypto_get_key_data(k), + ieee80211_crypto_get_key_len(k))) return EIO; if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP) { if (rum_write_multi(sc, base + IEEE80211_KEYBUF_SIZE, - k->wk_txmic, 8)) + ieee80211_crypto_get_key_txmic_data(k), 8)) return EIO; if (rum_write_multi(sc, base + IEEE80211_KEYBUF_SIZE + 8, - k->wk_rxmic, 8)) + ieee80211_crypto_get_key_rxmic_data(k), 8)) return EIO; } @@ -2886,7 +2890,8 @@ rum_group_key_set_cb(struct rum_softc *sc, union sec_param *data, sc->sc_clr_shkeys = 1; } - mode = rum_crypto_mode(sc, k->wk_cipher->ic_cipher, k->wk_keylen); + mode = rum_crypto_mode(sc, k->wk_cipher->ic_cipher, + ieee80211_crypto_get_key_len(k)); if (mode == 0) goto print_err; @@ -2941,7 +2946,8 @@ rum_pair_key_set_cb(struct rum_softc *sc, union sec_param *data, uint8_t buf[IEEE80211_ADDR_LEN + 1]; uint8_t mode; - mode = rum_crypto_mode(sc, k->wk_cipher->ic_cipher, k->wk_keylen); + mode = rum_crypto_mode(sc, k->wk_cipher->ic_cipher, + ieee80211_crypto_get_key_len(k)); if (mode == 0) goto print_err; diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index 147aa4044057..7d993caaf2a3 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -2375,7 +2375,7 @@ run_key_set_cb(void *arg) /* map net80211 cipher to RT2860 security mode */ switch (cipher) { case IEEE80211_CIPHER_WEP: - if(k->wk_keylen < 8) + if(ieee80211_crypto_get_key_len(k) < 8) /* TODO: add a specific WEP40/WEP104 call! */ mode = RT2860_MODE_WEP40; else mode = RT2860_MODE_WEP104; @@ -2408,15 +2408,20 @@ run_key_set_cb(void *arg) } if (cipher == IEEE80211_CIPHER_TKIP) { - if(run_write_region_1(sc, base, k->wk_key, 16)) + if (run_write_region_1(sc, base, + ieee80211_crypto_get_key_data(k), 16)) return; - if(run_write_region_1(sc, base + 16, &k->wk_key[16], 8)) /* wk_txmic */ + if (run_write_region_1(sc, base + 16, + ieee80211_crypto_get_key_txmic_data(k), 8)) /* wk_txmic */ return; - if(run_write_region_1(sc, base + 24, &k->wk_key[24], 8)) /* wk_rxmic */ + if (run_write_region_1(sc, base + 24, + ieee80211_crypto_get_key_rxmic_data(k), 8)) /* wk_rxmic */ return; } else { /* roundup len to 16-bit: XXX fix write_region_1() instead */ - if(run_write_region_1(sc, base, k->wk_key, (k->wk_keylen + 1) & ~1)) + if (run_write_region_1(sc, base, + ieee80211_crypto_get_key_data(k), + (ieee80211_crypto_get_key_len(k) + 1) & ~1)) return; } From nobody Wed Feb 11 06:05:20 2026 X-Original-To: dev-commits-src-main@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 4f9nwK1c08z6S01p for ; Wed, 11 Feb 2026 06:05:21 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9nwJ5nBZz3gbY for ; Wed, 11 Feb 2026 06:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770789920; 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=ZPDjNKX2SgTaylSVohYI0QGs0GHUPqjO3Dg4kY2tKx4=; b=mf9WFzInw7zWyFsQT/N+ovxY99ANZobax5dLHWnd9tmudDjWOLsJrLQfyamnYjlG8NI0Lz MGEnxLZSfoDsQXfzTAuPuy9YKIOEeyQ9RATdcW1RPK4iR3dR1Fw/tBi+vUZSeDv9JOYnud OJvf+HSvDrQ/psyah5NfM3dj2dn1felHdh+swNSp1rI62qDJg42JTneeDY2lr9bFCDi5no wG1jT2kX2H56awTXBaPjlJeyXgvRifZXqqB0Q1bzghPl4ZJH0QwbwD83MmvIf5TZxvaiq/ uPgwfq8XC+IL4aZhHyA0ZpCrv8uyIzHaADSgl524tdYlxV6ws9cD94l6Vyb1bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770789920; a=rsa-sha256; cv=none; b=bcyhNrMvja0ZBn+bwg+vlxEshfzXsvCThKt0fGBLKRPLd1/qPdlYkecTQqH5bNt9K4aFVC httE/X7pLM4TvJzvVptqytMw6mH0OtpIHk7QdoFM6vDJQAyd7yHM6g8FSxqTOetR+oIZKD JtdqDWOJVSzimRpAHLjzYiMlYQzk4lEG9ZjvQK1mT4xlvUyvhOpJ3c922K5i2+e0WdnsG1 YEAz9cMa1Eo9w+yNtNPQ7AzBtjoDZEK8sBpqKIX6i/KHASPdgJElCJd5DuNHFYN7gEDfvU CbghxYd/EuC0PSCpxaHZplaboW++dhQYcTdcYtHdWR2t0DoNo0INGZzsrNshNw== 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=1770789920; 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=ZPDjNKX2SgTaylSVohYI0QGs0GHUPqjO3Dg4kY2tKx4=; b=PWcUQ879bSCl6GYSzB6XamNr4JTERmQw785Y3vrkFjVCEY1gb/JUogRZHsVeLlDQ7EZ6c4 v9qGZUhv3S2kuETMkGeuBtu7V0hUSagXuQrxKu8zBqaAfWY19C5p0dJEn5pcoCoe9x/JhA k3Xlz8/JIbdzBWJCkQtBeJgmoMbbGKtbw0GuiHEddAEWV5Z7UxgUQ3pCZ2439fCfXEPrpH UQc8t9vs+6dSAVJXdx91TVVr9G04YSKgOOqlsUnd6CR+myzBYqZWGvbl+wfQeIt+UAkTMr ALT3zPmx5jHWaSpoUKa+jViU0j1f/o+Ep43Rm+Keif0HiQcKqcyo9Dep5KX8ZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f9nwJ1fYNzdvC for ; Wed, 11 Feb 2026 06:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 327cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 06:05:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: c08ee1eba989 - main - iwx: migrate to new net80211 encryption key API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c08ee1eba989b49c7c30945a551760eaeb2e3e15 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 06:05:20 +0000 Message-Id: <698c1c20.327cf.4efbecc0@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=c08ee1eba989b49c7c30945a551760eaeb2e3e15 commit c08ee1eba989b49c7c30945a551760eaeb2e3e15 Author: Adrian Chadd AuthorDate: 2026-01-02 04:32:39 +0000 Commit: Adrian Chadd CommitDate: 2026-02-11 06:05:03 +0000 iwx: migrate to new net80211 encryption key API Migrate to the new encryption key API rather than poking at the key struct directly. Locally tested: * STA mode - iwx0: mem 0x84c00000-0x84c03fff at device 0.0 on pci4 Differential Revision: https://reviews.freebsd.org/D54463 --- sys/dev/iwx/if_iwx.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/dev/iwx/if_iwx.c b/sys/dev/iwx/if_iwx.c index 3c953e522973..8f11e6a414e7 100644 --- a/sys/dev/iwx/if_iwx.c +++ b/sys/dev/iwx/if_iwx.c @@ -11069,11 +11069,13 @@ iwx_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) IWX_UNLOCK(sc); return (ENXIO); } - memcpy(cmd.common.key, k->wk_key, MIN(sizeof(cmd.common.key), - k->wk_keylen)); + memcpy(cmd.common.key, ieee80211_crypto_get_key_data(k), + MIN(sizeof(cmd.common.key), ieee80211_crypto_get_key_len(k))); IWX_DPRINTF(sc, IWX_DEBUG_KEYMGMT, "%s: key: id=%d, len=%i, key=%*D\n", - __func__, id, k->wk_keylen, k->wk_keylen, - (const unsigned char *) k->wk_key, ""); + __func__, id, + ieee80211_crypto_get_key_len(k), + ieee80211_crypto_get_key_len(k), + (const unsigned char *) ieee80211_crypto_get_key_data(k), ""); cmd.common.sta_id = IWX_STATION_ID; cmd.transmit_seq_cnt = htole64(k->wk_keytsc); From nobody Wed Feb 11 11:32:25 2026 X-Original-To: dev-commits-src-main@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 4f9x9x31V4z6SVHf for ; Wed, 11 Feb 2026 11:32:37 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f9x9x212tz3Mdj for ; Wed, 11 Feb 2026 11:32:37 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770809557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MZ4WK+txoKbFtlY/wTCEUj8oqrtWuQ1Ebava1//FzIY=; b=vzER8IPWuJ+SRYs8w8GlZkUbbiVMghGJkEAtK5r8YWFx71CZtUZ4vH7G5pnzNQZex0kyoh TKOxA2PjX05tyXPwAZMvPWmHDnH/YrheSR09srk3t93FjO6lb5airoJJL4+HQLDRdPPWJJ Mkk8FW4dm7DqSbtpdd+14OGWRfFdvy1jfVNIIw+fnFJcTzTpp5d+gMfGiVpSeQwVCpOg2s zoClQS9MV/Kzt3c2rODXEmwTxIY1JZhEM2VkJ8DGwhk9iCZtAOssqZOUZdWn4sjao0A2La O2Tk7K3nJyNXal1h5XNmi5KKu2yVDdoHVyjGVB4N0ccsn3thMFOVEuEoTleQiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770809557; a=rsa-sha256; cv=none; b=NW7FVxZS8fr/lgp8/nbaLeQqyKhqgnh/mttb75+FVi4Zqt3MztFYldy7k+8/Ro7va/amZs QEVtr+Ahy8BLcDs0LVbfv0rOhn6iM/yztVW1iV2QCWbQfp+EMTH8Vvmz1XGu0nOQRJxwbi FCSwbi8ubbqZpZuTw42ybgYDASkPbNArVIeesZPdh+/dp1NX418o+1saQzgoTr/Ny8E8RH ov1SIEuvGHKrJqauagCWvgZVRVtEsdgXiddsVwTv15xqZe8C29IFw44nBdAP/duOBLbAw8 dSDB2mfq5FKSuS/Do2N7hoqwwcmNO27kc6r20HMUnroKcvb28EKH1WNg4bo7KA== 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=1770809557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MZ4WK+txoKbFtlY/wTCEUj8oqrtWuQ1Ebava1//FzIY=; b=xKceDjgwBqDC/Y8xWIQ02iJ7B86nFwV6imbD213mz56EoBwJQOPPymVgE8MJTu0tvlw954 8oTAU+JhP0ihB6HoNjhEoG7ibAq8EKBWRgGetu6lrv3TgmEYD3wb3hswTKrTIqeR66a43o I0vukxTm/oKVwoTsfCcyozC/VvyfyuOSZB7uH3hZA7cjZtQhBuD9NAjfxI1zg80ltv/O7T EZlZlkBs0KZFCCJFZE+v2Q00wPPJJeEXGf2z9IerZY0ER095kW/oeS6pqgJNfnvBFRXJZg fNONnAWcHqOXoDewwFPuBGO4Bfui+IgjRhXkIIIREFNCti6EWY9QnAc1cYBqbw== Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4f9x9x1Jrpz1C1C for ; Wed, 11 Feb 2026 11:32:37 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-896d82bc48bso3404586d6.2 for ; Wed, 11 Feb 2026 03:32:37 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWU+/qI8XQmhiCHSZid6aPBLKMRvGio5vmyHDdFljsnDt6PVUOp2Vw+CVD8zw3reBcmG8Xgpa5eD1Nl+PasYpRmJ+ZaBg==@freebsd.org X-Gm-Message-State: AOJu0Yw0U0/gQ6+7ACY5nIGfnvbpYa5x06yBHYdYsP+SFO8MT+cKlZAR /fp/qGk1zOQNcT4W5Pi3uUtQCzy1vUPaOW/kA3OVrlQmhFdbLUkblVqmWALPJEDMHEJYsdlFIWT N//WJiOEAQArG5ECH4vn4TqeNGaB3UoI= X-Received: by 2002:a05:6214:8098:b0:894:9309:a2b with SMTP id 6a1803df08f44-8971d9ac747mr12032446d6.1.1770809556561; Wed, 11 Feb 2026 03:32:36 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <698ba212.1ceca.11654b2c@gitrepo.freebsd.org> In-Reply-To: <698ba212.1ceca.11654b2c@gitrepo.freebsd.org> From: Nuno Teixeira Date: Wed, 11 Feb 2026 11:32:25 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AZwV_Qi7Y5rQ8bdQU1yt5PEw0AoYKSK5bXuSESqgpjITH9rLW4ZizeMI9EOJOIQ Message-ID: Subject: Re: git: b4c3e9b5b09c - main - brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000957597064a8ababa" --000000000000957597064a8ababa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Bjoern, Do this import includes support for rpi4 wifi card? I did research and I found that wifi card is a Cypress CYW43455 or Broadcom BCM4345/6 and it is included in firmware-brcm80211. Thanks, Bjoern A. Zeeb escreveu (ter=C3=A7a, 10/02/2026 =C3=A0(s) = 21:24): > The branch main has been updated by bz: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Db4c3e9b5b09c829b4135aff738bd289= 3ed052377 > > commit b4c3e9b5b09c829b4135aff738bd2893ed052377 > Merge: 69c64e3fb575 1eabd3ed89eb > Author: Bjoern A. Zeeb > AuthorDate: 2026-02-10 21:22:03 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2026-02-10 21:22:49 +0000 > > brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers > > This version is based on > git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). > > We are likely only going to use the brcmfmac driver but given they > come nicely packaged in a directory structure and bwn(9) still uses > GPL-only phy files we could use some of the information from brcmsmac > and fix that (should it ever still be relevant). > > git-subtree-dir: sys/contrib/dev/broadcom/brcm80211 > git-subtree-mainline: 69c64e3fb575e0db0e2f0c1fc56f466624940ded > git-subtree-split: 1eabd3ed89eb4bb5c69e90eeaeda1a6dd31e8bab > > sys/contrib/dev/broadcom/brcm80211/Makefile | 13 + > .../dev/broadcom/brcm80211/brcmfmac/Makefile | 62 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c | 51 + > .../dev/broadcom/brcm80211/brcmfmac/bca/Makefile | 12 + > .../dev/broadcom/brcm80211/brcmfmac/bca/core.c | 39 + > .../dev/broadcom/brcm80211/brcmfmac/bca/module.c | 28 + > .../dev/broadcom/brcm80211/brcmfmac/bca/vops.h | 11 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c | 490 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h | 20 + > .../dev/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1269 + > .../dev/broadcom/brcm80211/brcmfmac/btcoex.c | 481 + > .../dev/broadcom/brcm80211/brcmfmac/btcoex.h | 18 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h | 342 + > .../dev/broadcom/brcm80211/brcmfmac/cfg80211.c | 8477 ++++++ > .../dev/broadcom/brcm80211/brcmfmac/cfg80211.h | 498 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c | 1472 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h | 92 + > .../dev/broadcom/brcm80211/brcmfmac/common.c | 637 + > .../dev/broadcom/brcm80211/brcmfmac/common.h | 95 + > .../dev/broadcom/brcm80211/brcmfmac/commonring.c | 236 + > .../dev/broadcom/brcm80211/brcmfmac/commonring.h | 62 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c | 1576 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h | 228 + > .../dev/broadcom/brcm80211/brcmfmac/cyw/Makefile | 12 + > .../dev/broadcom/brcm80211/brcmfmac/cyw/core.c | 373 + > .../broadcom/brcm80211/brcmfmac/cyw/fwil_types.h | 87 + > .../dev/broadcom/brcm80211/brcmfmac/cyw/module.c | 28 + > .../dev/broadcom/brcm80211/brcmfmac/cyw/vops.h | 11 + > .../dev/broadcom/brcm80211/brcmfmac/debug.c | 56 + > .../dev/broadcom/brcm80211/brcmfmac/debug.h | 143 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c | 215 + > .../dev/broadcom/brcm80211/brcmfmac/feature.c | 385 + > .../dev/broadcom/brcm80211/brcmfmac/feature.h | 131 + > .../dev/broadcom/brcm80211/brcmfmac/firmware.c | 859 + > .../dev/broadcom/brcm80211/brcmfmac/firmware.h | 95 + > .../dev/broadcom/brcm80211/brcmfmac/flowring.c | 508 + > .../dev/broadcom/brcm80211/brcmfmac/flowring.h | 74 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c | 514 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h | 401 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c | 432 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h | 224 + > .../dev/broadcom/brcm80211/brcmfmac/fwil_types.h | 1239 + > .../dev/broadcom/brcm80211/brcmfmac/fwsignal.c | 2514 ++ > .../dev/broadcom/brcm80211/brcmfmac/fwsignal.h | 48 + > .../dev/broadcom/brcm80211/brcmfmac/fwvid.c | 200 + > .../dev/broadcom/brcm80211/brcmfmac/fwvid.h | 88 + > .../dev/broadcom/brcm80211/brcmfmac/msgbuf.c | 1687 ++ > .../dev/broadcom/brcm80211/brcmfmac/msgbuf.h | 43 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c | 155 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h | 14 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c | 2546 ++ > sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h | 179 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c | 2785 ++ > sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h | 14 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c | 595 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h | 72 + > .../dev/broadcom/brcm80211/brcmfmac/proto.c | 71 + > .../dev/broadcom/brcm80211/brcmfmac/proto.h | 155 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c | 4650 +++ > sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h | 370 + > .../dev/broadcom/brcm80211/brcmfmac/tracepoint.c | 32 + > .../dev/broadcom/brcm80211/brcmfmac/tracepoint.h | 144 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c | 1604 ++ > sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h | 42 + > .../dev/broadcom/brcm80211/brcmfmac/vendor.c | 118 + > .../dev/broadcom/brcm80211/brcmfmac/vendor.h | 53 + > .../dev/broadcom/brcm80211/brcmfmac/wcc/Makefile | 12 + > .../dev/broadcom/brcm80211/brcmfmac/wcc/core.c | 40 + > .../dev/broadcom/brcm80211/brcmfmac/wcc/module.c | 28 + > .../dev/broadcom/brcm80211/brcmfmac/wcc/vops.h | 11 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c | 84 + > sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h | 31 + > .../dev/broadcom/brcm80211/brcmsmac/Makefile | 47 + > .../dev/broadcom/brcm80211/brcmsmac/aiutils.c | 707 + > .../dev/broadcom/brcm80211/brcmsmac/aiutils.h | 221 + > .../dev/broadcom/brcm80211/brcmsmac/ampdu.c | 1097 + > .../dev/broadcom/brcm80211/brcmsmac/ampdu.h | 53 + > .../dev/broadcom/brcm80211/brcmsmac/antsel.c | 309 + > .../dev/broadcom/brcm80211/brcmsmac/antsel.h | 27 + > .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h | 102 + > .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 92 + > .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h | 110 + > .../brcm80211/brcmsmac/brcms_trace_events.c | 23 + > .../brcm80211/brcmsmac/brcms_trace_events.h | 40 + > .../dev/broadcom/brcm80211/brcmsmac/channel.c | 771 + > .../dev/broadcom/brcm80211/brcmsmac/channel.h | 47 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h | 1902 ++ > .../dev/broadcom/brcm80211/brcmsmac/debug.c | 246 + > .../dev/broadcom/brcm80211/brcmsmac/debug.h | 75 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c | 1556 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h | 124 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h | 38 + > .../dev/broadcom/brcm80211/brcmsmac/mac80211_if.c | 1738 ++ > .../dev/broadcom/brcm80211/brcmsmac/mac80211_if.h | 113 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c | 8065 ++++++ > sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h | 670 + > .../dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2497 ++ > .../dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 241 + > .../dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h | 1113 + > .../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 5151 ++++ > .../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h | 110 + > .../dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 28572 > +++++++++++++++++++ > .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 298 + > .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h | 31 + > .../broadcom/brcm80211/brcmsmac/phy/phy_radio.h | 1522 + > .../dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h | 156 + > .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 3170 ++ > .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h | 44 + > .../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 10099 +++++++ > .../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h | 39 + > .../dev/broadcom/brcm80211/brcmsmac/phy_shim.c | 215 + > .../dev/broadcom/brcm80211/brcmsmac/phy_shim.h | 172 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c | 165 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h | 26 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h | 341 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c | 514 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h | 245 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h | 67 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c | 437 + > sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h | 36 + > .../dev/broadcom/brcm80211/brcmsmac/types.h | 294 + > .../dev/broadcom/brcm80211/brcmsmac/ucode_loader.c | 109 + > .../dev/broadcom/brcm80211/brcmsmac/ucode_loader.h | 56 + > .../dev/broadcom/brcm80211/brcmutil/Makefile | 10 + > sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c | 247 + > .../dev/broadcom/brcm80211/brcmutil/utils.c | 327 + > .../dev/broadcom/brcm80211/include/brcm_hw_ids.h | 116 + > .../dev/broadcom/brcm80211/include/brcmu_d11.h | 156 + > .../dev/broadcom/brcm80211/include/brcmu_utils.h | 216 + > .../dev/broadcom/brcm80211/include/brcmu_wifi.h | 247 + > .../dev/broadcom/brcm80211/include/chipcommon.h | 311 + > sys/contrib/dev/broadcom/brcm80211/include/defs.h | 94 + > sys/contrib/dev/broadcom/brcm80211/include/soc.h | 25 + > 133 files changed, 116023 insertions(+) > > diff --cc sys/contrib/dev/broadcom/brcm80211/Makefile > index 000000000000,000000000000..88115d072624 > new file mode 100644 > --- /dev/null > +++ b/sys/contrib/dev/broadcom/brcm80211/Makefile > @@@ -1,0 -1,0 +1,13 @@@ > ++# SPDX-License-Identifier: ISC > ++# > ++# Makefile fragment for Broadcom 802.11 Networking Device Driver > ++# > ++# Copyright (c) 2010 Broadcom Corporation > ++# > ++ > ++# common flags > ++subdir-ccflags-$(CONFIG_BRCMDBG) +=3D -DDEBUG > ++ > ++obj-$(CONFIG_BRCMUTIL) +=3D brcmutil/ > ++obj-$(CONFIG_BRCMFMAC) +=3D brcmfmac/ > ++obj-$(CONFIG_BRCMSMAC) +=3D brcmsmac/ > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile > index 000000000000,e5ca0f511822..e5ca0f511822 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c > index 000000000000,c4a54861bfb4..c4a54861bfb4 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile > index 000000000000,5e37c638f966..5e37c638f966 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c > index 000000000000,f471c962104a..f471c962104a > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c > index 000000000000,1e1c79b18c5b..1e1c79b18c5b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h > index 000000000000,7897e6b6eefb..7897e6b6eefb > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c > index 000000000000,9ec0c60b6da1..9ec0c60b6da1 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h > index 000000000000,b051d2860cd1..b051d2860cd1 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c > index 000000000000,8ab7d1e34a6e..8ab7d1e34a6e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c > index 000000000000,67c0c5a92f99..67c0c5a92f99 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h > index 000000000000,418b9424a179..418b9424a179 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h > index 000000000000,fe31051a9e11..fe31051a9e11 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c > index 000000000000,8af402555b5e..8af402555b5e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h > index 000000000000,273c80f2d483..273c80f2d483 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c > index 000000000000,9074ab49e806..9074ab49e806 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h > index 000000000000,d69f101f5834..d69f101f5834 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c > index 000000000000,688f16c51319..688f16c51319 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h > index 000000000000,3bdb6984b2dd..3bdb6984b2dd > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c > index 000000000000,e44236cb210e..e44236cb210e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h > index 000000000000,7fb11f4823e4..7fb11f4823e4 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c > index 000000000000,862a0336a0b5..862a0336a0b5 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h > index 000000000000,399b6810e394..399b6810e394 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile > index 000000000000,33e86724ba14..33e86724ba14 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c > index 000000000000,4f0ea4347840..4f0ea4347840 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h > index 000000000000,669564382e32..669564382e32 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c > index 000000000000,ce5fcfd42a7e..ce5fcfd42a7e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h > index 000000000000,870b5bead436..870b5bead436 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c > index 000000000000,eecf8a38d94a..eecf8a38d94a > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h > index 000000000000,9bb5f709d41a..9bb5f709d41a > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c > index 000000000000,c3a602197662..c3a602197662 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c > index 000000000000,488364ef8ff2..488364ef8ff2 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h > index 000000000000,31f8695ca417..31f8695ca417 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c > index 000000000000,83f8ed7d00f9..83f8ed7d00f9 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h > index 000000000000,4002d326fd21..4002d326fd21 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c > index 000000000000,e1127d7e086d..e1127d7e086d > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h > index 000000000000,818882b0fd01..818882b0fd01 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c > index 000000000000,c2d98ee6652f..c2d98ee6652f > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h > index 000000000000,e327dd58d29c..e327dd58d29c > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c > index 000000000000,6385a7db7f7d..6385a7db7f7d > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h > index 000000000000,ab3d6cfcb02b..ab3d6cfcb02b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h > index 000000000000,e74a23e11830..e74a23e11830 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c > index 000000000000,b70d20128f98..b70d20128f98 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h > index 000000000000,f9c36cd8f1de..f9c36cd8f1de > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c > index 000000000000,41eafcda77f7..41eafcda77f7 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h > index 000000000000,f3e011d090f2..f3e011d090f2 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c > index 000000000000,45fbcbdc7d9e..45fbcbdc7d9e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h > index 000000000000,6a849f4a94dd..6a849f4a94dd > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c > index 000000000000,1681ad00f82e..1681ad00f82e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h > index 000000000000,ae124c73fc3b..ae124c73fc3b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c > index 000000000000,0dc9d28cd77b..0dc9d28cd77b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h > index 000000000000,d2ecee565bf2..d2ecee565bf2 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c > index 000000000000,6327f4eca500..6327f4eca500 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h > index 000000000000,8e6c227e8315..8e6c227e8315 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c > index 000000000000,05f66ab13bed..05f66ab13bed > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h > index 000000000000,25d406019ac3..25d406019ac3 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c > index 000000000000,2e911d4874af..2e911d4874af > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h > index 000000000000,bd08d3aaa8f4..bd08d3aaa8f4 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c > index 000000000000,8a0bad5119a0..8a0bad5119a0 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h > index 000000000000,0d18ed15b403..0d18ed15b403 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c > index 000000000000,814fcc7538d5..814fcc7538d5 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h > index 000000000000,96032322b165..96032322b165 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c > index 000000000000,f0129d10d2b9..f0129d10d2b9 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h > index 000000000000,e000ef78928c..e000ef78928c > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c > index 000000000000,d07e7c7355d9..d07e7c7355d9 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h > index 000000000000,418f33ea6fd3..418f33ea6fd3 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile > index 000000000000,3db4cce44f42..3db4cce44f42 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c > index 000000000000,05d7c2a4fba5..05d7c2a4fba5 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c > index 000000000000,cfe01ca63ba6..cfe01ca63ba6 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h > index 000000000000,3aec44f80600..3aec44f80600 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c > index 000000000000,08841b9a5b81..08841b9a5b81 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h > index 000000000000,b2c7ae8966a1..b2c7ae8966a1 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile > index 000000000000,ffdd17eabe1d..ffdd17eabe1d > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c > index 000000000000,0cb64fc56783..0cb64fc56783 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h > index 000000000000,e791dd07ca78..e791dd07ca78 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c > index 000000000000,e1d707a7c964..e1d707a7c964 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h > index 000000000000,03bdcf29bd50..03bdcf29bd50 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c > index 000000000000,f411bc6d795d..f411bc6d795d > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h > index 000000000000,a3d487ab1964..a3d487ab1964 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h > diff --cc > sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h > index 000000000000,53b3dba50737..53b3dba50737 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h > diff --cc > sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h > index 000000000000,908ce3c864fe..908ce3c864fe > mode 000000,100644..100644 > --- > a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h > +++ > b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h > diff --cc > sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h > index 000000000000,24ac34fa0207..24ac34fa0207 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx= .h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx= .h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.= c > index 000000000000,52fc9eeb5fa5..52fc9eeb5fa5 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.= h > index 000000000000,cbf2f06436fc..cbf2f06436fc > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c > index 000000000000,3878c4124e25..3878c4124e25 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h > index 000000000000,39dd3a5b2979..39dd3a5b2979 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h > index 000000000000,0c685eeaed33..0c685eeaed33 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c > index 000000000000,81df41c7fbb5..81df41c7fbb5 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h > index 000000000000,d30a9fa30f1b..d30a9fa30f1b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c > index 000000000000,c739bf7463b3..c739bf7463b3 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h > index 000000000000,7905fd081721..7905fd081721 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h > index 000000000000,2a5cbeb9e783..2a5cbeb9e783 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c > index 000000000000,aadcff1e2b5d..aadcff1e2b5d > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h > index 000000000000,eaf926a96a88..eaf926a96a88 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c > index 000000000000,c1a9c1e442ee..c1a9c1e442ee > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h > index 000000000000,b7ca0d9891c4..b7ca0d9891c4 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c > index 000000000000,ce6ce2dea39c..ce6ce2dea39c > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h > index 000000000000,cab08f0669d1..cab08f0669d1 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h > index 000000000000,4e80f4d27949..4e80f4d27949 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c > index 000000000000,b4bba67a45ec..b4bba67a45ec > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h > index 000000000000,ae0e8d5df339..ae0e8d5df339 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c > index 000000000000,b03d5a1f1a93..b03d5a1f1a93 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c > index 000000000000,45dcd277a89f..45dcd277a89f > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h > index 000000000000,5d0083a87fd0..5d0083a87fd0 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h > index 000000000000,706ab03c8346..706ab03c8346 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h > index 000000000000,f49a10c452e9..f49a10c452e9 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c > index 000000000000,5331b5468e14..5331b5468e14 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h > index 000000000000,b49580c654fb..b49580c654fb > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c > index 000000000000,396d005f4d16..396d005f4d16 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h > index 000000000000,28208aba4af2..28208aba4af2 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c > index 000000000000,8b852581c4e4..8b852581c4e4 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h > index 000000000000,27d0934e600e..27d0934e600e > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c > index 000000000000,c9a29e626daa..c9a29e626daa > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h > index 000000000000,a014bbc4f935..a014bbc4f935 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h > index 000000000000,bfc63b2f0537..bfc63b2f0537 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c > index 000000000000,0a0c0ad4f96f..0a0c0ad4f96f > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h > index 000000000000,5bb88b78ed64..5bb88b78ed64 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h > index 000000000000,d65561227da0..d65561227da0 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c > index 000000000000,79d4a7a4da8b..79d4a7a4da8b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h > index 000000000000,af86c7fc5112..af86c7fc5112 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h > index 000000000000,12a0df5b4e98..12a0df5b4e98 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c > index 000000000000,80e3ccf865e3..80e3ccf865e3 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h > index 000000000000,c87dd89bcb78..c87dd89bcb78 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile > index 000000000000,f9b40cab766c..f9b40cab766c > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c > index 000000000000,1e2b1e487eb7..1e2b1e487eb7 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c > diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c > index 000000000000,fe94db0ba3f3..fe94db0ba3f3 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c > +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c > diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h > index 000000000000,b39c5c1ee18b..b39c5c1ee18b > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h > diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h > index 000000000000,f6344023855c..f6344023855c > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h > diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h > index 000000000000,946532328667..946532328667 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h > diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h > index 000000000000,7552bdb91991..7552bdb91991 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h > diff --cc sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h > index 000000000000,0340bba96868..0340bba96868 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h > diff --cc sys/contrib/dev/broadcom/brcm80211/include/defs.h > index 000000000000,9e7e6116eb74..9e7e6116eb74 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/defs.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/defs.h > diff --cc sys/contrib/dev/broadcom/brcm80211/include/soc.h > index 000000000000,824921191366..824921191366 > mode 000000,100644..100644 > --- a/sys/contrib/dev/broadcom/brcm80211/include/soc.h > +++ b/sys/contrib/dev/broadcom/brcm80211/include/soc.h > > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --000000000000957597064a8ababa Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Bjoern,

Do this import i= ncludes support for rpi4 wifi card?
I did research and I found tha= t wifi card is a Cypress CYW43455 or Broadcom BCM4345/6 and it is included = in firmware-brcm80211.

Thanks,

Bjoern A. = Zeeb <bz@freebsd.org> escreveu = (ter=C3=A7a, 10/02/2026 =C3=A0(s) 21:24):
The branch main has been updated by bz:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3Db4c3e9b5b09c829b4135aff738bd2893ed052377
commit b4c3e9b5b09c829b4135aff738bd2893ed052377
Merge: 69c64e3fb575 1eabd3ed89eb
Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-02-10 21:22:03 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-02-10 21:22:49 +0000

=C2=A0 =C2=A0 brcm80211: import Broadcom wireless brcmsmac and brcmfmac dri= vers

=C2=A0 =C2=A0 This version is based on
=C2=A0 =C2=A0 git.kernel.org/pub/sc= m/linux/kernel/git/torvalds/linux.git
=C2=A0 =C2=A0 e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

=C2=A0 =C2=A0 We are likely only going to use the brcmfmac driver but given= they
=C2=A0 =C2=A0 come nicely packaged in a directory structure and bwn(9) stil= l uses
=C2=A0 =C2=A0 GPL-only phy files we could use some of the information from = brcmsmac
=C2=A0 =C2=A0 and fix that (should it ever still be relevant).

=C2=A0 =C2=A0 git-subtree-dir: sys/contrib/dev/broadcom/brcm80211
=C2=A0 =C2=A0 git-subtree-mainline: 69c64e3fb575e0db0e2f0c1fc56f466624940de= d
=C2=A0 =C2=A0 git-subtree-split: 1eabd3ed89eb4bb5c69e90eeaeda1a6dd31e8bab
=C2=A0sys/contrib/dev/broadcom/brcm80211/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 13 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 62 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c |=C2=A0 =C2=A0 51 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/Makefile=C2=A0 =C2=A0|=C2=A0 = =C2=A0 12 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/core.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 39 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/module.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 28 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/vops.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 11 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c |=C2=A0 =C2=A0490 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h |=C2=A0 =C2=A0 20 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bcmsdh.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 1269 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/btcoex.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0481 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/btcoex.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 18 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h=C2=A0 |=C2=A0 =C2= =A0342 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cfg80211.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 8477 ++++++
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cfg80211.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0498 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c |=C2=A0 1472 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h |=C2=A0 =C2=A0 92 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/common.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0637 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/common.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 95 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/commonring.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0236 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/commonring.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 62 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c |=C2=A0 1576 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h |=C2=A0 =C2=A0228 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/Makefile=C2=A0 =C2=A0|=C2=A0 = =C2=A0 12 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/core.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0373 +
=C2=A0.../broadcom/brcm80211/brcmfmac/cyw/fwil_types.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 87 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/module.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 28 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/vops.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 11 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/debug.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 56 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/debug.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0143 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c=C2=A0 |=C2=A0 =C2= =A0215 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/feature.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0385 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/feature.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0131 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/firmware.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0859 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/firmware.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 95 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/flowring.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0508 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/flowring.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 74 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c |=C2=A0 =C2=A0514 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h |=C2=A0 =C2=A0401 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c |=C2=A0 =C2=A0432 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h |=C2=A0 =C2=A0224 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwil_types.h=C2=A0 =C2=A0|=C2=A0 = 1239 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwsignal.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 2514 ++
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwsignal.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 48 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwvid.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0200 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwvid.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 88 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/msgbuf.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 1687 ++
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/msgbuf.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 43 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0155 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 14 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c=C2=A0 |=C2=A0 2546 = ++
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h=C2=A0 |=C2=A0 =C2= =A0179 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c |=C2=A0 2785 ++ =C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h |=C2=A0 =C2=A0 14 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c=C2=A0 |=C2=A0 =C2= =A0595 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h=C2=A0 |=C2=A0 =C2= =A0 72 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/proto.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 71 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/proto.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0155 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c |=C2=A0 4650 +++ =C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h |=C2=A0 =C2=A0370 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/tracepoint.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 32 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/tracepoint.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0144 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c=C2=A0 |=C2=A0 1604 = ++
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h=C2=A0 |=C2=A0 =C2= =A0 42 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/vendor.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0118 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/vendor.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 53 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/Makefile=C2=A0 =C2=A0|=C2=A0 = =C2=A0 12 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/core.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 40 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/module.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 28 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/vops.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 11 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c |=C2=A0 =C2=A0 84 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h |=C2=A0 =C2=A0 31 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 47 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/aiutils.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0707 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/aiutils.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0221 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ampdu.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 1097 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ampdu.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 53 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/antsel.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0309 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/antsel.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 27 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_brcmsmac.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0102 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h=C2=A0 |=C2=A0 =C2= =A0 92 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0110 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_events.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 23 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_events.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 40 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/channel.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0771 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/channel.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0 47 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h=C2=A0 |=C2=A0 1902 = ++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/debug.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0246 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/debug.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 75 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c=C2=A0 |=C2=A0 1556 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h=C2=A0 |=C2=A0 =C2= =A0124 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h=C2=A0 |=C2=A0 =C2= =A0 38 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/mac80211_if.c=C2=A0 |=C2=A0 1738 = ++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/mac80211_if.h=C2=A0 |=C2=A0 =C2= =A0113 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c |=C2=A0 8065 +++++= +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h |=C2=A0 =C2=A0670 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c=C2=A0 |=C2=A0 2497 = ++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h=C2=A0 |=C2=A0 =C2= =A0241 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h=C2=A0 |=C2=A0 1113 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c=C2=A0 |=C2=A0 5151 = ++++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h=C2=A0 |=C2=A0 =C2= =A0110 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c=C2=A0 =C2=A0 | 28572 = +++++++++++++++++++
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c=C2=A0 =C2=A0 |=C2=A0 = =C2=A0298 +
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A0 31 +
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phy_radio.h=C2=A0 =C2=A0 |=C2=A0 = 1522 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h |=C2=A0 =C2=A0156 = +
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c=C2=A0 =C2=A0|=C2=A0 = 3170 ++
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 44 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 10099 +++++++ =C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h |=C2=A0 =C2=A0 39 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy_shim.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0215 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy_shim.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0172 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c=C2=A0 |=C2=A0 =C2= =A0165 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h=C2=A0 |=C2=A0 =C2= =A0 26 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h=C2=A0 |=C2=A0 =C2= =A0341 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c |=C2=A0 =C2=A0514 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h |=C2=A0 =C2=A0245 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h=C2=A0 |=C2=A0 =C2= =A0 67 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c=C2=A0 |=C2=A0 =C2= =A0437 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h=C2=A0 |=C2=A0 =C2= =A0 36 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/types.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0294 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ucode_loader.c |=C2=A0 =C2=A0109 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ucode_loader.h |=C2=A0 =C2=A0 56 = +
=C2=A0.../dev/broadcom/brcm80211/brcmutil/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 10 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c=C2=A0 |=C2=A0 =C2= =A0247 +
=C2=A0.../dev/broadcom/brcm80211/brcmutil/utils.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0327 +
=C2=A0.../dev/broadcom/brcm80211/include/brcm_hw_ids.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0116 +
=C2=A0.../dev/broadcom/brcm80211/include/brcmu_d11.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0156 +
=C2=A0.../dev/broadcom/brcm80211/include/brcmu_utils.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0216 +
=C2=A0.../dev/broadcom/brcm80211/include/brcmu_wifi.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A0247 +
=C2=A0.../dev/broadcom/brcm80211/include/chipcommon.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A0311 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/include/defs.h=C2=A0 |=C2=A0 =C2= =A0 94 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/include/soc.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 25 +
=C2=A0133 files changed, 116023 insertions(+)

diff --cc sys/contrib/dev/broadcom/brcm80211/Makefile
index 000000000000,000000000000..88115d072624
new file mode 100644
--- /dev/null
+++ b/sys/contrib/dev/broadcom/brcm80211/Makefile
@@@ -1,0 -1,0 +1,13 @@@
++# SPDX-License-Identifier: ISC
++#
++# Makefile fragment for Broadcom 802.11 Networking Device Driver
++#
++# Copyright (c) 2010 Broadcom Corporation
++#
++
++# common flags
++subdir-ccflags-$(CONFIG_BRCMDBG)=C2=A0 =C2=A0 =C2=A0 +=3D -DDEBUG
++
++obj-$(CONFIG_BRCMUTIL)=C2=A0 =C2=A0 =C2=A0 =C2=A0 +=3D brcmutil/
++obj-$(CONFIG_BRCMFMAC)=C2=A0 =C2=A0 =C2=A0 =C2=A0 +=3D brcmfmac/
++obj-$(CONFIG_BRCMSMAC)=C2=A0 =C2=A0 =C2=A0 =C2=A0 +=3D brcmsmac/
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile
index 000000000000,e5ca0f511822..e5ca0f511822
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c
index 000000000000,c4a54861bfb4..c4a54861bfb4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile
index 000000000000,5e37c638f966..5e37c638f966
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c
index 000000000000,f471c962104a..f471c962104a
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c
index 000000000000,1e1c79b18c5b..1e1c79b18c5b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h
index 000000000000,7897e6b6eefb..7897e6b6eefb
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c
index 000000000000,9ec0c60b6da1..9ec0c60b6da1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h
index 000000000000,b051d2860cd1..b051d2860cd1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 000000000000,8ab7d1e34a6e..8ab7d1e34a6e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c
index 000000000000,67c0c5a92f99..67c0c5a92f99
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h
index 000000000000,418b9424a179..418b9424a179
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h
index 000000000000,fe31051a9e11..fe31051a9e11
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
index 000000000000,8af402555b5e..8af402555b5e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h
index 000000000000,273c80f2d483..273c80f2d483
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c
index 000000000000,9074ab49e806..9074ab49e806
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h
index 000000000000,d69f101f5834..d69f101f5834
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c
index 000000000000,688f16c51319..688f16c51319
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h
index 000000000000,3bdb6984b2dd..3bdb6984b2dd
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c
index 000000000000,e44236cb210e..e44236cb210e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h
index 000000000000,7fb11f4823e4..7fb11f4823e4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c
index 000000000000,862a0336a0b5..862a0336a0b5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h
index 000000000000,399b6810e394..399b6810e394
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile
index 000000000000,33e86724ba14..33e86724ba14
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c
index 000000000000,4f0ea4347840..4f0ea4347840
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
index 000000000000,669564382e32..669564382e32
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c
index 000000000000,ce5fcfd42a7e..ce5fcfd42a7e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h
index 000000000000,870b5bead436..870b5bead436
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c
index 000000000000,eecf8a38d94a..eecf8a38d94a
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h
index 000000000000,9bb5f709d41a..9bb5f709d41a
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c
index 000000000000,c3a602197662..c3a602197662
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c
index 000000000000,488364ef8ff2..488364ef8ff2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h
index 000000000000,31f8695ca417..31f8695ca417
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c
index 000000000000,83f8ed7d00f9..83f8ed7d00f9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h
index 000000000000,4002d326fd21..4002d326fd21
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c
index 000000000000,e1127d7e086d..e1127d7e086d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h
index 000000000000,818882b0fd01..818882b0fd01
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c
index 000000000000,c2d98ee6652f..c2d98ee6652f
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h
index 000000000000,e327dd58d29c..e327dd58d29c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c
index 000000000000,6385a7db7f7d..6385a7db7f7d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h
index 000000000000,ab3d6cfcb02b..ab3d6cfcb02b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h
index 000000000000,e74a23e11830..e74a23e11830
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c
index 000000000000,b70d20128f98..b70d20128f98
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h
index 000000000000,f9c36cd8f1de..f9c36cd8f1de
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c
index 000000000000,41eafcda77f7..41eafcda77f7
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h
index 000000000000,f3e011d090f2..f3e011d090f2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
index 000000000000,45fbcbdc7d9e..45fbcbdc7d9e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h
index 000000000000,6a849f4a94dd..6a849f4a94dd
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c
index 000000000000,1681ad00f82e..1681ad00f82e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h
index 000000000000,ae124c73fc3b..ae124c73fc3b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c
index 000000000000,0dc9d28cd77b..0dc9d28cd77b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h
index 000000000000,d2ecee565bf2..d2ecee565bf2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
index 000000000000,6327f4eca500..6327f4eca500
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h
index 000000000000,8e6c227e8315..8e6c227e8315
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c
index 000000000000,05f66ab13bed..05f66ab13bed
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h
index 000000000000,25d406019ac3..25d406019ac3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c
index 000000000000,2e911d4874af..2e911d4874af
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h
index 000000000000,bd08d3aaa8f4..bd08d3aaa8f4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c
index 000000000000,8a0bad5119a0..8a0bad5119a0
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h
index 000000000000,0d18ed15b403..0d18ed15b403
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c
index 000000000000,814fcc7538d5..814fcc7538d5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h
index 000000000000,96032322b165..96032322b165
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c
index 000000000000,f0129d10d2b9..f0129d10d2b9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h
index 000000000000,e000ef78928c..e000ef78928c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c
index 000000000000,d07e7c7355d9..d07e7c7355d9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h
index 000000000000,418f33ea6fd3..418f33ea6fd3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile
index 000000000000,3db4cce44f42..3db4cce44f42
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c
index 000000000000,05d7c2a4fba5..05d7c2a4fba5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c
index 000000000000,cfe01ca63ba6..cfe01ca63ba6
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h
index 000000000000,3aec44f80600..3aec44f80600
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c
index 000000000000,08841b9a5b81..08841b9a5b81
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h
index 000000000000,b2c7ae8966a1..b2c7ae8966a1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile
index 000000000000,ffdd17eabe1d..ffdd17eabe1d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c
index 000000000000,0cb64fc56783..0cb64fc56783
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h
index 000000000000,e791dd07ca78..e791dd07ca78
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c
index 000000000000,e1d707a7c964..e1d707a7c964
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h
index 000000000000,03bdcf29bd50..03bdcf29bd50
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c
index 000000000000,f411bc6d795d..f411bc6d795d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h
index 000000000000,a3d487ab1964..a3d487ab1964
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.= h
index 000000000000,53b3dba50737..53b3dba50737
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_= msg.h
index 000000000000,908ce3c864fe..908ce3c864fe
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.= h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.= h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_= tx.h
index 000000000000,24ac34fa0207..24ac34fa0207
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h=
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h=
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c<= br> index 000000000000,52fc9eeb5fa5..52fc9eeb5fa5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h<= br> index 000000000000,cbf2f06436fc..cbf2f06436fc
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c
index 000000000000,3878c4124e25..3878c4124e25
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h
index 000000000000,39dd3a5b2979..39dd3a5b2979
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h
index 000000000000,0c685eeaed33..0c685eeaed33
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c
index 000000000000,81df41c7fbb5..81df41c7fbb5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h
index 000000000000,d30a9fa30f1b..d30a9fa30f1b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c
index 000000000000,c739bf7463b3..c739bf7463b3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h
index 000000000000,7905fd081721..7905fd081721
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h
index 000000000000,2a5cbeb9e783..2a5cbeb9e783
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c
index 000000000000,aadcff1e2b5d..aadcff1e2b5d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h
index 000000000000,eaf926a96a88..eaf926a96a88
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
index 000000000000,c1a9c1e442ee..c1a9c1e442ee
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h
index 000000000000,b7ca0d9891c4..b7ca0d9891c4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
index 000000000000,ce6ce2dea39c..ce6ce2dea39c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
index 000000000000,cab08f0669d1..cab08f0669d1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h
index 000000000000,4e80f4d27949..4e80f4d27949
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
index 000000000000,b4bba67a45ec..b4bba67a45ec
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
index 000000000000,ae0e8d5df339..ae0e8d5df339
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c
index 000000000000,b03d5a1f1a93..b03d5a1f1a93
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
index 000000000000,45dcd277a89f..45dcd277a89f
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
index 000000000000,5d0083a87fd0..5d0083a87fd0
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
index 000000000000,706ab03c8346..706ab03c8346
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
index 000000000000,f49a10c452e9..f49a10c452e9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
index 000000000000,5331b5468e14..5331b5468e14
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
index 000000000000,b49580c654fb..b49580c654fb
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
index 000000000000,396d005f4d16..396d005f4d16
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
index 000000000000,28208aba4af2..28208aba4af2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c
index 000000000000,8b852581c4e4..8b852581c4e4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h
index 000000000000,27d0934e600e..27d0934e600e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c
index 000000000000,c9a29e626daa..c9a29e626daa
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h
index 000000000000,a014bbc4f935..a014bbc4f935
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h
index 000000000000,bfc63b2f0537..bfc63b2f0537
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c
index 000000000000,0a0c0ad4f96f..0a0c0ad4f96f
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h
index 000000000000,5bb88b78ed64..5bb88b78ed64
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h
index 000000000000,d65561227da0..d65561227da0
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c
index 000000000000,79d4a7a4da8b..79d4a7a4da8b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h
index 000000000000,af86c7fc5112..af86c7fc5112
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h
index 000000000000,12a0df5b4e98..12a0df5b4e98
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c
index 000000000000,80e3ccf865e3..80e3ccf865e3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h
index 000000000000,c87dd89bcb78..c87dd89bcb78
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile
index 000000000000,f9b40cab766c..f9b40cab766c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c
index 000000000000,1e2b1e487eb7..1e2b1e487eb7
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c
index 000000000000,fe94db0ba3f3..fe94db0ba3f3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h
index 000000000000,b39c5c1ee18b..b39c5c1ee18b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h
index 000000000000,f6344023855c..f6344023855c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h
index 000000000000,946532328667..946532328667
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h
index 000000000000,7552bdb91991..7552bdb91991
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h
index 000000000000,0340bba96868..0340bba96868
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/defs.h
index 000000000000,9e7e6116eb74..9e7e6116eb74
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/defs.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/defs.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/soc.h
index 000000000000,824921191366..824921191366
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/soc.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/soc.h



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--000000000000957597064a8ababa-- From nobody Wed Feb 11 14:23:57 2026 X-Original-To: dev-commits-src-main@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 4fB0zk6LJYz6RYDS; Wed, 11 Feb 2026 14:24:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB0zk5T5Wz3kw9; Wed, 11 Feb 2026 14:24:02 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770819842; h=from:from: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=CGPXWzHzVG1FphBQwysv7DSMM3B4vmJ2s87FQtzXukM=; b=AA/O+EK70Ez/aUEyExwB8RSwc1OiqNYU3HR4k7LbGmyWiZpRjjDjvR8DBGJd3I1Ayael2d 9BnN7JjP3Lh59WDZD8SUFc9/a/EPJefMv7NK5DRS7Vudkk1YHyK1SoXsbre06KrLHEDOm4 xqkVsGoVJuaQQ6rrd6JP2T5pXp1ISw5CBa+8j2rdRGus7ybCfcSA27poMvFT3iFp1gACcl VXroBZ3sIgz0hpivDkD/9v6xOWHWIMrHQBjBmf7YqCpPlSAJLj/f+ArT3r9u/JTSRqxUDp jwJSj8v4FjRewsIHFf8l4+CeqGaDGNv8kOJ43j5WP0Sv3RS9cnTPqEIvhP94rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770819842; a=rsa-sha256; cv=none; b=VGfK8rCGSZv1xBQhPGRkOreULZnirp3jLPmGPNd+Y1YFmk4XRZs6FQPUykLlLyxRpGBoA/ cfaTydHE4Zo5QL0aMJNvCCAE7qafEklLAHvnv0mEk0qabpZKq7Y8fMtIN/BsWcm0JiMbjX 7GLfArMzfaccF0bkZ7CNkbG0dabiIHC4vAVPdPjT5N3WWRP2LTT1Kba3FkxM0yw0dwKac4 S8FoGlafpibMbICLk1GLPLdJokh0oyq9M71o0H2CVrpnw5P1oQXn84g2LX8eI7e8Ggekf7 KFEQMlaSR3UpRNhb1uqQSM1AW0q4gyktLbr7tGzgfWgw0DzrYHOpqRdqVvCSmw== 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=1770819842; h=from:from: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=CGPXWzHzVG1FphBQwysv7DSMM3B4vmJ2s87FQtzXukM=; b=OwJ2w8jSXQ3H6mLvGebIs2WJj65c+Yvfjv8tPP05ke/+GYiEJLfClH9IXgW3UWp+s0dGHP RORINWtGfy9fSWS1ZZ/fsvi8/wxa9MD+AhKy3ABrzHkSQJaMUx9mtFDpzF8NhLi7zgvbmm W7hHH8l3MZJ6K/h7fU5xxMdDxP6Fianr2cQJgHRV4TOOsChaNZTtKaNdUfZnm5/ybcmKdR 4UuRtelCTzqQ8oRXAYxynX4y4orH/ogNF7djtU0wO3W4LP5GwI2UuL6iKlXYAAhLd1uRyG qqkWN5kjeXgh0t98swm310TuuKWIEVDMVg0iy0j7kX9uSY93Q7OZeYmBgUCPSg== Received: from [IPV6:2a05:b400:110:12fe::a4] (user-12fe-a4.svr-vpn-1.vpn.cl.cam.ac.uk [IPv6:2a05:b400:110:12fe::a4]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fB0zj3YBkz2cx; Wed, 11 Feb 2026 14:24:01 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <25886a45-b8f0-45b0-8ed2-f1ffb56bbcbe@FreeBSD.org> Date: Wed, 11 Feb 2026 09:23:57 -0500 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Content-Language: en-US To: Konstantin Belousov Cc: Minsoo Choo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> <0bf02b0d-4115-4d10-93c0-e75a8733f75a@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/10/26 22:55, Konstantin Belousov wrote: > BTW, since we are talking about gdb. > What blocks updating the gdb port to 17.1? We are already two versions > behind. If it is kgdb, then could gdb port be split into userspace gdb > and kgdb, and have ugdb updated on each GNU release? I just haven't gotten around to it. :( I can move it higher up the priority list. I have a kgdb branch that I can rebase fairly easily. -- John Baldwin From nobody Wed Feb 11 15:45:52 2026 X-Original-To: dev-commits-src-main@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 4fB2p84hKJz6RhGV for ; Wed, 11 Feb 2026 15:45:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB2p8288lz3tcd for ; Wed, 11 Feb 2026 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770824752; 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=HH3YXV2SWlHG3wlW6RuTZ6CaV3hUN+WeHhOAoed6AGw=; b=nKRdJTaCEKNAbRb6S0XmmVjiGxSCZQRfGcPJGdk2VVI2Zb+yMekb2Ed6ps6kJIL8TTTKqH s10XLniIuBLEJA2lVEfmJlz7lZmKfRTNwpqjokxVPnobrt441gNGIoGMmgxs6gEf/tGeG3 fIb+ZDi/qahgNDI2i+lFnbZndaSM7rCUcZ+x5rVqKhV9NsKQpI2TDYp1Tasvxh2VzGFzhM uSa1pkcOgdJwj1wkUIz/t49Jgrp05YHZYEyo2vQyNfxVa+Cs13UJEfgZEQV8oKhuQGtFxE 6PAlJcqtCXgO1Y/AGzMJAggsq1NPe2n2TgWQV4AC6j67rsrYcmu73C6qg3QpIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770824752; a=rsa-sha256; cv=none; b=tFKwJWiOdCJzFGa7X3a05FO+W82ytbgPbkt+uyOI9Ba+0Lo4M9QObKC+5PCrdsxhiwzUys bcJL5eKNFnh245QoGKcZMM20BYeDH45EoSOe/GhWPRE7VJeKt4Yin3CTUqoC+SYZHCIh+6 WKWMGOBXeruitAejIfWMjxbrJhg81ernw8qZumdCZNZmFoEdKTDl1Qz2EGft/6gxv5kJC6 XqnVgJpanyPxCY5k47j/frFNdsJ4jeh0wsD6QYFHXM7CtgDkZ6JjKMF+20mwRUbJzzYqs0 q58Yroyk5PexMwhPtBd1Dq/zMKPh1QgXJgNyZr76US1o+Nelb6jqbCEiCKjphQ== 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=1770824752; 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=HH3YXV2SWlHG3wlW6RuTZ6CaV3hUN+WeHhOAoed6AGw=; b=k2d89F6IxDZaWLlQbsRoy1T4Hiryn1+ri9YFpg4/oKRUPusyXCWBJIGAmWjSOJ7O/c0Nd1 edkfEm2yq0dJQyRNdPfwHRvd8R15RWB2P4UMBIziij12ND25vo7laAYEzmbQbbaDpogdAG TF+kTwqdIeoMP9GxjlY+xFcUHK6Cm3FVXmLQcu084cbAz2WE6krpGUDjP2oDHsnkccPTRU 2qe2RxYFqET5xzNRtIDCg+ESdA6p5tRl1rciki23BZbwexsTUehOy2O+B05JvZ2qboWohD LyoRgb17fZeBkeI9Ncnrc8ikMPOaWR3Wn07t3mVmqJsmhG7FgVmY2msrrsn9KA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB2p81hYvzw3x for ; Wed, 11 Feb 2026 15:45:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22081 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 15:45:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 097458ac665d - main - freebsd-update: Error for -b basedir without UNAME_r set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 097458ac665db732cc91a22279da4cc14f694da2 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 15:45:52 +0000 Message-Id: <698ca430.22081.5723249e@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=097458ac665db732cc91a22279da4cc14f694da2 commit 097458ac665db732cc91a22279da4cc14f694da2 Author: Ed Maste AuthorDate: 2024-12-10 13:47:34 +0000 Commit: Ed Maste CommitDate: 2026-02-11 15:44:45 +0000 freebsd-update: Error for -b basedir without UNAME_r set freebsd-update sets the currently running release from UNAME -r, which can be overridden via the --currently-running commandline option (or by setting UNAME_r in the environment). This may be invalid if -b is used to specify a basedir other than /, so error out if -b is specified without setting the currently running version. PR: 283229 Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48016 --- usr.sbin/freebsd-update/freebsd-update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index aa42af13a302..a58b50e9ca2e 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -755,6 +755,10 @@ fetchupgrade_check_params () { esac chmod 700 ${WORKDIR} cd ${WORKDIR} || exit 1 + if [ "$BASEDIR" != / ] && [ -z "$UNAME_r" ]; then + echo "$(basename $0): -b basedir requires --currently-running to be specified." + exit 1 + fi # Generate release number. The s/SECURITY/RELEASE/ bit exists # to provide an upgrade path for FreeBSD Update 1.x users, since From nobody Wed Feb 11 16:05:20 2026 X-Original-To: dev-commits-src-main@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 4fB3Dd0zMCz6Rjwy for ; Wed, 11 Feb 2026 16:05:21 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB3Dd0DLqz3wR2 for ; Wed, 11 Feb 2026 16:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770825921; 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=eHEQ8wLiAMgYg07DyG9Ea3cAHiBdzZpcR4d3SGFo4FI=; b=qMtgdaHm47MOHgWTB2keLdxcbWFDco7h9N9L2cNMv7AqgwhHmqYzCpqHiqc+9vx3g2aITW rTifi5mXMCmfF8Ep28/f67rmEQYLCNlsEuVDsDOzU9441BiP0I0i9At2OoNDz/MiUM6XuF MaU1vG7BSv+u54LQ6RM5TSmAqPT+LF6AErRRH88J1A1VVuFa8rh30hiTwrdvSHStWsMz31 aznrv1Ur4xDzeilxswrreeMsIkvasJ4P57rwNGLGrmBgxFcRQRVR5n5rvTPm+i+7qZczTN Xs9U2OxmSbo73Ue+f0Qhkq3jEA1AXqkZSlewFPZqJGaJs80aSli5Zy7+U2PGBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770825921; a=rsa-sha256; cv=none; b=OowsKh+ZOzllNHpeeeO7SUTsIos9l5rW422l5lbuS2+rdKBTO9sD/CWcaYZTp34AY1cQZG fnS6csyLsCuI8nRusQmWoQW+GaFIrmqlf/pp5kJESqztTeT89gxtH11oNlG1Sj4mFs2drw E/n2spbDSFyOYjMP13Qa5DHjymTcDEQm4y1tGEmxz0+aFNkIgJ5g1w7ic+IVnOxHOzL9AC 7jdHV+5UMH6olS9hvMcJmwz4qs4BVPOhr7KOuKdtjU+Qnhmkx7Y9FxKd+y80krv6wUvYeK 4+XFgCQbQweU5xqZ6j16FYeF2vdcOb0MLbMtIYAWc4FPlJvYZgqUnNB1XvEj3Q== 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=1770825921; 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=eHEQ8wLiAMgYg07DyG9Ea3cAHiBdzZpcR4d3SGFo4FI=; b=rksAJDNEKIWmYh4FyuBRX312ijTPNKCTaErfEGI74uIN0mqxeJvS2Cbz9OylWscyR5biSA k/ntl1YKXoLBuVV2NqZEXLLljCPxSRtdS6DD2hL8xR/FBoD6hTnijXOrqBN9WCkbs0+38e I6JO7gSwby2V5dkpzq9yXZGLsoqNZP9GhPLxAlhxYMl0U9giuzo0/t5vNm/Rwk1EU2DBhX BP3I1iB+/hddWb+VyLiZVy1ZXz/KQaBsqjFYzVZXPOAxSMmU/uXpcBRVVRnNPnrgAM2TEX Zyc5FmUEKGRiqV9AuNBob+21f7QFZqhpNqy2kbRFm1M8yiDjfUHpYCUzMF65zg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB3Dc6r7Bzx9G for ; Wed, 11 Feb 2026 16:05:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22af1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 16:05:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 89589b6d3fba - main - amd64: add LASS support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 89589b6d3fbac43eb7c6b3cdbdd6f077888b2142 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 16:05:20 +0000 Message-Id: <698ca8c0.22af1.1435014b@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=89589b6d3fbac43eb7c6b3cdbdd6f077888b2142 commit 89589b6d3fbac43eb7c6b3cdbdd6f077888b2142 Author: Konstantin Belousov AuthorDate: 2024-10-24 02:12:25 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-11 16:04:30 +0000 amd64: add LASS support In short, LASS enforces all kernel memory accesses to have bit 63 set to 1, and all userspace accesses have bit 63 set to 0. Violations of these rules cause #GP. There are natural loopholes, like SMAP with rflags.AC=1 allows kernel to access userspace. Enablement is simple, we need to set CR4.LASS bit on all CPUs. There are complications when kernel has to execute code at low addresses, e.g. for la57 trampoline, or calling into EFI RT. The patch turns CR4.LASS off around these regions. LASS is officially documented in SDM, since at least rev. 085, October 2024. Tested in simics. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55218 --- sys/amd64/amd64/efirt_machdep.c | 4 ++++ sys/amd64/amd64/initcpu.c | 13 +++++++++++++ sys/amd64/amd64/machdep.c | 1 + sys/amd64/amd64/pmap.c | 9 +++++++++ sys/amd64/include/md_var.h | 1 + 5 files changed, 28 insertions(+) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index fe5d60c978dd..203b2b264587 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -348,6 +348,8 @@ efi_arch_enter(void) */ if (!pmap_pcid_enabled) invltlb(); + if (lass_enabled) + load_cr4(rcr4() & ~CR4_LASS); return (0); } @@ -357,6 +359,8 @@ efi_arch_leave(void) pmap_t curpmap; uint64_t cr3; + if (lass_enabled) + load_cr4(rcr4() | CR4_LASS); curpmap = &curproc->p_vmspace->vm_pmap; cr3 = curpmap->pm_cr3; if (pmap_pcid_enabled) { diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 7f317674907e..4c57c27596ad 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -290,6 +290,19 @@ initializecpu(void) if (cpu_stdext_feature2 & CPUID_STDEXT2_PKU) cr4 |= CR4_PKE; + /* + * Any CPU having Linear Address Space Separation (LASS) + * should have SMAP, but check it to be sure. Otherwise + * userspace accesses from kernel cannot work. + */ + if (IS_BSP() && (cpu_stdext_feature4 & CPUID_STDEXT4_LASS) != 0 && + (cpu_stdext_feature & CPUID_STDEXT_SMAP) != 0) { + lass_enabled = 1; + TUNABLE_INT_FETCH("hw.lass", &lass_enabled); + } + if (lass_enabled) + cr4 |= CR4_LASS; + /* * If SMEP is present, we only need to flush RSB (by default) * on context switches, to prevent cross-process ret2spec diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index b0da0b763b22..e9bb27a54dfb 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -204,6 +204,7 @@ int cold = 1; long Maxmem = 0; long realmem = 0; int late_console = 1; +int lass_enabled = 0; struct kva_md_info kmi; diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 243a6625bece..8695dd61316e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1737,6 +1737,7 @@ pmap_bootstrap_la57(vm_paddr_t *firstaddr) { void (*la57_tramp)(uint64_t pml5); pml5_entry_t *pt; + uint64_t cr4; if ((cpu_stdext_feature2 & CPUID_STDEXT2_LA57) == 0) return; @@ -1757,8 +1758,16 @@ pmap_bootstrap_la57(vm_paddr_t *firstaddr) KERNSTART + amd64_loadaddr()); printf("Calling la57 trampoline at %p, KPML5phys %#lx ...", la57_tramp, KPML5phys); + if (lass_enabled) { + cr4 = rcr4(); + load_cr4(cr4 & ~CR4_LASS); + } la57_tramp(KPML5phys); printf(" alive in la57 mode\n"); + if (lass_enabled) { + cr4 = rcr4(); + load_cr4(cr4 | CR4_LASS); + } } static void diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 19eab48168f7..7bb8ace27061 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -45,6 +45,7 @@ extern int hw_ibrs_disable; extern int hw_ssb_disable; extern int nmi_flush_l1d_sw; extern int syscall_ret_l1d_flush_mode; +extern int lass_enabled; extern vm_paddr_t intel_graphics_stolen_base; extern vm_paddr_t intel_graphics_stolen_size; From nobody Wed Feb 11 16:25:23 2026 X-Original-To: dev-commits-src-main@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 4fB3gm17mVz6Rm0k for ; Wed, 11 Feb 2026 16:25:24 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB3gl5Zzyz411X for ; Wed, 11 Feb 2026 16:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770827123; 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=EjRgon5f8jUkjbb1CwEw4z3OCLap7ncrxppCKWCD2pM=; b=cZWnYBnFf8I4HmF2PhkqMDhygccQH39fbBi8iBZTi4EU3jBEQ4Ml3ncs2OAw4uQhLW2cUV JsD1sagt1AgEzkduMkbR+z01U4jCppbKBtyzamxx3B8F60rE58Ed4E6zrkgb4LXIj8/v8Q KOOHJ3JBT5m+gt1GPr25RZrG56iwibZ7Qov/nZWsP7ldqCj7YIHMlowAdsVA09dDcfsvmK nYupF+Ba3Y3jm1tq6haGeKdbYU7mhppYifoDEmwq8eyC24UWDzYml6oMLleHfImDPXmWOM Xm5015s34MbWS3cX8l60uXwNQM785Q0QQgAc2/lNapZDaHc2Xct0M3fWN2KFgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770827123; a=rsa-sha256; cv=none; b=nomhfvSHwbpCr83NLBOXoxVMFXAUitFx+PD45ZCgGmhoESTmIxAVWf23aGZAvNsrjPLBQq +jsO48ptug386CKCudy7zJcdh6+EGf0ixHq4Cpj6iFXXf/X6sZ/0nQsSPtZUOS0peNkX4S 48n4RkBhPDQkTsvCDTZgrKj0L9dn+OKj/NoqQXKiBadbO7uSYVqNVO62RcmNMdOE6fqzv5 qg7vJeyCystQAU6MZ24YOuCujFEICCq4CRNaNMtJrP07XqZE6vRVRPo0oLWmaxDdQSCr/T KP8mw6C/AYWIp6cQhi5Q5K5hwjoXmorWobwulPNHCHc0p1dSlh9j155eh0X01w== 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=1770827123; 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=EjRgon5f8jUkjbb1CwEw4z3OCLap7ncrxppCKWCD2pM=; b=PNcZCYAIb8EcKJoByHGnhXeZL5Pc71l3WLaBfxoE7FyxZygDMm/DuOJpFgAjffagIF/hC7 WmNcKc4cSYzQjoc3OGHSsLAn+Yz2Rjc3gEzk+8eUFfAPupy/5UdQFCzczmxzJjLM1yiNle 9YOUFQH0CAreB9ErvCbxrf5H4kis3m40cz2Ji1PT4Jk52wwyrTtM2L8X2lQtlvozeo413x ZKJ0RaSpG6JPurJbLpN5zqZQ3N9DhGnmBFOS7t6x40T41ereepLrHiW+C7orgFZ9jijZvR NeY00uY5RKn/PTMQ0KGLs1+qFCeAIXhDaVDsZ/ty9GkNsQvV4kvMgujRi2SorQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB3gl4Rbczx1X for ; Wed, 11 Feb 2026 16:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2277f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 16:25:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7aa30669d6e0 - main - cp: Expect EINTR while copying List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aa30669d6e04444b8ad1e4863a6e674fcac4afc Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 16:25:23 +0000 Message-Id: <698cad73.2277f.4f4dd5d5@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7aa30669d6e04444b8ad1e4863a6e674fcac4afc commit 7aa30669d6e04444b8ad1e4863a6e674fcac4afc Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 16:24:46 +0000 cp: Expect EINTR while copying Both copy_file_range() and copy_fallback() can be interrupted before they have read anything at all, in which case they return -1 and set errno to EINTR. If that happens, we should retry, not fail. PR: 293028 MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55167 --- bin/cp/utils.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/cp/utils.c b/bin/cp/utils.c index 2036056ada68..2579ea0a9603 100644 --- a/bin/cp/utils.c +++ b/bin/cp/utils.c @@ -216,7 +216,10 @@ copy_file(const FTSENT *entp, bool dne, bool beneath) if (!use_copy_file_range) { wcount = copy_fallback(from_fd, to_fd); } - wtotal += wcount; + if (wcount >= 0) + wtotal += wcount; + else if (errno != EINTR) + break; if (info) { info = 0; (void)fprintf(stderr, @@ -224,7 +227,7 @@ copy_file(const FTSENT *entp, bool dne, bool beneath) entp->fts_path, to.base, to.path, cp_pct(wtotal, fs->st_size)); } - } while (wcount > 0); + } while (wcount != 0); if (wcount < 0) { warn("%s", entp->fts_path); rval = 1; From nobody Wed Feb 11 16:25:24 2026 X-Original-To: dev-commits-src-main@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 4fB3gm6Jzrz6Rm0l for ; Wed, 11 Feb 2026 16:25:24 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB3gm50L1z40vV for ; Wed, 11 Feb 2026 16:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770827124; 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=wC6GfrqII7oE3SnjydEU/w6EYo+gS2PetJefvMQxv48=; b=d8MFOG9oJ7/2BsfZSyGbgjzuGXoJVDru2s7gfnnunYdx45Clfjs7mXrTRQFBmvKYl5sGuY QduuRyfWgahPUU1CvSB1JpOzKZMtF6V9LCEM1lYLeiySEa/YGPCuPy+uRGDBdO7lbiKgDm cDd72AAOVw758NyRkinRQ2UDr9hWOi0mYavZY8mfPDFZ2cQ0aZ/KGjWLoMwewhlmQM8Tmo F0/uhFqfz6ocHMSGl1mSOj66KNW8590lWhq7zTGrLti6G/KcoRuaO2nPkZ3Ny04pzZ0T/8 ZT9PPsdw8gVE/k/DJLvmNU/4pR2+MQRifW2mz5N8nIfWk847eWuCmZ4M3f4rQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770827124; a=rsa-sha256; cv=none; b=E/fKyOZ1Kh4FSFQV/1af6ybl4iF89WdV2Wo/CBaq+PytMWDkW1SkIh8xEAKVisLmv0Ont5 r9Uue+/N8gLfq2R83ZEzbIqrZ+Wa2g+f1qxDxDWDtwAsPfgKeQ8CdqnqfZx+wZPTGzLIHq 4VdAKRcM9yWLrFy2l+1tAgFVwRIPF+eO89x88mE1aOLTUM2oKAsin++897yQpnGPkdNpIq nGos1mALobgbgjb/GLNYeGCPIJH7W3QnLkPUzLDNkZ8W+xaLvZk8S2ZSmTGupgqEKk2vuQ oLeJ1oqj2jtfqur7yhfxOt2ajEJHSlYrHOcHXrwdoYCD6+BcjpH/ij+Dpq+RBQ== 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=1770827124; 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=wC6GfrqII7oE3SnjydEU/w6EYo+gS2PetJefvMQxv48=; b=DCnCZBIe0bI+7V09k550+qJtRamVQtvyT6bNKeH15je38ikYnrm4Z/M4Pt/1wLvvfO7xbo oimayNxfT4Os8zpqykEX8uWkNvbdK3aieseXUhlCojXpVQghsUSxZyYlKczhnRbMJOqC9D qEU57/7+Uj85d8LcpZ9iGqtd73nuGAWIJJX0dwNKkYyaGukz854DGJ3xP/7M6kOVkaLuzb Dxx48dYsrUV7cjQsTAXzLpPp8sy0FOQevy2FPpp1qwuyjy5x1nyKuTYFAkFAjX0DXwpveJ BS3e5Ia5/df498r+oggSfeMCvFdQq3fLAUuAX5U+eM3JQNJ3wrN/VuDYFUen8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB3gm4NG4zxDX for ; Wed, 11 Feb 2026 16:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25425 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 16:25:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 0fb940fd63dd - main - install: Expect EINTR while copying List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fb940fd63dd9b6d6b848421c53b1e9ac8387265 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 16:25:24 +0000 Message-Id: <698cad74.25425.5153e53a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb940fd63dd9b6d6b848421c53b1e9ac8387265 commit 0fb940fd63dd9b6d6b848421c53b1e9ac8387265 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 16:24:50 +0000 install: Expect EINTR while copying Both copy_file_range() and read() / write() in our fallback loop can be interrupted before copying anything at all, in which case it returns -1 and sets errno to EINTR. If that happens, we should retry, not fail. While here, drop the size argument from copy() (we always want to copy the entire file anyway) and add test cases which exercise the metalog and digest functionality. PR: 293028 MFC after: 1 week Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55168 --- usr.bin/xinstall/tests/install_test.sh | 38 +++++++++++++++++++++++++++++ usr.bin/xinstall/xinstall.c | 44 +++++++++++++++++----------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/usr.bin/xinstall/tests/install_test.sh b/usr.bin/xinstall/tests/install_test.sh index 0f1f93ab4c63..3cea648aa805 100755 --- a/usr.bin/xinstall/tests/install_test.sh +++ b/usr.bin/xinstall/tests/install_test.sh @@ -512,6 +512,42 @@ set_optional_exec_body() atf_check test ! -x testfile } +atf_test_case metalog +metalog_head() { + atf_set "descr" "Test metalog generation" +} +metalog_body() { + atf_check install -M metalog -D dst -m 0755 -d dst + echo ". type=dir mode=0755" >expect + atf_check install -M metalog -D dst -m 0705 -d dst/dir + echo "./dir type=dir mode=0705" >>expect + atf_check -o save:file echo "Hello, world!" + atf_check install -M metalog -D dst -m 0604 file dst/dir + echo "./dir/file type=file mode=0604 size=14" >>expect + atf_check install -M metalog -D dst -lrs dir/file dst/"li nk" + echo "./li\040nk type=link mode=0755 link=dir/file" >>expect + atf_check mtree -f expect -p dst + atf_check -o file:expect cat metalog +} + +atf_test_case digest +digest_head() { + atf_set "descr" "Compute digest while copying" +} +digest_body() { + atf_check mkdir src dst + atf_check -e ignore dd if=/dev/random of=src/file bs=1m count=1 + for alg in md5 rmd160 sha1 sha256 sha512 ; do + rm -f dst/file digest metalog + atf_check -o save:digest $alg -q src/file + atf_check install -M metalog -D dst -h $alg -m 0644 src/file dst + echo -n "./file type=file mode=0644 size=1048576 $alg=" >expect + cat digest >>expect + atf_check cmp src/file dst/file + atf_check -o file:expect cat metalog + done +} + atf_init_test_cases() { atf_add_test_case copy_to_empty atf_add_test_case copy_to_nonexistent @@ -557,4 +593,6 @@ atf_init_test_cases() { atf_add_test_case set_owner_group_mode atf_add_test_case set_owner_group_mode_unpriv atf_add_test_case set_optional_exec + atf_add_test_case metalog + atf_add_test_case digest } diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index 28b546bc80c2..1aed8c1b24e4 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -140,7 +140,7 @@ static char *destdir, *digest, *fflags, *metafile, *tags; static int compare(int, const char *, size_t, int, const char *, size_t, char **); -static char *copy(int, const char *, int, const char *, off_t); +static char *copy(int, const char *, int, const char *); static int create_tempfile(const char *, char *, size_t); static char *quiet_mktemp(char *template); static char *digest_file(const char *); @@ -877,7 +877,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) } if (!stripped) { digestresult = copy(from_fd, from_name, to_fd, - tempfile, from_sb.st_size); + tempfile); } } } @@ -1175,8 +1175,7 @@ create_tempfile(const char *path, char *temp, size_t tsize) * copy from one file to another */ static char * -copy(int from_fd, const char *from_name, int to_fd, const char *to_name, - off_t size) +copy(int from_fd, const char *from_name, int to_fd, const char *to_name) { static char *buf = NULL; static size_t bufsize; @@ -1198,8 +1197,8 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, if (digesttype == DIGEST_NONE) { do { ret = copy_file_range(from_fd, NULL, to_fd, NULL, - (size_t)size, 0); - } while (ret > 0); + SSIZE_MAX, 0); + } while (ret > 0 || (ret < 0 && errno == EINTR)); if (ret == 0) goto done; if (errno != EINVAL) { @@ -1227,28 +1226,29 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name, if (buf == NULL) err(1, "Not enough memory"); } - while ((nr = read(from_fd, buf, bufsize)) > 0) { - if ((nw = write(to_fd, buf, nr)) != nr) { + for (;;) { + if ((nr = read(from_fd, buf, bufsize)) < 0) { + if (errno == EINTR) + continue; serrno = errno; (void)unlink(to_name); - if (nw >= 0) { - errx(EX_OSERR, - "short write to %s: %jd bytes written, " - "%jd bytes asked to write", - to_name, (uintmax_t)nw, - (uintmax_t)size); - } else { + errno = serrno; + err(EX_OSERR, "%s", from_name); + } + if (nr <= 0) + break; + digest_update(&ctx, buf, nr); + while (nr > 0) { + if ((nw = write(to_fd, buf, nr)) < 0) { + if (errno == EINTR) + continue; + serrno = errno; + (void)unlink(to_name); errno = serrno; err(EX_OSERR, "%s", to_name); } + nr -= nw; } - digest_update(&ctx, buf, nr); - } - if (nr != 0) { - serrno = errno; - (void)unlink(to_name); - errno = serrno; - err(EX_OSERR, "%s", from_name); } #ifndef BOOTSTRAP_XINSTALL done: From nobody Wed Feb 11 16:25:25 2026 X-Original-To: dev-commits-src-main@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 4fB3gp0qGZz6Rm7W for ; Wed, 11 Feb 2026 16:25:26 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB3gn5cVGz411c for ; Wed, 11 Feb 2026 16:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770827125; 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=CmXopGw5j/ss+hqXYirvb146ctwkC4uyrBqVZQXU3aA=; b=A4w9pGkN1xxlRJvTUTxCVxvb2NXy8WeAsMtKRPg7hXKsnYukRcYfL+mtSet8LAKrzDtEzh 6JSTozYinxlrNfOFVfZUVqumVP/GdA9yJmYJnsxKGOiLwUeF8UFJQFVXV29qs2CBYgqAFG uLCWwZO7SmOywAxDr+p8iE7GGLy3KXU0IPIv31zqCdlKpGj4YlOeMeCr2rcl3/uFBRb9YO ib+S3S3DcZrjczSYK3sS2LTs6pAUIBo1tEdpYoJ0OOCkWgaZ56PX4aM1KQka2putA78U7q W4AR29PsrVtbHPsa3aD7k36ELFXBU0e51+Ft+AyyoQfkMDd4Lk+3Ii0h2wvi0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770827125; a=rsa-sha256; cv=none; b=ma3zkUWbzP2GYfsUR/OECr4iuAUnRPqTk9DyAKJnTafW+Kb460SxItvYe8nh6cwoVYii9o k1q4OW+28u+aDzVol+U7yUU0kKf91jsJdv+vMg0VRAd43zjhpiHuHTpNK1xhxE/49ieigr nPHBiN8INTF8gwSOUm7+pzw0D8CLLxMQCRaPZqFGDaX04k1Q7B3BvdAjJIrA5OeezhED9o F75G1wzupi3t5qAVc2XayNmIcBUPgw37swUSPDQeLfFHLJsL7yMFqMs2li4KKPzxEUj5fp 4heT3CKqdbHJ9B3daZRAJ3VtPBhU//jKkrzSn91kdOqNJcKZcf+lS5F0QNAOSg== 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=1770827125; 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=CmXopGw5j/ss+hqXYirvb146ctwkC4uyrBqVZQXU3aA=; b=dN0/k3IZdJwBV60Z2InVcxGg/8RzgpH/MvVM7z4L945IQi8GDwlqCYuq6UQUN789Df4MVO +VxDys2eNsYzs5vkjgfmChDGkUQXPeJgsYCs6nHe0WXcY9eH6kmZFjBgL98hvXt/YyI0p5 KFk75AV9FJmWfMuU8LCGElw8SRkOQiK5/YsvbBSfNlJKcBpdRaYHE71bMA2+Tm3kd9cZ1g BOM7ET8knyV5xCTLvf/m1oGvkmc9GFGG8hmW3n4rH/65fpjYBs9rYE/QAKyzDJZ4U8RShu Ukw880dArOrLO9CCnmNFo93zrmpMn23HYPZiyYYAe3nLP+OYrtG7VB70pdw2SQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB3gn5D3Vzwh5 for ; Wed, 11 Feb 2026 16:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 259a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 16:25:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 71569594d860 - main - diff: Improve directory loop detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71569594d860a59d8362770a56d806e1d31fb946 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 16:25:25 +0000 Message-Id: <698cad75.259a9.24302262@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=71569594d860a59d8362770a56d806e1d31fb946 commit 71569594d860a59d8362770a56d806e1d31fb946 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-11 16:24:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-11 16:24:54 +0000 diff: Improve directory loop detection When we're done processing a directory, remove its entry from the tree of visited inodes, ensuring that we only report a loop when we encounter a descendant-to-ancestor link, not when we encounter a cousin-to-cousin or sibling-to-sibling link. MFC after: 1 week Reported by: Bakul Shah Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55248 --- usr.bin/diff/diffdir.c | 20 +++++++++++++++++--- usr.bin/diff/tests/diff_test.sh | 5 +++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 0e9beb80e6a1..489b873e2fcf 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -60,7 +60,8 @@ static struct inodetree v2 = RB_INITIALIZER(&v2); RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp); static int -vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, +vscandir(struct inodetree *tree, struct inode **inop, + const char *path, struct dirent ***dirp, int (*selectf)(const struct dirent *), int (*comparf)(const struct dirent **, const struct dirent **)) { @@ -85,6 +86,7 @@ vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, goto fail; RB_INSERT(inodetree, tree, ino); close(fd); + *inop = ino; return (ret); fail: serrno = errno; @@ -96,6 +98,13 @@ fail: return (-1); } +static void +leavedir(struct inodetree *tree, struct inode *ino) +{ + RB_REMOVE(inodetree, tree, ino); + free(ino); +} + /* * Diff directory traversal. Will be called recursively if -r was specified. */ @@ -104,6 +113,7 @@ diffdir(char *p1, char *p2, int flags) { struct dirent *dent1, **dp1, **edp1, **dirp1 = NULL; struct dirent *dent2, **dp2, **edp2, **dirp2 = NULL; + struct inode *ino1 = NULL, *ino2 = NULL; size_t dirlen1, dirlen2; char path1[PATH_MAX], path2[PATH_MAX]; int pos; @@ -131,7 +141,7 @@ diffdir(char *p1, char *p2, int flags) * Get a list of entries in each directory, skipping "excluded" files * and sorting alphabetically. */ - pos = vscandir(&v1, path1, &dirp1, selectfile, alphasort); + pos = vscandir(&v1, &ino1, path1, &dirp1, selectfile, alphasort); if (pos == -1) { if (errno == ENOENT && (Nflag || Pflag)) { pos = 0; @@ -143,7 +153,7 @@ diffdir(char *p1, char *p2, int flags) dp1 = dirp1; edp1 = dirp1 + pos; - pos = vscandir(&v2, path2, &dirp2, selectfile, alphasort); + pos = vscandir(&v2, &ino2, path2, &dirp2, selectfile, alphasort); if (pos == -1) { if (errno == ENOENT && Nflag) { pos = 0; @@ -217,11 +227,15 @@ diffdir(char *p1, char *p2, int flags) closem: if (dirp1 != NULL) { + if (ino1 != NULL) + leavedir(&v1, ino1); for (dp1 = dirp1; dp1 < edp1; dp1++) free(*dp1); free(dirp1); } if (dirp2 != NULL) { + if (ino2 != NULL) + leavedir(&v2, ino2); for (dp2 = dirp2; dp2 < edp2; dp2++) free(*dp2); free(dirp2); diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 6ca19a8f20cb..0d3acf50edf9 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -382,6 +382,11 @@ dirloop_body() -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \ diff -r a b + atf_check rm [ab]/foo/bar/up + atf_check mkdir -p b/foo/bar + atf_check ln -s foo a/baz + atf_check ln -s foo b/baz + atf_check diff -r a b } bigc_head() From nobody Wed Feb 11 18:17:17 2026 X-Original-To: dev-commits-src-main@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 4fB68s6JPvz6RxRB for ; Wed, 11 Feb 2026 18:17:17 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB68s3601z4G1j for ; Wed, 11 Feb 2026 18:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770833837; 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=8zQ79UUkP99j7GVaIQEKB+h7/YDQlB64x9puQb8de4g=; b=Ywx8eeZQtlISDUfgY81HSdVAa8p/n5z6p7GCmzPmoS1wtrg9PTeBHfSGOztJOrcoBERgX/ jQXCQTEggQ0QEPoawpdpPJvsFOZejQ9IflUiUAvOLDbBWesgOnCjRn1DUq8NGkh/CD8wBK sdeTPxpjDX2TxdzgT2nXyDBjxSbPRHzVBWAmkpn79xJc4z9AQI0dExafybHUJbXzCF2Iom +fc6hc+gd9WdI27ROltVZ9fSKgtc6F1R3fPSbD1CHHPzi/7iXSq6zs/U3lC7ET7Ea4EcWf FykOQ8z9lG2RZVkODWTIU4kNqoA4LX0pRoOto1fsWUeCtmIC8dh8DtdZ/FzxCg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770833837; a=rsa-sha256; cv=none; b=YmYqw5wG1jyL9+UPKSskuACfyYKeJjNWAOm7h4QZaFXcT4f+pnYimYf/R4YSz5PxLD77MK DfWjRmMFxOummyslhhCc2TQGC+haSecR2Z5oE7CYNxIDioXwL5zl45EB5cfGYPis5arrGw 5Y5R+/isg4dD/OOv+A5yQ6ngGpeGxg7dw3Nkez/dUfkoJyEn1tjoB+jC/kqH6kD2Qml0vA VNbOIC6zsu2G6kDz5IW8lMBebP/DyNSfSSwACKB1Dj9lZMixi6TeIRYvqgPheMxU5/LifL NgeJKaveCXmmqyqMz7r7u/G4Ib3kn7cXOXAdWp+RIpUHwwpe8VzUS2+kF+k+uw== 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=1770833837; 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=8zQ79UUkP99j7GVaIQEKB+h7/YDQlB64x9puQb8de4g=; b=U4LESoQsKjTNyvQ5mwED4Ngmh5VSExhpE4uIwon4X+qfX+W7KbTOKKlMb2Gn2mHzqbV5MW PSRQm2IrL3fuxHfbHGEaSlx5djZkcVcBtHS4zlC6Vi4pTURKe+qPFg0D7Xfuk8UjRFX3gW xWfM4/fFQQrShUrmfTGaLbgmToh/qF9yavK8zIJ0C2JD6U8aCLOvqLBXQGxPh1taMkYw9E knJgIPdovqEDN5e1IxUB6fE7YdrUKrC3cXvfOga5d//UbjIkMxpcuhdczHytLVnwXa+5Ht wcQClZiZXl9Zj9bGVBxYeAXnMDCXNuqihd03AJxxqtSEhRi0z4n8hiB9RWsBsA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB68s1dDtz11BY for ; Wed, 11 Feb 2026 18:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3942c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 18:17:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c182cf646a4f - main - lagg: Avoid dropping locks when starting the interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c182cf646a4f995fa8506afd8afc9541c4d32905 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 18:17:17 +0000 Message-Id: <698cc7ad.3942c.4831552d@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c182cf646a4f995fa8506afd8afc9541c4d32905 commit c182cf646a4f995fa8506afd8afc9541c4d32905 Author: Zhenlei Huang AuthorDate: 2026-02-11 18:15:41 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-11 18:15:41 +0000 lagg: Avoid dropping locks when starting the interface The init routine of a lagg(4) interface will not change during the whole lifecycle. So we can call lagg_init() directly instead of through the function pointer. Well, that requires a drop and pickup lock, which unnecessarily expose a small race window. Refactor lagg_init() into lagg_init_locked() and call the later one to avoid that. Meanwhile, delay updating the driver managed status until after the interface is really ready. Reviewed by: markj MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D55198 --- sys/net/if_lagg.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 7a8f82286c02..0333162da0d4 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -139,6 +139,7 @@ static int lagg_port_checkstacking(struct lagg_softc *); static void lagg_port2req(struct lagg_port *, struct lagg_reqport *); static void lagg_if_updown(struct lagg_softc *, bool); static void lagg_init(void *); +static void lagg_init_locked(struct lagg_softc *); static void lagg_stop(struct lagg_softc *); static int lagg_ioctl(struct ifnet *, u_long, caddr_t); #if defined(KERN_TLS) || defined(RATELIMIT) @@ -1279,16 +1280,21 @@ static void lagg_init(void *xsc) { struct lagg_softc *sc = (struct lagg_softc *)xsc; + + LAGG_XLOCK(sc); + lagg_init_locked(sc); + LAGG_XUNLOCK(sc); +} + +static void +lagg_init_locked(struct lagg_softc *sc) +{ struct ifnet *ifp = sc->sc_ifp; struct lagg_port *lp; - LAGG_XLOCK(sc); - if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - LAGG_XUNLOCK(sc); + LAGG_XLOCK_ASSERT(sc); + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) return; - } - - ifp->if_drv_flags |= IFF_DRV_RUNNING; /* * Update the port lladdrs if needed. @@ -1310,8 +1316,7 @@ lagg_init(void *xsc) lagg_watchdog_infiniband(sc); mtx_unlock(&sc->sc_mtx); } - - LAGG_XUNLOCK(sc); + ifp->if_drv_flags |= IFF_DRV_RUNNING; } static void @@ -1674,24 +1679,21 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) lagg_setflags(lp, 1); } - if (!(ifp->if_flags & IFF_UP) && - (ifp->if_drv_flags & IFF_DRV_RUNNING)) { + if ((ifp->if_flags & IFF_UP) == 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) /* * If interface is marked down and it is running, * then stop and disable it. */ lagg_stop(sc); - LAGG_XUNLOCK(sc); - } else if ((ifp->if_flags & IFF_UP) && - !(ifp->if_drv_flags & IFF_DRV_RUNNING)) { + else if ((ifp->if_flags & IFF_UP) != 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) /* * If interface is marked up and it is stopped, then * start it. */ - LAGG_XUNLOCK(sc); - (*ifp->if_init)(sc); - } else - LAGG_XUNLOCK(sc); + lagg_init_locked(sc); + LAGG_XUNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: From nobody Wed Feb 11 19:37:20 2026 X-Original-To: dev-commits-src-main@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 4fB7xF3RHPz6S5PR for ; Wed, 11 Feb 2026 19:37:21 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB7xF0WBpz4PgQ for ; Wed, 11 Feb 2026 19:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770838641; 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=6AzY0wbzNMeYskpY69BHEYTvlJsrOI0xIYuiWHG4fYE=; b=PwQm6rdoxW3k5SixO6s0oXAUwrvR9jEbwND6bD00jQdXJFVprtrzA8uw+uxj4nGTQCxRyp fGIb62AZkNufJBAVYZp1UelKQQ8DgH2j42vpcbrXxT7CFCov3OpBS4squKrhcqfBt0AkD5 Q40r2rNUGM/We0MR+CVB1qLcgl7t3djZRiUUkqRu1rbT+hOsAUKlEWXhXKTDy35vSW2F12 1rFBSpGNNYLSyxU+EqWaGPjhA4wMhZEyV2x/KvHaBtG/1SBy3AmsfLsncCqq3AeuytLa8j GgUOwGqBs2ZHMhMGRiFtAfHtlapAhWKYwb/79iop80WrGTC+5XsZkXjFVvSLow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770838641; a=rsa-sha256; cv=none; b=KnYhM1gdKalI27BAOXjaTSmV/scGxODaVNNRQVLDkuGoXNzUzp36dYPCHjaVhrRMJATxrZ 2hxi4CuOunQGjjNcnbFGCD2KAmTnfo8rJydGERCLf/nxiZ84DhSIap5flueuorhR7UQmy/ +ZtUQqU+J2SFf4h7qYs9mdO0ARJQQ3qfGBWxKd0pVMP7SnhWv6jMaKRP3eSiw2Ew0zT6ZI HnAj/IB3FDhTqARYfbbrX7MLoe8p6PFDTE9m0gTkDPUkaI2MTNDs+PIKX/ovDhiTZkoUN0 EIJP1BvJnjBfCmYCfN0l4vQVn4EaR7uvDxQeHTFWb5tDf+01WrTI8mswXAL3VA== 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=1770838641; 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=6AzY0wbzNMeYskpY69BHEYTvlJsrOI0xIYuiWHG4fYE=; b=lTteOh4TVsBW3dWgILqk5rF/6NyinaRWlQMbKmrEV+EVjSUtW9AnkGM+RtslwDaJRg2PvY 6GzOE5xpjXosN/fVi9IBb1ALL7POt4ghD/ZGo40GhpFcMG0TcMRLsKvFWDYsMjoUFoa/yI Wtj0qa/51ijq6uqrAZyN+X0LTxbtfj4zJ2rlV+Eic9cRg8KHUIUo4ezUGWcuLnkVscUZFq VeA5LDyMBYcTt5a6Vgxvs7qJcFT3FfUlSAEihvWwQ/Heb7FhNc42rvZ5HwI/FqOQ1rk9my gsQ6BqRebKBKhhRCZIuTKvibuqUqylg4WuLHOIFB5dkMhWC1GfEnj8YASt7cTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB7xD6hMsz1331 for ; Wed, 11 Feb 2026 19:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 400b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 19:37:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Morozovsky Subject: git: e89454417b2b - main - pw: make manual page more friendly for uid/gid search List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e89454417b2bfecce9daee10dece2f49632640d3 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 19:37:20 +0000 Message-Id: <698cda70.400b6.5322cd10@gitrepo.freebsd.org> The branch main has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=e89454417b2bfecce9daee10dece2f49632640d3 commit e89454417b2bfecce9daee10dece2f49632640d3 Author: Dmitry Morozovsky AuthorDate: 2026-02-11 19:34:00 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-11 19:36:42 +0000 pw: make manual page more friendly for uid/gid search pw.8 structure is quite different from usual manual page, especially in describing -o option usage. Specifically, these paragraphs do not contain "uid/gid" terms, and have "user id"/"group id" instead, making searching for "override duplicate safety belt" difficult. Try to simplify such searches. Also, clarify uid/gid space between 100 and 1000 as "somewhat special", as it actually is. Discussed on: russian telegram FreeBSD group Reviewed by: eugen, novel MFC after: 1 week --- usr.sbin/pw/pw.8 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index f6d9ebca6308..9b75ff772c25 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd August 19, 2025 +.Dd February 11, 2026 .Dt PW 8 .Os .Sh NAME @@ -572,8 +572,8 @@ It is possible to use to create a new account that duplicates an existing user id. While this is normally considered an error and will be rejected, the .Fl o -option overrides the check for duplicates and allows the duplication of -the user id. +option overrides the check for uniqueness and allows the duplication of +the uid. This may be useful if you allow the same user to login under different contexts (different group allocations, different home directory, different shell) while providing basically the same @@ -686,6 +686,9 @@ In general, user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . +Also, uids and gids between 100 and 999 are commonly used by pseudo-users +assotiated with third-party programs, and generally should be avoided for +assigning for normal users. .It Fl w Ar passmethod The .Fl w @@ -886,7 +889,7 @@ also has a option that allows allocation of an existing group id to a new group. The default action is to reject an attempt to add a group, and this option overrides the check for duplicate group ids. -There is rarely any need to duplicate a group id. +There is rarely any need to duplicate a gid. .Pp The .Cm groupmod From nobody Wed Feb 11 19:56:48 2026 X-Original-To: dev-commits-src-main@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 4fB8Mj0Kxjz6S6b6 for ; Wed, 11 Feb 2026 19:56:49 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB8Mh3M97z3Bqm for ; Wed, 11 Feb 2026 19:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770839808; 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=CVSZAvztIJrFiLlfzL3LxG7DDk8JzJUWh5U/8U95Xww=; b=mXQgDg2a93K7h6ZKzd6NG9Kg8SsetrbcPLhwWQ1l+65QlzxKgH6OjD6R5lCa0z8UjZ5HIU L10dcoVqw1ruTyHZXv9Bv0IlBTJ7IQX+Ugw2GU/gl6NoZFHWoCDOxBacLtXSOmE84eC33K ymY4WWg0MilUUSxamm56NhAQJsj+0366fVQNamC7NSUU2Yx6LXhRwy3gpdtrX6Udo5TRCB ZK6dogaqs7fKEfs0N5NI1K5yVji4zteFb9wMnDk2DPeuu4Xho8Ytnk3iQgoZ0k1S2ZzZe0 DMExgsZVR3DyUFYwi7jLoa3Gs/EMEu3OWreYJvJCyhAwACCFodSu8vKMDSEQFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770839808; a=rsa-sha256; cv=none; b=lADvxfVvorzgYelQbp+ewOmVNwLtJJc3J6Itw/o5e4B+FI88wvpF+NXl6ny16r47Qoc8sz H4elF96FCDmVIoKOYlLwAflqIxynCT2pOeY+kZ0FYzVpTvrx8x+OGsmuN6VbNExWtIH5pE zeSZWL+Qzcdtb1mjEXdQkdjkY1XDSvMcwVz7R+kiI/inaHbLgyataAq09FaTRNRAg02h5o eFymFovam2ptyw4pKnsYbze8TvhCjyEmbgMJMhWfOvn7nvhkCJqWWI23wt94/08lpOCA47 HkbFXmuIbx6aydgfukjy31kGsmScKcs1F4oh3XmmZjuzLSI9rpELZ4NHMG4Leg== 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=1770839808; 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=CVSZAvztIJrFiLlfzL3LxG7DDk8JzJUWh5U/8U95Xww=; b=U7bt0xRjdpuIfxK0cjYPB+n84NFhv6q3O6erbcQgQvJMDhn3aQYz9ngmjbH4ydacKGDFQJ HEsPxLxrj1IYKpbMabUISuDNrdzJI5kkwBPy2M39yaOjVg0MDGMZusknKDx7gtD8CMuZJD LdbVUSSDah54PyEwWb+XNqkZayPq8TenfvBW5CYzvAt9ditDqmJwJf9tBTqem7HMW3YTBA qFD4GWCgDdVQIwfFCLrcFzSOlQRatzdVToh3LEWNm+Vn54ryfqqXkRFWciFuKl8SPQG1gY tiJ8ZQwO4NMZbR9q4xtii179gpP5ma69lzJCy7yDfNrVHNoZnid/hhRJgurWPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB8Mh2MNHz13VY for ; Wed, 11 Feb 2026 19:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 438f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 19:56:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 7bf81e39d830 - main - ls: check fts_children() for errors that may not surface otherwise List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bf81e39d83087dc7f984077b5eed5a48df794d4 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 19:56:48 +0000 Message-Id: <698cdf00.438f0.1764e898@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf81e39d83087dc7f984077b5eed5a48df794d4 commit 7bf81e39d83087dc7f984077b5eed5a48df794d4 Author: Kyle Evans AuthorDate: 2026-02-11 19:55:55 +0000 Commit: Kyle Evans CommitDate: 2026-02-11 19:56:37 +0000 ls: check fts_children() for errors that may not surface otherwise In particular, if one simply does a non-recursive `ls` on a directory that is not accessible, there are some classes of errors that may cause it to fail that wouldn't be surfaced unless we do an fts_read() that will recurse into the inaccessible directory. Catch those kinds of errors here since we cannot expect to an FTS_ERR/FTS_DNR entry to follow up on them. PR: 287451 Reviewed by: kib Discusssed with: des Differential Revision: https://reviews.freebsd.org/D51056 --- bin/ls/ls.c | 17 +++++++++++++++++ bin/ls/tests/ls_tests.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index b3d0a508d714..c33d4d38c359 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -707,6 +707,23 @@ traverse(int argc, char *argv[], int options) output = 1; } chp = fts_children(ftsp, ch_options); + if (chp == NULL && errno != 0) { + warn("%s", p->fts_path); + rval = 1; + + /* + * Avoid further errors on this entry. We won't + * always get an FTS_ERR/FTS_DNR for errors + * in fts_children(), because opendir could + * have failed early on and that only flags an + * error for fts_read() when we try to recurse + * into it. We catch both the non-recursive and + * the recursive case here. + */ + (void)fts_set(ftsp, p, FTS_SKIP); + break; + } + display(p, chp, options); if (!f_recursive && chp != NULL) diff --git a/bin/ls/tests/ls_tests.sh b/bin/ls/tests/ls_tests.sh index c732b60b21a4..be662b75695d 100755 --- a/bin/ls/tests/ls_tests.sh +++ b/bin/ls/tests/ls_tests.sh @@ -476,6 +476,35 @@ b_flag_body() atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b } +atf_test_case childerr +childerr_head() +{ + atf_set "descr" "Verify that fts_children() in pre-order errors are checked" + atf_set "require.user" "unprivileged" +} + +childerr_body() +{ + atf_check mkdir -p root/dir root/edir + atf_check touch root/c + + # Check that listing an empty directory hasn't regressed into being + # called an error. + atf_check -o match:"total 0" -e empty ls -l root/dir + + atf_check chmod 0 root/dir + + # If we did not abort after fts_children() properly, then stdout would + # have an output of the total files enumerated (0). Thus, assert that + # it's empty and that we see the correct error on stderr. + atf_check -s not-exit:0 -e match:"Permission denied" ls -l root/dir + + # Now ensure that we didn't just stop there, we printed out a directory + # that would've been enumerated later. + atf_check -s not-exit:0 -o match:"^root/edir" \ + -e match:"Permission denied" ls -lR root +} + atf_test_case d_flag d_flag_head() { @@ -971,6 +1000,7 @@ atf_init_test_cases() #atf_add_test_case Z_flag atf_add_test_case a_flag atf_add_test_case b_flag + atf_add_test_case childerr #atf_add_test_case c_flag atf_add_test_case d_flag atf_add_test_case f_flag From nobody Wed Feb 11 20:44:00 2026 X-Original-To: dev-commits-src-main@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 4fB9Q868q7z6SBsh for ; Wed, 11 Feb 2026 20:44:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9Q85CpFz3PRX for ; Wed, 11 Feb 2026 20:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842640; 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=I18q/FXK2LAAPEtmZc6hktZmgSbNjrctFKGU3s52Qlk=; b=AeHFVer0NGYGqAPE+/Mq7hNcs5vbskGAIyHqZ2icEcBw8gN5qNKyXVDhCTZHjS9zfaqzbo ZZPgG6+Xps62P8Nxwi8leX9IJv+xKOzVid0K14rqA4Xv/LEC5Myp9CZbWsMZE0yQa758XZ I1mVFZFx+EU89m2L4U9Zn8t5xhIYHW1N3NtOE/ioPcKX6x4tTCrCRGdG3+yVSgO8Xd8KuT L/pP63njxmZSp3OCNIfa/1qVn5Qz/nngstfUDJhXEk1QfUge/pxUyN+Uq/+VAGjH36ylnI O3dtUI1nbSkkZIxS7drxhu39alBAy4lTgHHjOnUzlHo1VRBIHJleXDUA7n2O8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842640; a=rsa-sha256; cv=none; b=UBCCFSr/Yzcg4y9gXqTyO0lZH5QaMcStisIkybVY8WTHYpRds3GhLv+tptOycEdNnZ8nqG bgiTLFunwkdUaGTR9MRKpiACvXoTpZ5FwVrVMh7STZnpbHODkMXum6LSyAJT5u/030Gp+w 0g0oWL2V1j6VnZDUtsv+094iWmwpQQdYRfL3py2sobZfafj/0q/ez0rtfpr8r8hk991Hid ysnWj0wmpg+jSMQ3RR4DzjIdik+8N/gfDK85HWxek7x+GySMm6pkOWHOGzD/iAhu4vqE9k 4XBhqkxmjl9GE1SCKLM7/Quxm29VKQi3H7++ONrH25R6kC2GpZgcxJ8L2VuAvQ== 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=1770842640; 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=I18q/FXK2LAAPEtmZc6hktZmgSbNjrctFKGU3s52Qlk=; b=LisTSFpiIGVqnPZaLcShcKk+kysdf2pyd3Qzc6cduIRvjFcsohuHLpn5DhDuZwRLuanTZC zAdWUXxri8CNUkIfyodxPBK4SoCa/R766u/w7DT5x54K+tBhTJVemL7xwYfCnTY0tP688Q f0Ew5JQ2stRDkN6ZMUcrqu0dlViwMdoSqickW9HuPlkj6lCYb/UOwCGA5nMvM4aqwkrKi8 bzrW6By0dxvPUZNa820ZuainjoPz1t2aGltTWiWlDHf+DnRGR41FZlvUDyADqCtRZ7HMnf soCUhkEkK4vMuT0vbQ8JheUaF7E/gFN9XkD4V6GRSo5uPJ2u4jOS5OTsEEPHfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9Q84fsBz15HR for ; Wed, 11 Feb 2026 20:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47b9c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: bd58239d3653 - main - hwpstate_amd(4): attach(): More diagnostic on CPPC enable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd58239d3653dab7cd3999cad222f695a49a7e3b Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:00 +0000 Message-Id: <698cea10.47b9c.11d46cdf@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bd58239d3653dab7cd3999cad222f695a49a7e3b commit bd58239d3653dab7cd3999cad222f695a49a7e3b Author: Olivier Certner AuthorDate: 2026-01-29 17:37:20 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:20 +0000 hwpstate_amd(4): attach(): More diagnostic on CPPC enable When the 'debug.hwpstate_verbose' tunable/sysctl knob is set, dump the initial content of the CPPC_CAPABILITY_1 and CPPC_REQUEST registers. If, after enabling CPPC, reading/writing some MSR fails during the attach sequence, print a diagnostic. However, once CPPC is enabled, we cannot go back (disabling it is impossible), so we'll attach even if fiddling with other MSRs failed. While here, move diagnostic printing on attach out of the callback that is executed on (potentially) another CPU and with interrupts disabled, putting it into the attach routine itself. While here, fix format for printing the CPU ID. PR: 292615 Reviewed by: aokblast (older version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55006 --- sys/x86/cpufreq/hwpstate_amd.c | 133 ++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 49 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index ac0d9c9e49b0..d1186ae786ce 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -261,7 +261,7 @@ print_cppc_caps_1(struct sbuf *const sb, const uint64_t caps) AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, caps); } -#define MSR_NOT_READ_MSG "Fault on read" +#define MSR_NOT_READ_MSG "Not read (fault or previous errors)" static void print_cppc_no_caps_1(struct sbuf *const sb) @@ -644,46 +644,45 @@ hwpstate_identify(driver_t *driver, device_t parent) device_printf(parent, "hwpstate: add child failed\n"); } -struct amd_set_autonomous_hwp_request { - device_t dev; - int res; +struct set_autonomous_hwp_data { + /* Inputs */ + struct hwpstate_softc *sc; + /* Outputs */ + /* HWP_ERROR_CPPC_* */ + u_int res; + /* Below fields filled depending on 'res'. */ + uint64_t caps; + uint64_t init_request; + uint64_t request; }; static void amd_set_autonomous_hwp_cb(void *args) { - struct hwpstate_softc *sc; - struct amd_set_autonomous_hwp_request *req = - (struct amd_set_autonomous_hwp_request *)args; - device_t dev; - uint64_t caps; - int ret; + struct set_autonomous_hwp_data *const data = args; + struct hwpstate_softc *const sc = data->sc; + int error; - dev = req->dev; - sc = device_get_softc(dev); - ret = wrmsr_safe(MSR_AMD_CPPC_ENABLE, 1); - if (ret != 0) { - device_printf(dev, "Failed to enable cppc for cpu%d (%d)\n", - curcpu, ret); - req->res = ret; - } + /* We proceed sequentially, so we'll clear out errors on progress. */ + data->res = HWP_ERROR_CPPC_ENABLE | HWP_ERROR_CPPC_CAPS | + HWP_ERROR_CPPC_REQUEST | HWP_ERROR_CPPC_REQUEST_WRITE; - ret = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->cppc.request); - if (ret != 0) { - device_printf(dev, - "Failed to read CPPC request MSR for cpu%d (%d)\n", curcpu, - ret); - req->res = ret; - } + error = wrmsr_safe(MSR_AMD_CPPC_ENABLE, 1); + if (error != 0) + return; + data->res &= ~HWP_ERROR_CPPC_ENABLE; - ret = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &caps); - if (ret != 0) { - device_printf(dev, - "Failed to read HWP capabilities MSR for cpu%d (%d)\n", - curcpu, ret); - req->res = ret; + error = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data->caps); + if (error != 0) return; - } + data->res &= ~HWP_ERROR_CPPC_CAPS; + + error = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &sc->cppc.request); + if (error != 0) + return; + data->res &= ~HWP_ERROR_CPPC_REQUEST; + /* The CPPC_REQUEST value before we tweak it. */ + data->init_request = sc->cppc.request; /* * In Intel's reference manual, the default value of EPP is 0x80u which @@ -692,35 +691,71 @@ amd_set_autonomous_hwp_cb(void *args) */ SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_EPP_BITS, 0x80); SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MIN_PERF_BITS, - BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, caps)); + BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data->caps)); SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MAX_PERF_BITS, - BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, caps)); + BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data->caps)); /* enable autonomous mode by setting desired performance to 0 */ SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); - ret = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->cppc.request); - if (ret) { - device_printf(dev, "Failed to setup autonomous HWP for cpu%d\n", - curcpu); - req->res = ret; + error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->cppc.request); + if (error != 0) return; - } - req->res = 0; + data->res &= ~HWP_ERROR_CPPC_REQUEST_WRITE; + data->request = sc->cppc.request; } static int amd_set_autonomous_hwp(struct hwpstate_softc *sc) { - struct amd_set_autonomous_hwp_request req; - device_t dev; + const device_t dev = sc->dev; + const u_int cpuid = cpu_get_pcpu(dev)->pc_cpuid; + struct set_autonomous_hwp_data data; + struct sbuf sbs; + struct sbuf *sb; + + data.sc = sc; + smp_rendezvous_cpu(cpuid, smp_no_rendezvous_barrier, + amd_set_autonomous_hwp_cb, smp_no_rendezvous_barrier, &data); + + if (hwp_has_error(data.res, HWP_ERROR_CPPC_ENABLE)) { + device_printf(dev, "CPU%u: Failed to enable CPPC!\n", cpuid); + return (ENXIO); + } + device_printf(dev, "CPU%u: CPPC enabled.\n", cpuid); + + /* + * Now that we have enabled CPPC, we can't go back, so we'll attach even + * in case of further malfunction, allowing the user to retry setting + * CPPC_REQUEST via the sysctl knobs. + */ - dev = sc->dev; - req.dev = dev; - smp_rendezvous_cpu(cpu_get_pcpu(dev)->pc_cpuid, - smp_no_rendezvous_barrier, amd_set_autonomous_hwp_cb, - smp_no_rendezvous_barrier, &req); + sb = sbuf_new(&sbs, NULL, 0, SBUF_AUTOEXTEND); - return (req.res); + if (hwpstate_verbose) + sbuf_printf(sb, + "CPU%u: Initial MSR values after CPPC enable:\n", cpuid); + if (hwp_has_error(data.res, HWP_ERROR_CPPC_CAPS)) + print_cppc_no_caps_1(sb); + else if (hwpstate_verbose) + print_cppc_caps_1(sb, data.caps); + if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST)) + print_cppc_no_request(sb); + else if (hwpstate_verbose) + print_cppc_request(sb, data.init_request); + if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST_WRITE)) + device_printf(dev, "CPU%u: Could not write into " + MSR_AMD_CPPC_REQUEST_NAME "!\n", + cpuid); + else if (hwpstate_verbose) { + sbuf_printf(sb, "CPU%u: Tweaked MSR values:\n", cpuid); + print_cppc_request(sb, data.request); + } + + sbuf_finish(sb); + sbuf_putbuf(sb); + sbuf_delete(sb); + + return (0); } static int From nobody Wed Feb 11 20:44:01 2026 X-Original-To: dev-commits-src-main@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 4fB9QB0Rjpz6SBwC for ; Wed, 11 Feb 2026 20:44: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9Q95wmwz3PXL for ; Wed, 11 Feb 2026 20:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842641; 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=WQa50+52wPEB7n42FsJgpqwJa0YGfaJHrQmZFkP5HYk=; b=Ay8+cxY5xpCRfgfqYIYL8f6TJ1s1otAR5hHa3NoFg9KQOZMLaoKG3gTB0H6W/MAIlDzC6E xL51Na100jwTqLR+yMZG7uq0xhmfmJzcaPQSj3Vgrtv/jGe4HAaq2E1vmnPkxZF5zA4CPC sOG4qSogX8IQHocER99NtEeTAIB2GkbMnI6FKS85umOdv/FtxkIRsAraXnrFV+ZyEe+UX6 AZNTpFPBXy8kzcEbbtyrhVINZS+fuf99y8L3tmmEqaLbuc2yrJK6aUYdLt3Xzo77LSPRFR O3w0hR1O3LlTeOA5CsJqOC6Kf4IHtgDXCTwK976E03jtwT7EpzeakMnklP5gRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842641; a=rsa-sha256; cv=none; b=oMesJRqfxNQ2Awvaca/aEabwo7VSm5/h0nxDnG1wfDaOgQHo7ZDRKL3gefvw9vOzGEo15A HK9W2hR+b4iTGXHJ26/n7IJPUgJEcaguxSMBT0K01AaxAiGtvgXyI6POeXZN833LqdFfj0 r0ERZCHRBQwMUJX0/KRyN0Qn2sgM5aKLixYFZj4Zkxj6r//7auO7Yq/8N4K3/HEEzb6oe4 wibJQUcAHVn6p6yhAdkgO67oN9EXO7JGinyvBpaC8et0ULRRrX6cp5RzC3qx5wXOD9kiRY gMGJ8vSzKNg62ijqXHSvRNN+6tg0fxNapZLUKDxgxWfp/pQ7y3RJ4mWHfI/gGw== 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=1770842641; 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=WQa50+52wPEB7n42FsJgpqwJa0YGfaJHrQmZFkP5HYk=; b=LU4oSS4vhr3xje/mVqfiuV8qXyYnNVSNfzdd7+ntqobEtXq0CDFYAuHTGShBCdoigSoCq4 w/pT+gEAyxPv3ZuiXGklQP6tg+HAcfbgBZf3r47jXBZTFI/ZaLVGq254dAb7ifafkKtHMQ H9Z72SgacrBscYYkyGFjCOdD5jnWly8MXYi/J56MixX2D8sbjntbAtXHGj8tU2Z/lAKJ4y k0mHoFdvZy3gdpHQq/DLEr7YpoqO3R+KTbuID2UaLH2MriUgjDBgevopKh5pRBQgXbAPhd jOwUVKKAgOKusfM0w9FSNQsQV26QXTNk05o9rpSMTu+crIDT+JufQB6QSOfb5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9Q95Td6z15L0 for ; Wed, 11 Feb 2026 20:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 186bd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: df7b4dcdb8ff - main - hwpstate_amd(4): Sane defaults for min/max perf on insane capabilities List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df7b4dcdb8ff32a735916b50a473424b543c1e5e Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:01 +0000 Message-Id: <698cea11.186bd.4748259@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=df7b4dcdb8ff32a735916b50a473424b543c1e5e commit df7b4dcdb8ff32a735916b50a473424b543c1e5e Author: Olivier Certner AuthorDate: 2026-01-29 21:14:48 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:20 +0000 hwpstate_amd(4): Sane defaults for min/max perf on insane capabilities If the CPPC_CAPABILITY_1 register stays at its reset value (0) even after enabling CPPC, as observed in the field (see the referenced PR below), use sane min/max performance limits as hinted by the ACPI spec, i.e., all 0s for the minimum value and all 1s for the maximum one. While here, let's cope upfront with some more insane situations, where the minimum value would be greater than the maximum one, but also if they would be equal which does not seem to make sense at all in the CPPC frame (and, anyway, in this case, the actual minimum and maximum values we program should have no effect at all). That last case actually also covers the one exposed in the previous paragraph. PR: 292615 Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55007 --- sys/x86/cpufreq/hwpstate_amd.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index d1186ae786ce..049699ea02d4 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -661,6 +661,7 @@ amd_set_autonomous_hwp_cb(void *args) { struct set_autonomous_hwp_data *const data = args; struct hwpstate_softc *const sc = data->sc; + uint64_t lowest_perf, highest_perf; int error; /* We proceed sequentially, so we'll clear out errors on progress. */ @@ -690,12 +691,30 @@ amd_set_autonomous_hwp_cb(void *args) * CPPC driver. */ SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_EPP_BITS, 0x80); + + /* Enable autonomous mode by setting desired performance to 0. */ + SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); + + /* + * When MSR_AMD_CPPC_CAPS_1 stays at its reset value (0) before CPPC + * activation (not supposed to happen, but happens in the field), we use + * reasonable default values that are explicitly described by the ACPI + * spec (all 0s for the minimum value, all 1s for the maximum one). + * Going further, we actually do the same as long as the minimum and + * maximum performance levels are not sorted or are equal (in which case + * CPPC is not supposed to make sense at all), which covers the reset + * value case. + */ + lowest_perf = BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data->caps); + highest_perf = BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data->caps); + if (lowest_perf >= highest_perf) { + lowest_perf = 0; + highest_perf = -1; + } SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MIN_PERF_BITS, - BITS_VALUE(AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, data->caps)); + lowest_perf); SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_MAX_PERF_BITS, - BITS_VALUE(AMD_CPPC_CAPS_1_HIGHEST_PERF_BITS, data->caps)); - /* enable autonomous mode by setting desired performance to 0 */ - SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_DES_PERF_BITS, 0); + highest_perf); error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, sc->cppc.request); if (error != 0) From nobody Wed Feb 11 20:44:02 2026 X-Original-To: dev-commits-src-main@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 4fB9QC0TDmz6SBPw for ; Wed, 11 Feb 2026 20:44:03 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QB6pT6z3PVT for ; Wed, 11 Feb 2026 20:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842643; 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=JSABBLlD2l12OFm4Xc0jTihP/1XhcULAA9pkbHIsA7E=; b=vrutWvVjD0coB5VVqPLhEAEJJls6ucaTyD6HKGD0b45ARGjPPL7LX3/rcItTd+CABbkSpf UQp6m1zPU/Io1/RweLBk38YkOpJc9f+b89JAypFD7ldGzKAP+6I5pS9kZiAAA7qcvLrCVj MLp8sg9CkUgXl1EowkHebn1RxgNgcPlxGTwKQ6nbWpJ35jzggjSiKmxsV6clkH8tc5EO3C PbqmDlWe4upR//y2mj3qmlfrAWBBpFeHTdsinR9afO4l+k7tcFIPdsmyux96yGsdura6iU YNAHtuiSBGMK+JYJxIZxOoh2ABZa6s5iS3BJBsL8w6XVaMwDtI7t8OT+zJ3VZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842643; a=rsa-sha256; cv=none; b=fVO5rO+/cYZ/aW9OUrwkunSih5CNj9pDMkvm6LnZXwls41q9N0THbtNoXoQQyvl1ANpqFw 90bw4THjnjL1n/R7+tcEFw2g91X6ERELGZUj5QQW7ULg4h2UNN5L09wyzw8kYVpkDEovix 0d3HwiBaa+NL09PQQZX7PLohyF5OfiS1e4/+LD5HBRJGwXOEfaIewjlqFk+aMVW0nOr3xu UH65D1nJCUC5mnIdrvUXKuWdMOL/LXMy3WhEz5pQb91CWXuL8XjSneiLM4+9oCrMIgHxS3 Nm4OConSbSJHIl57CHpqHINZHt56d46Lm44Mrlo/IMzRZwEsp0EiUwybtP+DWg== 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=1770842643; 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=JSABBLlD2l12OFm4Xc0jTihP/1XhcULAA9pkbHIsA7E=; b=uNrOYwdOu3rMT99Pj2OYPZPCpCdXPPm6DbioaMd5Bx9oaeaCavw99kFgRDH7TONKtti/Uo ckBkrJlNRQuqInbXzgyExeV6ey/fGx7lctUs93Vsv1mmz1P/sNBzePXwHF95wPxB3bK16i mwit69qWHt89jADwvc+FezUxoPjvFOEa4XziNK45xKOhGA59mwI4+AJL1u8W2YsChFPVzR 9xu4RTfIMtxX2R1sbj8w8OSvR7zXhtusmMp95Czq/WAGSZT02jZ5nAdAeea9UE3tR6g5pq ABtA6smsoMejtpj7oY327k+my+/J5jwJLXLa8bTyAj7C2YpFCuGk4sDJeoucgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QB60bMz158k for ; Wed, 11 Feb 2026 20:44:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46042 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6db204dc2de0 - main - hwpstate_amd(4): Factor out setting the CPPC_REQUEST register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6db204dc2de0f52e9a6842af29f026a8a2951e3c Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:02 +0000 Message-Id: <698cea12.46042.6e964248@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6db204dc2de0f52e9a6842af29f026a8a2951e3c commit 6db204dc2de0f52e9a6842af29f026a8a2951e3c Author: Olivier Certner AuthorDate: 2026-01-27 11:30:48 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:20 +0000 hwpstate_amd(4): Factor out setting the CPPC_REQUEST register In preparation for creating other knobs to tweak values in this register beyond just the EPP (Efficiency/Performance Preference). While here, add a herald comment before the softc structure indicating how we achieve atomicity when modifying the softc. Reviewed by: aokblast Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55008 --- sys/x86/cpufreq/hwpstate_amd.c | 94 +++++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 25 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 049699ea02d4..18d420dc7747 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -147,6 +147,12 @@ enum hwpstate_flags { PSTATE_CPPC = 1, }; +/* + * Atomicity is achieved by only modifying a given softc on its associated CPU + * and with interrupts disabled. + * + * XXX - Only the CPPC support complies at the moment. + */ struct hwpstate_softc { device_t dev; u_int flags; @@ -354,35 +360,78 @@ sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) return (error); } + +struct set_cppc_request_cb { + struct hwpstate_softc *sc; + uint64_t request; + uint64_t mask; + int res; /* 0 or HWP_ERROR_CPPC_REQUEST_WRITE */ +}; + static void -set_epp(device_t hwp_device, u_int val) +set_cppc_request_cb(void *args) { - struct hwpstate_softc *sc; + struct set_cppc_request_cb *const data = args; + uint64_t *const req = &data->sc->cppc.request; + int error; - sc = device_get_softc(hwp_device); - if (BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->cppc.request) == val) - return; - SET_BITS_VALUE(sc->cppc.request, AMD_CPPC_REQUEST_EPP_BITS, val); - x86_msr_op(MSR_AMD_CPPC_REQUEST, - MSR_OP_RENDEZVOUS_ONE | MSR_OP_WRITE | - MSR_OP_CPUID(cpu_get_pcpu(hwp_device)->pc_cpuid), - sc->cppc.request, NULL); + *req &= ~data->mask; + *req |= data->request & data->mask; + + error = wrmsr_safe(MSR_AMD_CPPC_REQUEST, *req); + data->res = error == 0 ? 0 : HWP_ERROR_CPPC_REQUEST_WRITE; +} + +static inline void +set_cppc_request_send_one(struct set_cppc_request_cb *const data, device_t dev) +{ + const u_int cpuid = cpu_get_pcpu(dev)->pc_cpuid; + + data->sc = device_get_softc(dev); + smp_rendezvous_cpu(cpuid, smp_no_rendezvous_barrier, + set_cppc_request_cb, smp_no_rendezvous_barrier, data); +} + +static int +set_cppc_request(device_t hwp_dev, uint64_t request, uint64_t mask) +{ + struct set_cppc_request_cb data = { + .request = request, + .mask = mask, + /* 'sc' filled by set_cppc_request_send_one(). */ + }; + int error; + + if (hwpstate_pkg_ctrl_enable) { + const devclass_t dc = devclass_find(HWP_AMD_CLASSNAME); + const int units = devclass_get_maxunit(dc); + + error = 0; + for (int i = 0; i < units; ++i) { + const device_t dev = devclass_get_device(dc, i); + + set_cppc_request_send_one(&data, dev); + if (data.res != 0) + /* Note the error, but continue. */ + error = EFAULT; + } + } else { + set_cppc_request_send_one(&data, hwp_dev); + error = data.res != 0 ? EFAULT : 0; + } + + return (error); } static int sysctl_epp_handler(SYSCTL_HANDLER_ARGS) { - device_t dev, hwp_dev; - devclass_t dc; - struct hwpstate_softc *sc; const u_int max_epp = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, (uint64_t)-1); + const device_t dev = oidp->oid_arg1; + struct hwpstate_softc *const sc = device_get_softc(dev); u_int val; int error = 0; - int cpu; - - dev = oidp->oid_arg1; - sc = device_get_softc(dev); /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ check_cppc_enabled(sc, __func__); @@ -398,14 +447,9 @@ sysctl_epp_handler(SYSCTL_HANDLER_ARGS) } val = (val * max_epp) / 100; - if (hwpstate_pkg_ctrl_enable) { - dc = devclass_find(HWP_AMD_CLASSNAME); - CPU_FOREACH(cpu) { - hwp_dev = devclass_get_device(dc, cpu); - set_epp(hwp_dev, val); - } - } else - set_epp(dev, val); + error = set_cppc_request(dev, + BITS_WITH_VALUE(AMD_CPPC_REQUEST_EPP_BITS, val), + BITS_WITH_VALUE(AMD_CPPC_REQUEST_EPP_BITS, -1)); end: return (error); From nobody Wed Feb 11 20:44:03 2026 X-Original-To: dev-commits-src-main@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 4fB9QD2Ltpz6SBQ2 for ; Wed, 11 Feb 2026 20:44:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QC6sBGz3PRy for ; Wed, 11 Feb 2026 20:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842644; 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=L9VcGKmVGCSWzSfYybzZI2jFhOCrhwtwPdhJpupla28=; b=byVbLNFFHWw1FG/4QU19i0I0WIFFVetuJAdhDFApDVIzZfnUZsEEvNp4X3zcoe+czkCuiW kDwGLePDRPBQ+MXpzIDwrSjohtWaVW5cnMvlm55M455pnaTynvSQ8LbbpqIp1aHPSCtLDs snK8W9yIHutRWr9QZK0HGJo+1hb1GcSsNmMgehaItyqjZmyzbQNmyyhRVUwM3tV2jnG49z wtYI7GCShc4Ah5Njf3Ve18Ao4t6hvjX/+p9opLawZeCgfdVOBwhjmY77x4Zw+B/UVhe0y6 4vC1SMm5TQETxWgAvf3t4cROaNHy6PwmfgIzwd7BPMCgk88s8aJt7UBpGOxd+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842644; a=rsa-sha256; cv=none; b=c0YETb9WsRDeT0fS+q9lqvzfLZnSxsv23QEf3GeiC9y4QY2wRfxFUV67Mgjv9bMS+pUslz VeOmNRnq1TShTR2HR85LYUWAk+3Henvl97laGrXt638yqXw9L+roRmWBY1UU5VsoU+WkfJ 8FNkH0Q/GJIavzs4773jAMGMHbxBRFtlHKs3484WlJKg6MeLk+OCfvAYVfHUFaM9yRMioG 8hGnB0Y405hyDlX91r6Ip8avf5IJtXmbMPJX+824s0DxCoXjj/h/x5KRjvmFEyRT2AmqWL 3AexRyOEsVlSKOMIIz8mSIqPLwbh/Q0KCXX/PZKzm+mKzaeX7CPggY81DNSCoA== 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=1770842644; 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=L9VcGKmVGCSWzSfYybzZI2jFhOCrhwtwPdhJpupla28=; b=cQUQzKxFIB/Y3Ukz2huzthouKGlkUSboQwao1ATylyM5UlIMSEnYIWi8rQefq7/dav3isU kGS6RatAHLXoYPdjTk0vKX5Qy8zKddn+rDAbi9rvcyMuvGQjFV10eGPzroyrAto4BfZ46n z/lqgTNtjyk+B1DH1Qef23jftvQmoshF1Ek6o/4wF04b2VXdJ5u3Qv1fB+A2OGwYiUcx0R ViQWQ0j6P6In9D/1eGZDrooiF+eaab6eN+VHH8qYdxpv555W5yioJrdAeqqPzcsaRZalFv cbp3KzLARl4VhEkmlJzgwbJ6iJnvc4ymNgZmwqp0dVYt2WVHJunl+8MLaTuAWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QC6PSyz153P for ; Wed, 11 Feb 2026 20:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46046 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 951788e3733e - main - hwpstate_amd(4): 'epp' sysctl leaf to operate on real EPP hardware values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 951788e3733e415ca4721c0a63454937dcb29b2c Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:03 +0000 Message-Id: <698cea13.46046.5ecd1411@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=951788e3733e415ca4721c0a63454937dcb29b2c commit 951788e3733e415ca4721c0a63454937dcb29b2c Author: Olivier Certner AuthorDate: 2026-01-27 11:44:29 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:21 +0000 hwpstate_amd(4): 'epp' sysctl leaf to operate on real EPP hardware values We were using percents, for compatibility with hwpstate_intel(4), but this looses granularity that might be important in some scenarios or with specific CPU models. For consistency, hwpstate_intel(4) should be changed accordingly, at the expense of breaking compatibility. For release notes: Introduction of hwpstate_amd(4) deserves a release note, even if the original commit was not tagged. Functionality introduced by recent commits tagged with "Relnotes" should be mentioned along that one. PR: 292615 Reviewed by: aokblast Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55009 --- sys/x86/cpufreq/hwpstate_amd.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 18d420dc7747..c35fe0719d74 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -428,30 +428,25 @@ sysctl_epp_handler(SYSCTL_HANDLER_ARGS) { const u_int max_epp = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, (uint64_t)-1); - const device_t dev = oidp->oid_arg1; + const device_t dev = arg1; struct hwpstate_softc *const sc = device_get_softc(dev); u_int val; - int error = 0; + int error; /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ check_cppc_enabled(sc, __func__); - val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->cppc.request) * 100 / - max_epp; + val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->cppc.request); + error = sysctl_handle_int(oidp, &val, 0, req); if (error != 0 || req->newptr == NULL) - goto end; - if (val > 100) { - error = EINVAL; - goto end; - } - val = (val * max_epp) / 100; + return (error); + if (val > max_epp) + return (EINVAL); error = set_cppc_request(dev, BITS_WITH_VALUE(AMD_CPPC_REQUEST_EPP_BITS, val), BITS_WITH_VALUE(AMD_CPPC_REQUEST_EPP_BITS, -1)); - -end: return (error); } @@ -924,7 +919,7 @@ hwpstate_attach(device_t dev) "epp", CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, sysctl_epp_handler, "IU", "Efficiency/Performance Preference " - "(range from 0, most performant, through 100, most efficient)"); + "(range from 0, most performant, through 255, most efficient)"); } return (cpufreq_register(dev)); } From nobody Wed Feb 11 20:43:59 2026 X-Original-To: dev-commits-src-main@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 4fB9QD68snz6SBnL for ; Wed, 11 Feb 2026 20:44:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QD4qdrz3PVp for ; Wed, 11 Feb 2026 20:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842644; 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=NevUR4YUHj3sJ7sNzzP6cN8IxDiD2BRe67TvGYjGhC4=; b=QUSh/UfthSq0RGBRCCw8YbA29TaBccVI1ZcXx79+yvXF8rjtgBE8JesimoxFKO9iGRcWwP yywtIfVhQcbxvBEHXOqEeYt0CHjdwGDGigtowHH84HwcRNKkyEYP78fk2WUOHrQB0HzmFt SwX3rylI8Kn+XXR3DhV0zIWOY4BZLQ6A10a8aolq2i1dV59+gTYA/TyO7VQW5pGRfqFzgr YfAiaVdA73aaooNPO97akc1752O/j5fOgHSi9ieesPjrTtw8poQrXzfuR3V5+mo07wySLG MykLkMy7znFOAYGiIhaY7VMEJ/pbTWYBGJBQGrH+OAusvdjHM4xj1TLUzlfmXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842644; a=rsa-sha256; cv=none; b=chTUHS3Hsn2xW9jEZb+KGAxGJ++mKWlpE5xffiE0yT1FXRbnLbET5QAtv6cZH9tCv420sd zg/jDaW/OJNkUNplcxqtvMB3bW+MwOe3aYWkFBLyjUcg7MTpOvfGOE1xuAUgbRL4B0XDML 9gb7AH9dH900tiSD8lXpqMfRyRc8uFSiWg6QE+TYFubp/S/H9lOMAJcIuN7OFjulppPtxV 8067crBG9KEIxI8KFP7IOteGPkMYzbJW5kNHaS8gydY9X0nFCmYzDDMPJ5ioEBPsvFOvly pZWGCncGNvWJMz2ZVBox4+iV4//IU16jyeQW75p1lnZk2P0u7kNxkGrrrsGz/Q== 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=1770842644; 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=NevUR4YUHj3sJ7sNzzP6cN8IxDiD2BRe67TvGYjGhC4=; b=GYWaPe2oeHQ1T2ZK10wvWzFoXRMU02dcw111o4WxCdCqD8n3pvRgY+MNta1IcJltBM9IGr seB0xdpElypDkRWKGxSzbiy6brQWkuZ3wh0Hqu3uAW45DLovUgBhMWP/p4ACa0xpJNctcg uEhD7e1p2eiKFnjsSnh6quRjP6wddMnW1crANKNY6zNkYOiqd/K179c7kuPUMv+0LFvCJg mwGa6xM0Qqz+ph7dU92HhypQq5i2SJMKV71y1UVRa7yGYMpixglHQkQrI6jD1ARXPsDNYi LXvaRiSxh9BGLSFZbAhD2ad7/2tNNAWH34wF4S/mPqR2mYvV4iHihxtjgUIubQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9Q73sHpz14R4 for ; Wed, 11 Feb 2026 20:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 181e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:43:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 8aac1e9b028e - main - hwpstate_amd(4): Register dump: Fine-grained error reporting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aac1e9b028e5bd2e249023687effd98739358a6 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:43:59 +0000 Message-Id: <698cea0f.181e6.21bb59f2@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8aac1e9b028e5bd2e249023687effd98739358a6 commit 8aac1e9b028e5bd2e249023687effd98739358a6 Author: Olivier Certner AuthorDate: 2026-01-29 16:23:54 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:42:15 +0000 hwpstate_amd(4): Register dump: Fine-grained error reporting If some of the registers cannot be read, report that but continue trying reading the others. This also has the side benefit of simplifying code. While here, use sbuf_new_for_sysctl(), and rename 'res' and 'ret', which are to contain error values, to 'error'. While here, remove the test on getting the per-cpu structure, as if it is not present we would have already crashed on device attach. While here, fix format for printing the CPU ID. PR: 292615 Reviewed by: aokblast (older version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55005 --- sys/x86/cpufreq/hwpstate_amd.c | 112 ++++++++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 40 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index e8499f2e3c88..ac0d9c9e49b0 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -86,6 +86,7 @@ #define MSR_AMD_CPPC_STATUS 0xc00102b4 #define MSR_AMD_CPPC_CAPS_1_NAME "CPPC_CAPABILITY_1" +#define MSR_AMD_CPPC_ENABLE_NAME "CPPC_ENABLE" #define MSR_AMD_CPPC_REQUEST_NAME "CPPC_REQUEST" #define MSR_AMD_PWR_ACC 0xc001007a @@ -216,11 +217,26 @@ check_cppc_enabled(const struct hwpstate_softc *const sc, const char *const func ": %s() called but PSTATE_CPPC not set", func)); } +/* + * Internal errors conveyed by code executing on another CPU. + */ +#define HWP_ERROR_CPPC_ENABLE (1 << 0) +#define HWP_ERROR_CPPC_CAPS (1 << 1) +#define HWP_ERROR_CPPC_REQUEST (1 << 2) +#define HWP_ERROR_CPPC_REQUEST_WRITE (1 << 3) + +static inline bool +hwp_has_error(u_int res, u_int err) +{ + return ((res & err) != 0); +} + struct get_cppc_regs_data { uint64_t enable; uint64_t caps; uint64_t req; - int res; + /* HWP_ERROR_CPPC_* except HWP_ERROR_*_WRITE */ + u_int res; }; static void @@ -245,6 +261,14 @@ print_cppc_caps_1(struct sbuf *const sb, const uint64_t caps) AMD_CPPC_CAPS_1_LOWEST_PERF_BITS, caps); } +#define MSR_NOT_READ_MSG "Fault on read" + +static void +print_cppc_no_caps_1(struct sbuf *const sb) +{ + sbuf_printf(sb, MSR_AMD_CPPC_CAPS_1_NAME ": " MSR_NOT_READ_MSG "\n"); +} + static void print_cppc_request(struct sbuf *const sb, const uint64_t request) { @@ -260,66 +284,74 @@ print_cppc_request(struct sbuf *const sb, const uint64_t request) AMD_CPPC_REQUEST_MAX_PERF_BITS, request); } +static void +print_cppc_no_request(struct sbuf *const sb) +{ + sbuf_printf(sb, MSR_AMD_CPPC_REQUEST_NAME ": " MSR_NOT_READ_MSG "\n"); +} + static void get_cppc_regs_cb(void *args) { struct get_cppc_regs_data *data = args; + int error; + + data->res = 0; + + error = rdmsr_safe(MSR_AMD_CPPC_ENABLE, &data->enable); + if (error != 0) + data->res |= HWP_ERROR_CPPC_ENABLE; + + error = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data->caps); + if (error != 0) + data->res |= HWP_ERROR_CPPC_CAPS; - data->res = rdmsr_safe(MSR_AMD_CPPC_ENABLE, &data->enable); - if (data->res == 0) - data->res = rdmsr_safe(MSR_AMD_CPPC_CAPS_1, &data->caps); - if (data->res == 0) - data->res = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &data->req); + error = rdmsr_safe(MSR_AMD_CPPC_REQUEST, &data->req); + if (error != 0) + data->res |= HWP_ERROR_CPPC_REQUEST; } static int sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) { - device_t dev; - struct pcpu *pc; + const struct hwpstate_softc *const sc = arg1; + const device_t dev = sc->dev; + const u_int cpuid = cpu_get_pcpu(dev)->pc_cpuid; struct sbuf *sb; - struct hwpstate_softc *sc; - struct get_cppc_regs_data request; - uint64_t data; - int ret; + struct sbuf sbs; + struct get_cppc_regs_data data; + int error; - sc = (struct hwpstate_softc *)arg1; /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ check_cppc_enabled(sc, __func__); - dev = sc->dev; - pc = cpu_get_pcpu(dev); - if (pc == NULL) - return (ENXIO); - - sb = sbuf_new(NULL, NULL, 1024, SBUF_FIXEDLEN | SBUF_INCLUDENUL); - sbuf_putc(sb, '\n'); - smp_rendezvous_cpu(pc->pc_cpuid, smp_no_rendezvous_barrier, - get_cppc_regs_cb, smp_no_rendezvous_barrier, &request); - ret = request.res; - if (ret) - goto out; + sb = sbuf_new_for_sysctl(&sbs, NULL, 0, req); - data = request.enable; - sbuf_printf(sb, "CPU%d: HWP %sabled\n", pc->pc_cpuid, - ((data & 1) ? "En" : "Dis")); - if (data == 0) - goto out; + smp_rendezvous_cpu(cpuid, smp_no_rendezvous_barrier, get_cppc_regs_cb, + smp_no_rendezvous_barrier, &data); - data = request.caps; - print_cppc_caps_1(sb, data); + if (hwp_has_error(data.res, HWP_ERROR_CPPC_ENABLE)) + sbuf_printf(sb, "CPU%u: " MSR_AMD_CPPC_ENABLE_NAME ": " + MSR_NOT_READ_MSG "\n", cpuid); + else + sbuf_printf(sb, "CPU%u: HWP %sabled (" MSR_AMD_CPPC_REQUEST_NAME + ": %#" PRIx64 ")\n", cpuid, data.enable & 1 ? "En" : "Dis", + data.enable); - data = request.req; - print_cppc_request(sb, data); + if (hwp_has_error(data.res, HWP_ERROR_CPPC_CAPS)) + print_cppc_no_caps_1(sb); + else + print_cppc_caps_1(sb, data.caps); -out: - if (ret == 0) - ret = sbuf_finish(sb); - if (ret == 0) - ret = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb)); + if (hwp_has_error(data.res, HWP_ERROR_CPPC_REQUEST)) + print_cppc_no_request(sb); + else + print_cppc_request(sb, data.req); + + error = sbuf_finish(sb); sbuf_delete(sb); - return (ret); + return (error); } static void From nobody Wed Feb 11 20:44:05 2026 X-Original-To: dev-commits-src-main@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 4fB9QF2N6Dz6SBnP for ; Wed, 11 Feb 2026 20:44:05 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QF0WCWz3PdS for ; Wed, 11 Feb 2026 20:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842645; 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=PznTY2yrpTrhpFJsH3BqDqg2GcxmIv6j4SSJ9bEEFeM=; b=F1nX1ZB2FCMvThWoSoYDkr1bB4ggh6ROgcBSB0KoQn5N7J3biuRycfsveN8XAQ3M8zHSON Ce7Y9tCEqX6LYUg+xPuu2Z3WALzWLFCgBhcJN46/mqfd3O3ErFG1KEC5hYLr8QzHyMssWI bwoX8M9tkHQGfvpf2V8sZGRHt2V89CzxL+cLWoVTSr+7MakS0MMcryWyR/a+Svoxz6bquX EAzexpTJFE3zhyosCgaI2T9r6nNylzB0KFK+ghHeTJZQuvga0qEVSsl+aUizK7QpOldq18 L+vS2TG4HyvAsQdSnL2HLEQo37ro+dwMAts19NKbt3pPWJBDs3awJYJASgYfHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842645; a=rsa-sha256; cv=none; b=kYqKARmWThypuAcpxgm+P9QlU03cr5fkXVghxLMbNZAvdiC56QliPUHyNbUNvD1gx9Y/4A FqLy023wDEP5aNhuvzKnPM9XCEGtwX7t/D/2L0rXstLQXSa5IqzH7ri3q5Him2a9nO/41u MEmEA1L5sAmYZns5VpSpwHXhmo4+GsyZhWtIUna0FWeRfLDcP4WKiKr+VHNWv8jdefC4YY NgK+oedF5zflTRYJGRpaie9BJXqk/BnbSfHA/DA3xauccCWaSqmXuu3rJycaMfR+eJBLMp tZAwYAMu93s0cCaw0pjatKXApgUXhvQy5M0LZX9e+B5WyXVWLC2p8Kg61cjmuA== 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=1770842645; 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=PznTY2yrpTrhpFJsH3BqDqg2GcxmIv6j4SSJ9bEEFeM=; b=aiqj2vWgtxB3Luk0zHa4obU3iIAaEYjOYzhAIRTH5WDGmsx7KvWtUxIMwABkLIJOUZkLgc N6el8hoIHqV9f0gimE3Y+ReKIc87sOFWbj8KS6c0DcmnwtyPJOU9VVvL55J2O39Z+3+5dK DHPMU6BoX+A9PfQZ+KZAtaQNv5VI1nQJVLTL/sGmNFIAPthq4i8s46NisDXfSKAIs5AR5t d7qJSdlLglWCAorU+ttJRDILwyrZzCpM47bqyQfOIF79a082bdBFcQ8R2iueq+0APNnd6Q R3mYVXsVeEfmixvvhp6Qo2vE/3hhHRguDsZDPm13GGrINeClvXDDN59Vi0Mgqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QF05ZDz14ZT for ; Wed, 11 Feb 2026 20:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4696e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 7689e68506a9 - main - hwpstate_amd(4): Add knobs to get/set all fields of CPPC_REQUEST List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7689e68506a900de4ba79924d781f092bb9d0335 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:05 +0000 Message-Id: <698cea15.4696e.1774e156@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=7689e68506a900de4ba79924d781f092bb9d0335 commit 7689e68506a900de4ba79924d781f092bb9d0335 Author: Olivier Certner AuthorDate: 2026-01-27 12:39:40 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:21 +0000 hwpstate_amd(4): Add knobs to get/set all fields of CPPC_REQUEST This will allow experimentations and finer-grained tuning to the full extent allowed by the hardware, which is especially important given that the spec leaves to hardware implementors an important leeway in interpreting CPPC's numeric parameters, causing the same settings to have different effects on different CPU models. PR: 292615 Reviewed by: aokblast (older version) Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55010 --- sys/x86/cpufreq/hwpstate_amd.c | 54 ++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index c35fe0719d74..3a5652a8361f 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -424,10 +424,9 @@ set_cppc_request(device_t hwp_dev, uint64_t request, uint64_t mask) } static int -sysctl_epp_handler(SYSCTL_HANDLER_ARGS) +sysctl_cppc_request_field_handler(SYSCTL_HANDLER_ARGS) { - const u_int max_epp = - BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, (uint64_t)-1); + const u_int max = BITS_VALUE(arg2, (uint64_t)-1); const device_t dev = arg1; struct hwpstate_softc *const sc = device_get_softc(dev); u_int val; @@ -436,17 +435,16 @@ sysctl_epp_handler(SYSCTL_HANDLER_ARGS) /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ check_cppc_enabled(sc, __func__); - val = BITS_VALUE(AMD_CPPC_REQUEST_EPP_BITS, sc->cppc.request); + val = BITS_VALUE(arg2, sc->cppc.request); error = sysctl_handle_int(oidp, &val, 0, req); if (error != 0 || req->newptr == NULL) return (error); - if (val > max_epp) + if (val > max) return (EINVAL); - error = set_cppc_request(dev, - BITS_WITH_VALUE(AMD_CPPC_REQUEST_EPP_BITS, val), - BITS_WITH_VALUE(AMD_CPPC_REQUEST_EPP_BITS, -1)); + error = set_cppc_request(dev, BITS_WITH_VALUE(arg2, val), + BITS_WITH_VALUE(arg2, -1)); return (error); } @@ -916,10 +914,42 @@ hwpstate_attach(device_t dev) SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "epp", CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, dev, 0, - sysctl_epp_handler, "IU", - "Efficiency/Performance Preference " - "(range from 0, most performant, through 255, most efficient)"); + "epp", CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, + dev, AMD_CPPC_REQUEST_EPP_BITS, + sysctl_cppc_request_field_handler, "IU", + "Efficiency/Performance Preference (from 0, " + "most performant, to 255, most efficient)"); + + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "minimum_performance", + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, + dev, AMD_CPPC_REQUEST_MIN_PERF_BITS, + sysctl_cppc_request_field_handler, "IU", + "Minimum allowed performance level (from 0 to 255; " + "should be smaller than 'maximum_performance'; " + "effective range limited by CPU)"); + + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "maximum_performance", + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, + dev, AMD_CPPC_REQUEST_MAX_PERF_BITS, + sysctl_cppc_request_field_handler, "IU", + "Maximum allowed performance level (from 0 to 255; " + "should be larger than 'minimum_performance'; " + "effective range limited by CPU)"); + + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "desired_performance", + CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, + dev, AMD_CPPC_REQUEST_DES_PERF_BITS, + sysctl_cppc_request_field_handler, "IU", + "Desired performance level (from 0 to 255, " + "0 enables autonomous mode, otherwise value should be " + "between 'minimum_performance' and 'maximum_performance' " + "inclusive)"); } return (cpufreq_register(dev)); } From nobody Wed Feb 11 20:44:06 2026 X-Original-To: dev-commits-src-main@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 4fB9QG35ZHz6SBqh for ; Wed, 11 Feb 2026 20:44:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QG1JS8z3PSM for ; Wed, 11 Feb 2026 20:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842646; 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=oSKyn+9JRTkkYiBsdo/gBz5nAXdc51i2cW1GuNqZs8c=; b=Y2dE0dfUlXLFHYtZU0KDXUzk+UVRLnLXkWDCeuieVPtP1hoAR7mcAHcdGigJ0a5syv8b3V m9o6X2yIuu9QhK9yMB3wXGu/ivzO+vL2G93MUmmNtQjHngAEFzl0wu/W+Du7DTqLtOIWSX QYkXjv2yckocdcTOdaindmlJZOPiNXniPFOWWsBBEDWUXAdgkLEJE68xwKU3F5NYo5SnDV gJ+7E/aGwid2DSmoh/GY1+L0+4zqrh+oMWtA7+XAH0MRvHhlOL1XkzJVdK/9BhODrPQkzG 6gGRBaa8Nx7tAncXcppvxdlT/rp6llVHJNJQ4Ggr19h0X4oP8Cljn4+G2DciDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842646; a=rsa-sha256; cv=none; b=WL6OgFGaWxx4r/n2pVpCa1ELVqvVcojj8MGbS0pka9CM5SRg0vB4uL3F2j0GXhGoW48osh yzpqxv5tsyN5/S6N081mrSIlT6VwO7ivF9XA6Ez5c398jpLI0b6fCYHYp5aqmW89P3PxBb jlBDWUYVCFZW4SVHriPPFxypxvlBmu6Ht7QXr83c2BM2L/Nk8yeMTP95f99vC6iahh2vJi iq4elRoNhct2kL9wUBSA+ePFXkyKRzLuia8AaVe+1k3LyS5aCUABZIw06Tpa/nzWyDBmBK wWp+CpMM0AdQj14r8rXSx4eJIlR54HoFeiN5S7AQExVtdUL4W3yHb/Halu9meg== 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=1770842646; 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=oSKyn+9JRTkkYiBsdo/gBz5nAXdc51i2cW1GuNqZs8c=; b=CXMla12nDBIqA92E0g8eRTyBTk3epWLF0W2jUdHArakh/JtrCI1uhNCXNAd9Uo7m1Pg+cS eAe+lHlqr00Z3aXswJYVx9EnE0CoWLeGnjJF7GD9v/2qoi/F3nmpQc2trEw3rCaJh3+DQ9 oV9O/oi6YF+EDWI6uzc03Btl1sh48c/bGWJ6LyKqKPXt5nrQ4rLVZao/N/25BpS/yETJ2w gS9M9uklxFcUwSAnzeDbLX+HhP8CYeNNOAXCANh4kE8Yef8IQG/TWANfsSFWeTa4POR7mm +g5jOCxRzwqEyVycv+uWRGWg/RFLzQS2cBTK26LcJhU2dLEQycARtYWvdA3A1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QG0rX5z14xq for ; Wed, 11 Feb 2026 20:44:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47726 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: cec0ab05866e - main - hwpstate_amd(4): Style: Sort headers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cec0ab05866e664e7d7636cdadc782a4ca824bd2 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:06 +0000 Message-Id: <698cea16.47726.16186ce9@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=cec0ab05866e664e7d7636cdadc782a4ca824bd2 commit cec0ab05866e664e7d7636cdadc782a4ca824bd2 Author: Olivier Certner AuthorDate: 2026-01-29 22:22:35 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:21 +0000 hwpstate_amd(4): Style: Sort headers And separate includes from the rest with an additional newline. Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 3a5652a8361f..058d20449d48 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -52,17 +52,17 @@ #include #include #include -#include #include -#include +#include #include +#include #include -#include #include +#include #include -#include #include +#include #include #include @@ -74,6 +74,7 @@ #include "acpi_if.h" #include "cpufreq_if.h" + #define MSR_AMD_10H_11H_LIMIT 0xc0010061 #define MSR_AMD_10H_11H_CONTROL 0xc0010062 #define MSR_AMD_10H_11H_STATUS 0xc0010063 From nobody Wed Feb 11 20:44:07 2026 X-Original-To: dev-commits-src-main@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 4fB9QJ0GYlz6SBSk for ; Wed, 11 Feb 2026 20:44:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QH2GsXz3PSj for ; Wed, 11 Feb 2026 20:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842647; 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=35/+cxAlh2sNQu9nJw2lEwXFRdllgZPNA0iHT6rzEx4=; b=wctXkSuAxxupL/K6K+SeNGVnkHZt10Cz28/g5V67VCm22GpfJ7GKbKVF5j0oFhIYKxXwwg QxDESv+6JxZ9HOXZeRXw7xJqF5jIbykpo51hSnhn0BC2BNfB2lvuaFcQ7ASkklPd4TtpYq H5P8s97dRGFwqUN1BN7QZG6kKQOjssF8GXEAgGNBC50JLIakflDK5FM0H4i1f5bwQYmUnY V+o772/ijwJY9fG0Gnn97T1BLrWbKtXmfo117WwGJcwX/sYZyT4VVx90Xx7JbxfsA0mYZ2 jaLkHOuS1sSPrMAa3ahpJ+3L5vIUmeP0oND/uLQpw5hYRU/DS6Hy16qSZIybLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842647; a=rsa-sha256; cv=none; b=rM5LK/DkvgjBghfOafHIHLbh0I/GYhL6iE7M5LlmfqvUP772VAwZY3xv82xir5wJe9+S5e gb2apL3269XaThL0qXVn6Nj8dIGTdEBg43RVeKj6N4+HF4ljQdBgNOnhZXyF9kElbmZNuW K2Sq/CIphEcWfbRGtxSKK8/OeDAILRTGHpCS7tgbeCQY06Y5wRG+6iFOf659UbCbIJ1PVB W/I+uZEZgYheM3M3Z98YSBADOO2P98PLjb3/LNcnz4eskN5hNMzyWrLBVIo2guhIfayrbf dodr/ANuzCqztvfzZero4DEp576jiEz3GU+loi8wcZOpEiiuE2OmxmwqUBk4hQ== 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=1770842647; 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=35/+cxAlh2sNQu9nJw2lEwXFRdllgZPNA0iHT6rzEx4=; b=CpAjkiWTUebyzWxW2/o7ntmqCOzU2FkttNVzJbPtzGtw9zCktOrx4/C4HUQ0RgVh9Nnpc2 Fz1UxaBDmosIWuLg9n3WdyvLteiHhMnte/yDvr+pGhQA7ZaFJmpcrLbYl4tkezgBTckXN9 ga5gyraOWM3yUl4HBFVcIEdkJ7WUSULsk7QfwbiKRNQYXTsnv/NajnVb9f1t/TNtlGl4jD xIfaHQGFNWJmz+GVm5n9+FoTzba/p/E28SfQ02UI3quXsELfYNR3PXur2PqNAgRBvJ58cM r75BwjDaTqIku0OsqZwYNs956FWnOPkjwU/Wgd+/pTyqpkt81XXAGpJf7XDF5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QH1Zjxz15L2 for ; Wed, 11 Feb 2026 20:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4772a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: a78e7c22c5d7 - main - hwpstate_amd(4): Update copyright List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a78e7c22c5d7463577e87a31024df079f7282d01 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:07 +0000 Message-Id: <698cea17.4772a.4e43e35f@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=a78e7c22c5d7463577e87a31024df079f7282d01 commit a78e7c22c5d7463577e87a31024df079f7282d01 Author: Olivier Certner AuthorDate: 2026-01-29 22:26:19 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:22 +0000 hwpstate_amd(4): Update copyright Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 058d20449d48..255e47e21256 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -9,6 +9,11 @@ * Copyright (c) 2009 Norikatsu Shigemura * Copyright (c) 2008-2009 Gen Otsuji * Copyright (c) 2025 ShengYi Hung + * Copyright (c) 2026 The FreeBSD Foundation + * + * Portions of this software were developed by Olivier Certner + * at Kumacom SARL under sponsorship from the FreeBSD + * Foundation. * * This code is depending on kern_cpu.c, est.c, powernow.c, p4tcc.c, smist.c * in various parts. The authors of these files are Nate Lawson, From nobody Wed Feb 11 20:44:08 2026 X-Original-To: dev-commits-src-main@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 4fB9QJ5fRxz6SBnV for ; Wed, 11 Feb 2026 20:44:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QJ2tl6z3PhN for ; Wed, 11 Feb 2026 20:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842648; 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=/b/ZGZJUujOwfftbeowZKS/kuvt0hhUwNo3/bKDD6tY=; b=TFBJO4LL0I7k/zLyGSAAr8zYfcxBzdaSYKuT/upttISiAN/QCCnPK51hZ4gmFAKtG/jXSq pjNslMZVzU72sCuoJwce/wb9J3KGgPeL/n5DKuWWotHZ6THAjnHsEJ7toH/74xopb1k/ab pLGVgP389Uhqt01rnlPP+vHiDm/5uLqmi+cHgtS8ymceW9SE8tIy6WeBuOlzZjgB6YvNEC t0TeCzFPZMdjkZ13x+fLfXNJHLWn3mtuUn8SgLvYMo8lW2/qwtCDsrNwhQUFQHGcH0wu/E YRsJi+vL6rS+obCmrOHgJ7PO+KxC3Koj4cSxFFYAiGX99rFsXsQy5BBEhA/Lpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842648; a=rsa-sha256; cv=none; b=SK48DiJjo/ADPgSC/DHdAHjCVFVujEJg1vHLw6oSo1FH5hbrBlnX2XZinNV4eDyel43biK a+ZhVSmxYbTfpCdhOoHwuAfKJcwPUg9g7dAeGGaIBSUMW9rgJ6xNQHgkkTk2jMOG0XIcy5 7JloDUsUQfYMPVxTjQGSVkxkQoTUzr7/PzMu51Qu3pVsdG/llYNQcb6BReNqQd61XusIAn zz/isW5TFnvFqbwmBwnqOwJfoR8sUFqJaA6PBU+Jy1HSnM+7lQyADWmj7sFk3y+7rlm3zS 0eNtkEuTP4/N3fHyltD1Pkk/1JEDAiCRNahYxCLLVgsyLNEYkXdHenypXdjAAQ== 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=1770842648; 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=/b/ZGZJUujOwfftbeowZKS/kuvt0hhUwNo3/bKDD6tY=; b=h/puBFZ8npxfYEzHfNXXxiFbul14ZBu9C4Akr4Piokr0Smmh+8quxOxqzxjq4rhsE9Uwig Ihx2W5xO7T5anw6gscIKlTvrq2mLL0pSqSEDKSFro4187qwn7UO21izXNzXReKy+TQDf2X kU60fML0CMeehdalPDpqJ47u0KZJMAfy/SkvTPYiF9ZUwTMgsBrBpVjOdhblDDCbkcXdCd 2gZ/UQ2jJ8/biRqDh8AWFJuHxWwsDOWMzXztI0ek9B8bKAeEWCi2Elyzwdx0h4gOljZTMt KyP+YbzBkdsThL9yuJX0rETY9Tre2q+0wji/PEd92hZqkhUlGZlFT/Z9RU71rQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QJ2P9jz14R5 for ; Wed, 11 Feb 2026 20:44:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47c35 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4285340c604a - main - hwpstate_amd(4): Style: Align 'machdep.hwpstate_amd_cppc_enable' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4285340c604a4dea340bd6f0ec0d721b2155f0da Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:08 +0000 Message-Id: <698cea18.47c35.21583c4e@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4285340c604a4dea340bd6f0ec0d721b2155f0da commit 4285340c604a4dea340bd6f0ec0d721b2155f0da Author: Olivier Certner AuthorDate: 2026-02-09 18:03:12 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:22 +0000 hwpstate_amd(4): Style: Align 'machdep.hwpstate_amd_cppc_enable' Align it like the rest. No functional change (intended). Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 255e47e21256..6901327c9bb5 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -198,7 +198,7 @@ SYSCTL_BOOL(_debug, OID_AUTO, hwpstate_pstate_limit, CTLFLAG_RWTUN, "If enabled (1), limit administrative control of P-states to the value in " "CurPstateLimit"); -static bool hwpstate_amd_cppc_enable = true; +static bool hwpstate_amd_cppc_enable = true; SYSCTL_BOOL(_machdep, OID_AUTO, hwpstate_amd_cppc_enable, CTLFLAG_RDTUN, &hwpstate_amd_cppc_enable, 0, "Set 1 (default) to enable AMD CPPC, 0 to disable"); From nobody Wed Feb 11 20:44:09 2026 X-Original-To: dev-commits-src-main@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 4fB9QK6ckTz6SBnX for ; Wed, 11 Feb 2026 20:44:09 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QK3dxBz3Pn6 for ; Wed, 11 Feb 2026 20:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842649; 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=wawx9PRU5nFxmIYfcvZysqZyqtNL98tkIHarX7ppMU0=; b=b+VGcLEDomYVAHLjDr7PcGcSP4AbHzVOdZ19+btdmvuFHOU6XZ/Ys5bfTPBeTFroJp18B2 L9+/Fia6eFlupe7SnFa4dmvGVzHR4w7AiHtk8s88pINz3NXiJXnTOhDgtjZJ5RD9KI/c1k 9Wvbx18HW9BhuO0G5bTCRC7aVuI4OD12U0kUSHpPVbT7sANtnl19XII5FHIBsPjSBtz2ub 6QA+Fokn00ch5/YPcgMSMS/pu+NU9fA45HBTMOJr53aEMQN4HbXAoM753cwpF1Bbt42aaV yF4LShT9XqzmbEIqhr558cz5PB+okVSNWuf6FAI81ve3o35k6sJBYTEIacENAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842649; a=rsa-sha256; cv=none; b=d1orSkncI0gxEWQK1QI/n3df+LNYg8tvlx4AUPv/jN1NoscbjN7j8ZSaeuOlO6/IXhLvBO SyKv5l5VAjiD/JZkUH7h3q+ZIVBNUq9V7pUDIUuMGzJOoZaw54CfGMkFmg90ARg/UX1W+f gz1NnbaOVtgu/I/6RW+Ke6PHxI1XcEkPzTHCEweeYLp7Za4LJeUfJ7pTHsMCxq31p9+cXG bqYd0ANlNFKjlamxUPCwTrTOfoBPa16k7sm3tD0ms0RCQeWlIyht/mWKaqa/qIPRJfHQEF ywdPlbU2Cf86HD6RoxK4hhpLilDPLuCTJJL92Q+logH58kxXlmntr1TvNcnoOQ== 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=1770842649; 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=wawx9PRU5nFxmIYfcvZysqZyqtNL98tkIHarX7ppMU0=; b=b9D7wyfwMrTL/L8kLgzIUkK+ctrKEJo81XEOOnjVIdQkEPreWTpR3l/ZKYFpcQqsQ9zx0H ukFLfv5pHLJOIMD/uPafqLOXHzKFC1ODFFcRIpeUtKZMQuv4nolYBZXD3pXiV5Qjs/K86i zkciqGTJt3hjxJpXpQe8sEJ/sJ5nNtawIfo8TzZYkfQ1Y24E9iXnjgM2WMhbjzz2m6klTu l5b5x0ZUlDireJGP+/Io4eCciVYdKpx26C81+Z92G0EHQLNwO8eWuSANbkxN4FrX8J/d1Q wHgDrUllTtcp1bjO5XS5ItsIUrupPrEYsT65xa7NUpMHL/q5gqO7p97ax9YSeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QK3CG1z14ZV for ; Wed, 11 Feb 2026 20:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46972 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: ebcd80f76ed1 - main - hwpstate_amd(4): Rename PSTATE_CPPC internal flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebcd80f76ed117afa90419e5ac60cd558715f584 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:09 +0000 Message-Id: <698cea19.46972.64a7c0b4@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=ebcd80f76ed117afa90419e5ac60cd558715f584 commit ebcd80f76ed117afa90419e5ac60cd558715f584 Author: Olivier Certner AuthorDate: 2026-02-09 09:21:28 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:22 +0000 hwpstate_amd(4): Rename PSTATE_CPPC internal flag While here, also rename check_cppc_enabled() => check_cppc_in_use(). No functional change (intended). Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 6901327c9bb5..688b86e1ad35 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -149,9 +149,7 @@ struct hwpstate_setting { int pstate_id; /* P-State id */ }; -enum hwpstate_flags { - PSTATE_CPPC = 1, -}; +#define HWPFL_USE_CPPC (1 << 0) /* * Atomicity is achieved by only modifying a given softc on its associated CPU @@ -223,10 +221,10 @@ static device_method_t hwpstate_methods[] = { }; static inline void -check_cppc_enabled(const struct hwpstate_softc *const sc, const char *const func) +check_cppc_in_use(const struct hwpstate_softc *const sc, const char *const func) { - KASSERT((sc->flags & PSTATE_CPPC) != 0, (HWP_AMD_CLASSNAME - ": %s() called but PSTATE_CPPC not set", func)); + KASSERT((sc->flags & HWPFL_USE_CPPC) != 0, (HWP_AMD_CLASSNAME + ": %s() called but HWPFL_USE_CPPC not set", func)); } /* @@ -334,8 +332,8 @@ sysctl_cppc_dump_handler(SYSCTL_HANDLER_ARGS) struct get_cppc_regs_data data; int error; - /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ - check_cppc_enabled(sc, __func__); + /* Sysctl knob does not exist if HWPFL_USE_CPPC is not set. */ + check_cppc_in_use(sc, __func__); sb = sbuf_new_for_sysctl(&sbs, NULL, 0, req); @@ -438,8 +436,8 @@ sysctl_cppc_request_field_handler(SYSCTL_HANDLER_ARGS) u_int val; int error; - /* Sysctl knob does not exist if PSTATE_CPPC is not set. */ - check_cppc_enabled(sc, __func__); + /* Sysctl knob does not exist if HWPFL_USE_CPPC is not set. */ + check_cppc_in_use(sc, __func__); val = BITS_VALUE(arg2, sc->cppc.request); @@ -564,7 +562,7 @@ hwpstate_set(device_t dev, const struct cf_setting *cf) if (cf == NULL) return (EINVAL); sc = device_get_softc(dev); - if (sc->flags & PSTATE_CPPC) + if ((sc->flags & HWPFL_USE_CPPC) != 0) return (EOPNOTSUPP); set = sc->hwpstate_settings; for (i = 0; i < sc->cfnum; i++) @@ -590,7 +588,7 @@ hwpstate_get(device_t dev, struct cf_setting *cf) if (cf == NULL) return (EINVAL); - if (sc->flags & PSTATE_CPPC) { + if ((sc->flags & HWPFL_USE_CPPC) != 0) { pc = cpu_get_pcpu(dev); if (pc == NULL) return (ENXIO); @@ -626,7 +624,7 @@ hwpstate_settings(device_t dev, struct cf_setting *sets, int *count) if (sets == NULL || count == NULL) return (EINVAL); sc = device_get_softc(dev); - if (sc->flags & PSTATE_CPPC) + if ((sc->flags & HWPFL_USE_CPPC) != 0) return (EOPNOTSUPP); if (*count < sc->cfnum) @@ -654,7 +652,7 @@ hwpstate_type(device_t dev, int *type) sc = device_get_softc(dev); *type = CPUFREQ_TYPE_ABSOLUTE; - *type |= sc->flags & PSTATE_CPPC ? + *type |= (sc->flags & HWPFL_USE_CPPC) != 0 ? CPUFREQ_FLAG_INFO_ONLY | CPUFREQ_FLAG_UNCACHED : 0; return (0); @@ -832,7 +830,7 @@ hwpstate_probe(device_t dev) if (hwpstate_amd_cppc_enable && (amd_extended_feature_extensions & AMDFEID_CPPC)) { - sc->flags |= PSTATE_CPPC; + sc->flags |= HWPFL_USE_CPPC; device_set_desc(dev, "AMD Collaborative Processor Performance Control (CPPC)"); } else { @@ -846,7 +844,7 @@ hwpstate_probe(device_t dev) } sc->dev = dev; - if (sc->flags & PSTATE_CPPC) + if ((sc->flags & HWPFL_USE_CPPC) != 0) return (0); /* @@ -909,7 +907,7 @@ hwpstate_attach(device_t dev) int res; sc = device_get_softc(dev); - if ((sc->flags & PSTATE_CPPC) != 0) { + if ((sc->flags & HWPFL_USE_CPPC) != 0) { if ((res = amd_set_autonomous_hwp(sc))) return (res); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), @@ -1103,7 +1101,7 @@ hwpstate_detach(device_t dev) struct hwpstate_softc *sc; sc = device_get_softc(dev); - if (!(sc->flags & PSTATE_CPPC)) + if ((sc->flags & HWPFL_USE_CPPC) == 0) hwpstate_goto_pstate(dev, 0); return (cpufreq_unregister(dev)); } From nobody Wed Feb 11 20:44:10 2026 X-Original-To: dev-commits-src-main@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 4fB9QM0qD4z6SBwS for ; Wed, 11 Feb 2026 20:44:11 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QL4l6pz3PnG for ; Wed, 11 Feb 2026 20:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842650; 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=n26lkM/EkoymUk/rZwSuyHWrBbfaLKFJAZ+XNr9eB+k=; b=suhtX+Krs0Z5HT0XlYX1Zv1YERTNR+wZ8WP+0FTMWyHPywSldApzl4wbtxOfF0em5T+c6N MUBFFzuASV+90txT0cYyWFjbsdMaAAjaLdN5S0MX5XTBuH+9b53I1BguZpWnAbOyyQfTl0 7uvzvDZPojcqN9wIi8A9FvB8GnHZoxPBKWVFta8isQNVjniUJGb1PlPqK7aBI+dDLFdJxa h3O0Be653If4mgHI4eG4kDDg9EBVcGylcy0q/o9DjxAQfMu8Q8p5qithHiX3SN9Ysuz5Sn QTCSvBHDAQmhBc6mM3GSSTr9xZE+yDW94ZJZNuvrLRT5/11bX7JTpcNC5umr+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842650; a=rsa-sha256; cv=none; b=TFcEYCNStSPi9f3TWJdG8pSah1ad1fYtAJHoZNerOed2YIOyOY6g3TGvRKyeFBHAM/5x5Z 0+O2gsY/23Ab7Xj5finiBsGfZjiRHiOuhjinQcstNKOAJlqxOLkdRf6qipBHbvhwI9Z+XI q989vowiyEClyl9GSIcNjfhz5/ZOrgmxk7TusBGhQrNxDD0uW44mHW5PeeGzrgGLgobAw2 B22+q49MFGPoZ/8WDq596tmd+rYu6je1DoVZjGb5Vs+pNfgANX30ORz6M7yjHW7bBxw+Fm Br+/4TTrz6uIdALnzK3dpskVd2LinXDYG5fOq65v+YLh5PA54C0gVobHra2M/w== 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=1770842650; 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=n26lkM/EkoymUk/rZwSuyHWrBbfaLKFJAZ+XNr9eB+k=; b=OD2yT3H12us+6OX+Uxz242RM+F/UIl4qEopUjicuZjsQXQPMEsbNaZ4rXgXWDVw0+YZBxk 6j6K9EuYlHAXJNEN13C5zncm2MRnd8iL7LrGC5dM0N/wVoyjW2TihtTbOtBPsQCv9MIAEw HD08mWyDYkuO+pIHkx6kpE2ORMXV9CodRtHzQczHUsiLWDQBoTTOiCnT1tFlJAagWBaDf0 AovplvlRFtbVVECRslNT/3xhVFulZgccbplc6asLWHkhfT/zwZqn8MTZF3uM8lpsl/8Fqh VOMXBHqjHPccQn2FrrKD3JD/MmlUwip1waBOBUP0HcBt37hV4j4x7i4ipnkzsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QL40J8z158n for ; Wed, 11 Feb 2026 20:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47a36 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c6a0eb7ada62 - main - hwpstate_amd(4): Rename '*set_autonomous_hwp*()' => 'enable_cppc*()' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6a0eb7ada62c7d6e7d4686b2fe32e009311c1aa Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:10 +0000 Message-Id: <698cea1a.47a36.19e8b501@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c6a0eb7ada62c7d6e7d4686b2fe32e009311c1aa commit c6a0eb7ada62c7d6e7d4686b2fe32e009311c1aa Author: Olivier Certner AuthorDate: 2026-02-09 09:30:53 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:23 +0000 hwpstate_amd(4): Rename '*set_autonomous_hwp*()' => 'enable_cppc*()' This is to better reflect that we are really enabling CPPC in these functions and because we are likely to stop activating CPPC autonomous mode by default in the near future. No functional change (intended). Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 688b86e1ad35..1548227faacf 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -698,7 +698,7 @@ struct set_autonomous_hwp_data { }; static void -amd_set_autonomous_hwp_cb(void *args) +enable_cppc_cb(void *args) { struct set_autonomous_hwp_data *const data = args; struct hwpstate_softc *const sc = data->sc; @@ -765,7 +765,7 @@ amd_set_autonomous_hwp_cb(void *args) } static int -amd_set_autonomous_hwp(struct hwpstate_softc *sc) +enable_cppc(struct hwpstate_softc *sc) { const device_t dev = sc->dev; const u_int cpuid = cpu_get_pcpu(dev)->pc_cpuid; @@ -775,7 +775,7 @@ amd_set_autonomous_hwp(struct hwpstate_softc *sc) data.sc = sc; smp_rendezvous_cpu(cpuid, smp_no_rendezvous_barrier, - amd_set_autonomous_hwp_cb, smp_no_rendezvous_barrier, &data); + enable_cppc_cb, smp_no_rendezvous_barrier, &data); if (hwp_has_error(data.res, HWP_ERROR_CPPC_ENABLE)) { device_printf(dev, "CPU%u: Failed to enable CPPC!\n", cpuid); @@ -908,7 +908,7 @@ hwpstate_attach(device_t dev) sc = device_get_softc(dev); if ((sc->flags & HWPFL_USE_CPPC) != 0) { - if ((res = amd_set_autonomous_hwp(sc))) + if ((res = enable_cppc(sc)) != 0) return (res); SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), SYSCTL_STATIC_CHILDREN(_debug), OID_AUTO, From nobody Wed Feb 11 20:44:11 2026 X-Original-To: dev-commits-src-main@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 4fB9QN1Mnjz6SBwX for ; Wed, 11 Feb 2026 20:44:12 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9QM5FfGz3PlH for ; Wed, 11 Feb 2026 20:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770842651; 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=NZEueyvb0TkfuDBlOmt7Bfd/olkxGChjxU7mT5RCwbY=; b=hJO8e52uHu+/ALjlFiwigx2/BI0O7zOx26CPyfcsUX9ZyZio6oCqKZaxLJw+H6t+esWNBW f89QUs/xH8Gh9xZ5PjbgZ/amVX/rv/oZd5VE0tANwmCAwMLJBlgPqXhxjBdIUE0XY10n+G IqK3TPE+xwjMrkj2vjmTNwO8ZdEAZ+MpyrlJ8S2soWxyRA9N6Z9qq/ebKZReVWbONw6yVq f6/SlujQAmXeniNZSbtitlEoqSL1okGu6MsMn2y/RJ3kloqtQGdn5e1atSwytZFiZcywML 016YfL1fbmA8VZsUjAuPlK1XW5BQelR8U1QqY6l918RWTY8xjnYTk8rd66g60g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770842651; a=rsa-sha256; cv=none; b=u2un0euYAOYF2KjTjGDZPOafn5qYubCYy1inluqWfcVOigeG7h8H475BY3huMyijvKy9WF XWCOXwvo8MQe5iplecx7hF1LtZTIs5inyS3H9v+JP/QOzJsbimBfjOIGZpoeuGlqZIp3Tn aBHO6fgKoXZXZB3OVUQZt8DkQhKtikER9HiV8YznY03xzD2c8cNIlzb70FnwRiZEOCrJNL 19rRL/E1li/eV+MNTbuYXbyaYtiIXZ2dJ4NB1UM83JokNjJoO4xy1fYb2/7AB5ubVCFz8l 1OQjlQL9dT0WriLip9Tv2jjW6iIIbX4WqdHdKRbRipJw3qzACefoR1UX9cHr9Q== 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=1770842651; 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=NZEueyvb0TkfuDBlOmt7Bfd/olkxGChjxU7mT5RCwbY=; b=PD+0r81f9mFCxEjPbpgjVgMgaoO969QBCaelswrKlowWtzsl7yuKSPc3qJhm4VpCP2+qr0 yGxYc9rn7fBe/a34Ejv3aImNNvJ4BXWiAtg7nFIURFmCe6wLpv+qW60MpSSjQ4kiGuV0Tt NNSUI/E3Irfe8h8+O9iVuUR+ssmoNmn44+kFT0FEtJMP+6ockdP30T4fBKJMkCNUM2xsy9 Fr9C7EG/MiULe4/cCbEOx8D9z8JCYhc0/NQlSle2oQid5NPI/cal91NBVF6W36VvfQA+RG d6ScSTn16EQn24ZqMTQjQyjGtW7ZbUyFcfF2XJDhfJ9omqnnaNJpnR2oRXnxOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9QM4r6jz15HX for ; Wed, 11 Feb 2026 20:44:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 477a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:44:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 2b728d3bbfbc - main - hwpstate_amd(4): Move 'struct get_cppc_regs_data' & co. closer to use List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b728d3bbfbc61e014cdfa7940227e46027329b9 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:44:11 +0000 Message-Id: <698cea1b.477a4.4849a649@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2b728d3bbfbc61e014cdfa7940227e46027329b9 commit 2b728d3bbfbc61e014cdfa7940227e46027329b9 Author: Olivier Certner AuthorDate: 2026-02-09 10:39:53 +0000 Commit: Olivier Certner CommitDate: 2026-02-11 20:43:23 +0000 hwpstate_amd(4): Move 'struct get_cppc_regs_data' & co. closer to use No functional change (intended). Sponsored by: The FreeBSD Foundation --- sys/x86/cpufreq/hwpstate_amd.c | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate_amd.c b/sys/x86/cpufreq/hwpstate_amd.c index 1548227faacf..7e845e172620 100644 --- a/sys/x86/cpufreq/hwpstate_amd.c +++ b/sys/x86/cpufreq/hwpstate_amd.c @@ -227,28 +227,6 @@ check_cppc_in_use(const struct hwpstate_softc *const sc, const char *const func) ": %s() called but HWPFL_USE_CPPC not set", func)); } -/* - * Internal errors conveyed by code executing on another CPU. - */ -#define HWP_ERROR_CPPC_ENABLE (1 << 0) -#define HWP_ERROR_CPPC_CAPS (1 << 1) -#define HWP_ERROR_CPPC_REQUEST (1 << 2) -#define HWP_ERROR_CPPC_REQUEST_WRITE (1 << 3) - -static inline bool -hwp_has_error(u_int res, u_int err) -{ - return ((res & err) != 0); -} - -struct get_cppc_regs_data { - uint64_t enable; - uint64_t caps; - uint64_t req; - /* HWP_ERROR_CPPC_* except HWP_ERROR_*_WRITE */ - u_int res; -}; - static void print_msr_bits(struct sbuf *const sb, const char *const legend, const uint64_t bits, const uint64_t msr_value) @@ -300,6 +278,28 @@ print_cppc_no_request(struct sbuf *const sb) sbuf_printf(sb, MSR_AMD_CPPC_REQUEST_NAME ": " MSR_NOT_READ_MSG "\n"); } +/* + * Internal errors conveyed by code executing on another CPU. + */ +#define HWP_ERROR_CPPC_ENABLE (1 << 0) +#define HWP_ERROR_CPPC_CAPS (1 << 1) +#define HWP_ERROR_CPPC_REQUEST (1 << 2) +#define HWP_ERROR_CPPC_REQUEST_WRITE (1 << 3) + +static inline bool +hwp_has_error(u_int res, u_int err) +{ + return ((res & err) != 0); +} + +struct get_cppc_regs_data { + uint64_t enable; + uint64_t caps; + uint64_t req; + /* HWP_ERROR_CPPC_* except HWP_ERROR_*_WRITE */ + u_int res; +}; + static void get_cppc_regs_cb(void *args) { From nobody Wed Feb 11 21:03:53 2026 X-Original-To: dev-commits-src-main@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 4fB9s51z40z6SDYL for ; Wed, 11 Feb 2026 21:03:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB9s519zfz3X8G for ; Wed, 11 Feb 2026 21:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770843833; 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=eirafuMcg97K7mrcQaYdSlNLuYGCt/HNSyJ9gWCR4Rg=; b=YFQqxXHfkkUvptCRtpzROElEF1M3bQUDrLt5836sK3uinFb1r6WvBpQOkWjd7xl5elB3Mv qnULgIVU8c61QLeVBn0XEMPDymycAWN+U0fDgC/5MDsx21aVMvl+l9GUXp7oV6Q24KtJG0 MafZgK/EoCsarJfPT+bzEo1OgoaemGoeH6FXk1SsIJfzztOwDVw2EY+/G4Ngwbv1vhzAeH pqYr+CXCk8uMimNmZ888qethwOqwdwIuXy5Qz5MXTO0hg1DOw6gZ0sB/qDCbvGs5GvoHrb q08M5Un4b/onpvom9lEbTA3uE1PKUXyIV1AAJ4GTa+svTW7os/sKxUL1j+Dozg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770843833; a=rsa-sha256; cv=none; b=aKJxD/dtINkFGwqHo412CYLKUU6B7Py5Mjo9fRITwlpF0cqi8ZMwyLHK5ZMVKZihqClPAP DmBdy4+nuwvMGg28qYTGNMf1o6oIwMeqHBD+GuuHqeK5oAQJK9RKLFzFCRUbgXYyNFJX3F IPAG45mA5kQ/QdPPrPp3WcOG1TAt+p9waK+ye7kaj8KWB8szoCv0cWgXmMnQPJhoeXVOXs Ay5iZJPIxNwi4LO3TVpaYyv7QrbVW1yXWqrIVudB4U4SR8hdVGHajROCPL3JwIDKaDMYb2 rHEaHbw4EI8ftXyy7uHzxOgrTEnvDuFQjaWC2u6ZPs8vCp36AbUMziCwVFCekQ== 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=1770843833; 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=eirafuMcg97K7mrcQaYdSlNLuYGCt/HNSyJ9gWCR4Rg=; b=bEEXbop/z3uL5J82+Jg9bKt6fDyf4luF/Raj5NeVCq5Cudfyn2EFTjVDcQHZHzLmb/ES52 6O8AxlZFmqjycH2DptH/LSQdPPpVeaPxj6EJzgSAVSdfF3bO9luyIkeWtNS47YdI0ORODD h0y1XN5dnYeTqmjau88ImY+8JcrO4H3n+MZBHZ0lLbkcj68eD5fe490BlbtyQ7LlMLiC3y LpJzu/qsxPRz2LkNedXAmjXfFK5mVx5i+wGe9mWSL341D1q5aQsTTQVpY0PwRSgJAYkF5R QwhB3Xbx1TPg6oNLOFL4U8xKDRx3dWD/OBuhCdGXMwsHdCCZd9yN0CSMe8wXPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB9s50XTJz15Zp for ; Wed, 11 Feb 2026 21:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1989d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 21:03:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 66797b469ee3 - main - pw.8: spell List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66797b469ee3e303c5e228bea1e244f433e666e1 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 21:03:53 +0000 Message-Id: <698ceeb9.1989d.a43ddd4@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=66797b469ee3e303c5e228bea1e244f433e666e1 commit 66797b469ee3e303c5e228bea1e244f433e666e1 Author: Maxim Konovalov AuthorDate: 2026-02-11 21:03:11 +0000 Commit: Maxim Konovalov CommitDate: 2026-02-11 21:03:11 +0000 pw.8: spell --- usr.sbin/pw/pw.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/pw/pw.8 b/usr.sbin/pw/pw.8 index 9b75ff772c25..91d746e90c02 100644 --- a/usr.sbin/pw/pw.8 +++ b/usr.sbin/pw/pw.8 @@ -687,7 +687,7 @@ user and group ids less than 100 are reserved for use by the system, and numbers greater than 32000 may also be reserved for special purposes .Pq used by some system daemons . Also, uids and gids between 100 and 999 are commonly used by pseudo-users -assotiated with third-party programs, and generally should be avoided for +associated with third-party programs, and generally should be avoided for assigning for normal users. .It Fl w Ar passmethod The From nobody Wed Feb 11 21:51:45 2026 X-Original-To: dev-commits-src-main@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 4fBBwY2Bw5z6RY7p for ; Wed, 11 Feb 2026 21:51:57 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBBwY1HPkz3bZj for ; Wed, 11 Feb 2026 21:51:57 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770846717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5WkncFx3Jgt1uuwArYTV0iegUW3OsJI6CPfRs5zftTE=; b=bmUEN9fO6TXH8o8DAK8gcW8A9lfWbmzoTnlYCCsNTXOh/fA2BbBxs2KNPijpH6C8e6vG+4 2tJoStKikvwS6XnlYM2R/aiA4SeWligDYyCllkwwxArvLxfpJEYiwYYAC1qgn3hM/1ptrl WyUEzBXrz8rYEPPBWSYAuo3z2p5Y2FOcd5vkXEUNy3gvj+T0rlwFUkMBeHOcPq5j7Ac9Yo nNrequzYBsv80n1BZd4+gM0TdGIADFACIpcVNLPJyq2HMLzFvBo2JTndkAyBpz3z7GHGl2 EF851dthTwetv1a9KqrSVmPMfzfOhy2fgqnxXevko7uXfuH1vguux1kRd4OGdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770846717; a=rsa-sha256; cv=none; b=P7/hR8u1S9U26rpGdKelqkEwXi0dF4bLhhR8F3qxvj0P8YUCxRbogz+YenzhrbCvgSmyVJ 0JoSFKdeUH2cOtHkJPazoWJ2IGem4yFu8oWDgQFfbxHxynk+ROXCb0hFGvxAfNxcsXzTQx xj6JQRHGNo02jxrDtoZa/qTwit5bYEgq9WgzNySPRUxvWH797KKon+f5/gDbcy8E1AR8BW ZqlZwsD0+eLmAcQYrO+YFnaHq145mtTi4ZK7tROMbROCc1qQ6mZeeUss2Sxuqiz593wlnW brCICmXACxUN9hQNoehIc0ALA+FdjOlj/JcI2qVT0QRhOSFJOpX+tDr5DtVrtw== 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=1770846717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5WkncFx3Jgt1uuwArYTV0iegUW3OsJI6CPfRs5zftTE=; b=WzvamF1mwP0Gkb8aD13yUTd5xI5KTsrF96VHst3P9i7nr2gxcZnJMIGJIgbaYBsJPSD6e1 16RmvrP9JVGmmUGNOd4HiCRLcq6Zia7MV83lTKV86HIlNiuaFOfVZHymVrQ/Xy4DZtiTsL 2rVfeIJC1azxPIi8kiY6XVZOJQXpliNfZEK1ZGgDpYE3IKzATluA9xYSYHVlvliD/aB2JT JBqiFm9MthCGy2+70XLrHBp/2miV0PTN6hB74+ndivYuZg0QRXJLQJh2+y0Jc5s7QpGEOZ yE+Pvv50h6amlEY0146luMSxuhrrUSeEBo7w8b8/9lfVYo1+bYmw6bBPt3SmKg== Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fBBwY0ZnLzCKd for ; Wed, 11 Feb 2026 21:51:57 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-503360913f7so7281851cf.0 for ; Wed, 11 Feb 2026 13:51:57 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWfGU1987owW/UhYbBdJb7xIp3dwRS3T5uIy0pCVF1M5sA8L/h5DY7C5d2pv49PIAWGyG/5yCPL+Vyj0UKmP8mYunvoeg==@freebsd.org X-Gm-Message-State: AOJu0YwOrj8WAzFEQn7XPIAyzM7xDQdEApe4QsAy9ZR2+fnEPLXtBr13 Bspg2H84gFpxLoOID3D40yEO5vgvz0ba+ktOs8PxLglcuQdXr0OBKfOHTgVxEoTCuXajwNpFksE BZbIY62x8XB61vi9XjagC7QFDV+gkTO0= X-Received: by 2002:ac8:5890:0:b0:4ee:2339:a056 with SMTP id d75a77b69052e-50691c7f418mr11396931cf.2.1770846716394; Wed, 11 Feb 2026 13:51:56 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <698ba212.1ceca.11654b2c@gitrepo.freebsd.org> In-Reply-To: From: Nuno Teixeira Date: Wed, 11 Feb 2026 21:51:45 +0000 X-Gmail-Original-Message-ID: X-Gm-Features: AZwV_QiAvLtLNKsbPFZUrbRbZTPcXXHLpbOFqWoPvt-X-XIKg1ztoBTEC7U9RHs Message-ID: Subject: Re: git: b4c3e9b5b09c - main - brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000007b81e8064a936132" --0000000000007b81e8064a936132 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable (...) Maybe not. Maybe it was just a dream. :) Cheers, Nuno Teixeira escreveu (quarta, 11/02/2026 =C3=A0(s) 11:32): > Hello Bjoern, > > Do this import includes support for rpi4 wifi card? > I did research and I found that wifi card is a Cypress CYW43455 or > Broadcom BCM4345/6 and it is included in firmware-brcm80211. > > Thanks, > > Bjoern A. Zeeb escreveu (ter=C3=A7a, 10/02/2026 =C3=A0(s= ) 21:24): > >> The branch main has been updated by bz: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3Db4c3e9b5b09c829b4135aff738bd28= 93ed052377 >> >> commit b4c3e9b5b09c829b4135aff738bd2893ed052377 >> Merge: 69c64e3fb575 1eabd3ed89eb >> Author: Bjoern A. Zeeb >> AuthorDate: 2026-02-10 21:22:03 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2026-02-10 21:22:49 +0000 >> >> brcm80211: import Broadcom wireless brcmsmac and brcmfmac drivers >> >> This version is based on >> git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git >> e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ). >> >> We are likely only going to use the brcmfmac driver but given they >> come nicely packaged in a directory structure and bwn(9) still uses >> GPL-only phy files we could use some of the information from brcmsma= c >> and fix that (should it ever still be relevant). >> >> git-subtree-dir: sys/contrib/dev/broadcom/brcm80211 >> git-subtree-mainline: 69c64e3fb575e0db0e2f0c1fc56f466624940ded >> git-subtree-split: 1eabd3ed89eb4bb5c69e90eeaeda1a6dd31e8bab >> >> sys/contrib/dev/broadcom/brcm80211/Makefile | 13 + >> .../dev/broadcom/brcm80211/brcmfmac/Makefile | 62 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c | 51 + >> .../dev/broadcom/brcm80211/brcmfmac/bca/Makefile | 12 + >> .../dev/broadcom/brcm80211/brcmfmac/bca/core.c | 39 + >> .../dev/broadcom/brcm80211/brcmfmac/bca/module.c | 28 + >> .../dev/broadcom/brcm80211/brcmfmac/bca/vops.h | 11 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c | 490 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h | 20 + >> .../dev/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1269 + >> .../dev/broadcom/brcm80211/brcmfmac/btcoex.c | 481 + >> .../dev/broadcom/brcm80211/brcmfmac/btcoex.h | 18 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h | 342 + >> .../dev/broadcom/brcm80211/brcmfmac/cfg80211.c | 8477 ++++++ >> .../dev/broadcom/brcm80211/brcmfmac/cfg80211.h | 498 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c | 1472 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h | 92 + >> .../dev/broadcom/brcm80211/brcmfmac/common.c | 637 + >> .../dev/broadcom/brcm80211/brcmfmac/common.h | 95 + >> .../dev/broadcom/brcm80211/brcmfmac/commonring.c | 236 + >> .../dev/broadcom/brcm80211/brcmfmac/commonring.h | 62 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c | 1576 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h | 228 + >> .../dev/broadcom/brcm80211/brcmfmac/cyw/Makefile | 12 + >> .../dev/broadcom/brcm80211/brcmfmac/cyw/core.c | 373 + >> .../broadcom/brcm80211/brcmfmac/cyw/fwil_types.h | 87 + >> .../dev/broadcom/brcm80211/brcmfmac/cyw/module.c | 28 + >> .../dev/broadcom/brcm80211/brcmfmac/cyw/vops.h | 11 + >> .../dev/broadcom/brcm80211/brcmfmac/debug.c | 56 + >> .../dev/broadcom/brcm80211/brcmfmac/debug.h | 143 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c | 215 + >> .../dev/broadcom/brcm80211/brcmfmac/feature.c | 385 + >> .../dev/broadcom/brcm80211/brcmfmac/feature.h | 131 + >> .../dev/broadcom/brcm80211/brcmfmac/firmware.c | 859 + >> .../dev/broadcom/brcm80211/brcmfmac/firmware.h | 95 + >> .../dev/broadcom/brcm80211/brcmfmac/flowring.c | 508 + >> .../dev/broadcom/brcm80211/brcmfmac/flowring.h | 74 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c | 514 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h | 401 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c | 432 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h | 224 + >> .../dev/broadcom/brcm80211/brcmfmac/fwil_types.h | 1239 + >> .../dev/broadcom/brcm80211/brcmfmac/fwsignal.c | 2514 ++ >> .../dev/broadcom/brcm80211/brcmfmac/fwsignal.h | 48 + >> .../dev/broadcom/brcm80211/brcmfmac/fwvid.c | 200 + >> .../dev/broadcom/brcm80211/brcmfmac/fwvid.h | 88 + >> .../dev/broadcom/brcm80211/brcmfmac/msgbuf.c | 1687 ++ >> .../dev/broadcom/brcm80211/brcmfmac/msgbuf.h | 43 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c | 155 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h | 14 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c | 2546 ++ >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h | 179 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c | 2785 ++ >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h | 14 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c | 595 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h | 72 + >> .../dev/broadcom/brcm80211/brcmfmac/proto.c | 71 + >> .../dev/broadcom/brcm80211/brcmfmac/proto.h | 155 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c | 4650 +++ >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h | 370 + >> .../dev/broadcom/brcm80211/brcmfmac/tracepoint.c | 32 + >> .../dev/broadcom/brcm80211/brcmfmac/tracepoint.h | 144 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c | 1604 ++ >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h | 42 + >> .../dev/broadcom/brcm80211/brcmfmac/vendor.c | 118 + >> .../dev/broadcom/brcm80211/brcmfmac/vendor.h | 53 + >> .../dev/broadcom/brcm80211/brcmfmac/wcc/Makefile | 12 + >> .../dev/broadcom/brcm80211/brcmfmac/wcc/core.c | 40 + >> .../dev/broadcom/brcm80211/brcmfmac/wcc/module.c | 28 + >> .../dev/broadcom/brcm80211/brcmfmac/wcc/vops.h | 11 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c | 84 + >> sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h | 31 + >> .../dev/broadcom/brcm80211/brcmsmac/Makefile | 47 + >> .../dev/broadcom/brcm80211/brcmsmac/aiutils.c | 707 + >> .../dev/broadcom/brcm80211/brcmsmac/aiutils.h | 221 + >> .../dev/broadcom/brcm80211/brcmsmac/ampdu.c | 1097 + >> .../dev/broadcom/brcm80211/brcmsmac/ampdu.h | 53 + >> .../dev/broadcom/brcm80211/brcmsmac/antsel.c | 309 + >> .../dev/broadcom/brcm80211/brcmsmac/antsel.h | 27 + >> .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h | 102 + >> .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 92 + >> .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h | 110 + >> .../brcm80211/brcmsmac/brcms_trace_events.c | 23 + >> .../brcm80211/brcmsmac/brcms_trace_events.h | 40 + >> .../dev/broadcom/brcm80211/brcmsmac/channel.c | 771 + >> .../dev/broadcom/brcm80211/brcmsmac/channel.h | 47 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h | 1902 ++ >> .../dev/broadcom/brcm80211/brcmsmac/debug.c | 246 + >> .../dev/broadcom/brcm80211/brcmsmac/debug.h | 75 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c | 1556 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h | 124 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h | 38 + >> .../dev/broadcom/brcm80211/brcmsmac/mac80211_if.c | 1738 ++ >> .../dev/broadcom/brcm80211/brcmsmac/mac80211_if.h | 113 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c | 8065 ++++++ >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h | 670 + >> .../dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 2497 ++ >> .../dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 241 + >> .../dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h | 1113 + >> .../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 5151 ++++ >> .../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h | 110 + >> .../dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c | 28572 >> +++++++++++++++++++ >> .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c | 298 + >> .../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h | 31 + >> .../broadcom/brcm80211/brcmsmac/phy/phy_radio.h | 1522 + >> .../dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h | 156 + >> .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c | 3170 ++ >> .../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h | 44 + >> .../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 10099 +++++++ >> .../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h | 39 + >> .../dev/broadcom/brcm80211/brcmsmac/phy_shim.c | 215 + >> .../dev/broadcom/brcm80211/brcmsmac/phy_shim.h | 172 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c | 165 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h | 26 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h | 341 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c | 514 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h | 245 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h | 67 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c | 437 + >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h | 36 + >> .../dev/broadcom/brcm80211/brcmsmac/types.h | 294 + >> .../dev/broadcom/brcm80211/brcmsmac/ucode_loader.c | 109 + >> .../dev/broadcom/brcm80211/brcmsmac/ucode_loader.h | 56 + >> .../dev/broadcom/brcm80211/brcmutil/Makefile | 10 + >> sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c | 247 + >> .../dev/broadcom/brcm80211/brcmutil/utils.c | 327 + >> .../dev/broadcom/brcm80211/include/brcm_hw_ids.h | 116 + >> .../dev/broadcom/brcm80211/include/brcmu_d11.h | 156 + >> .../dev/broadcom/brcm80211/include/brcmu_utils.h | 216 + >> .../dev/broadcom/brcm80211/include/brcmu_wifi.h | 247 + >> .../dev/broadcom/brcm80211/include/chipcommon.h | 311 + >> sys/contrib/dev/broadcom/brcm80211/include/defs.h | 94 + >> sys/contrib/dev/broadcom/brcm80211/include/soc.h | 25 + >> 133 files changed, 116023 insertions(+) >> >> diff --cc sys/contrib/dev/broadcom/brcm80211/Makefile >> index 000000000000,000000000000..88115d072624 >> new file mode 100644 >> --- /dev/null >> +++ b/sys/contrib/dev/broadcom/brcm80211/Makefile >> @@@ -1,0 -1,0 +1,13 @@@ >> ++# SPDX-License-Identifier: ISC >> ++# >> ++# Makefile fragment for Broadcom 802.11 Networking Device Driver >> ++# >> ++# Copyright (c) 2010 Broadcom Corporation >> ++# >> ++ >> ++# common flags >> ++subdir-ccflags-$(CONFIG_BRCMDBG) +=3D -DDEBUG >> ++ >> ++obj-$(CONFIG_BRCMUTIL) +=3D brcmutil/ >> ++obj-$(CONFIG_BRCMFMAC) +=3D brcmfmac/ >> ++obj-$(CONFIG_BRCMSMAC) +=3D brcmsmac/ >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile >> index 000000000000,e5ca0f511822..e5ca0f511822 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c >> index 000000000000,c4a54861bfb4..c4a54861bfb4 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile >> index 000000000000,5e37c638f966..5e37c638f966 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c >> index 000000000000,f471c962104a..f471c962104a >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c >> index 000000000000,1e1c79b18c5b..1e1c79b18c5b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h >> index 000000000000,7897e6b6eefb..7897e6b6eefb >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c >> index 000000000000,9ec0c60b6da1..9ec0c60b6da1 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h >> index 000000000000,b051d2860cd1..b051d2860cd1 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c >> index 000000000000,8ab7d1e34a6e..8ab7d1e34a6e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c >> index 000000000000,67c0c5a92f99..67c0c5a92f99 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h >> index 000000000000,418b9424a179..418b9424a179 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h >> index 000000000000,fe31051a9e11..fe31051a9e11 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c >> index 000000000000,8af402555b5e..8af402555b5e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h >> index 000000000000,273c80f2d483..273c80f2d483 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c >> index 000000000000,9074ab49e806..9074ab49e806 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h >> index 000000000000,d69f101f5834..d69f101f5834 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c >> index 000000000000,688f16c51319..688f16c51319 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h >> index 000000000000,3bdb6984b2dd..3bdb6984b2dd >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c >> index 000000000000,e44236cb210e..e44236cb210e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h >> index 000000000000,7fb11f4823e4..7fb11f4823e4 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c >> index 000000000000,862a0336a0b5..862a0336a0b5 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h >> index 000000000000,399b6810e394..399b6810e394 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile >> index 000000000000,33e86724ba14..33e86724ba14 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c >> index 000000000000,4f0ea4347840..4f0ea4347840 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h >> index 000000000000,669564382e32..669564382e32 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c >> index 000000000000,ce5fcfd42a7e..ce5fcfd42a7e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h >> index 000000000000,870b5bead436..870b5bead436 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c >> index 000000000000,eecf8a38d94a..eecf8a38d94a >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h >> index 000000000000,9bb5f709d41a..9bb5f709d41a >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c >> index 000000000000,c3a602197662..c3a602197662 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c >> index 000000000000,488364ef8ff2..488364ef8ff2 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h >> index 000000000000,31f8695ca417..31f8695ca417 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c >> index 000000000000,83f8ed7d00f9..83f8ed7d00f9 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h >> index 000000000000,4002d326fd21..4002d326fd21 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c >> index 000000000000,e1127d7e086d..e1127d7e086d >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h >> index 000000000000,818882b0fd01..818882b0fd01 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c >> index 000000000000,c2d98ee6652f..c2d98ee6652f >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h >> index 000000000000,e327dd58d29c..e327dd58d29c >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c >> index 000000000000,6385a7db7f7d..6385a7db7f7d >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h >> index 000000000000,ab3d6cfcb02b..ab3d6cfcb02b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h >> index 000000000000,e74a23e11830..e74a23e11830 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c >> index 000000000000,b70d20128f98..b70d20128f98 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h >> index 000000000000,f9c36cd8f1de..f9c36cd8f1de >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c >> index 000000000000,41eafcda77f7..41eafcda77f7 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h >> index 000000000000,f3e011d090f2..f3e011d090f2 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c >> index 000000000000,45fbcbdc7d9e..45fbcbdc7d9e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h >> index 000000000000,6a849f4a94dd..6a849f4a94dd >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c >> index 000000000000,1681ad00f82e..1681ad00f82e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h >> index 000000000000,ae124c73fc3b..ae124c73fc3b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c >> index 000000000000,0dc9d28cd77b..0dc9d28cd77b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h >> index 000000000000,d2ecee565bf2..d2ecee565bf2 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c >> index 000000000000,6327f4eca500..6327f4eca500 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h >> index 000000000000,8e6c227e8315..8e6c227e8315 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c >> index 000000000000,05f66ab13bed..05f66ab13bed >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h >> index 000000000000,25d406019ac3..25d406019ac3 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c >> index 000000000000,2e911d4874af..2e911d4874af >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h >> index 000000000000,bd08d3aaa8f4..bd08d3aaa8f4 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c >> index 000000000000,8a0bad5119a0..8a0bad5119a0 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h >> index 000000000000,0d18ed15b403..0d18ed15b403 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c >> index 000000000000,814fcc7538d5..814fcc7538d5 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h >> index 000000000000,96032322b165..96032322b165 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c >> index 000000000000,f0129d10d2b9..f0129d10d2b9 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h >> index 000000000000,e000ef78928c..e000ef78928c >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c >> index 000000000000,d07e7c7355d9..d07e7c7355d9 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h >> index 000000000000,418f33ea6fd3..418f33ea6fd3 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile >> index 000000000000,3db4cce44f42..3db4cce44f42 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c >> index 000000000000,05d7c2a4fba5..05d7c2a4fba5 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c >> index 000000000000,cfe01ca63ba6..cfe01ca63ba6 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h >> index 000000000000,3aec44f80600..3aec44f80600 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c >> index 000000000000,08841b9a5b81..08841b9a5b81 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h >> index 000000000000,b2c7ae8966a1..b2c7ae8966a1 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile >> index 000000000000,ffdd17eabe1d..ffdd17eabe1d >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c >> index 000000000000,0cb64fc56783..0cb64fc56783 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h >> index 000000000000,e791dd07ca78..e791dd07ca78 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c >> index 000000000000,e1d707a7c964..e1d707a7c964 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h >> index 000000000000,03bdcf29bd50..03bdcf29bd50 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c >> index 000000000000,f411bc6d795d..f411bc6d795d >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h >> index 000000000000,a3d487ab1964..a3d487ab1964 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h >> diff --cc >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h >> index 000000000000,53b3dba50737..53b3dba50737 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h >> diff --cc >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h >> index 000000000000,908ce3c864fe..908ce3c864fe >> mode 000000,100644..100644 >> --- >> a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h >> +++ >> b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h >> diff --cc >> sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h >> index 000000000000,24ac34fa0207..24ac34fa0207 >> mode 000000,100644..100644 >> --- >> a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h >> +++ >> b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events= .c >> index 000000000000,52fc9eeb5fa5..52fc9eeb5fa5 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events= .h >> index 000000000000,cbf2f06436fc..cbf2f06436fc >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c >> index 000000000000,3878c4124e25..3878c4124e25 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h >> index 000000000000,39dd3a5b2979..39dd3a5b2979 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h >> index 000000000000,0c685eeaed33..0c685eeaed33 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c >> index 000000000000,81df41c7fbb5..81df41c7fbb5 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h >> index 000000000000,d30a9fa30f1b..d30a9fa30f1b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c >> index 000000000000,c739bf7463b3..c739bf7463b3 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h >> index 000000000000,7905fd081721..7905fd081721 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h >> index 000000000000,2a5cbeb9e783..2a5cbeb9e783 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c >> index 000000000000,aadcff1e2b5d..aadcff1e2b5d >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h >> index 000000000000,eaf926a96a88..eaf926a96a88 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c >> index 000000000000,c1a9c1e442ee..c1a9c1e442ee >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h >> index 000000000000,b7ca0d9891c4..b7ca0d9891c4 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c >> index 000000000000,ce6ce2dea39c..ce6ce2dea39c >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h >> index 000000000000,cab08f0669d1..cab08f0669d1 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h >> index 000000000000,4e80f4d27949..4e80f4d27949 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c >> index 000000000000,b4bba67a45ec..b4bba67a45ec >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h >> index 000000000000,ae0e8d5df339..ae0e8d5df339 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c >> index 000000000000,b03d5a1f1a93..b03d5a1f1a93 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c >> index 000000000000,45dcd277a89f..45dcd277a89f >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h >> index 000000000000,5d0083a87fd0..5d0083a87fd0 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h >> index 000000000000,706ab03c8346..706ab03c8346 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h >> index 000000000000,f49a10c452e9..f49a10c452e9 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c >> index 000000000000,5331b5468e14..5331b5468e14 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h >> index 000000000000,b49580c654fb..b49580c654fb >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c >> index 000000000000,396d005f4d16..396d005f4d16 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h >> index 000000000000,28208aba4af2..28208aba4af2 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c >> index 000000000000,8b852581c4e4..8b852581c4e4 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h >> index 000000000000,27d0934e600e..27d0934e600e >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c >> index 000000000000,c9a29e626daa..c9a29e626daa >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h >> index 000000000000,a014bbc4f935..a014bbc4f935 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h >> index 000000000000,bfc63b2f0537..bfc63b2f0537 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c >> index 000000000000,0a0c0ad4f96f..0a0c0ad4f96f >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h >> index 000000000000,5bb88b78ed64..5bb88b78ed64 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h >> index 000000000000,d65561227da0..d65561227da0 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c >> index 000000000000,79d4a7a4da8b..79d4a7a4da8b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h >> index 000000000000,af86c7fc5112..af86c7fc5112 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h >> index 000000000000,12a0df5b4e98..12a0df5b4e98 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c >> index 000000000000,80e3ccf865e3..80e3ccf865e3 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h >> index 000000000000,c87dd89bcb78..c87dd89bcb78 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile >> index 000000000000,f9b40cab766c..f9b40cab766c >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c >> index 000000000000,1e2b1e487eb7..1e2b1e487eb7 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c >> index 000000000000,fe94db0ba3f3..fe94db0ba3f3 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c >> +++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h >> index 000000000000,b39c5c1ee18b..b39c5c1ee18b >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h >> index 000000000000,f6344023855c..f6344023855c >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h >> index 000000000000,946532328667..946532328667 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h >> index 000000000000,7552bdb91991..7552bdb91991 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h >> index 000000000000,0340bba96868..0340bba96868 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/defs.h >> index 000000000000,9e7e6116eb74..9e7e6116eb74 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/defs.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/defs.h >> diff --cc sys/contrib/dev/broadcom/brcm80211/include/soc.h >> index 000000000000,824921191366..824921191366 >> mode 000000,100644..100644 >> --- a/sys/contrib/dev/broadcom/brcm80211/include/soc.h >> +++ b/sys/contrib/dev/broadcom/brcm80211/include/soc.h >> >> > > -- > Nuno Teixeira > FreeBSD UNIX: Web: https://FreeBSD.org > --=20 Nuno Teixeira FreeBSD UNIX: Web: https://FreeBSD.org --0000000000007b81e8064a936132 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
(...)

Maybe not.
Mayb= e it was just a dream.
:)

Cheers,

Nuno= Teixeira <eduardo@freebsd.org> escreveu (quarta, 11/02/2026 =C3=A0(s) 11:32):

Bjoern A. Zeeb <bz@freebsd.org> escreveu (ter=C3=A7a, 10/02/2026 =C3=A0(s) 21:24):<= br>
The branch main = has been updated by bz:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3Db4c3e9b5b09c829b4135aff738bd2893ed052377
commit b4c3e9b5b09c829b4135aff738bd2893ed052377
Merge: 69c64e3fb575 1eabd3ed89eb
Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-02-10 21:22:03 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-02-10 21:22:49 +0000

=C2=A0 =C2=A0 brcm80211: import Broadcom wireless brcmsmac and brcmfmac dri= vers

=C2=A0 =C2=A0 This version is based on
=C2=A0 =C2=A0 git.kernel.org/pub/sc= m/linux/kernel/git/torvalds/linux.git
=C2=A0 =C2=A0 e5f0a698b34ed76002dc5cff3804a61c80233a7a ( tag: v6.17 ).

=C2=A0 =C2=A0 We are likely only going to use the brcmfmac driver but given= they
=C2=A0 =C2=A0 come nicely packaged in a directory structure and bwn(9) stil= l uses
=C2=A0 =C2=A0 GPL-only phy files we could use some of the information from = brcmsmac
=C2=A0 =C2=A0 and fix that (should it ever still be relevant).

=C2=A0 =C2=A0 git-subtree-dir: sys/contrib/dev/broadcom/brcm80211
=C2=A0 =C2=A0 git-subtree-mainline: 69c64e3fb575e0db0e2f0c1fc56f466624940de= d
=C2=A0 =C2=A0 git-subtree-split: 1eabd3ed89eb4bb5c69e90eeaeda1a6dd31e8bab
=C2=A0sys/contrib/dev/broadcom/brcm80211/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 13 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 62 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c |=C2=A0 =C2=A0 51 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/Makefile=C2=A0 =C2=A0|=C2=A0 = =C2=A0 12 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/core.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 39 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/module.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 28 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bca/vops.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 11 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c |=C2=A0 =C2=A0490 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h |=C2=A0 =C2=A0 20 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/bcmsdh.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 1269 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/btcoex.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0481 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/btcoex.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 18 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h=C2=A0 |=C2=A0 =C2= =A0342 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cfg80211.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 8477 ++++++
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cfg80211.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0498 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c |=C2=A0 1472 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h |=C2=A0 =C2=A0 92 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/common.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0637 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/common.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 95 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/commonring.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0236 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/commonring.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 62 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c |=C2=A0 1576 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h |=C2=A0 =C2=A0228 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/Makefile=C2=A0 =C2=A0|=C2=A0 = =C2=A0 12 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/core.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0373 +
=C2=A0.../broadcom/brcm80211/brcmfmac/cyw/fwil_types.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 87 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/module.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 28 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/cyw/vops.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 11 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/debug.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 56 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/debug.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0143 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c=C2=A0 |=C2=A0 =C2= =A0215 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/feature.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0385 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/feature.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0131 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/firmware.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0859 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/firmware.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 95 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/flowring.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0508 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/flowring.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 74 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c |=C2=A0 =C2=A0514 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h |=C2=A0 =C2=A0401 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c |=C2=A0 =C2=A0432 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h |=C2=A0 =C2=A0224 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwil_types.h=C2=A0 =C2=A0|=C2=A0 = 1239 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwsignal.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 2514 ++
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwsignal.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 48 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwvid.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0200 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/fwvid.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 88 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/msgbuf.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 1687 ++
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/msgbuf.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 43 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0155 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 14 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c=C2=A0 |=C2=A0 2546 = ++
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h=C2=A0 |=C2=A0 =C2= =A0179 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c |=C2=A0 2785 ++ =C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h |=C2=A0 =C2=A0 14 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c=C2=A0 |=C2=A0 =C2= =A0595 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h=C2=A0 |=C2=A0 =C2= =A0 72 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/proto.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 71 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/proto.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0155 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c |=C2=A0 4650 +++ =C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h |=C2=A0 =C2=A0370 = +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/tracepoint.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 32 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/tracepoint.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0144 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c=C2=A0 |=C2=A0 1604 = ++
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h=C2=A0 |=C2=A0 =C2= =A0 42 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/vendor.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0118 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/vendor.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 53 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/Makefile=C2=A0 =C2=A0|=C2=A0 = =C2=A0 12 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/core.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 40 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/module.c=C2=A0 =C2=A0|=C2=A0 = =C2=A0 28 +
=C2=A0.../dev/broadcom/brcm80211/brcmfmac/wcc/vops.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0 11 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c |=C2=A0 =C2=A0 84 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h |=C2=A0 =C2=A0 31 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 47 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/aiutils.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0707 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/aiutils.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0221 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ampdu.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 1097 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ampdu.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 53 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/antsel.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0309 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/antsel.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 27 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_brcmsmac.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0102 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h=C2=A0 |=C2=A0 =C2= =A0 92 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0110 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_events.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 23 +
=C2=A0.../brcm80211/brcmsmac/brcms_trace_events.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 40 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/channel.c=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0771 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/channel.h=C2=A0 =C2=A0 =C2=A0 |= =C2=A0 =C2=A0 47 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h=C2=A0 |=C2=A0 1902 = ++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/debug.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0246 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/debug.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0 75 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c=C2=A0 |=C2=A0 1556 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h=C2=A0 |=C2=A0 =C2= =A0124 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h=C2=A0 |=C2=A0 =C2= =A0 38 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/mac80211_if.c=C2=A0 |=C2=A0 1738 = ++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/mac80211_if.h=C2=A0 |=C2=A0 =C2= =A0113 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c |=C2=A0 8065 +++++= +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h |=C2=A0 =C2=A0670 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c=C2=A0 |=C2=A0 2497 = ++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h=C2=A0 |=C2=A0 =C2= =A0241 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h=C2=A0 |=C2=A0 1113 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c=C2=A0 |=C2=A0 5151 = ++++
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h=C2=A0 |=C2=A0 =C2= =A0110 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c=C2=A0 =C2=A0 | 28572 = +++++++++++++++++++
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phy_qmath.c=C2=A0 =C2=A0 |=C2=A0 = =C2=A0298 +
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phy_qmath.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A0 31 +
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phy_radio.h=C2=A0 =C2=A0 |=C2=A0 = 1522 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h |=C2=A0 =C2=A0156 = +
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c=C2=A0 =C2=A0|=C2=A0 = 3170 ++
=C2=A0.../broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 44 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c | 10099 +++++++ =C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h |=C2=A0 =C2=A0 39 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy_shim.c=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0215 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/phy_shim.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0172 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c=C2=A0 |=C2=A0 =C2= =A0165 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h=C2=A0 |=C2=A0 =C2= =A0 26 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h=C2=A0 |=C2=A0 =C2= =A0341 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c |=C2=A0 =C2=A0514 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h |=C2=A0 =C2=A0245 = +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h=C2=A0 |=C2=A0 =C2= =A0 67 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c=C2=A0 |=C2=A0 =C2= =A0437 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h=C2=A0 |=C2=A0 =C2= =A0 36 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/types.h=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0294 +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ucode_loader.c |=C2=A0 =C2=A0109 = +
=C2=A0.../dev/broadcom/brcm80211/brcmsmac/ucode_loader.h |=C2=A0 =C2=A0 56 = +
=C2=A0.../dev/broadcom/brcm80211/brcmutil/Makefile=C2=A0 =C2=A0 =C2=A0 =C2= =A0|=C2=A0 =C2=A0 10 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c=C2=A0 |=C2=A0 =C2= =A0247 +
=C2=A0.../dev/broadcom/brcm80211/brcmutil/utils.c=C2=A0 =C2=A0 =C2=A0 =C2= =A0 |=C2=A0 =C2=A0327 +
=C2=A0.../dev/broadcom/brcm80211/include/brcm_hw_ids.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0116 +
=C2=A0.../dev/broadcom/brcm80211/include/brcmu_d11.h=C2=A0 =C2=A0 =C2=A0|= =C2=A0 =C2=A0156 +
=C2=A0.../dev/broadcom/brcm80211/include/brcmu_utils.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0216 +
=C2=A0.../dev/broadcom/brcm80211/include/brcmu_wifi.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A0247 +
=C2=A0.../dev/broadcom/brcm80211/include/chipcommon.h=C2=A0 =C2=A0 |=C2=A0 = =C2=A0311 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/include/defs.h=C2=A0 |=C2=A0 =C2= =A0 94 +
=C2=A0sys/contrib/dev/broadcom/brcm80211/include/soc.h=C2=A0 =C2=A0|=C2=A0 = =C2=A0 25 +
=C2=A0133 files changed, 116023 insertions(+)

diff --cc sys/contrib/dev/broadcom/brcm80211/Makefile
index 000000000000,000000000000..88115d072624
new file mode 100644
--- /dev/null
+++ b/sys/contrib/dev/broadcom/brcm80211/Makefile
@@@ -1,0 -1,0 +1,13 @@@
++# SPDX-License-Identifier: ISC
++#
++# Makefile fragment for Broadcom 802.11 Networking Device Driver
++#
++# Copyright (c) 2010 Broadcom Corporation
++#
++
++# common flags
++subdir-ccflags-$(CONFIG_BRCMDBG)=C2=A0 =C2=A0 =C2=A0 +=3D -DDEBUG
++
++obj-$(CONFIG_BRCMUTIL)=C2=A0 =C2=A0 =C2=A0 =C2=A0 +=3D brcmutil/
++obj-$(CONFIG_BRCMFMAC)=C2=A0 =C2=A0 =C2=A0 =C2=A0 +=3D brcmfmac/
++obj-$(CONFIG_BRCMSMAC)=C2=A0 =C2=A0 =C2=A0 =C2=A0 +=3D brcmsmac/
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile
index 000000000000,e5ca0f511822..e5ca0f511822
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c
index 000000000000,c4a54861bfb4..c4a54861bfb4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/acpi.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile
index 000000000000,5e37c638f966..5e37c638f966
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c
index 000000000000,f471c962104a..f471c962104a
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c
index 000000000000,1e1c79b18c5b..1e1c79b18c5b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/module.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h
index 000000000000,7897e6b6eefb..7897e6b6eefb
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bca/vops.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c
index 000000000000,9ec0c60b6da1..9ec0c60b6da1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h
index 000000000000,b051d2860cd1..b051d2860cd1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcdc.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 000000000000,8ab7d1e34a6e..8ab7d1e34a6e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bcmsdh.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c
index 000000000000,67c0c5a92f99..67c0c5a92f99
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h
index 000000000000,418b9424a179..418b9424a179
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/btcoex.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h
index 000000000000,fe31051a9e11..fe31051a9e11
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/bus.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
index 000000000000,8af402555b5e..8af402555b5e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h
index 000000000000,273c80f2d483..273c80f2d483
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cfg80211.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c
index 000000000000,9074ab49e806..9074ab49e806
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h
index 000000000000,d69f101f5834..d69f101f5834
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/chip.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c
index 000000000000,688f16c51319..688f16c51319
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h
index 000000000000,3bdb6984b2dd..3bdb6984b2dd
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/common.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c
index 000000000000,e44236cb210e..e44236cb210e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h
index 000000000000,7fb11f4823e4..7fb11f4823e4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/commonring.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c
index 000000000000,862a0336a0b5..862a0336a0b5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h
index 000000000000,399b6810e394..399b6810e394
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/core.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile
index 000000000000,33e86724ba14..33e86724ba14
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c
index 000000000000,4f0ea4347840..4f0ea4347840
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
index 000000000000,669564382e32..669564382e32
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/fwil_types.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c
index 000000000000,ce5fcfd42a7e..ce5fcfd42a7e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/module.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h
index 000000000000,870b5bead436..870b5bead436
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/cyw/vops.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c
index 000000000000,eecf8a38d94a..eecf8a38d94a
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h
index 000000000000,9bb5f709d41a..9bb5f709d41a
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/debug.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c
index 000000000000,c3a602197662..c3a602197662
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/dmi.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c
index 000000000000,488364ef8ff2..488364ef8ff2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h
index 000000000000,31f8695ca417..31f8695ca417
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/feature.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c
index 000000000000,83f8ed7d00f9..83f8ed7d00f9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h
index 000000000000,4002d326fd21..4002d326fd21
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/firmware.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c
index 000000000000,e1127d7e086d..e1127d7e086d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h
index 000000000000,818882b0fd01..818882b0fd01
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/flowring.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c
index 000000000000,c2d98ee6652f..c2d98ee6652f
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h
index 000000000000,e327dd58d29c..e327dd58d29c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fweh.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c
index 000000000000,6385a7db7f7d..6385a7db7f7d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h
index 000000000000,ab3d6cfcb02b..ab3d6cfcb02b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h
index 000000000000,e74a23e11830..e74a23e11830
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwil_types.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c
index 000000000000,b70d20128f98..b70d20128f98
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h
index 000000000000,f9c36cd8f1de..f9c36cd8f1de
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwsignal.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c
index 000000000000,41eafcda77f7..41eafcda77f7
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h
index 000000000000,f3e011d090f2..f3e011d090f2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/fwvid.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
index 000000000000,45fbcbdc7d9e..45fbcbdc7d9e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h
index 000000000000,6a849f4a94dd..6a849f4a94dd
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/msgbuf.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c
index 000000000000,1681ad00f82e..1681ad00f82e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h
index 000000000000,ae124c73fc3b..ae124c73fc3b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/of.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c
index 000000000000,0dc9d28cd77b..0dc9d28cd77b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h
index 000000000000,d2ecee565bf2..d2ecee565bf2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/p2p.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
index 000000000000,6327f4eca500..6327f4eca500
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h
index 000000000000,8e6c227e8315..8e6c227e8315
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pcie.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c
index 000000000000,05f66ab13bed..05f66ab13bed
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h
index 000000000000,25d406019ac3..25d406019ac3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/pno.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c
index 000000000000,2e911d4874af..2e911d4874af
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h
index 000000000000,bd08d3aaa8f4..bd08d3aaa8f4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/proto.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c
index 000000000000,8a0bad5119a0..8a0bad5119a0
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h
index 000000000000,0d18ed15b403..0d18ed15b403
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/sdio.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c
index 000000000000,814fcc7538d5..814fcc7538d5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h
index 000000000000,96032322b165..96032322b165
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/tracepoint.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c
index 000000000000,f0129d10d2b9..f0129d10d2b9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h
index 000000000000,e000ef78928c..e000ef78928c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/usb.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c
index 000000000000,d07e7c7355d9..d07e7c7355d9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h
index 000000000000,418f33ea6fd3..418f33ea6fd3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/vendor.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile
index 000000000000,3db4cce44f42..3db4cce44f42
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c
index 000000000000,05d7c2a4fba5..05d7c2a4fba5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/core.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c
index 000000000000,cfe01ca63ba6..cfe01ca63ba6
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/module.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h
index 000000000000,3aec44f80600..3aec44f80600
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/wcc/vops.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c
index 000000000000,08841b9a5b81..08841b9a5b81
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h
index 000000000000,b2c7ae8966a1..b2c7ae8966a1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmfmac/xtlv.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile
index 000000000000,ffdd17eabe1d..ffdd17eabe1d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c
index 000000000000,0cb64fc56783..0cb64fc56783
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h
index 000000000000,e791dd07ca78..e791dd07ca78
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/aiutils.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c
index 000000000000,e1d707a7c964..e1d707a7c964
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h
index 000000000000,03bdcf29bd50..03bdcf29bd50
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ampdu.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c
index 000000000000,f411bc6d795d..f411bc6d795d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h
index 000000000000,a3d487ab1964..a3d487ab1964
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/antsel.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.= h
index 000000000000,53b3dba50737..53b3dba50737
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h +++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_= msg.h
index 000000000000,908ce3c864fe..908ce3c864fe
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.= h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.= h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_= tx.h
index 000000000000,24ac34fa0207..24ac34fa0207
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h=
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h=
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c<= br> index 000000000000,52fc9eeb5fa5..52fc9eeb5fa5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h<= br> index 000000000000,cbf2f06436fc..cbf2f06436fc
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/brcms_trace_events.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c
index 000000000000,3878c4124e25..3878c4124e25
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h
index 000000000000,39dd3a5b2979..39dd3a5b2979
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/channel.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h
index 000000000000,0c685eeaed33..0c685eeaed33
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/d11.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c
index 000000000000,81df41c7fbb5..81df41c7fbb5
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h
index 000000000000,d30a9fa30f1b..d30a9fa30f1b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/debug.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c
index 000000000000,c739bf7463b3..c739bf7463b3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h
index 000000000000,7905fd081721..7905fd081721
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/dma.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h
index 000000000000,2a5cbeb9e783..2a5cbeb9e783
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/led.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c
index 000000000000,aadcff1e2b5d..aadcff1e2b5d
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h
index 000000000000,eaf926a96a88..eaf926a96a88
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/mac80211_if.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
index 000000000000,c1a9c1e442ee..c1a9c1e442ee
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h
index 000000000000,b7ca0d9891c4..b7ca0d9891c4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/main.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
index 000000000000,ce6ce2dea39c..ce6ce2dea39c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
index 000000000000,cab08f0669d1..cab08f0669d1
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_hal.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h
index 000000000000,4e80f4d27949..4e80f4d27949
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_int.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
index 000000000000,b4bba67a45ec..b4bba67a45ec
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
index 000000000000,ae0e8d5df339..ae0e8d5df339
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_lcn.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c
index 000000000000,b03d5a1f1a93..b03d5a1f1a93
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_n.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
index 000000000000,45dcd277a89f..45dcd277a89f
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
index 000000000000,5d0083a87fd0..5d0083a87fd0
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_qmath.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
index 000000000000,706ab03c8346..706ab03c8346
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phy_radio.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
index 000000000000,f49a10c452e9..f49a10c452e9
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phyreg_n.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
index 000000000000,5331b5468e14..5331b5468e14
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
index 000000000000,b49580c654fb..b49580c654fb
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_lcn.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
index 000000000000,396d005f4d16..396d005f4d16
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
index 000000000000,28208aba4af2..28208aba4af2
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy/phytbl_n.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c
index 000000000000,8b852581c4e4..8b852581c4e4
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h
index 000000000000,27d0934e600e..27d0934e600e
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/phy_shim.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c
index 000000000000,c9a29e626daa..c9a29e626daa
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h
index 000000000000,a014bbc4f935..a014bbc4f935
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pmu.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h
index 000000000000,bfc63b2f0537..bfc63b2f0537
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/pub.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c
index 000000000000,0a0c0ad4f96f..0a0c0ad4f96f
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h
index 000000000000,5bb88b78ed64..5bb88b78ed64
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/rate.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h
index 000000000000,d65561227da0..d65561227da0
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/scb.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c
index 000000000000,79d4a7a4da8b..79d4a7a4da8b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h
index 000000000000,af86c7fc5112..af86c7fc5112
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/stf.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h
index 000000000000,12a0df5b4e98..12a0df5b4e98
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/types.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c
index 000000000000,80e3ccf865e3..80e3ccf865e3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h
index 000000000000,c87dd89bcb78..c87dd89bcb78
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmsmac/ucode_loader.h
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile
index 000000000000,f9b40cab766c..f9b40cab766c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/Makefile
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c
index 000000000000,1e2b1e487eb7..1e2b1e487eb7
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/d11.c
diff --cc sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c
index 000000000000,fe94db0ba3f3..fe94db0ba3f3
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c
+++ b/sys/contrib/dev/broadcom/brcm80211/brcmutil/utils.c
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h
index 000000000000,b39c5c1ee18b..b39c5c1ee18b
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcm_hw_ids.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h
index 000000000000,f6344023855c..f6344023855c
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_d11.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h
index 000000000000,946532328667..946532328667
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_utils.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h
index 000000000000,7552bdb91991..7552bdb91991
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/brcmu_wifi.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h
index 000000000000,0340bba96868..0340bba96868
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/chipcommon.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/defs.h
index 000000000000,9e7e6116eb74..9e7e6116eb74
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/defs.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/defs.h
diff --cc sys/contrib/dev/broadcom/brcm80211/include/soc.h
index 000000000000,824921191366..824921191366
mode 000000,100644..100644
--- a/sys/contrib/dev/broadcom/brcm80211/include/soc.h
+++ b/sys/contrib/dev/broadcom/brcm80211/include/soc.h



--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org


--
Nuno Teixeira
=
FreeBSD UNIX:=C2=A0 <eduardo@FreeBSD.org>=C2=A0 =C2=A0Web:=C2=A0 https://Fr= eeBSD.org
--0000000000007b81e8064a936132-- From nobody Thu Feb 12 04:49:30 2026 X-Original-To: dev-commits-src-main@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 4fBNBM0kDZz6SGZh for ; Thu, 12 Feb 2026 04:49:31 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBNBM05X7z3NQS for ; Thu, 12 Feb 2026 04:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770871771; 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=zUFSkdJ4wV5shLirlJBM2d66EPqZOsStFWIIYfXoAE0=; b=mE3v5MUSqaUdYhqCCaLCuDME3fFW1o0k0vbYUtFDziFmkg/emmcbB4yPc8OBXxxWnLry2K ZTH34hYIVWhh9lJApf2bHDt6ipxjTaHk6ddsD4QhfZ3uEF3FU1HEl6eOuGKxo68zV0jtSi 39rb7P5oecXheMfd0KPtZ6xekC+xQwo9eMkYLx+cqX/1Gl8OuFAtEXHVBzwQAnDD7zI3Cq NhcwprLjafWwT1wv9cwl8wLpKcdIqrbOWcQbwGemUNnG4QcFIpb65e5agmUSr6+Tk7hwcn sLFybBT39gfrcz+AYp3y8bSNJAaRcNxGqjVS7Bez/kkfn6yx0rwdio5zLNATRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770871771; a=rsa-sha256; cv=none; b=XVe0OYNmH806zRw0e01CFVHUwopDNzKthoeB3Bhr0Z6JvdIMwRFIyt3GVqXsZ7rxTSjBWx MAS68S+waRDvN+s8w8753SMGgBblPmGR7sDIB5hUgmqcSNg6MP8DXxo3b4k+Rtdlzo+/KV FOyfGhC3MrjLFpciwuOmzFEccX+TkxqN04aF7tDG07WoA5gJn06+dEuClAHEDKJOqJbiw/ Ca4DmC/7JqdtN5KoT//tzkxC8vrBbwhantejdqTU+tLCKK6Q6Snjl9fEkQw+QEsPK6Ozvy GZ6lCb02EqeaN3RCdhpIGQODFsMfaaOAZwZkIjp7kM6/6s4GK8NTGGQXgOBNFg== 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=1770871771; 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=zUFSkdJ4wV5shLirlJBM2d66EPqZOsStFWIIYfXoAE0=; b=ePP+kUrQYASWjV1phDLuFcvmVUKpzbnM4K2+55YvXRHJUPWUPqZ28eEszphM7KVzFLR97v rvfJYL+LfYkR4MhrHPmP1zizmNJ0GLJcqgj++1T0QXL9PzMYIsPamou/LGjDTanSNf/wRW mPMkFOOV/FILCzXBe5ZjUUxYExPNigAqog4BOsnReuj1q1Vh5zJ+kQID53HhWEO7UD6yon GAvPVR33CVXGiNrI908VYjM5jXFZzRegEzGLHu/gUuqFW/41C9bEvZ+rlkkV69AMwKn0+r R3iSxesMTqbBH5vsZZbOgp/u7V6naWcyKwXoDbtd5m58suSzgkaiKS8c2GKn5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBNBL6T81z5lB for ; Thu, 12 Feb 2026 04:49:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21dcc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 04:49:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 261ed379c88a - main - prepare-commit-msg: Sync with committers guide List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 261ed379c88a99fa9cb6239a85798f0e578aa485 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 04:49:30 +0000 Message-Id: <698d5bda.21dcc.4f7b2421@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=261ed379c88a99fa9cb6239a85798f0e578aa485 commit 261ed379c88a99fa9cb6239a85798f0e578aa485 Author: Alexander Ziaee AuthorDate: 2026-02-12 04:46:16 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-12 04:46:19 +0000 prepare-commit-msg: Sync with committers guide Add `Discussed with:`, `Closes:`, `MFC to:`, and `Co-authored-by:` to the commit message template from the committer's guide. While here, wordsmith these to fit on standard console. Reported by: lwhsu Discussed with: emaste, jlduran Reviewed by: vexeduxr Differential Revision: https://reviews.freebsd.org/D54707 --- tools/tools/git/hooks/prepare-commit-msg | 35 ++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/tools/tools/git/hooks/prepare-commit-msg b/tools/tools/git/hooks/prepare-commit-msg index 007f0f8cbbd8..ff11f599f344 100755 --- a/tools/tools/git/hooks/prepare-commit-msg +++ b/tools/tools/git/hooks/prepare-commit-msg @@ -42,24 +42,29 @@ $(awk '1;/^#$/{exit}' $1) # # Uncomment and complete these metadata fields, as appropriate: # -# PR: -# Reported by: -# Reviewed by: -# Tested by: -# Approved by: -# Obtained from: -# Fixes: -# MFC after: -# Relnotes: -# Security: -# Event: -# Sponsored by: +# PR: +# Reported by: +# Reviewed by: +# Tested by: +# Discussed with: +# Approved by: +# Obtained from: +# Fixes: +# MFC after: +# MFC to: +# Relnotes: +# Security: +# Event: +# Sponsored by: # Pull Request: /pull/###> +# Closes: /pull/###> +# Co-authored-by: # Differential Revision: # -# "Pull Request" and "Differential Revision" require the *full* GitHub or -# Phabricator URL. The commit author should be set appropriately, using -# \`git commit --author\` if someone besides the committer sent in the change. +# "Pull Request", "Closes" and "Differential Revision" require the +# *full* GitHub or Phabricator URL. The commit author should be set +# appropriately, using \`git commit --author\` if someone besides the +# committer sent in the change. $(awk '/^#$/,EOF' "$1") EOF From nobody Thu Feb 12 06:28:02 2026 X-Original-To: dev-commits-src-main@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 4fBQN25YK3z6SQ9D for ; Thu, 12 Feb 2026 06: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBQN24dVMz3cL8 for ; Thu, 12 Feb 2026 06: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=1770877682; 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=kUKBXHY2rYy4ggcHcGq3j5Rwiu/DHutibk/ru/y92lg=; b=povELNgtx1yGUWfeziEtRmZB5jnuVcY8AqR7H+81Fc4F+rCpToXHUDDnJf9CfE/XHxSOih gSz+Y6z/X5nKp+QvrEC0nwPN6LiaZEfiY7oZaq6X5cjerEWu/0pQ7j1FG2eDcthpkJyeRb 8/nxeNrnySI4k8veX4RhKhI2aofy+YeBNlsal1ioud6DZ7Tkl2N68NKW/tgyi9csi1Ywxo S8L1gNHREzzJ4o7j2St77gBaQU0izchY+AqkmiskyL8CHN10DUxKENhf4Gmqihzh0UySks yuoWWgAUurcDVshnVy+7oCo7EsdOn70E8+02BQZLUFZuVRxz8p0KJ5EmobVcrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770877682; a=rsa-sha256; cv=none; b=qRZtWtvv2cLivOLKIvY5H9KEgTXW6B3lplXqdo/1b4blK/qim4d9Re4PmnE4QrivBfS8qL pC1sT9Coj9mUCEo9KZlyd/VCpapWP+Y/84wT8+TRGc36GyIg6ThernjI3wD2oKebdOeDdm yZLei8uA347FemLLeXebAUMXERed0bwj2rclv5dqQd7SeKerwav0q/XwMsXsBl6AE7TbF3 sKpS9m3Y7hQpAa3ZDVeZK09BfXnJGuWYAIg+V4hqNYkQM8vb0t8UDjPr4aIltsdkLTssu3 G+99T3qYHift37SIl+tF0tFJgI+cqAlPGF50+y0z8QgsHUd76FlJGjJXpFRUSQ== 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=1770877682; 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=kUKBXHY2rYy4ggcHcGq3j5Rwiu/DHutibk/ru/y92lg=; b=PniWy+5LGNRyk4nc43yUNVGkciJMic6XpOjNFTT80qqUHNc2gDlfSzcEDcA+0Pd7H7C/0q nKGG0QBMuqx+4diDwgNzfPXzAwDPwivGjJJHU90DaNva+ExtjY5tCRhorWkVWY4h20eIg+ PDY7G4ctQ47c7dfptF36yJrhfRCe0wbLDuKvh6tn8+zsFP+2Bfz91J12USW3ZvJ7JX2k26 5j2QUdeDu1i13ssNMrbB5ekGLWmynO/oue8BmeMyELsEpWdSCzKr2mqGGpAaZqaWeo2Ie+ 8Ayai2wfWXCVHTPzoJRjdnSyYfFnkTmuUh0BKznIwyIv+29dPr+bPeCdc0P2GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBQN248cYz8RK for ; Thu, 12 Feb 2026 06:28:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 328ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 06:28:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Morozovsky Subject: git: 0d9b5db9fc65 - main - committers-ports: add andy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 06:28:02 +0000 Message-Id: <698d72f2.328ff.20078537@gitrepo.freebsd.org> The branch main has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=0d9b5db9fc652e79e4eb08a2f583e9b825a50b92 commit 0d9b5db9fc652e79e4eb08a2f583e9b825a50b92 Author: Dmitry Morozovsky AuthorDate: 2026-02-12 06:08:30 +0000 Commit: Dmitry Morozovsky CommitDate: 2026-02-12 06:27:48 +0000 committers-ports: add andy Following up ziaee's pattern, and add andy's line. I'm not sure whether the original commit bit creation date should be used, and use commit bit re-activation date for now. MFC after: 1 week --- share/misc/committers-doc.dot | 1 + 1 file changed, 1 insertion(+) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 8c9fe4cf9991..bdcbd6579df2 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -76,6 +76,7 @@ node [color=lightblue2, style=filled, bgcolor=black]; "0mp" [label="Mateusz Piotrowski\n0mp@FreeBSD.org\n2019/09/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2003/12/22"] allanjude [label="Allan Jude\nallanjude@FreeBSD.org\n2014/05/17"] +andy [label="Andrey Zakhvatov\nandy@FreeBSD.org\n2025/09/15"] bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] From nobody Thu Feb 12 06:43:23 2026 X-Original-To: dev-commits-src-main@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 4fBQk25LdDz6SRJP; Thu, 12 Feb 2026 06:43:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4fBQk217Mmz3fTF; Thu, 12 Feb 2026 06:43:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61C6hNZT018566; Thu, 12 Feb 2026 08:43:26 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61C6hNZT018566 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61C6hNjb018565; Thu, 12 Feb 2026 08:43:23 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 12 Feb 2026 08:43:23 +0200 From: Konstantin Belousov To: John Baldwin Cc: Minsoo Choo , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 8f23665fed2f - main - pcb.h: mark struct pcb to be preserved Message-ID: References: <69896027.2112e.2852c0dd@gitrepo.freebsd.org> <5bec84ad-a01e-4931-98e6-4ba06adb1237@FreeBSD.org> <0bf02b0d-4115-4d10-93c0-e75a8733f75a@FreeBSD.org> <25886a45-b8f0-45b0-8ed2-f1ffb56bbcbe@FreeBSD.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <25886a45-b8f0-45b0-8ed2-f1ffb56bbcbe@FreeBSD.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4fBQk217Mmz3fTF X-Spamd-Bar: ---- On Wed, Feb 11, 2026 at 09:23:57AM -0500, John Baldwin wrote: > On 2/10/26 22:55, Konstantin Belousov wrote: > > BTW, since we are talking about gdb. > > What blocks updating the gdb port to 17.1? We are already two versions > > behind. If it is kgdb, then could gdb port be split into userspace gdb > > and kgdb, and have ugdb updated on each GNU release? > > I just haven't gotten around to it. :( I can move it higher up the priority > list. I have a kgdb branch that I can rebase fairly easily. I would humbly repeat my proposal splitting the port into gdb and kgdb. This would greatly reduce the pressure, since I believe the number of people needing the most recent userspace debugger is much higher. From nobody Thu Feb 12 07:51:24 2026 X-Original-To: dev-commits-src-main@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 4fBSDD6w2qz6SX7L for ; Thu, 12 Feb 2026 07:51:24 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBSDD61yzz3ldd for ; Thu, 12 Feb 2026 07:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770882684; 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=wDiUIxET0wWweaQM1G9mcwfMA7xyhKEg5MeEnrmswd8=; b=mzwgJUEogo1ZQ5YzgaBKzS/XbLOd+f/piwLZpMt1S6Ory4aND30OEAA7uWeFe1xTzRNtOX iAEVWSdYwVwtD5mk34SqXrKekUg3LaVer+IykwibEQdBe9su+fb/YPXMi5dmbd0RtvCcew PsdYhrScLRa8vcMnmQm4gJo0FshfL9+K8W5y6etkfxqK/JnWb8spxA7fDWV+Li7KfE976D o+Ymv77t2IK6sfy7FkbdkiemrftzwISWCaHf4PFJZ68y2ItosUs3sx0S2WckGIP3U6tPRz qfGRBCPSUnGEaLwkB4rKrUf3LvGhq9pk81eCZ1eVCv6bdOv+a6XJXP99g1tNoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770882684; a=rsa-sha256; cv=none; b=yzEoKPrt4UEX9j9eW8fgvImTWCcIQjmK/PNc5wq99cNwLRJnhvwEMe3cPO5RFoDPmF9h30 aHziz229ze2WKQw73DO9VXmLs+UAUZMSf+u6gux9Ys+zIdG+3fbJ+5fxm98lQMiWjOQw25 MA/LQIGbPWYdYAfgmTZfEzQ7l7f4xvzuY7Av1VRM2mo2me1QMID5meIUXTaxnsnVXexrle qlkxH+QEjdm/2nmSK86/V28rGoQY9cdQ6+LqRTJf4HwvbQcnWE8Eyo2a1PWfyWtPMt+Pf1 KwB/eqzbECwPRk2OPYL51xv+XdC8EOgaMNEKDIM4ncjYzmZjn5O3VEOM2JR32A== 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=1770882684; 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=wDiUIxET0wWweaQM1G9mcwfMA7xyhKEg5MeEnrmswd8=; b=jyuLOGoVd9dlC0W1ripNMyRGTiXhnHqr98T4ymyD8TPwQd4mX7i529ZrkGq4qT/wmlh7+i 9jJSu96IkEJI/e3J9H7guWL0d7rR3A6ZqpZlN7cCzPZYAgUj/iO9YZiE67D2oeT+lbkUik dO2BMfXtYusw3uvzV5v/5gTCcp2FQDTE00urD6xU1noEepKKHtrroNORuQ/Ncd+xuRqf7f yt+rTT6U9Gr0GAhIerK3Q63EzTG+FwHrZzY7kXK7U7n/JQbmu4ov5vCxTxk2K/f7axienH 04h88/dQvWCXYdvmAh3MDEbnWgIB9fYf1HNYgE5Az3vXna2IE73DyT1DdYpjMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBSDD5cgMzBSl for ; Thu, 12 Feb 2026 07:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ebe8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 07:51:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c67d8acca30e - main - sbin/setkey/setkey.8: cleanup groff mdoc warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c67d8acca30e9f96f0a56f197003d0a4c663a060 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 07:51:24 +0000 Message-Id: <698d867c.3ebe8.4d55d9de@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c67d8acca30e9f96f0a56f197003d0a4c663a060 commit c67d8acca30e9f96f0a56f197003d0a4c663a060 Author: Konstantin Belousov AuthorDate: 2026-02-12 07:43:46 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-12 07:47:22 +0000 sbin/setkey/setkey.8: cleanup groff mdoc warnings PR: 293072 Sponsored by: NVidia networking MFC after: 3 days --- sbin/setkey/setkey.8 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sbin/setkey/setkey.8 b/sbin/setkey/setkey.8 index e3bcf10b9a9a..04d9ba6977f3 100644 --- a/sbin/setkey/setkey.8 +++ b/sbin/setkey/setkey.8 @@ -281,7 +281,7 @@ and they cannot be used. .Pp .It Ar extensions take some of the following: -.Bl -tag -width Fl natt_mtu -compact +.Bl -tag -width natt_mtu -compact .\" .It Fl m Ar mode Specify a security protocol mode for use. @@ -326,7 +326,7 @@ Do not allow cyclic sequence number. .It Fl lh Ar time .It Fl ls Ar time Specify hard/soft life time duration of the SA. -.It Fl natt Ar oai \([ Ar sport \(] Ar oar \([ Ar dport \(] +.It Fl natt Ar oai \[lB] Ar sport \[rB] Ar oar \[lB] Ar dport \[rB] Manually configure NAT-T for the SA, by specifying initiator .Ar oai and @@ -334,9 +334,9 @@ requestor .Ar oar ip addresses and ports. Note that the -.Sq \([ +.Sq \[lB] and -.Sq \(] +.Sq \[rB] symbols are part of the syntax for the ports specification, not indication of the optional components. .It Fl natt_mtu Ar fragsize @@ -493,7 +493,7 @@ The direction is followed by one of the following policy levels: .Li none , or .Li ipsec . -.Bl -compact -bullet +.Bl -bullet .It The .Li discard @@ -510,11 +510,12 @@ The policy level means that IPsec operation will take place onto the packet. .El +.Pp .It Ar protocol/mode/src-dst/level The .Ar protocol/mode/src-dst/level statement gives the rule for how to process the packet. -.Bl -compact -bullet +.Bl -bullet .It The .Ar protocol @@ -563,7 +564,7 @@ or If the SA is not available in every level, the kernel will request the SA from the key exchange daemon. .Pp -.Bl -compact -bullet +.Bl -bullet .It A value of .Li default From nobody Thu Feb 12 07:57:36 2026 X-Original-To: dev-commits-src-main@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 4fBSMN3JHnz6SXQV for ; Thu, 12 Feb 2026 07:57:36 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBSMN296Zz3nDf for ; Thu, 12 Feb 2026 07:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770883056; 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=UhlwpbU89YE4j1t5yn5mC9NVSDiPPR2i960sHlhM1Eo=; b=PiuVtIo1MwV02SQnCA+XSH2z0ICojwDmNXMo6Xx8/Tpw2BRDX6aHTjALhS0SSDTG5rKAYr KjcTPZ/6AxrMJfcLR/6rvnJqTF3rSDa/RUe3YBI35HMqzWnKU9XSsNHYZLr97CRdO5UELn ZrvBEjf/8oh/z6FXNuqiPA8CzRfZe5ZskZJOfsZuQ+MVThw+W7tWOSMCDIjkm++iD+hDpO hwT4KY8AVeywy+1k+oWgDyjAqtmdg2383sDJx8ZIHVrPJja+Ob8RZT53oJfgeFtvXgYj9p 5q5iFQ20ZR0ynhhEd1qeR6XRjbPaDpU2L9vorhPo7pBTaNTh+yzaK8HlBmJCQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770883056; a=rsa-sha256; cv=none; b=JKyeidPte65Dp9v6fkbojsmzWTUxkL8OenLDmvlqthVIrB01iws/K9I1YICZ0fOngZdtxz QIpxLs6tAi4DSMfLJQ6q2kGN9HeMYoWQ/r2LddxaWtHf0OiNc+PYIJmpZjSOfLIlRCqQ1R HfKOF83ejWquKjx0pD9dSxrSFB6NQ1XTW1qBFtwY/q2GT2tZTw0cTMBSyE9a2TnR3V2Uq4 VL59hCIMtQCZes7qiJ3JIwIp2uQnOoYS1D68qhzvQsWAEekjOyROEnXna8MrM4xEiaimpb LkKyXunje23XxS2fE9H5dcmXfjQQtrU9xQva2kfX+PWVMoJCtV5Bclohs3st1Q== 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=1770883056; 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=UhlwpbU89YE4j1t5yn5mC9NVSDiPPR2i960sHlhM1Eo=; b=oZvhjXg4pXlZn3ys9BfaEz9C49E/doUUJdGeSez6QxToFgQhxGgdC2C0rRZUVmLuhAiGZ9 meZJeSHOA7AB/ql37QRXu3Iod3MmyLKCTxBkT8EJrBQmimP2f+2OnsBM6Bvk5azXzShjJF Ks5FU5iTDWk/J4sR0WuDc00M8dpylBQVG2kNEEjuf2O+Z1G7xzf3oYyFOdGgpdklDfNPcM +fTQeJ4LrvNV74qvWmXJdqGHWTTBVUn4zNtDwHcIHUr519QkS8gfuA29JeXNUvII4OvK5I ojJlIBSfCEOtwEB8ou3jR3TQkHPyFEfm46b/0NrDzF/JSqZGmfjIQl23iK3jXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBSMN1VCnzBRK for ; Thu, 12 Feb 2026 07:57:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e0e3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 07:57:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 10fde719587c - main - lib/libc/net/sockatmark.3: fix groff mdoc warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 10fde719587c22085c95759a242e9c51d249d024 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 07:57:36 +0000 Message-Id: <698d87f0.3e0e3.5024a559@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=10fde719587c22085c95759a242e9c51d249d024 commit 10fde719587c22085c95759a242e9c51d249d024 Author: Konstantin Belousov AuthorDate: 2026-02-12 07:56:42 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-12 07:56:42 +0000 lib/libc/net/sockatmark.3: fix groff mdoc warning PR: 293072 Sponsored by: The FreeBSD Foundation MFC after: 3 days --- lib/libc/net/sockatmark.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/net/sockatmark.3 b/lib/libc/net/sockatmark.3 index f499eb0b902d..2b6fe2a8907b 100644 --- a/lib/libc/net/sockatmark.3 +++ b/lib/libc/net/sockatmark.3 @@ -108,8 +108,8 @@ is a descriptor for a file, not a socket. .Rs .%T "An Introductory 4.4BSD Interprocess Communication Tutorial" .%A Stuart Sechrest -.Re .%U https://docs.freebsd.org/44doc/psd/20.ipctut/paper.pdf +.Re .Rs .%T "An Advanced 4.4BSD Interprocess Communication Tutorial" .%A Samuel J. Leffler From nobody Thu Feb 12 09:26:02 2026 X-Original-To: dev-commits-src-main@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 4fBVKS1PrLz6Sgpv; Thu, 12 Feb 2026 09:26:04 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBVKR5dVGz40sb; Thu, 12 Feb 2026 09:26:03 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770888363; h=from:from: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=PxJxYccZJz+5+xZhZV77vtepz3VJPudapwgm//4618M=; b=qPLzgv+fbIc4Q+RP+SBsEpynZWz9xvtBu3GexVEjb6s9MyWU0EeOB4ZsC+V9YQw36+X3jK mHmKEnI7bKPA71uIUeTSETGl8Y3X5tpCjTeJTa+kdIP6zOYm1OHeoExMkjLecBws6GEUF7 I1Um48hpoAgJiNGtgCEfEHpq35pAT1FHwFwNFhAdvSsW/u8YoZQ1fVyyb/VWCdZk4wwLWB LjXAi1NMegpHFFb+6xffmi5DZPDK19TJ54NU+QzUmCQI+w3BHo273mLrlenDpl2b6VluzH 1nqaKBaCxAH88/9gHzYyYZGmiKwtCDAtgljdm/ITnzNljjc0vs1vOxfYruHA+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770888363; a=rsa-sha256; cv=none; b=h3Fa7UbzYn3fjvPqZ8I8fRmgOdazelDZD9uyV758lMbITENgG0V9qmSVaaLzcPSDb/RyiC MUlfQ/WOIxprLhmGSsUSW+HJFWN1LRwSdxNq6V0HU9epR/xkDRlvUnMpGys0wzV5liTWBF 932vXYOOGmMlxV1cWlZz8APkT1oECzOl+LpKmYarRFpVV+73vB0D6iaekVA3VjBkr0FkCc Vozrlv2PPAFlzxG3u4n7XMpg/FvdCgI4Gi4/bXHEQPSAmcIGO2xVPF6UwlgI0hA1ey/xIY BdkAQECMb4u2Anm3KLdZTl4e4WMt9O8iP8FPKe7+SZ7ueQRwh69igA1V1LXk+g== 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=1770888363; h=from:from: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=PxJxYccZJz+5+xZhZV77vtepz3VJPudapwgm//4618M=; b=Xe5L7VOPnWSoRmxGSGkksTPG0tgGbTH+3liRIyPk4HmILhOuOAejd69Kswe2uu7Ly8EWGb xp1GGmk8jD9JoORv0hb3Fp1pnAp3onq4YcarDh1UW0piQAZDfFKmAv4hdJerNG5fLp5AEo 2gJvHMFzYIPGzpCcGnvfca4YON+2528VX1RbpbENATsNNg2PGRy3r+hB9AyjAQVLc1z9dS cjEBtq2ouFB8x5+/yUrvEMC/WUcgahuJWuQpKkyBdHeFGLn9qnMOaHgIkAS80+m33QwgLI cDjTgKbp1/RBJSb9n1c5N4oGgzujiC3t/71Cv97J/iq42euNZ8066ZNITbImBA== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fBVKR48gYzYyL; Thu, 12 Feb 2026 09:26:03 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 67503754A4; Thu, 12 Feb 2026 10:26:02 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f0a6a9aadb1 - main - share: Delete bitrotted make_*_driver.sh scripts In-Reply-To: <202507101937.56AJb3YD060058@gitrepo.freebsd.org> (Jessica Clarke's message of "Thu, 10 Jul 2025 19:37:03 GMT") References: <202507101937.56AJb3YD060058@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 12 Feb 2026 10:26:02 +0100 Message-ID: <86ikc22tzp.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jessica Clarke writes: > +OLD_DIRS+=3Dusr/share/examples/drivers The directory is still in the mtree file, so it gets recreated on every installworld. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Thu Feb 12 09:28:08 2026 X-Original-To: dev-commits-src-main@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 4fBVMs4CTtz6SgyJ; Thu, 12 Feb 2026 09:28:09 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBVMs2K1Rz41Mg; Thu, 12 Feb 2026 09:28:09 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770888489; h=from:from: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=KnNepywpVzFOVnhSulVSMTdDhn6oN4cf9ZB3Ns6nyuU=; b=uMfOiRVqm6v+1ZI1P8Bly86lrdUd34qdWqeLy16EE0QiqWFzUcwr4FKy3sj89ZBQwAGqkA pvBvu4mKvEjH3wEx3x3zXEERozQaQiUtRsUPnwgMeBbnOucWxOz5xBdIZV2Pq3o+n/nojh Am0gICkNXMa5vhOj7UgP+JgaFw1nJtlMiFv0KgGmoHR/CPa4NSFh1ABN5Rzn1j1BzMpd5b n9xOnmpVWI1tutqLuCE9dc1uFIxV+WYfXfKUBLOYtygYuUmdH8se/tnLZJGflgsnudQcH4 mse1z0bQN+YIsCkNIjnFnnH2lbj87dDvP5w/vuj4IlP+K94keQbkEi8pmGtunQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770888489; a=rsa-sha256; cv=none; b=TxguhGGoVPx/4wYZfHmPuRrRmIvl3naxbQLwF09H8hBhnk/js9XL6friP+mR8dFzO52vDb uMG4pYyRWKwIGoPPu8gJlv9P5SlywKbi2UA86DdWEiJjnx68dEVzjKmAGHivN0dxzq/IA5 7eGf4ohh+jTSCcZ3PHbWxM+ML69ReldojqqxIZn935QSSRt8RJfsRs2KkC6HUAvv+YVyKP UfwfjTK5PzkHUgkupYDcbmSrWlcGvvyKUA89yTdM2vMtUOEM3Gl/jbI+Yt3NM3U0aRzpIN NT00/QYWsLRZObvkZpqshB9qnNqLc6Wqr/ohCUdSa60g5YDhsJXAwye9/QnMDA== 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=1770888489; h=from:from: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=KnNepywpVzFOVnhSulVSMTdDhn6oN4cf9ZB3Ns6nyuU=; b=vUSOPKR7gO+/AEJPrSXg3RFbs1grd5yKvlskRZHvxgq71SU3jR+Pa6x2jnKBV/yFgTOqnT uh5ngWlNI/dxXGLSjDVtG21t0WutcAPx3kqt5dFiqvw+GdWN2RHEakNluIgG4l3rCCgKpg 5+JBlkjgWq+S17oTqBDf9TK1EMklWEtOSjdagnBey29Pbc/58isM6faoqOgry5XTkOdFvU i1a3jD/mDjbxbzqQKDH9AWY2YLOn1Hm1HT4Qyhqjg+YVwUM9IAwlXjl6jqu1jpT/IVjR7p KI8oEbsPxFwXKBd/YmRFpfytKta4VkcoOX2d1Xj7lSsAaWkz2afB9PcA4Cjx+A== Received: from ltc.des.dev (lfbn-nan-1-698-103.w86-236.abo.wanadoo.fr [86.236.35.103]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fBVMs0yXMzZ0W; Thu, 12 Feb 2026 09:28:09 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 1FFF02E377; Thu, 12 Feb 2026 10:28:08 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Jessica Clarke Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f0a6a9aadb1 - main - share: Delete bitrotted make_*_driver.sh scripts In-Reply-To: <86ikc22tzp.fsf@ltc.des.dev> ("Dag-Erling =?utf-8?Q?Sm=C3=B8r?= =?utf-8?Q?grav=22's?= message of "Thu, 12 Feb 2026 10:26:02 +0100") References: <202507101937.56AJb3YD060058@gitrepo.freebsd.org> <86ikc22tzp.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Thu, 12 Feb 2026 10:28:08 +0100 Message-ID: <86ecmq2tw7.fsf@ltc.des.dev> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Dag-Erling Sm=C3=B8rgrav writes: > Jessica Clarke writes: > > +OLD_DIRS+=3Dusr/share/examples/drivers > The directory is still in the mtree file, so it gets recreated on every > installworld. Sorry, this was fixed in ac2f284258e4, but the fix was not MFCed. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Thu Feb 12 10:32:48 2026 X-Original-To: dev-commits-src-main@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 4fBWpT1T5Hz6RJcV for ; Thu, 12 Feb 2026 10:32:49 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBWpS6CvGz3GNB for ; Thu, 12 Feb 2026 10:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770892368; 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=kSL39lXp9V8gQeMt8yBJVjRrtCm6nOyeHEZHp8ULLdA=; b=eTHNFwc5BAn3cUX+NR4vFFTeJOBy/lZUWXWbK3YI9vaOgwvEQwl4kJ0mP+Yl+eYEd+e0yB +fdez8ApL1oirpY7tv+MUFeAgiNTm3PzcB8+Ot2+v+ZvQrfYpBCEIUVPEs137k0eSGZs2b 4mOo9oDgMJ4CgK9I9rja0DFUD59LKUVD+TybQt/HmzJ+d9PCBo8l6rb/tl6U7lTBgyR4fK C9Oyitlw3j33pTBtnYli/tij9JFfJf3BQl4Awg0Kv4ZbggbPpp4srQbu4SBWfnVHg2WIBp ss6ofs2oAYg99Twthqp3/dFFc06AsfJ9v9yL0gX9QJ8d7ht2h3rTNhowW7z1Iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770892368; a=rsa-sha256; cv=none; b=kdO0miYVyphTNhu9oU583EsnlQdMz+WLocP74AW5oDqc74JuHzqfp7FgxorZ1WkH7fCE2i 9YRfLsZO1HRcgs/KNX/PICgoemTk1bZTQHVP/nsVlvpqf4ZgsUk3dgQr5tm52W7HDHlqm0 Zm2rKeswjXGNyfCaMONdxn1j0YGJKYCIgg8MPC6lDpaJdXFcPKThs5flDoWla7MaQOdq3k 5MkZs4rxYLwAmfBTv5FNuCyv7S6SY/uBCR0loywSv+3HZsgLfesN7Dbnh4wOGwfo75voxn dOykCQsAvsRVtXRVon+YtzkvCBR6e/xNUYX9jkDgKcwUwzFM697VL3J0zfzllA== 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=1770892368; 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=kSL39lXp9V8gQeMt8yBJVjRrtCm6nOyeHEZHp8ULLdA=; b=mMrU8On3s4rgiHf4O+dF+eF5QyGxMKefO5YaIau9fmkSPUqEy44WxiYCXKkp1RJLvZq89j 18QO225VhG9F2g/IZgsrxa7Dy/saUCM+rr3NRr2peY86kZ+K7/0uS8WLOYy5jL+KYBpJCG 62vi+7q5LwbSz0YcJDPG6BWOaTaRsIkmOtnpcFedX2x/Ee5XXirfiSUzM1VZZHdhe8Nb3m Y0z59SU2z7dFTdL7tXpup9Qk64TgCCD2oYgIdYRG3F4xh0FFX1/lusIcvJXvUWSa/SFpGo HjVJ9j1bjCVvrJRzNA6TTlZGCtKi5kVvkWPyMTCbVxlQ/ZgVqPVANrauyOiOJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBWpS5gV9zYMQ for ; Thu, 12 Feb 2026 10:32:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa5c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 10:32:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 83693c121aec - main - stress2: Fix cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83693c121aecccf3499c52fcf409157ee604cd53 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 10:32:48 +0000 Message-Id: <698dac50.1fa5c.2d56481d@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=83693c121aecccf3499c52fcf409157ee604cd53 commit 83693c121aecccf3499c52fcf409157ee604cd53 Author: Peter Holm AuthorDate: 2026-02-12 10:32:24 +0000 Commit: Peter Holm CommitDate: 2026-02-12 10:32:24 +0000 stress2: Fix cleanup --- tools/test/stress2/misc/syzkaller67.sh | 2 +- tools/test/stress2/misc/syzkaller78.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/syzkaller67.sh b/tools/test/stress2/misc/syzkaller67.sh index d5dc340442ae..d08c2d4d43b5 100755 --- a/tools/test/stress2/misc/syzkaller67.sh +++ b/tools/test/stress2/misc/syzkaller67.sh @@ -95,5 +95,5 @@ mycc -o /tmp/$prog -Wall -Wextra -O0 -m32 /tmp/$prog.c || exit 1 (cd /tmp; timeout 2m ./$prog) -rm -rf /tmp/$prog /tmp/$prog.c /tmp/syzkaller.* +rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core /tmp/syzkaller.* exit 0 diff --git a/tools/test/stress2/misc/syzkaller78.sh b/tools/test/stress2/misc/syzkaller78.sh index 1858129d4c81..e279bd8f4d1f 100755 --- a/tools/test/stress2/misc/syzkaller78.sh +++ b/tools/test/stress2/misc/syzkaller78.sh @@ -278,5 +278,5 @@ while pgrep -q $prog; do sleep 2; done while pkill swap; do :; done wait -rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core /tmp/$prog.?????? $work +rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core $work exit 0 From nobody Thu Feb 12 10:32:47 2026 X-Original-To: dev-commits-src-main@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 4fBWpX6rtvz6RJR2 for ; Thu, 12 Feb 2026 10:32:52 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBWpR62YDz3GFR for ; Thu, 12 Feb 2026 10:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770892367; 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=zvJzCPmW4LIGiWHBHrSCz3pDnq9Adl952o3FgnZ68GY=; b=p8ug2+1yxITSk0V5TGOdKf7jMKATJgmGfQaX0LGC+39BogX7NprW9w4Eo/Us+1hkAsoggi 05UGd8Q+LupBFEJnpgKnp8k2lrv0iXkRZDXmSw7M7xKay0Dm3L50Rvkyh8uua1V5eIao7m t5qW5oyrAVxvriFDLUOt6w5gg8Y0kp8lfO3/P6KaZoFVVs4LOnWt5H/wlYCtnS4BHVnbSM 5EUUUObFnUApyx2mZx42N/26oV63QLfyujbb15l/EIHwauebhfQOyMTYH8NvZ0xnzguCCx GQZjRwbmt03ncf02wWQKZLyhNSoi19wHggajmvq7WVqS8iMmNZBTH3fR9KI2qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770892367; a=rsa-sha256; cv=none; b=SEhg53JuiM78gD3zPjB55x5bpXh1zKdY2X3RCiPnYKHswCkzxuQsmHn+ZdQcdfz/xoDUIg vO2GrD2gX9rrMUL+TifXnJEWmts1eoJ9HO7LeKjh/1kprF+SeJK5H3cH3JNVMIqE9lZ0lv +j+dofxJZXB9AnUOyu++BtKyZGzKRP7zw/Z597t6Ave7tq45b10msrjia2oZ6arnvEm2ap 19UwGL8bzra3kJTaMr4s/GWok5Psoprny1pQ68NNHHEIOToORg3Ks+gqI9I4aTTTHqCAYY 0WEUXTLhbtXeY5adCkR3Z1YewzdHeXYwgYjRPu9fadSVOnCW6uRmtCidnlcF+Q== 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=1770892367; 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=zvJzCPmW4LIGiWHBHrSCz3pDnq9Adl952o3FgnZ68GY=; b=yh4vV/optzkCwouvi/jgnxdkBkz3p9G7cQtaeb8opZ3lp7chZRuv39rdpC7yhqV8fT4c9D WY6fUWcRfFJmEobOdPF4YoB9t2C8uvRM5wnPlh14xoQFMln8CYIvntT+i7yuXTZ9kph8Fo MYYkam3aTF2uG9II2SOAjCxF9LxTxdABTzkGR5GsSMOxyrBGtGGM0bmC0iy5uMhZA9lb7o 6cja+EGglkg6uqlXUQeZC9GCaN5uMH8SAd3SOER1GLwGaOwGFtrx4KqCp9UQOTFQyqh6Xx opnIsRQ4vu7MEn1A1HUmefjF4mkuLE0onP+xniNYjC4vZhtz7iItYEyKnPbNIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBWpR5Nl4zY9h for ; Thu, 12 Feb 2026 10:32:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f57e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 10:32:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 2b061bd1796d - main - stress2: Limit output from test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b061bd1796dc50eddc41b57f8ecd4596235a657 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 10:32:47 +0000 Message-Id: <698dac4f.1f57e.357365f9@gitrepo.freebsd.org> The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=2b061bd1796dc50eddc41b57f8ecd4596235a657 commit 2b061bd1796dc50eddc41b57f8ecd4596235a657 Author: Peter Holm AuthorDate: 2026-02-12 10:31:36 +0000 Commit: Peter Holm CommitDate: 2026-02-12 10:31:36 +0000 stress2: Limit output from test --- tools/test/stress2/misc/syzkaller52.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/syzkaller52.sh b/tools/test/stress2/misc/syzkaller52.sh index ec5244bdae65..8f9b60667b43 100755 --- a/tools/test/stress2/misc/syzkaller52.sh +++ b/tools/test/stress2/misc/syzkaller52.sh @@ -451,7 +451,7 @@ mycc -o /tmp/syzkaller52 -Wall -Wextra -O0 /tmp/syzkaller52.c -l pthread || start=`date +%s` while [ $((`date +%s` - start)) -lt 120 ]; do (cd /tmp; timeout 3m ./syzkaller52) -done +done > /dev/null 2>&1 rm -rf /tmp/syzkaller52 /tmp/syzkaller52.c /tmp/syzkaller52.core \ /tmp/syzkaller.?????? From nobody Thu Feb 12 13:57:48 2026 X-Original-To: dev-commits-src-main@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 4fBcM53jtwz6RfV3 for ; Thu, 12 Feb 2026 13:57:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBcM52yb7z3lr7 for ; Thu, 12 Feb 2026 13:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770904673; 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=Zf4lKbaE33PfeuqQysMoFX8X5kOG1UNpA383X8mU6Ng=; b=byTRCNOePQ3A4ZHq1rPa7UXfyZrTTgI3nkhnBSGSeVk+q4SbksrTAM0YlubijqV4yryyRq sizlmnxV84pMhe8SvwzqsENRodvje6sb9/NXxJEJrDi7pqYVmz+fk4OMqR8kU5nYCCppru xPlhr4q+T3zx6+ctSr6ixfWMEbB/DDzfBHKNf3YpxY5Re7J6nDMlHpSW18TWFKuw/YVpMs 2w8pkmHnnGcEZneQR1UEYaDlqt8/QjyHchMBT6OtPX6+uN2pH38DIYH4RmS2mY1ts2LmZz ax/wNqHCOfk9B0Er4qZk/dCRpoHFv7JxTRLxuzl6j639Xasq6ElTC/y9wIWnHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770904673; a=rsa-sha256; cv=none; b=di3ZQ5Ogcf24DsYtWWDjewLoTTo5WSgA5jboJmCCU98a4t4ovUp1tU2XH2VmDSkFN4jqNE k6xOzHY5GIokjpkWwNhcHbCeVesUKEPXIHi1/fGzf2CO5bt0iC/kbT8xZMpsRHwvbaqVvN k77tUX+IwHQo77//q9qxVHjbqdUnyipYP2wvNYZo0/U5Bxfy2aP/r5olyvPQDdzHuIEqlB NC31NCzeNymgFTUPPrAsy+3c5QWawN0tKGxYOYBGTsN3rfyl/+DINwuMrUlCZuTzd0iuMU Ky8VSG9epAjLwMXiIPo4EQJ7/Nw8X7Gx2X9jCu9RvnJxHHp1DFXVzTY0vqBKLw== 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=1770904673; 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=Zf4lKbaE33PfeuqQysMoFX8X5kOG1UNpA383X8mU6Ng=; b=vAjmjLAcQVbkC7sUW8MjHY+Iaizl/7yve2k74dxc2gFU0VPYMgaXbHUFumZ5CaRGMRtpMb cImtn+6itKy2riXuQ+YuGHCg12f90FYvMNuL4lDTgFUYTnKOX6D2GgERpE9nlyRfI9ElqG +ihb5v142/nkC1o0Ol/ba3kqq4KVUsoe210lchASSgzevglBnqpwzWsMzNwXKg8dZ7375n Cd3tYM4Oezo5H43f31UNcYCNeZzh3HvToLalOe35JaKmgniDSV9Rlb0INhk3iNPbjWIIEE UxmrZrJMZyVW6GHOyx7G6MSgZjp9DyHKen4dGSF37pRkuo2cy/tJxE1TEE27DA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBcM52VNqzfld for ; Thu, 12 Feb 2026 13:57:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ca5d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 13:57:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: c3f945eac453 - main - libc: Remove leftover comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3f945eac4538de572600787a73221f2549c62c8 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 13:57:48 +0000 Message-Id: <698ddc5c.3ca5d.31afeffd@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=c3f945eac4538de572600787a73221f2549c62c8 commit c3f945eac4538de572600787a73221f2549c62c8 Author: Aymeric Wibo AuthorDate: 2026-02-12 13:55:01 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-12 13:57:38 +0000 libc: Remove leftover comments These comments refer to a comment in div.c which doesn't exist anymore. Fixes: 7c7299df76e2 ("libc: Remove support for pre-C99 C standards") Sponsored by: Klara, Inc. --- lib/libc/stdlib/imaxdiv.c | 1 - lib/libc/stdlib/ldiv.c | 2 -- lib/libc/stdlib/lldiv.c | 1 - 3 files changed, 4 deletions(-) diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c index bf9737a3c47a..a8b4df2f3904 100644 --- a/lib/libc/stdlib/imaxdiv.c +++ b/lib/libc/stdlib/imaxdiv.c @@ -28,7 +28,6 @@ #include -/* See comments in div.c for implementation details. */ imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom) { diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c index 4c73bcc14af4..7b785ef66c16 100644 --- a/lib/libc/stdlib/ldiv.c +++ b/lib/libc/stdlib/ldiv.c @@ -39,8 +39,6 @@ ldiv(long num, long denom) { ldiv_t r; - /* see div.c for comments */ - r.quot = num / denom; r.rem = num % denom; diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c index 6feeb74bacd6..cdce0a4f6a27 100644 --- a/lib/libc/stdlib/lldiv.c +++ b/lib/libc/stdlib/lldiv.c @@ -28,7 +28,6 @@ #include -/* See comments in div.c for implementation details. */ lldiv_t lldiv(long long numer, long long denom) { From nobody Thu Feb 12 14:07:13 2026 X-Original-To: dev-commits-src-main@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 4fBcYs4qbVz6Rg84 for ; Thu, 12 Feb 2026 14:07:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBcYs2hkLz3njY for ; Thu, 12 Feb 2026 14:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770905233; 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=Rpd6fuLA/0318GtwKmxnj4sEPh5bnWK2QvfsDS0vBTw=; b=UXzCQ1ACZ/EwZjwNt3PK3HvY4ScqefQNvkls8QLIKwHcJJ0MRF7o7EXSZOJExksZqfSHTT yZ4BXUEby2cscMduDDlHBQ64EzIRQ5UJK/A+CtGQ4XYkvTLnDNP6x5H6CVrh3YDY0tADvw dI/hCv06UvFMwOpm+E6Vi2QxiYcWrPv9qm1Er5LL+TNw/TRvMzDNYKwiP+/Jxp0RbAiGl/ LE4MsklvsVtTIKjIPQQ8YwzGEoAhEDCMPC4K50fmgFFOwnbIxtVaTDPb0Lg2pjHdGKZeXn Bupg/xF9lZ2h9Z80dVCvTJZjfTAJUf+iznUTFW6mm1D/G7WC28Jzhk9rs+6TBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770905233; a=rsa-sha256; cv=none; b=dALMMeZgTIkfgg8AHX3cvIV4eaYBwt/4UdgjgGicB72k4WP3Ld/DVtRMpB6UEljyb6DQoz E4aI6diaKcZ9CGQfDnWbws8DjGTuzzzSxlgxgANP1Qt3zStmc9PaBa7T1nYx270qT2dajz cbuiMzvSmMHV9YCtUKiJnw6lHnsBDvDZ1xfKjxF/uydJkHrBK4c+0veFf0RpfNlGxu+Xil Xlicc4WXAobnwRelZsuoHuVUFn6j6N2FPBgkXkO+BXkqs5mOH2VDelZB4bPL3orTWaDObs GOv7xb189n3UMIUvFVpVKpUPq7byp5s7+R5/nVcb20Y+GwmgcqH9AlqQF5L4nw== 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=1770905233; 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=Rpd6fuLA/0318GtwKmxnj4sEPh5bnWK2QvfsDS0vBTw=; b=gt9cR1+qmz9F2q7PBAsDWiCSdvAGb0VQUByII+IOnf7gBKrnFt2GGX9qjA26lbWVlWbFeO +m3+fLAf2N0u6eJEeicqEwsaeu8xcxSgBvF+z3qKItWCwP7vBEAZcOHCCtHIP9Dt8OxTCg yfrfbyHzQyPqz/guMviQ4n+Ka5EdAMAmVq9eNcZzA52y9sfYzq6DpBwRfdNOJttacV7hwE w03fkOFmcRb20JM6+ArjgzDCxD8nPpkgL3EpHnOSAVCzVcOWSvEdj1R0Gi8mTgAN2QOR2r V7S5Ezlqh9/FJwwXjAyScK3pB6eAPSzWX4YvFhLQhwlZrC5r7wnbWSJlLi0ouw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBcYs29GNzg28 for ; Thu, 12 Feb 2026 14:07:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ac71 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 14:07:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: be393b6f0497 - main - netinet6: Add a struct socket declaration to ip6_var.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be393b6f0497f374c679c31e746705515eb9a554 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 14:07:13 +0000 Message-Id: <698dde91.3ac71.2458dd0c@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be393b6f0497f374c679c31e746705515eb9a554 commit be393b6f0497f374c679c31e746705515eb9a554 Author: Mark Johnston AuthorDate: 2026-02-12 13:59:40 +0000 Commit: Mark Johnston CommitDate: 2026-02-12 13:59:40 +0000 netinet6: Add a struct socket declaration to ip6_var.h MFC after: 1 week Reported by: Ian FREISLICH --- sys/netinet6/ip6_var.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h index 4951f43ea4da..6c5604a2a562 100644 --- a/sys/netinet6/ip6_var.h +++ b/sys/netinet6/ip6_var.h @@ -372,9 +372,10 @@ VNET_DECLARE(bool, ip6_log_cannot_forward); #define V_ip6_log_cannot_forward VNET(ip6_log_cannot_forward) extern struct pr_usrreqs rip6_usrreqs; -struct sockopt; struct inpcb; +struct socket; +struct sockopt; struct ucred; int icmp6_ctloutput(struct socket *, struct sockopt *sopt); From nobody Thu Feb 12 14:07:14 2026 X-Original-To: dev-commits-src-main@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 4fBcYt5DkNz6RgBN for ; Thu, 12 Feb 2026 14:07:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBcYt3L06z3nbS for ; Thu, 12 Feb 2026 14:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770905234; 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=KAqnOh02ENrDNYR5iJ3tcmsXZREj7rJ8ThWA35EF3To=; b=mkTQeihJdpucJujNN4XtrI5v9O53HnzyLO4gIsxGlx0P0EuTQQ+quRJgmOM3Ol1UKhlMvy joAz4BsmLnSNK6NQaYorAufmdip2AZbtVj25kEgCcZPgMg+iJTYpDgdhJg/OjlQwPV0iH9 n/jw7GadXJGALlfcoei3qHlqXSZ7wt2jnup32icTr9z+eeVJIvGuwnpCBAFstjJYPCKvkn 68CasDjoOEiGaZGJlLSFcl3/gdmeR/NQSs1mubL801oRItfTc+aIT4wyOUOgGyCpbWR01y 0RNSiefvx/YiBVhH6nLhxtjA9sErsBrz5tsD2/CPiq3+KNAOyklaFq++GNx0yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770905234; a=rsa-sha256; cv=none; b=M5hVsj/8lVigivUkSmoLxPLvnSpmp7fFZh7FgVlvbezT75XKeDycKf5wVWJbkKayvfPQ/K XTVLp9BoohEU6yfsWWdNND3I1Tipd/57R0mEuwOwHn0nd9Bu4bdIdtb1MnOFDgwWFAcSKy OaLbgopTxyuv3BJIi1NwKYvz1zNQBeHXazITy0sdAmejNQrk/kgWIW0XaFgHoReMKDQ6z5 a2R4vcvocF01+dzzRC/mfxmOSNfzidANXtGFLkikxJCQTtnlLPgG279Ai3VSup+qm0TblO BHMbQWOpoP4cGbFjWx50SQTy8nV/EROSMDtzCCmjVSSn9gvp4BXJzW9Pk49ayA== 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=1770905234; 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=KAqnOh02ENrDNYR5iJ3tcmsXZREj7rJ8ThWA35EF3To=; b=lFZB4bvi0UfOcO0Hxa4Ce2u7Wb7dWg88/rVv8XaUN1x3B5lgEfHSbiTgKOB6B+wWb+J71L /+FExPQZTbKbolH0fhAWGy0vZn2MldCRCFifBKjOzxnrm+mP7uT/4ovqj8t2fsWk8Lt+uw cY4ZGaVrLBTSLHrER0vxh7kGVAhmfRYjz894L7kxiChDSvAeMRNGcm0RXDzVfMW+TCd0ta iCbEVKlazSM97S4MClD+wD5JXy2Unk6f+kc2d2VWqU6PKYBwimNmyprSpkTK4+AQOKd14z H8O5MaoFKo5Gmg+nfAG0Cy9PEBI0N7oe1vxeogBcv0qhr0xQ5E6pMnpA0JfmLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBcYt2xNwzfT8 for ; Thu, 12 Feb 2026 14:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c7d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 14:07:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7c1c0e94363d - main - rpc: Improve socket locking in svc_vc_accept() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c1c0e94363db09af0c260d9292160cdd2230f23 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 14:07:14 +0000 Message-Id: <698dde92.3c7d9.165d84c1@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c1c0e94363db09af0c260d9292160cdd2230f23 commit 7c1c0e94363db09af0c260d9292160cdd2230f23 Author: Mark Johnston AuthorDate: 2026-02-12 14:00:43 +0000 Commit: Mark Johnston CommitDate: 2026-02-12 14:00:43 +0000 rpc: Improve socket locking in svc_vc_accept() so_state modifications must be synchronized by the socket lock. For the listening socket this probably doesn't matter but for the child socket I think it's possible that this unlocked update clobbers a state transition if the nascent connection is being disconnected for some reason. Also fix the line which potentially clears SS_NBIO in the listening socket. It is unclear whether this code is used at all. Reviewed by: glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55247 --- sys/rpc/svc_vc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c index 7e30582c59e0..848109704ad0 100644 --- a/sys/rpc/svc_vc.c +++ b/sys/rpc/svc_vc.c @@ -389,12 +389,15 @@ svc_vc_accept(struct socket *head, struct socket **sop) SOLISTEN_LOCK(head); nbio = head->so_state & SS_NBIO; head->so_state |= SS_NBIO; - error = solisten_dequeue(head, &so, 0); - head->so_state &= (nbio & ~SS_NBIO); + error = solisten_dequeue(head, &so, nbio ? SOCK_NONBLOCK : 0); + if (nbio == 0) { + SOLISTEN_LOCK(head); + head->so_state &= ~SS_NBIO; + SOLISTEN_UNLOCK(head); + } if (error) goto done; - so->so_state |= nbio; *sop = so; /* connection has been removed from the listen queue */ From nobody Thu Feb 12 14:15:09 2026 X-Original-To: dev-commits-src-main@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 4fBcl203YLz6Rh6V for ; Thu, 12 Feb 2026 14:15:10 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBcl15hhHz3qhQ for ; Thu, 12 Feb 2026 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770905709; 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=l11GRXfbsp6WPk9biEhd6dO6c8ObIPL3hWy96ZPu3cU=; b=rPhQ7F/sY4Mh0/+ZorDATo75MSYc9mNWYV+Gl89XXBhJ7spwhFSo2SKIi/V1RZftXzrubs LVNXFW4KHAp40tRPxPxEUeA3lOfqAQlmXMOjll8zt/xpkTvrG24p+8kA1V1kyhkoQTWU/j urM6n6Jio9dFu4I4tlQSd0QCpqBDFKAxyVzQQO/4kmXlZPKZWEakrw/Jj71W5cOYWz6rQv 0jU0bTnuJ8BXdHpeZ3HhIWVacIqdKLIbYnXoEFbdrBNxAPtDJ4GdtHN0JG11QjdW7FzmzN YTVO3/M4SivPg7hGm8xZM5aEGfLDOxXPkca758tdPuGCv1IoxZAStZ3hCbYYQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770905709; a=rsa-sha256; cv=none; b=avVyU94BttREaP8qxyZ+sMDz0Jp1ZpVhvEGTKKkFITUb3dk1PuhKasi91S1EiLcBrWKizy AKKcts5DREIzupyUUCZ4Mwq4mMtf3VgPedz2wGKKtTCYofx9C7e9aMQsjR/JAo9+G4qaH7 X8mYhEpaihugIpNzCBFXRopBkWfw/RcdQ4tsdmDJ5MFFkZQbydp/EhwJ7/W0R4U3Cf3VAT FD/5f4bdnzAem2qSovJMLh3PToiPoyJizOjfaxBLC67phuZf4HEGKO+m79tHCeboT0GSg4 Gh9FiF03P5Xms4yJB67Ov06Xyiddka6a6s5zlcLc11PgLVBszom6hxc/zgP9pg== 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=1770905709; 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=l11GRXfbsp6WPk9biEhd6dO6c8ObIPL3hWy96ZPu3cU=; b=I6z5gxQwdoVSrvw3QZaZZOcSs5JCphdkVvxIJtZtbblpQLauZa1duI6Uv2scV/nOoH8g9v vcJ5BEok0PQDIjzg2xN5fgfQqmTtfb9iuO0ULXnZB+QvW8wuJWk4DZa1Wm2rVAfi2kGG3X ceQZW+3oGYvhAP8K/kw/hKXNUDnc1v4yIDgGxsN5wGSevPZFWEYPjEnCZVeY+uDAtUTbBM rjNZr3g11WJ85/Tetc0JafMoZ3UsRVlgJ+G+sgaWl65yEIKpdRHaW1oI8VvgLsHdoJ2lre wzEb6v8R2rrBkKX73U9PCiHgwMzTl6k3nATBFuiZ/F15gghdBD0cPYB6RbcKQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBcl15Gv6zfxH for ; Thu, 12 Feb 2026 14:15:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d5df by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 14:15:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 64e612b46290 - main - newsyslog.conf.5: Add a CAVEAT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64e612b46290617ec753b4ee6ec633a3724940e3 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 14:15:09 +0000 Message-Id: <698de06d.3d5df.668037bf@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=64e612b46290617ec753b4ee6ec633a3724940e3 commit 64e612b46290617ec753b4ee6ec633a3724940e3 Author: Alexander Ziaee AuthorDate: 2026-02-12 14:14:47 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-12 14:14:48 +0000 newsyslog.conf.5: Add a CAVEAT PR: 282639 MFC after: 3 days Reviewed by: michaelo Differential Revision: https://reviews.freebsd.org/D55122 --- usr.sbin/newsyslog/newsyslog.conf.5 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/newsyslog/newsyslog.conf.5 b/usr.sbin/newsyslog/newsyslog.conf.5 index 0a47af7285c6..b0c1e78eb085 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.5 +++ b/usr.sbin/newsyslog/newsyslog.conf.5 @@ -18,7 +18,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd September 1, 2025 +.Dd February 4, 2026 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -497,3 +497,6 @@ entry: .Sh HISTORY This manual page first appeared in .Fx 4.10 . +.Sh CAVEATS +If a line is specified multiple times, +the file will be rotated multiple times. From nobody Thu Feb 12 14:34:07 2026 X-Original-To: dev-commits-src-main@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 4fBd90587sz6Rjgv for ; Thu, 12 Feb 2026 14:34:12 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBd9024zzz3tsR for ; Thu, 12 Feb 2026 14:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770906852; 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=e5bRVzH2T+9cXAJ98R5V1pp25iB6pSpUXDL840WZSXA=; b=KVXYSUZrcmZggf/bNT/oQW5ZZur9ux2FFWGKSXks5RulqRC0VtMuEWdAF07fGPhBtlAmtt 9OI5gV/q17sOAuEuHCgPeRTLB40ZWY6mN17gkqYuDZYQ5QianTKGQIVQ3oMqyTXZevJ03Z gViN5oDnES+mh9eZ7PgDR8JQT/683tgF2L6gAFoSgTU8V9fv+wt26zeH4WfpX8Yd5IghqT HRjuVt8T9NsQNSaS5VXHVqRHecF5ZW77EyA1tjsBGmc9tiakx24gBNysq41KKy5F/3wWqr eZCKc7vtGN/Z2i+cAk6BJ0CABl7/RcgBpABHBmfNHlpq1qclZ3qEJ2ffgkSy/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770906852; a=rsa-sha256; cv=none; b=GATE1xHiGrUm6m7wtOLYLUEA0VQ6jVaL2+4N3fTLvB2npTZJWhqVPC8luca5dmr0XvbB6/ QJtKQgrEyZ7B8l3hmATKff76UOu/oebtyjxZxkuuvf735gaON+eJwvxLeB7MYHhCLrqPLx yOOkFfMP+F6UrdzGSd9GmZf+ZEphGi0JXzQqhqqRPTlhlt0uqUIhUA8NPp793tcHZJ5Cxu KBmkwC8vIlYJ1p5FoH+Lgif9hgQafmH2/99lptVetStarH1ivnFERooo+DurhUjFGYe60L c47WmgZujwsdE6kDrxJXSZzWehrMUKAx/ofsE3nH9Ouvl1DxtteWKqPvK2HkRw== 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=1770906852; 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=e5bRVzH2T+9cXAJ98R5V1pp25iB6pSpUXDL840WZSXA=; b=MYdQ7TeRplUwfyLVyHw1B0JuqADc6b7iUMYDpwrnUAVDoPHOAUarSjJ63sG5679gq3So14 7xUU9dus3CPkgOgiXFDntzh2ZoVcTncGZ9tLI9ALk0qYWreaKq5ssbDheYfv0Jk3lHbaPZ dU2jNAT5lvJJVCcdWppaBedmBNMZ6cqvMXyGY9dXb/b2xvuh8/WcbyJzCmuOT3SD1o01Uu nsLDJQ09TgFJ6VaQpZCsKS2aqpfuVBhUp1JP/V7Nd42YB5clUnPPWhdQLXHSAi6Hybd0R7 QT6hQIkrbckeFCP9gUoeEV0lUTWjV0q0pJVEnTrUvbmmsHQLhcuiKAK/DVzggQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBd901N2Rzgv0 for ; Thu, 12 Feb 2026 14:34:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fcfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 14:34:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 9778537b6738 - main - igc: remove M_HASHTYPE when RSS is not enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9778537b6738d8693e887c3b0c8bc4d5a0aa28ce Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 14:34:07 +0000 Message-Id: <698de4df.3fcfb.25ef144b@gitrepo.freebsd.org> The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=9778537b6738d8693e887c3b0c8bc4d5a0aa28ce commit 9778537b6738d8693e887c3b0c8bc4d5a0aa28ce Author: Cheng Cui AuthorDate: 2026-02-11 22:21:32 +0000 Commit: Cheng Cui CommitDate: 2026-02-12 14:33:29 +0000 igc: remove M_HASHTYPE when RSS is not enabled Summary: manually cherry-pick 21dd554d1697 Reviewed by: kbowling Differential Revision: https://reviews.freebsd.org/D55256 --- sys/dev/igc/igc_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index 96949492fd24..7ab09078d8f4 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -593,6 +593,6 @@ igc_determine_rsstype(uint16_t pkt_info) case IGC_RXDADV_RSSTYPE_IPV6_TCP_EX: return M_HASHTYPE_RSS_TCP_IPV6_EX; default: - return M_HASHTYPE_OPAQUE; + return M_HASHTYPE_NONE; } } From nobody Thu Feb 12 14:55:39 2026 X-Original-To: dev-commits-src-main@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 4fBddl66Sjz6Rls8 for ; Thu, 12 Feb 2026 14:55:39 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBddl5VBmz3xSJ for ; Thu, 12 Feb 2026 14:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770908139; 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=nAsjVAYokVoFPsZ3LP9MaPQ9+j6xr6lkyiayy5ko1cw=; b=T2jF9XVdX7xNyF5mFTy4paAKoNJaXxVRz8Xq7O7/CTptwi730INtaAgj0jDvDlfNUKWGWr uWJo39T9SqiLeImtCLAQFTHwABn3s0jx0A8/eagcGxEaukx9wF+PBJNJGxqYOtiVUmi2nV z9kuBb7cdy8A1fI0MH7//W645Amo7PjQEzsAFOuLJRCk+3l/IhBG+VZ95Ukjj8iWVmjur1 G8XiE0P7OwrazBLk/O1MCNWkARNku/Y4SqZ8zBtTMpDACQ4JWapVq0YvtBwYccINiN3lqz vrAVWFelM2WULv+sPHqNCX0S8hC36fOectNereXldoWX/vJAtQWw+O5j9qFKbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770908139; a=rsa-sha256; cv=none; b=ALEEzGTJ/vtHhbKBIic8Rt3U/Y9g6UfjQbf3kPhP4Yo0yOWEIRJwvTiEHVEurrtMMkCxDx Je7cuZCm8UwDczAygR9693b949foW5yoeeIzjgrQ/R6PZc8sDT0OSkIeqghh4jZa3lCrTx bq7Uj/KSqDRIIuvNQOjAR/QzLaRhXXuCt9OWcPCnmSXx1PXUgNukIg1uRBnr8q3EM1xoxC z75ZMAAHjrBIAdQWJQ/Q+i6rRNiGcchrPv3dMT1g3XExyuzIS7zodYWHbMSpBE/kaVOZLQ J3j3hZq7TIPQ/PgX3QQ/K6ws//ibC3wOHUjRbneLgRXpNSerVkPl8+FW+t1F5A== 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=1770908139; 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=nAsjVAYokVoFPsZ3LP9MaPQ9+j6xr6lkyiayy5ko1cw=; b=cNW7mmGUX9wVWq05w4My6+2vWL2YFl+mgmQIUKeCPyjf6MT+WI4rnETJK144KEJ9BbrHG4 S6dOc8xhJaIOgFjh4XblsFkohSxnSfBF368Nyw5ye0VKL7uXlPgmmAzSnGPLsppnhZfGUX Oi777OVxe0keCYpth32HLV+IaAzg/+vzMv2FhzooKRQvLwTLAV+YPCo2lCqaBQguTz9e9r 6DGtvRFQyanUMncjW/hp/h0V4/qQD6kdGo1vaK0SCwQZmEJ7y/y0G480AkzSl+jPwfap8L 2VFzwXr6JW3alXne186vSsGUXjP0OitX/zj4T+c/oRMnTWVnFkXWKXAau1GVWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBddl4D7DzgnG for ; Thu, 12 Feb 2026 14:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 195b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 14:55:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 0bba277f2223 - main - libc: Improve {,l,ll,imax}div(3) manpages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bba277f2223a31e4453ade39be110b1b3aeb1dd Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 14:55:39 +0000 Message-Id: <698de9eb.195b2.5da69416@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=0bba277f2223a31e4453ade39be110b1b3aeb1dd commit 0bba277f2223a31e4453ade39be110b1b3aeb1dd Author: Aymeric Wibo AuthorDate: 2026-02-12 14:50:19 +0000 Commit: Aymeric Wibo CommitDate: 2026-02-12 14:55:14 +0000 libc: Improve {,l,ll,imax}div(3) manpages Mainly rename numerator parameter of div(3) and ldiv(3) from num to numer, and explicitly specify what "numer", "denom", and "rem" mean in the manpages. MFC after: 3 days Obtained from: https://github.com/apple-oss-distributions/libc (partially) Sponsored by: Klara, Inc. --- lib/libc/stdlib/div.3 | 14 ++++++++------ lib/libc/stdlib/div.c | 6 +++--- lib/libc/stdlib/imaxdiv.3 | 6 +++--- lib/libc/stdlib/ldiv.3 | 14 ++++++++------ lib/libc/stdlib/ldiv.c | 6 +++--- lib/libc/stdlib/lldiv.3 | 6 +++--- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/lib/libc/stdlib/div.3 b/lib/libc/stdlib/div.3 index 55c1bd107cb7..87b9665684fb 100644 --- a/lib/libc/stdlib/div.3 +++ b/lib/libc/stdlib/div.3 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 14, 2001 +.Dd February 12, 2026 .Dt DIV 3 .Os .Sh NAME @@ -38,21 +38,23 @@ .Sh SYNOPSIS .In stdlib.h .Ft div_t -.Fn div "int num" "int denom" +.Fn div "int numer" "int denom" .Sh DESCRIPTION The .Fn div function computes the value -.Fa num/denom -and returns the quotient and remainder in a structure named +.Fa numer Ns / Ns Fa denom +(numerator/denominator). +It returns a structure named .Fa div_t that contains two .Vt int members named .Va quot -and -.Va rem . +(quotient) and +.Va rem +(remainder). .Sh SEE ALSO .Xr imaxdiv 3 , .Xr ldiv 3 , diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c index 351dca870553..cdc6e1922060 100644 --- a/lib/libc/stdlib/div.c +++ b/lib/libc/stdlib/div.c @@ -35,12 +35,12 @@ #include /* div_t */ div_t -div(int num, int denom) +div(int numer, int denom) { div_t r; - r.quot = num / denom; - r.rem = num % denom; + r.quot = numer / denom; + r.rem = numer % denom; return (r); } diff --git a/lib/libc/stdlib/imaxdiv.3 b/lib/libc/stdlib/imaxdiv.3 index 1553a81edae2..9e51c47b53c3 100644 --- a/lib/libc/stdlib/imaxdiv.3 +++ b/lib/libc/stdlib/imaxdiv.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 14, 2001 +.Dd February 12, 2026 .Dt IMAXDIV 3 .Os .Sh NAME @@ -39,9 +39,9 @@ The .Fn imaxdiv function computes the value of .Fa numer -divided by +(numerator) divided by .Fa denom -and returns the stored result in the form of the +(denominator) and returns the stored result in the form of the .Vt imaxdiv_t type. .Pp diff --git a/lib/libc/stdlib/ldiv.3 b/lib/libc/stdlib/ldiv.3 index 66abb00d4d6c..c2ab444bdcab 100644 --- a/lib/libc/stdlib/ldiv.3 +++ b/lib/libc/stdlib/ldiv.3 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 3, 2022 +.Dd February 12, 2026 .Dt LDIV 3 .Os .Sh NAME @@ -40,21 +40,23 @@ .Sh SYNOPSIS .In stdlib.h .Ft ldiv_t -.Fn ldiv "long num" "long denom" +.Fn ldiv "long numer" "long denom" .Sh DESCRIPTION The .Fn ldiv function computes the value -.Fa num Ns / Ns Fa denom -and returns the quotient and remainder in a structure named +.Fa numer Ns / Ns Fa denom +(numerator/denominator). +It returns the quotient and remainder in a structure named .Vt ldiv_t that contains two .Vt long members named .Va quot -and -.Va rem . +(quotient) and +.Va rem +(remainder). .Sh SEE ALSO .Xr div 3 , .Xr imaxdiv 3 , diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c index 7b785ef66c16..4e92c56dd3e2 100644 --- a/lib/libc/stdlib/ldiv.c +++ b/lib/libc/stdlib/ldiv.c @@ -35,12 +35,12 @@ #include /* ldiv_t */ ldiv_t -ldiv(long num, long denom) +ldiv(long numer, long denom) { ldiv_t r; - r.quot = num / denom; - r.rem = num % denom; + r.quot = numer / denom; + r.rem = numer % denom; return (r); } diff --git a/lib/libc/stdlib/lldiv.3 b/lib/libc/stdlib/lldiv.3 index d1de4e9234e3..783ea3df6554 100644 --- a/lib/libc/stdlib/lldiv.3 +++ b/lib/libc/stdlib/lldiv.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 14, 2001 +.Dd February 12, 2026 .Dt LLDIV 3 .Os .Sh NAME @@ -39,9 +39,9 @@ The .Fn lldiv function computes the value of .Fa numer -divided by +(numerator) divided by .Fa denom -and returns the stored result in the form of the +(denominator) and returns the stored result in the form of the .Vt lldiv_t type. .Pp From nobody Thu Feb 12 15:03:05 2026 X-Original-To: dev-commits-src-main@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 4fBdpK30Smz6Rmv4 for ; Thu, 12 Feb 2026 15:03:05 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBdpK1f8Kz40Kh for ; Thu, 12 Feb 2026 15:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770908585; 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=vZj1IcExqiI0mjEKPf6oyYtXd66e5LCTsR+lquAAntg=; b=SZKFuEgfUvaJmXkfjxHTxiB0ebAgnHWhhowWXQgdbds2LCb7wViqv7vK/FnNiU4yFsG0O0 61Lsr4PUbmHJ+W3LxP7FVlasrDqordxNRiR0ORBoozMrQHmD3Z4Y+o19atdaymhCOrmhdy StEHDIZpxuM7Bi8DRKoCuwtj+GgE99+saEB2+/V6ymg9APz2noz3N4JrgLc51mkDhOHCUf 891wY3TyEmFh1GpIiZb5dvXxKdxOx71NoCchqsCwnfxGFdbMXkjL5jnVvnF61ttR29jIuj IyWqAtYMwwxuigrziHwfCldXaU29GYde1rh7Zf8sx1DUS4llpykABAwmUB4pnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770908585; a=rsa-sha256; cv=none; b=TAAo7j/dc/A/wCYjWACD23QOoOeyzybTZe0W6OcJCLpnaRD/W+XtXKrRHgT5rFdPHI78sC zebjlzAD37qTS+WsH7pE7xGCx2JO1WvsUCas3zt37iNWodh+8Id0gWIcqsMLexDjST42dy CL8hPKvjQ30IkHeAqPOZSvqLbK7h3ThKvtrYKK38mVR5nm2a67bgZc5HNf/zmaaNUHsSmk ofAX/KnINmDJNEhaoXN6LvMD3td2ciWTYnI90m3Tvw/wMF4JskorOujM9D6GzGkbZ3wPSM RuG2heyJ/FIzbqMJ01PKUE35bZrgwzTpKZIOXyKcLPiCe4xtO0eHqWdk3jvu+Q== 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=1770908585; 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=vZj1IcExqiI0mjEKPf6oyYtXd66e5LCTsR+lquAAntg=; b=Ii5yp6bZbH9HzqkUS2uVFIwdcRrI91PPOhsd44FjC7EJea3wtrGq69tu3ru3JhJT+r7E51 UIg9ukWdO3c7lQR+Jamp4tuk8q+9fSCPOqNkd6BWsmTkMI3SzlohIc6aqduWduScfh93OU qDg7vJheP4xdXnyqWFKaUiwzbevOecWTDa7wWLTPRC3riddxN5em+fhftVioPhQRB2OQH9 fNgMHC0CKOk1TL0wtSwfP7o6nXJEM8oOtL7DFj+m9ArIK9vMbaQvQq/+rxeR9L70VaZx5E 6GIwTI8MvdrG8UBb6iY4o3S/kgKY8uISzEXaPpNOHftlvHzL0VtOn82k02tVQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBdpK15q1zhPs for ; Thu, 12 Feb 2026 15:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1975c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 15:03:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: fbe6da7f7592 - main - libnv/tests: unskip nvlist_send_recv__send_many_fds__dgram List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbe6da7f7592169ad7c26aa563f4c6305de1e345 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 15:03:05 +0000 Message-Id: <698deba9.1975c.2165adbd@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=fbe6da7f7592169ad7c26aa563f4c6305de1e345 commit fbe6da7f7592169ad7c26aa563f4c6305de1e345 Author: Siva Mahadevan AuthorDate: 2026-02-11 21:05:25 +0000 Commit: Siva Mahadevan CommitDate: 2026-02-12 15:01:57 +0000 libnv/tests: unskip nvlist_send_recv__send_many_fds__dgram The test passes consistently for 1000+ consecutive iterations. PR: 260891 Reviewed by: oshogbo Approved by: lwhsu (mentor) Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55223 --- lib/libnv/tests/nvlist_send_recv_test.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c index 79297dfe2043..4a5c10df656d 100644 --- a/lib/libnv/tests/nvlist_send_recv_test.c +++ b/lib/libnv/tests/nvlist_send_recv_test.c @@ -482,8 +482,6 @@ ATF_TC_BODY(nvlist_send_recv__send_many_fds__dgram, tc) size_t len; int error; - atf_tc_skip("https://bugs.freebsd.org/260891"); - /* size of the largest datagram to send */ temp_maxdgram = 16772; len = sizeof(maxdgram); From nobody Thu Feb 12 15:03:06 2026 X-Original-To: dev-commits-src-main@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 4fBdpL6Qxzz6Rmm3 for ; Thu, 12 Feb 2026 15:03:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBdpL2psPz40H7 for ; Thu, 12 Feb 2026 15:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770908586; 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=YXI1CqOpE7GdeRd6R4Pv+itHk8ELZKvoqfu2sUb8Erc=; b=a126qJCHEvO94+x6UMqBqcGWZr99phdzzRj7ic2ahDBhpyMnd65c/P8agRJFIh+E7WSMP5 HtEH3QogWvYci65YJRfQyGGfU/ryN0ANMRCVe5qorjDhZ42+Vz4ImJyJU2ODFyHXhE5PAZ 0/rF4gCC8HuqiSyawYDAA/d/uwsFozjUQCw5VCk28mcqVbtwzT5mzXKiZ3bYXerw17nmcL 2qoDXlW8XqizMaqepaYSY1jA6P1jlqMwaP0np13FVC8/UMQ3punzaDyxSXgNs9h/i2+ThH U4eE68pe3xHSSAIds54k5iGIjdVEX0Lz4V2xUtXT+ED27sEafg6m4umIFesi+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770908586; a=rsa-sha256; cv=none; b=RPghcxLtLXYHIT6fMFzlV2jV4Rh7QTDMSWuIr78JnC1pKUYWVYw++TM7hmvMgDV0R52yqy DNQMvdwk2JZKwFIi2EyKwQJNZ4Lci8lxG28fBCUHWcNVSdrXJQtJswvo0Csaj/GAfgOMOu PVxQMSGte4YNh1qsFlt+VViGlu76f32X7IhSTY/Z5cOPNr/0Lyq9/UEJj/OOH6Z376tDSY TEVDUZnqkiFpDdguXqiSSK7u6+tlrHBf2EKB19WzJKYetffdNqvzTqGHcLcNAuXXWT3n6Y 5h2LwAtW+QvHesCMLw5JNj2r3ysvN7Mj1GoMLPWUK5BRuyoCTxtQD6M0EQrYfQ== 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=1770908586; 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=YXI1CqOpE7GdeRd6R4Pv+itHk8ELZKvoqfu2sUb8Erc=; b=AC0fdZxhh2rCUNuDoN4xmdeBATiofMI3KRKPbLVa/3IZCHTI0fzIfXG+ztxaEAfOW1qbtQ i/cR24TVx29DKWPAFh0/DmQ0MaIN9c12sWCIQKWfLhHoh/5WgxF+lKLjpCqVfJQ6kFBQYj N8rX7ZS1NLJRSVxxrHKAqHG8rmeHXCN8Bx65acZ5WnGpA14OAncexzbhd/5ioqTI48wHJp VmyOwK3Miz08UOwmhDB7KcHsBUn/6RQK8TK+qJoAzLkTm3sfMJEFf3R+yDOi9j+Wwp23IY HFL0CAK+ZgFkzm/e5OtQV8xo9dQdqUDvay8Bv7hpMtrZavHSl78cSwDqiMCGew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBdpL2HlVzhPt for ; Thu, 12 Feb 2026 15:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 15:03:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 5fa297f4bcd2 - main - mixer/tests: use require.kmods property instead of ad-hoc checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fa297f4bcd277dca7eef03e68363fb1e721799e Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 15:03:06 +0000 Message-Id: <698debaa.196ff.62c62bc0@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa297f4bcd277dca7eef03e68363fb1e721799e commit 5fa297f4bcd277dca7eef03e68363fb1e721799e Author: Siva Mahadevan AuthorDate: 2026-02-11 21:50:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-02-12 15:01:57 +0000 mixer/tests: use require.kmods property instead of ad-hoc checks Reviewed by: christos Approved by: lwhsu (mentor) Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D55221 --- usr.sbin/mixer/tests/Makefile | 3 ++- usr.sbin/mixer/tests/mixer_test.sh | 12 ------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/usr.sbin/mixer/tests/Makefile b/usr.sbin/mixer/tests/Makefile index c8056169f9a4..a39a66cc8277 100644 --- a/usr.sbin/mixer/tests/Makefile +++ b/usr.sbin/mixer/tests/Makefile @@ -1,6 +1,7 @@ ATF_TESTS_SH+= mixer_test # mixer tests fiddle with a singleton dummy audio device. -TEST_METADATA.mixer_test= is_exclusive=true +TEST_METADATA.mixer_test= is_exclusive=true \ + required_kmods="snd_dummy" .include diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh index 45003251c460..c48512db5ec7 100755 --- a/usr.sbin/mixer/tests/mixer_test.sh +++ b/usr.sbin/mixer/tests/mixer_test.sh @@ -45,13 +45,6 @@ restore_conf() test -r "test_mixer_conf" && mixer $(cat test_mixer_conf) } -load_dummy() -{ - if ! kldload -n snd_dummy; then - atf_skip "cannot load snd_dummy.ko" - fi -} - set_default() { deflt_unit="$(mixer | grep ^pcm | cut -f1 -d:)" @@ -78,7 +71,6 @@ o_flag_head() } o_flag_body() { - load_dummy mixer_exists set_default @@ -96,7 +88,6 @@ d_flag_head() } d_flag_body() { - load_dummy mixer_exists set_default @@ -118,7 +109,6 @@ volume_head() } volume_body() { - load_dummy mixer_exists set_default save_conf @@ -204,7 +194,6 @@ mute_head() } mute_body() { - load_dummy mixer_exists set_default save_conf @@ -248,7 +237,6 @@ recsrc_head() } recsrc_body() { - load_dummy mixer_exists set_default save_conf From nobody Thu Feb 12 21:39:34 2026 X-Original-To: dev-commits-src-main@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 4fBpbp2cwtz6Rh11 for ; Thu, 12 Feb 2026 21:39:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBpbp1sBfz3pRB for ; Thu, 12 Feb 2026 21:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770932374; h=from:from: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; bh=ccfhWj2OXjLq4dzni5tbak5hL0LIVPxaC8T+l/Xyb3w=; b=TEQmQU1I6I5GbOeYPoY5Ho//FHyXOJdHjT13u5MpdkRzP3d6UmBvRyt1Jddu/Y8QAj8m8q AE6IwhGvFp75JCp3dmB6DX0NctbQS9B5BOYZhpSgxujWTBovHEBs5Nigbual/RDPUyZGLP wV0uOnVT2gfL+S9o/qCeE8DeJFNpd9jI/z6mnZ4r4jaoJNhvris8g/U+SV/jgB5uVDtHWz UStwsLXA455mODuex75bzxn1EmmX9v3My+YNbwF+ASjQfC88QdnBwpyg+bKBFvcpSw+S1K vi32ZlumuNGypGjkqW8bS4Bx4hC/bYkjsL4Vc8KY8ktfdm0bqCf4ukhFYtzMpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770932374; a=rsa-sha256; cv=none; b=iPYCnd2Cyzzs8JHxksuaxtzKoxKNOoHxA530EbfxPC2agCskySeyvlljvLymkN8gbNnWyE T0BRtK1eg2l+Wlwcmm7eAZBqo/JuyR0gkGgvymwe8X14Ye+OvDYdKoYXH6KmsaMhbXZMxH JCY1gqd5mpSceUoHCvF2LMP2coDBlEODfhta7tX2DM6y1Tys7W50eEens8r5OfIH7Wc2r5 M+oJ6ZCaTb4eYKN5XH9jobrgke7R/ort/nm30Pe2XwrlLzNmPwdFonSrbsgcoKXbWnQdMB lIOzJhOanrfFSjLcE7yWGp/H1U1lmIxxRkS0wB1JXtCmGwSGNl8BNJ+ANRrolQ== 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=1770932374; h=from:from: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; bh=ccfhWj2OXjLq4dzni5tbak5hL0LIVPxaC8T+l/Xyb3w=; b=WOeJehrJsT9cNw3mLxT6He+DozkOElt7UJ+41BwXj2IVoIrlCr3oKtIeY72BPo2kZwXqF7 omE5HhXRHZ1nnYBaK9NgsybfXXP3kqgkGmnXZw/OWJQUodRMQOET18qU7VOrPWvWZVnxfY NiIG7x06FVU0MR5vXDx2AIe4Rrg8trJ8xuM8HgSJm+F8momegSvojuOMv+iSGyaB2dzC87 D+60BpoBjuZiC5Gf/BzIuyYdh6oYCf/j4/YvSmeSFvH4EZ50piXU2qvKpaj1yMRb+aeDue 4xqVRjF1P8tQtOghwtpMZBhLWrwl5QoJ2WumRqkExkyp+DqKgsCizhriAA6oMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBpbp1N7qztJW for ; Thu, 12 Feb 2026 21:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 21:39:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Eric A. Borisch From: Kristof Provost Subject: git: 363b57d579ba - main - libpfctl: Sort order of snl attribute parser List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 363b57d579bafa8a52cfb5a1dcb98af821b1ecb6 Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 21:39:34 +0000 Message-Id: <698e4896.1c5d6.2e11b88d@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=363b57d579bafa8a52cfb5a1dcb98af821b1ecb6 commit 363b57d579bafa8a52cfb5a1dcb98af821b1ecb6 Author: Eric A. Borisch AuthorDate: 2026-02-12 00:26:26 +0000 Commit: Kristof Provost CommitDate: 2026-02-12 16:05:16 +0000 libpfctl: Sort order of snl attribute parser snl atttribute parsers must be sorted by type, so PF_GS_BCOUNTERS (16) must follow PF_GF_PCOUNTERS (15). Fix ordering and add a call to SNL_VERIFY_PARSERS. Without this fix, byte counters reported by 'pfctl -s info' with a loginterface are always zero. PR: 291763 MFC after: 1 week Reviewed by: kp Signed-off-by: eborisch@gmail.com --- lib/libpfctl/libpfctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 63f61932519c..4f4a7fe57002 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -389,14 +389,18 @@ static const struct snl_attr_parser ap_getstatus[] = { { .type = PF_GS_FCOUNTERS, .off = _OUT(fcounters), .cb = snl_attr_get_counters }, { .type = PF_GS_SCOUNTERS, .off = _OUT(scounters), .cb = snl_attr_get_counters }, { .type = PF_GS_CHKSUM, .off = _OUT(pf_chksum), .arg_u32 = PF_MD5_DIGEST_LENGTH, .cb = snl_attr_get_bytes }, - { .type = PF_GS_BCOUNTERS, .off = _OUT(bcounters), .arg_u32 = 2 * 2, .cb = snl_attr_get_uint64_array }, { .type = PF_GS_PCOUNTERS, .off = _OUT(pcounters), .arg_u32 = 2 * 2 * 2, .cb = snl_attr_get_uint64_array }, + { .type = PF_GS_BCOUNTERS, .off = _OUT(bcounters), .arg_u32 = 2 * 2, .cb = snl_attr_get_uint64_array }, { .type = PF_GS_NCOUNTERS, .off = _OUT(ncounters), .cb = snl_attr_get_counters }, { .type = PF_GS_FRAGMENTS, .off = _OUT(fragments), .cb = snl_attr_get_uint64 }, }; SNL_DECLARE_PARSER(getstatus_parser, struct genlmsghdr, snl_f_p_empty, ap_getstatus); #undef _OUT +static const struct snl_hdr_parser *stat_parser[] = { + &getstatus_parser, +}; + struct pfctl_status * pfctl_get_status_h(struct pfctl_handle *h) { @@ -407,6 +411,8 @@ pfctl_get_status_h(struct pfctl_handle *h) uint32_t seq_id; int family_id; + SNL_VERIFY_PARSERS(stat_parser); + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); if (family_id == 0) return (NULL); From nobody Thu Feb 12 21:39:35 2026 X-Original-To: dev-commits-src-main@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 4fBpbq4lZQz6RgyT for ; Thu, 12 Feb 2026 21:39:35 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBpbq2DQ7z3phx for ; Thu, 12 Feb 2026 21:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770932375; 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=Tx/q3tzaMgycCxFMysSdeQ7DD5IzxgJSRNs/tMxITPU=; b=R78Wcx1qUsGo1W8iulvIsti+vXeLHHjwBh4jdiGGFiFyv3QYBJ7Tkt3aNku7EINS4FHPeM yOl1kek3sWoIFD8TTXnMWMJrR6+7ytRLLUxazaO7VQgoLw7VKymDJlQCP9qeGZvaMyXOkD ZS0rAvdpE2p44IggFT3Wno6/mJM4NVD9oQI9mMjWqiEvFqthsmkYdl3rx5ihfSpds0uXo1 qYARPeKqq9A4LkhPhcccFKWmEKs2Y9f5M38ARh3xh+pvSNAcXWtT40DJirypL35AMpLJKQ bwOWGuuvx/e3aWiG0b1fcLRnrYUeEW9sE1AcwrZbCnZajBOh6U2K5iwWigaN3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770932375; a=rsa-sha256; cv=none; b=UH/LpPftwfkmt/Ehqez/vEwyvWHEd5NfB9WNSmuaFKPK8kad0sQZi/+r4bOXhtgl+XQjHV eRr2EkvS4wJ74w94VKGqd/xdUg078DT2VKyWP/NIm8DXAGCoT18B5tSRCCxESZLVEj+Ud5 J8XrkaIYdxM62oJXNSvFtfMKyO1Yfl358FciTl78upKabXqhIH/YtdYCxlTa90mFWnicwE s0hzK/To5HzsRSSRwzEQiJr0MQQcMCwaYsNGUaE/533lLLHj2kn9iW/LV9eKysSOzKEFmO NUSABj2Rs7SIzMCSby3n7iv1/prmqYZ+kuUsUgSBaiBVDQoG8rSUV0o+V9S0gQ== 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=1770932375; 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=Tx/q3tzaMgycCxFMysSdeQ7DD5IzxgJSRNs/tMxITPU=; b=WsvUglxreGFsN/TVKDOhr2szlUynVmK/chn/7j/LEXAXFEEjQrOvYWSHU2aE9qXo27joIF sESISrLLRqHvEgq55rqWdGp8V5lhCjLMtCPXrIwSZTLBHMskdi98JPzpdHSY26tWGYHaFL wYlqM7YpAXWAT0mOZ/u+WXxfWOnDqe3KaJjzyV8DW5dvQxBU4QKn3O89JyVn6Pge5YRKgr cj7czv8OqGKDCGVg3N9lYmF7JTUSmXVSq8xCtZ4cbkr7wS5RO1xMr8UlJ6E9fj/n4wPbnT usyjsMaIYtmD1AYLbqQDq/p+him3EQqzYeXUsTfiSmB5S6m/pt26pegGB5ijPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBpbq1p9fzsnR for ; Thu, 12 Feb 2026 21:39:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d708 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 21:39:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1e7665e36860 - main - libpfctl: verify all parsers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e7665e36860af87cae24cbeb1a65a97ad9a0efb Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 21:39:35 +0000 Message-Id: <698e4897.1d708.622b76e1@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1e7665e36860af87cae24cbeb1a65a97ad9a0efb commit 1e7665e36860af87cae24cbeb1a65a97ad9a0efb Author: Kristof Provost AuthorDate: 2026-02-12 09:39:05 +0000 Commit: Kristof Provost CommitDate: 2026-02-12 16:05:16 +0000 libpfctl: verify all parsers List all currently defined parsers in 'all_parsers', and pass them to SNL_VERIFY_PARSERS(). This will detect incorrect odering in parsers, which will help us detect otherwise subtle bugs. Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 52 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 4f4a7fe57002..9025b94249ce 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -69,12 +69,15 @@ const char* PFCTL_SYNCOOKIES_MODE_NAMES[] = { static int _pfctl_clear_states(int , const struct pfctl_kill *, unsigned int *, uint64_t); +static void _pfctl_verify_parsers(void); struct pfctl_handle * pfctl_open(const char *pf_device) { struct pfctl_handle *h; + _pfctl_verify_parsers(); + h = calloc(1, sizeof(struct pfctl_handle)); h->fd = open(pf_device, O_RDWR); @@ -397,10 +400,6 @@ static const struct snl_attr_parser ap_getstatus[] = { SNL_DECLARE_PARSER(getstatus_parser, struct genlmsghdr, snl_f_p_empty, ap_getstatus); #undef _OUT -static const struct snl_hdr_parser *stat_parser[] = { - &getstatus_parser, -}; - struct pfctl_status * pfctl_get_status_h(struct pfctl_handle *h) { @@ -411,8 +410,6 @@ pfctl_get_status_h(struct pfctl_handle *h) uint32_t seq_id; int family_id; - SNL_VERIFY_PARSERS(stat_parser); - family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); if (family_id == 0) return (NULL); @@ -1971,15 +1968,9 @@ static struct snl_attr_parser ap_state[] = { #undef _OUT SNL_DECLARE_PARSER(state_parser, struct genlmsghdr, snl_f_p_empty, ap_state); -static const struct snl_hdr_parser *all_parsers[] = { - &state_parser, &skey_parser, &speer_parser, - &creator_parser, &getrules_parser -}; - int pfctl_get_states_h(struct pfctl_handle *h, struct pfctl_state_filter *filter, pfctl_get_state_fn f, void *arg) { - SNL_VERIFY_PARSERS(all_parsers); int family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); int ret; @@ -4239,3 +4230,40 @@ pfctl_source_clear(struct pfctl_handle *h, struct pfctl_source_clear *kill) return (e.error); } +static const struct snl_hdr_parser *all_parsers[] = { + &begin_addrs_parser, + &clear_states_parser, + &clr_addrs_parser, + &creator_parser, + &get_addr_parser, + &get_addrs_parser, + &get_limit_parser, + &get_timeout_parser, + &getrule_parser, + &getrules_parser, + &getstatus_parser, + &nadd_parser, + &natlook_parser, + &ndel_parser, + &ruleset_parser, + &skey_parser, + &source_parser, + &sourcelim_parser, + &speer_parser, + &srcnode_parser, + &state_parser, + &statelim_parser, + &table_add_addr_parser, + &table_astats_parser, + &table_del_addr_parser, + &table_get_addr_parser, + &table_set_addr_parser, + &tstats_clr_parser, + &tstats_parser, +}; + +static void +_pfctl_verify_parsers(void) +{ + SNL_VERIFY_PARSERS(all_parsers); +} From nobody Thu Feb 12 21:39:36 2026 X-Original-To: dev-commits-src-main@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 4fBpbr5Qxhz6RhDV for ; Thu, 12 Feb 2026 21:39:36 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBpbr2zW7z3pBt for ; Thu, 12 Feb 2026 21:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770932376; 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=wcVrATw7MByEGIyegxi8aVbaOGr23168xA9kb+7RCdE=; b=u0CHO+fkDXPj7xj14O8XzDH90qm4lopDGpT+n6dHNhXAh8udycYm9FlZRRU2/Zsti/NqMx GWOnrn7M9bhjH0uQ3hRTvufyNxkJ4OhK0EZk9vydMUhGcA3eOpHr/NWh1QehTNAZFauzTF vjbg2sBXLsYg7sCNw2qVVe9o/Tx2jOmMhlqyzyo/O8RqHCxweU7uWFaLPk8S7oKEhYyxHu REsxe7CWwblP3oE4udw3E0EYJ314ioRHL0DvjxTXSA5TdsNpAa85MuzMrTprNdOtqZUncS thsyCHpUlVLW16VcpEKlJIihBtSglxd1b3KBPUhVn3ENZCbSOQpJFx6ag+JFKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770932376; a=rsa-sha256; cv=none; b=xKJy3e8ssRiESdHdVWEePUgJJu24svHEhHhTOuyL1XJ2miiMhDwKIe22efS7kvKELeviyt u/j21ibgoeS6+HT9JTWuppj7D6LM/LPNWwWQe7S5JGx0SOSIvtNerGLxHZTcOMyfBig3W0 /bci62j+73Dl95rTsqU2a129dw/ES1fjxJlTfUuHqlewOkwbuwQ8WquZOZ4EDIG6yWikGi mlTi1Du0J4Q3ohcKAkmyr0TiJrCehSW7UqMiK1pzsWa8y5N8Uon8jLzZTYX49qPLe90mFh YeHqni2KuQp1ZGrJ0IORwgnI/2pTKznOd3ZVzIp5seWbt/GypGOcvkf7ch5Deg== 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=1770932376; 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=wcVrATw7MByEGIyegxi8aVbaOGr23168xA9kb+7RCdE=; b=DAhUgmmJiQMJwb0lJID16/tYYy2Xs3E7XpG513leZQ04LDAm8EKM8h3mILC4bDPZpXcP8V WEI7PJw1tIewjdcdO6g+DsbeYv4QoGyImETBT5sKrz5J7s218U+G/So2qAxZI5eJ4RChto 6cshleq5IHOC110vITQQZQwl1VShh5LTnTSmhTaX3tQ2oDGFwry4PJFfXHOwWZEoRInAHq /lI2likuyUvlZYwKLI1uAf+kfxFMr9xu4kc+kJJgaZVVYapFu3Z+OTBde8+Sj2VrgB4M3k TigQ4lLPuLj1Nf6XhF2N9M9jV6IEym3FfJVmQ81j7j27KS24dHvb+dGSgCfl0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBpbr2Yw1zsZw for ; Thu, 12 Feb 2026 21:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c5db by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 21:39:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: d03b6bb766f8 - main - pf tests: verify blocked count on log interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d03b6bb766f8c816547f9c39e05af8238242251e Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 21:39:36 +0000 Message-Id: <698e4898.1c5db.6e38914f@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d03b6bb766f8c816547f9c39e05af8238242251e commit d03b6bb766f8c816547f9c39e05af8238242251e Author: Kristof Provost AuthorDate: 2026-02-12 13:06:34 +0000 Commit: Kristof Provost CommitDate: 2026-02-12 16:05:16 +0000 pf tests: verify blocked count on log interface Also check the IPv6 pass/block numbers. PR: 291763 MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/netpfil/pf/loginterface.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/loginterface.sh b/tests/sys/netpfil/pf/loginterface.sh index 6decb69fe63d..c192d8e4e4a4 100644 --- a/tests/sys/netpfil/pf/loginterface.sh +++ b/tests/sys/netpfil/pf/loginterface.sh @@ -41,9 +41,11 @@ basic_body() epair=$(vnet_mkepair) ifconfig ${epair}a 192.0.2.2/24 up + ifconfig ${epair}a inet6 2001:db8::2/64 no_dad vnet_mkjail alcatraz ${epair}b jexec alcatraz ifconfig ${epair}b 192.0.2.1/24 up + jexec alcatraz ifconfig ${epair}b inet6 2001:db8::1/64 no_dad # Sanity check atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 @@ -63,10 +65,11 @@ basic_body() # And after we've sent traffic there's non-zero counters atf_check -s exit:0 -o ignore ping -c 1 192.0.2.1 + atf_check -s exit:0 -o ignore ping -c 1 2001:db8::1 atf_check -o match:"Interface Stats for ${epair}b" \ jexec alcatraz pfctl -s info - atf_check -o match:"Passed 1" \ + atf_check -o match:"Passed 1 [1-9]" \ jexec alcatraz pfctl -s info # And no interface stats once we remove the loginterface @@ -74,6 +77,15 @@ basic_body() "pass" atf_check -o not-match:"Interface Stats for ${epair}b" \ jexec alcatraz pfctl -s info + + # Check blocked count + pft_set_rules alcatraz \ + "set loginterface ${epair}b" \ + "block" + atf_check -s exit:2 -o ignore ping -c 1 2001:db8::1 + atf_check -s exit:2 -o ignore ping -c 1 192.0.2.1 + atf_check -o match:"Blocked 1 [1-9]" \ + jexec alcatraz pfctl -s info } basic_cleanup() From nobody Fri Feb 13 01:18:26 2026 X-Original-To: dev-commits-src-main@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 4fBvSM3cSTz6S4Q7 for ; Fri, 13 Feb 2026 01:18:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBvSM0S9zz4HHW for ; Fri, 13 Feb 2026 01:18:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770945507; 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=ygO12LNmEweNedpMn/8oANwIBKvbJoeA3sagAJiXgNI=; b=vJghPr97ej1mXAW8aP0pwYzrZZVkP8Nwe28yAf8vQXRv87vwUtJGN5/ll4I1bVDi4QnMFr uEWmYkTAusw1Hy70MilMLLQmQMF+J5QFkUXUrfbGhrbTM7wb44UE0WCACIoqQCtPCJc77D Xfe3ayrmCyMnAe9A6LlcjYWnz3T7Qhuwq3C5FnYhUlASkRgWVLywJVet7Vh2tbeepUBG/W 3mqMX1adkxxOTNVcA4mHslVXGab+eSqK9KmtPZJtXm5YBQIBF1JVgNhNo2Tr4b4mUyahxS jUAY/AvqiEK3Ca5chrIYbDIudNMbjSn5EkBLsUD9BffExdEeJrh8+HNX6gpwqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770945507; a=rsa-sha256; cv=none; b=TSUkLbtEiTUgqnKrZn9SYyNz06P+rKM5bOU3dxO0X1GcWr4s9Op5iXlWMW+LLjS2n0pLkc yuxX/HMyC8yY9PjBXNEq8pYK4ig2ONBZ8l8maoFP021cGmU1cw32BkxFamyuFzCui07OjD SZXjMSzYjW0ZUvnspluRtSiIKxBhU/E+1BZ7k0eBCtFH1zqhrSloF09JcjbBXQ4tDgAFeB /Dr0YUjYtC92mVoUzrqHKExAnK/beiZvpYc/IVUMQSiSqIUvvDM+rew/sJ9Vcgz59PlsGD Ecans02erAXS4ucau4w9iPw5SsbbEWOgKqEImrzowHWlPb0lWxY+gPvmlKGSVQ== 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=1770945507; 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=ygO12LNmEweNedpMn/8oANwIBKvbJoeA3sagAJiXgNI=; b=WXLYY7Iqyrxs5p0Wwofr6KaUnVYSWOkYc162wWw+p/XAPL2M7+Vl+H6LsC/o2B0wxESn42 fmiBRZvyyp4BRN/DIuB14NECwJ28XOCOMCVkMC1b7rHPwW1dgSxMfzTRm92gc8PWeppjX0 OON6+wC0YveVepjumhXguOFYyZmvngpQ9PXYeoi2TGqHmVopiO/v/NOP5+SJ2Fy2+fR0U/ sAzMQYzzhjMi8g1eTC7VUse8K7Rm8qpBgqR3JJkF14leESL/rmVkb4psIDi3CPyo/fcnz1 brtb1kjh4wa5OYLQVHInkmd7musJ0Fcb7STWfPFGm7jIFR1ooI6XsmNptJDWpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBvSL6fGqz10sx for ; Fri, 13 Feb 2026 01:18:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c7b2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 01:18:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: afe55ae68e74 - main - cxgbe(4): Fix assertion in timer calibration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afe55ae68e742ea5e5eb9e78cf68d570d458cd0d Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 01:18:26 +0000 Message-Id: <698e7be2.3c7b2.37e9551@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=afe55ae68e742ea5e5eb9e78cf68d570d458cd0d commit afe55ae68e742ea5e5eb9e78cf68d570d458cd0d Author: Navdeep Parhar AuthorDate: 2026-02-10 19:07:43 +0000 Commit: Navdeep Parhar CommitDate: 2026-02-13 00:54:08 +0000 cxgbe(4): Fix assertion in timer calibration The calibration callout is stopped when the adapter is marked off limits but not when the adapter is merely stopped. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index e35bb9f64951..e14efc912de6 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -1249,7 +1249,7 @@ t4_calibration(void *arg) sc = (struct adapter *)arg; - KASSERT(hw_all_ok(sc), ("!hw_all_ok at t4_calibration")); + KASSERT(!hw_off_limits(sc), ("hw_off_limits at t4_calibration")); hw = t4_read_reg64(sc, A_SGE_TIMESTAMP_LO); sbt = sbinuptime(); From nobody Fri Feb 13 03:01:18 2026 X-Original-To: dev-commits-src-main@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 4fBxl32cqCz6SF3W for ; Fri, 13 Feb 2026 03:01:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBxl247Jbz3DYY for ; Fri, 13 Feb 2026 03:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770951678; h=from:from: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; bh=kYfQxL6rsvhOLB2jqfkfLNib83nbRTr0AOTFa3EwnlE=; b=sY+PRXzF4IHb6Jp6iLMl2lbdZiRUqRz8evTrsyN5Ap6f7sZRsEHXfFj1L6CGSE6TR0kPXZ cMnk72GNB92hgVbXy8ya0B2RIHwmpIBBuDv8M3YlSXXfIxnxO7IxMOAIMcTvS5Upt1syf+ 9ftBBZ7cf8VKMDckTILsqoBMo6noo/jfUPEcsGhWRQ73u0A2CWXoHnC24HHgGdMD5BM2Je RAhGx3XYSlVKM6AfNrNZomYW5RGja0/vpNNaloZ5e6loNvVwDK/yB396Iqin3X9vhoKLE3 RYCbNRudp4BSi8Bk4U/EiYqPzbHrLdmPoLLGiEkM6qoNlquuEmYaMgU7VY45pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770951678; a=rsa-sha256; cv=none; b=G3/+/pf5sgtyxQDZXwLkp9b5ZH1GZnPdsHd8MIdN2I/XXWTu8+LXvlee2g9HvcJJkCJd8r adNcW3lR8oO9CQrCBE5NwCe0GZVp0j8I1wjd/vgDQ30ajaj5hxJ30OR7T/7oLwuOVwgrOc hEaSsUpQqxbrD4a1St8gK/E2DN01fT0wniTTBsCJj2rKZf1xwNELqkcfDcEMe8XGmGjRCI vhI3m+i7AfOFzR4ThO0C7TzWi0xb84o5ARMX0Ip0Tn4rMlJFD8ESNclVgSVUs4PjVnUirm wpiMmBKGtB7gw5+lhiXM6Me0WlCdDkz7xs8N3LuXllkHx9jOley2n3Lh99aAbg== 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=1770951678; h=from:from: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; bh=kYfQxL6rsvhOLB2jqfkfLNib83nbRTr0AOTFa3EwnlE=; b=ngHbP3tIbD+xYb6nTHDFZb65OZ4NueysbPvmobX7vmn0NSPiaxu6soCFvfYH6dt1afm7MR ll6nTAg1VEGzgULKOuqFE930E6Am4W9gG/K0R26v9/sMyVBQvZbWxRo09VGpau5/t4n7EV Mz8mM2pirNQoTezPbaMVApkSCNRrtCGFzU/CyKAPAJd/2F2wg4XvPLlw4j6CU0yZDgjvR0 HVNYuP0Oge/Vtr5VXiW1Q3BFT7RhaxpP3M4wHRRioboMi5FfRwRIBPUp4w1ohWqF0G7Sfm 07Eg12ukTkd5rSjoD6yYQOKno3kCIQ8GRiz6nbZMIjMhgBq6M/ofzR1tNWjhQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBxl23Vn7z13XS for ; Fri, 13 Feb 2026 03:01:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45372 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 03:01:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 1a6bdd6266e3 - main - asmc: Convert driver to CTLFLAG_MPSAFE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a6bdd6266e3b53c8b6b597a77a100353b7ae13a Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 03:01:18 +0000 Message-Id: <698e93fe.45372.5389b068@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6bdd6266e3b53c8b6b597a77a100353b7ae13a commit 1a6bdd6266e3b53c8b6b597a77a100353b7ae13a Author: Abdelkader Boudih AuthorDate: 2026-02-13 03:00:22 +0000 Commit: Adrian Chadd CommitDate: 2026-02-13 03:00:46 +0000 asmc: Convert driver to CTLFLAG_MPSAFE Replace CTLFLAG_NEEDGIANT with CTLFLAG_MPSAFE for all sysctls. The driver already uses spin mutexes (sc->sc_mtx) for hardware access protection and does not require the Giant lock. This improves scalability by allowing concurrent sysctl access without Giant serialization. Reviewed by: ngie, adrian Differential Revision: https://reviews.freebsd.org/D54613 --- sys/dev/asmc/asmc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index b6b98b1c8953..c0ff555b7b65 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -628,49 +628,49 @@ asmc_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "id", - CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, model->smc_fan_id, "I", "Fan ID"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "speed", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, model->smc_fan_speed, "I", "Fan speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "safespeed", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, j, model->smc_fan_safespeed, "I", "Fan safe speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "minspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, model->smc_fan_minspeed, "I", "Fan minimum speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "maxspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, model->smc_fan_maxspeed, "I", "Fan maximum speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "targetspeed", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, model->smc_fan_targetspeed, "I", "Fan target speed in RPM"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_fan_tree[i]), OID_AUTO, "manual", - CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, dev, j, asmc_mb_sysctl_fanmanual, "I", "Fan manual mode (0=auto, 1=manual)"); } @@ -686,7 +686,7 @@ asmc_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_temp_tree), OID_AUTO, model->smc_tempnames[i], - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, i, asmc_temp_sysctl, "I", model->smc_tempdescs[i]); } @@ -703,14 +703,14 @@ asmc_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "left", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0, model->smc_light_left, "I", "Keyboard backlight left sensor"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "right", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0, model->smc_light_right, "I", "Keyboard backlight right sensor"); @@ -718,7 +718,7 @@ asmc_attach(device_t dev) SYSCTL_CHILDREN(sc->sc_light_tree), OID_AUTO, "control", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY | - CTLFLAG_NEEDGIANT, dev, 0, + CTLFLAG_MPSAFE, dev, 0, model->smc_light_control, "I", "Keyboard backlight brightness control"); } @@ -736,21 +736,21 @@ asmc_attach(device_t dev) SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_sms_tree), OID_AUTO, "x", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0, model->smc_sms_x, "I", "Sudden Motion Sensor X value"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_sms_tree), OID_AUTO, "y", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0, model->smc_sms_y, "I", "Sudden Motion Sensor Y value"); SYSCTL_ADD_PROC(sysctlctx, SYSCTL_CHILDREN(sc->sc_sms_tree), OID_AUTO, "z", - CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT, + CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, dev, 0, model->smc_sms_z, "I", "Sudden Motion Sensor Z value"); From nobody Fri Feb 13 06:34:50 2026 X-Original-To: dev-commits-src-main@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 4fC2TQ1Vfzz6SYcv for ; Fri, 13 Feb 2026 06:34:50 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fC2TQ0nVmz3X7w for ; Fri, 13 Feb 2026 06:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770964490; 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=tXu9ELIWNMoq3LxWg75bitiIV3nYlJXsYPf2Mm7N+5Q=; b=FHe7XOQ8Ql4bDaGxhe0rnPHTmG3h6Mz5enSuEnYLCTfC5opwKzMTG92TWb9Ov9CEPiZnkH FVuPR0jRzoZjLyoSQ+Aez6bhS9rRaJpQx07zaP6wRqaJ0CkUK6hJ4SNL6UtWLIzQfyye4C iOYN71Kl2tdC3D/Y1938dtbhAFElpTKLiBgoY1VKSyZIdbgKHSb9+5OcqW3gofj4WV0tag cyHGp30V0GA+wc8oS0QB4ivWSJvb+mk+x2Wq5X8i6MQKvHVKhO339o4Xw6mA4QSJ8urldY ZE49pT+8virZyvQ9iZBcuJ+J1ACPTLh5+1q0bCE85UlCTm7JF47qT0OG3vWL8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770964490; a=rsa-sha256; cv=none; b=WuI/hvCKRqATLzA7D645sW3HEJLa9GyxfMcehw7LVwVDS2O+QvCv7QhrI0bkY4p/gwUEE+ 6G7OBr/KBZlATaFqzf5cyuesr/FHZXZwdc2ydMIUDJVQSC4iKge30ciHHbOjNayFCVx1vB y7KFTIzV5GvIerdZc4HJVTC/gAxpj4euGNV//xtYya0U/jlYOumT05s71EKfCPCtPAm2Wb YBNY01QzEC0YdxAvWZPfMccgjIW5zLArFpKLPXsaoDdfsp6PKf9U774BT/R3aIdYnQ3R6e 14DI5R++nC02HyhyjPd4SLkLl3iwYBXJ3Kae3RAzFfKisZHlplyvN51nBJYyqw== 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=1770964490; 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=tXu9ELIWNMoq3LxWg75bitiIV3nYlJXsYPf2Mm7N+5Q=; b=tCEdCVHSOz7cKYBe2hdRMUA4u0nYoIg51FvRmPpv2r0Sz9la9SE+rLrSBkVKCS9L7fZMvQ fh2cebaCQq4bXQENCzmaKPqPWx8tcV5aiuYeanp9HnYPEIM1iYrPGP6WjC+H9LQVFJgYTe DWqlDcojJGS6YbZ0JT2yr0nmIq2wEgXj1oxZdlzHdvxRBkYVI6HYPVTjw+JeP8oyqVq3rl vu0oojnyKQp9+Jav0IHJmQwwMUg9ZSTOaL399rmWVVu0u8qDzzPYNye68B1e4T82ovjbQ7 oGyOKQxhxass2St2CZMMsepFDn59AZg8uMko710C6bw5sct/Tl7bCbruNcx+JA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fC2TQ0LHqz18rj for ; Fri, 13 Feb 2026 06:34:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34ad9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 06:34:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 2bdec2ee73be - main - e1000: Increase FC pause/refresh time on PCH2 and newer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bdec2ee73be7dbafce9982b0dc5c273918a5443 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 06:34:50 +0000 Message-Id: <698ec60a.34ad9.4dc45859@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=2bdec2ee73be7dbafce9982b0dc5c273918a5443 commit 2bdec2ee73be7dbafce9982b0dc5c273918a5443 Author: Kevin Bowling AuthorDate: 2026-02-13 06:30:22 +0000 Commit: Kevin Bowling CommitDate: 2026-02-13 06:33:43 +0000 e1000: Increase FC pause/refresh time on PCH2 and newer This corresponds to Linux f74dc880098b4a29f76d756b888fb31d81ad9a0c That commit does not provide any public background detail, but it's been in use for over 5 years and corresponds to previous chip bugs w.r.t. automatic generation of PAUSE frames. Reviewed by: kgalazka MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54555 --- sys/dev/e1000/if_em.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 4d7bc794a0b2..3118b27e8122 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3225,8 +3225,8 @@ em_reset(if_ctx_t ctx) case e1000_pch_ptp: hw->fc.high_water = 0x5C20; hw->fc.low_water = 0x5048; - hw->fc.pause_time = 0x0650; - hw->fc.refresh_time = 0x0400; + hw->fc.pause_time = 0xFFFF; + hw->fc.refresh_time = 0xFFFF; /* Jumbos need adjusted PBA */ if (if_getmtu(ifp) > ETHERMTU) E1000_WRITE_REG(hw, E1000_PBA, 12); From nobody Fri Feb 13 08:17:54 2026 X-Original-To: dev-commits-src-main@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 4fC4mL6pBwz6SjFy for ; Fri, 13 Feb 2026 08:17:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fC4mL5t9qz3fP5 for ; Fri, 13 Feb 2026 08:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770970674; 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=RZgNNKuX6DEIPICJQIww/yPU5kXRQsMPGpiGiY7OxYc=; b=oY+m3IgKM66TEQZwKdn0ufToASyM1U8e9ghtJYu+y6WzrrdECVMBy0oe7XWkjSxTwEMOsa NrBISVVktIXSHvrX9et3NSDPpxksEKKMFvq5HQHcFIxPKw2MANAc+tACtRAtALOb5brAgB a3k5R4eA4ox+v3D8jOL8ffCQjv+pXakVpUqx/uY7ZBzLpmGqXDplmu5OfUKj8m7FCR+6CX w1fAH4JPq6ZNdjzBJPQFxvWJvOy72KmnDBgjhCcLTIcxkbE5Xe4WkaeaYZ/+6TTErtoo2N wRw2pdXQNhmkHgxZxmfpdvH3t2ZM1JWYUtqfHS5QUrBbfgoJY4vYcQ+n0m8IOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770970674; a=rsa-sha256; cv=none; b=KPAojWMtStqZwPG4OiW/XNlJL8OXjwK8NU/WHDZJo3lQwTKX69mO1QWlypOmBmZbStdBzK WRD1M2lhcyU0b8QlrnB8ne8sEOUSl4aXTYdA7xQ9W/EGPOeMfORcye0setFYvovfk8HcrC 1qM50C1Jg1z/3EwmkhaiO/SvsboTKokZBpiS+YUYDd4Y2LbBT+AJaTPCy3c7Jxn8bknAFB ZCapNIlbTs3VZwtNDmAd6v6jpjBkVdP/T6RJhFPHv1lstRaCgcCOyrkN1PMXl3RKomlEEe Yit0btJfT24QJM6v/rNz08vCq4oQUb2ZL7hdfQdJneuEOv4AC6MbiO9zJ/jWkA== 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=1770970674; 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=RZgNNKuX6DEIPICJQIww/yPU5kXRQsMPGpiGiY7OxYc=; b=q7Wars0tJV12TdP57VC4YY+dnuNdJQKy/6ORpVgup6o0cCIFL4Y2vH6nXwYueImAIC2IB3 ezNGX7QAW0QKVratzh2mdwNhY7i+v6GzqKqfT6cZncsMdbDa+tFn+dgeI78rtfiSflgRS3 r21a5mVeBzQxVMuajm3vWSE8B9M7R/KHq+J56EjSN95xIJI5FbRrS+KIIcGoew8Vgbobep 0WLPVKbjtCAriF0SZeSXBsujZBUo7hNPgvncty8bVLiU6CFlFHGyfHPvcROVGt+A1QnW/s PnK/jm/TkyKlZ6wnkn8boMi6/SqdmynjQgZnalhngafQet3imktWm46XSCesgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fC4mL59Zlz1CRr for ; Fri, 13 Feb 2026 08:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40137 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 08:17:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: af99e40af1dd - main - x86: add a safe variant of MSR_OP_SCHED* operations for x86_msr_op(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: af99e40af1dd4e8b39ca986240ee8b9aea722958 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 08:17:54 +0000 Message-Id: <698ede32.40137.471593f8@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af99e40af1dd4e8b39ca986240ee8b9aea722958 commit af99e40af1dd4e8b39ca986240ee8b9aea722958 Author: Konstantin Belousov AuthorDate: 2026-02-01 23:43:50 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-13 07:55:04 +0000 x86: add a safe variant of MSR_OP_SCHED* operations for x86_msr_op(9) The modifier executes the operation using msr{read,write}_safe() functions instead of plain msr reads and writes. Returns EFAULT if any MSR access caused #GP. Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55045 --- sys/x86/include/x86_var.h | 3 +- sys/x86/x86/cpu_machdep.c | 75 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 70 insertions(+), 8 deletions(-) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index 215fe0562465..caaab207b57a 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -174,6 +174,7 @@ uint64_t rdtsc_ordered(void); * * All modes cause execution on the target CPU(s) with interrupts disabled. */ +#define MSR_OP_SAFE 0x08000000 #define MSR_OP_LOCAL 0x10000000 #define MSR_OP_SCHED_ALL 0x20000000 #define MSR_OP_SCHED_ONE 0x30000000 @@ -181,7 +182,7 @@ uint64_t rdtsc_ordered(void); #define MSR_OP_RENDEZVOUS_ONE 0x50000000 #define MSR_OP_CPUID(id) ((id) << 8) -void x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res); +int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res); #if defined(__i386__) && defined(INVARIANTS) void trap_check_kstack(void); diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 5f8965bd5614..023b02ba7c76 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -118,15 +118,60 @@ struct msr_op_arg { int op; uint64_t arg1; uint64_t *res; + bool safe; + int error; }; static void -x86_msr_op_one(void *argp) +x86_msr_op_one_safe(struct msr_op_arg *a) +{ + uint64_t v; + int error; + + error = 0; + switch (a->op) { + case MSR_OP_ANDNOT: + error = rdmsr_safe(a->msr, &v); + if (error != 0) { + atomic_cmpset_int(&a->error, 0, error); + break; + } + v &= ~a->arg1; + error = wrmsr_safe(a->msr, v); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_OR: + error = rdmsr_safe(a->msr, &v); + if (error != 0) { + atomic_cmpset_int(&a->error, 0, error); + break; + } + v |= a->arg1; + error = wrmsr_safe(a->msr, v); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_WRITE: + error = wrmsr_safe(a->msr, a->arg1); + if (error != 0) + atomic_cmpset_int(&a->error, 0, error); + break; + case MSR_OP_READ: + error = rdmsr_safe(a->msr, &v); + if (error == 0) + *a->res = v; + else + atomic_cmpset_int(&a->error, 0, error); + break; + } +} + +static void +x86_msr_op_one_unsafe(struct msr_op_arg *a) { - struct msr_op_arg *a; uint64_t v; - a = argp; switch (a->op) { case MSR_OP_ANDNOT: v = rdmsr(a->msr); @@ -150,11 +195,24 @@ x86_msr_op_one(void *argp) } } +static void +x86_msr_op_one(void *arg) +{ + struct msr_op_arg *a; + + a = arg; + if (a->safe) + x86_msr_op_one_safe(a); + else + x86_msr_op_one_unsafe(a); +} + #define MSR_OP_EXMODE_MASK 0xf0000000 #define MSR_OP_OP_MASK 0x000000ff -#define MSR_OP_GET_CPUID(x) (((x) & ~MSR_OP_EXMODE_MASK) >> 8) +#define MSR_OP_GET_CPUID(x) \ + (((x) & ~(MSR_OP_EXMODE_MASK | MSR_OP_SAFE)) >> 8) -void +int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) { struct thread *td; @@ -167,8 +225,10 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) exmode = op & MSR_OP_EXMODE_MASK; a.op = op & MSR_OP_OP_MASK; a.msr = msr; + a.safe = (op & MSR_OP_SAFE) != 0; a.arg1 = arg1; a.res = res; + a.error = 0; switch (exmode) { case MSR_OP_LOCAL: @@ -209,8 +269,8 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) thread_unlock(td); break; case MSR_OP_RENDEZVOUS_ALL: - smp_rendezvous(smp_no_rendezvous_barrier, x86_msr_op_one, - smp_no_rendezvous_barrier, &a); + smp_rendezvous(smp_no_rendezvous_barrier, + x86_msr_op_one, smp_no_rendezvous_barrier, &a); break; case MSR_OP_RENDEZVOUS_ONE: cpu = MSR_OP_GET_CPUID(op); @@ -221,6 +281,7 @@ x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) default: __assert_unreachable(); } + return (a.error); } /* From nobody Fri Feb 13 08:17:55 2026 X-Original-To: dev-commits-src-main@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 4fC4mM6j91z6SjDR for ; Fri, 13 Feb 2026 08:17:55 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fC4mM5mz0z3fP6 for ; Fri, 13 Feb 2026 08:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770970675; 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=jJk587gR6XTvbo1XDD0E5rlU/djowQoSocfx9o/OwCw=; b=TMXMCiIkOEeZD0BNv7d4JPsgbipfFBEVuloXTmfwx4v/PowZunW5nCYkd2CZA37AME46iF PN5vPIR3Zya/G9VEODo+b5MYq0PtduQijQRbsgFqLBY7QYkGZ+V9yiM4sb82czc8u6zDvZ FqeMBdVVylVvEU0ZzbkSr6HrVeu8y+mY36+gRwM6v4qyEIb6RzT0zHIK1SalIyLhYW5DBX d5SH4Q5Oueffl6leJs2gtQ8+jpmi8bCUQmdp2CmvAQaU6JVFLkz0DA5SgVEOS/oQWNr7AW FEnJXKK8uV+3wOnqMbx0bg5WUX5L8/M0efdtsFDniXl1y9NW6d/WN4+1cGWE3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770970675; a=rsa-sha256; cv=none; b=nxJwOivThitTjojj90XcriHpD9+yueAfh7CZivGULGu3rAJWLy2gKpv9BkU4hc2mdOYkCj I7CdfTVeqzgXe/PpRSySeXaoHztIuQM0gkk+j5OpGxwKlcyVqHMavir/hRpo0ni9zug8yH fiuUAXD98d0FXT5RPC9pHk+/+mCwdtO6J2WAEh5ZDXz/11asM3eyQZEedRWnqF4Y7cFY+/ /zblYfACjXZWqCVWApdHIrBRHilWCtQm9tfCjgK6LYIwgvVDYYGarD33njBcHGwP6j7wTs BWmCFmBfYs0eazqHwkE/vrkVOwxXCeDdpPUFhUk8/fc24JZ/WhYwBq/nFe/mEQ== 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=1770970675; 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=jJk587gR6XTvbo1XDD0E5rlU/djowQoSocfx9o/OwCw=; b=kxAmfmMu1pvnpiFMmizaeZhZrop8C8R/t0gCECMreqBIk+1chaImz5uwRENMWGUPJA33Z+ R07HwEPi8CZUIt9VujhTOfkKd3mOjQOTAEBou2lW5Du9Jazv1ZRFTxXXOtZhWYHXgsqY7e RQc2hyzwPAy6lFNq/M/3f6K7CXq95yuYpf2oIzx6LXa/6KsBBbUdC6VosSJRzoylRSLJyk 6EL1E7v25HNC+IC25DWen8IgF/cc28uNi4Df1dDrX9gpXlUc6uuZdssgBf+0LDbOEWOLUZ 5skwMd94c94/Ve1dBr1zcDIdr94MWZyqyISk3/S3/M3rnHi6+qR6kZs+MouO1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fC4mM5N10z1CVJ for ; Fri, 13 Feb 2026 08:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40456 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 08:17:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 36ceb5509d01 - main - x86_msr_op(9): consistently return the value read from MSR List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 36ceb5509d01ff2e6482a78ca809c344574e9a25 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 08:17:55 +0000 Message-Id: <698ede33.40456.5f8393c3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=36ceb5509d01ff2e6482a78ca809c344574e9a25 commit 36ceb5509d01ff2e6482a78ca809c344574e9a25 Author: Konstantin Belousov AuthorDate: 2026-02-04 00:24:58 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-13 07:55:04 +0000 x86_msr_op(9): consistently return the value read from MSR If the operation is executed on more than one CPU, a random instance of the read value is returned. Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55045 --- sys/x86/x86/cpu_machdep.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 023b02ba7c76..6c3f4add6202 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -136,6 +136,8 @@ x86_msr_op_one_safe(struct msr_op_arg *a) atomic_cmpset_int(&a->error, 0, error); break; } + if (a->res != NULL) + atomic_store_64(a->res, v); v &= ~a->arg1; error = wrmsr_safe(a->msr, v); if (error != 0) @@ -147,6 +149,8 @@ x86_msr_op_one_safe(struct msr_op_arg *a) atomic_cmpset_int(&a->error, 0, error); break; } + if (a->res != NULL) + atomic_store_64(a->res, v); v |= a->arg1; error = wrmsr_safe(a->msr, v); if (error != 0) @@ -159,10 +163,12 @@ x86_msr_op_one_safe(struct msr_op_arg *a) break; case MSR_OP_READ: error = rdmsr_safe(a->msr, &v); - if (error == 0) - *a->res = v; - else + if (error == 0) { + if (a->res != NULL) + atomic_store_64(a->res, v); + } else { atomic_cmpset_int(&a->error, 0, error); + } break; } } @@ -175,11 +181,15 @@ x86_msr_op_one_unsafe(struct msr_op_arg *a) switch (a->op) { case MSR_OP_ANDNOT: v = rdmsr(a->msr); + if (a->res != NULL) + atomic_store_64(a->res, v); v &= ~a->arg1; wrmsr(a->msr, v); break; case MSR_OP_OR: v = rdmsr(a->msr); + if (a->res != NULL) + atomic_store_64(a->res, v); v |= a->arg1; wrmsr(a->msr, v); break; @@ -188,7 +198,8 @@ x86_msr_op_one_unsafe(struct msr_op_arg *a) break; case MSR_OP_READ: v = rdmsr(a->msr); - *a->res = v; + if (a->res != NULL) + atomic_store_64(a->res, v); break; default: __assert_unreachable(); From nobody Fri Feb 13 08:17:56 2026 X-Original-To: dev-commits-src-main@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 4fC4mP1vJ5z6Sj7Z for ; Fri, 13 Feb 2026 08:17:57 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fC4mN71WRz3fGv for ; Fri, 13 Feb 2026 08:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770970677; 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=0LSiH4Daed9iuQIuvLu9j+zK614tRKwTiA5sE4Bh4Kg=; b=e2wXG+8Fr/u1V+SpI1k3Aly+hQm8sO+higxLdj+P84fhQ0BYca/T+71/llDUT2SXC6gv/v yEvhPlxF7qD+bOjpRJPwfblX+UmuLX0ZXIHbHbNvhrgHjVtLsl/1jUUiWfANuMAhkYCOnn 8DnMPK+S54l4rqFMZ2oYeVZjR5E3WAaqRMH/fqjGxKPhc76ZlSD+cBiiHWf02acHOiiO6m xkEfZE+8nuAq7i8srqbxysrnkDHlde9TS1uWXgM8UV+of3I2/5Zd3Qwlz551f2hTArtu1f g4cS5umYyMrw5lE4S/yiavP1nCjt6zodF5jXAFywAOs5sOh3macO5bKPcL9+zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770970677; a=rsa-sha256; cv=none; b=xWQydJ5O3lnIekroKziuM2o4mO4knBvaBPF/o4Y63iKPuNmyo0QbH3DHDbdagW/WBN2ztX /w900+sELahOgw65bxOVkkFgYyJzKQS//zqrDeDU7oV7K4IT7I4IZIbrcawbkEoFftWciK bl6iscasSJotseS70IYi4CJ8JG1VXDwKiLB39i7/MkyRsU5q4kLSKjnA5tCv5Y5oI6JeZ3 F082jP1VZiuAhCuuQUUk+9DxEItpAJ1tgFTdiLLDxvAaSnuWHIhlsGKcr9oZHwLvEP8kvr NeGZV73DaXxI5nPQdcFPoYXAyAOvgXQ2XHL8oUnNfRKz9MG3e0zXfF+Rp9cZmA== 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=1770970677; 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=0LSiH4Daed9iuQIuvLu9j+zK614tRKwTiA5sE4Bh4Kg=; b=igp4Kl1VIFvU+w1afhnyvAys0ggIPvxVm/x1pBwL0REpz49JiSQPKIw2LgS3xZZuwggABQ bc2k132o1qBGCfhIi2g05lI3b6p+M1Y7Mu3pLUC6+FWIjNaWJ9gNixKaRXNU1TYAiBp3MG rPlwPqsc8CGSryOxKPOysx9hX0SNKNBnDiaJ74ZEKvAVJLUkfpKsgTGmQFTDYbYsEBesN8 VDlTLaOJ4LhQi/cVc9HVZNN+cld054aKm27S21WPeStC8jBVvxUTocOq2WYdOc7aWIz75Y MKkE1vCj1F+Vo0bwYujxgeTrRUVPRUlqpKyHrTc9Z0fmna7KY8SG64mLVZvHbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fC4mN6BZPz1C7q for ; Fri, 13 Feb 2026 08:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e05c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 08:17:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: cb81a9c18db9 - main - x86: provide extended description for x86_msr_op(9) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: cb81a9c18db93a2046c47b0c7dc0bd6adcdd2495 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 08:17:56 +0000 Message-Id: <698ede34.3e05c.3beb55d4@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cb81a9c18db93a2046c47b0c7dc0bd6adcdd2495 commit cb81a9c18db93a2046c47b0c7dc0bd6adcdd2495 Author: Konstantin Belousov AuthorDate: 2026-02-04 00:22:08 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-13 07:55:04 +0000 x86: provide extended description for x86_msr_op(9) Reviewed by: markj, olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55045 --- sys/x86/include/x86_var.h | 6 ++---- sys/x86/x86/cpu_machdep.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/sys/x86/include/x86_var.h b/sys/x86/include/x86_var.h index caaab207b57a..40dd21107436 100644 --- a/sys/x86/include/x86_var.h +++ b/sys/x86/include/x86_var.h @@ -162,7 +162,7 @@ void x86_set_fork_retval(struct thread *td); uint64_t rdtsc_ordered(void); /* - * MSR ops for x86_msr_op() + * MSR ops for x86_msr_op(). */ #define MSR_OP_ANDNOT 0x00000001 #define MSR_OP_OR 0x00000002 @@ -170,9 +170,7 @@ uint64_t rdtsc_ordered(void); #define MSR_OP_READ 0x00000004 /* - * Where and which execution mode - * - * All modes cause execution on the target CPU(s) with interrupts disabled. + * Where and which execution mode. */ #define MSR_OP_SAFE 0x08000000 #define MSR_OP_LOCAL 0x10000000 diff --git a/sys/x86/x86/cpu_machdep.c b/sys/x86/x86/cpu_machdep.c index 6c3f4add6202..5483fbd6dd4e 100644 --- a/sys/x86/x86/cpu_machdep.c +++ b/sys/x86/x86/cpu_machdep.c @@ -223,6 +223,49 @@ x86_msr_op_one(void *arg) #define MSR_OP_GET_CPUID(x) \ (((x) & ~(MSR_OP_EXMODE_MASK | MSR_OP_SAFE)) >> 8) +/* + * Utility function to wrap common MSR accesses. + * + * The msr argument specifies the MSR number to operate on. + * arg1 is an optional additional argument which is needed by + * modifying ops. + * + * res is the location where the value read from MSR is placed. It is + * the value that was initially read from the MSR, before applying the + * specified operation. Can be NULL if the value is not needed. If + * the op is executed on more than one CPU, it is unspecified on which + * CPU the value was read. + * + * op encoding combines the target/mode specification and the requested + * operation, all or-ed together. + * + * MSR accesses are executed with interrupts disabled. + + * The following targets can be specified: + * MSR_OP_LOCAL execute on current CPU. + * MSR_OP_SCHED_ALL execute on all CPUs, by migrating + * the current thread to them in sequence. + * MSR_OP_SCHED_ALL | MSR_OP_SAFE execute on all CPUs by migrating, using + * safe MSR access. + * MSR_OP_SCHED_ONE execute on specified CPU, migrate + * curthread to it. + * MSR_OP_SCHED_ONE | MSR_OP_SAFE safely execute on specified CPU, + * migrate curthread to it. + * MSR_OP_RENDEZVOUS_ALL execute on all CPUs in interrupt + * context. + * MSR_OP_RENDEZVOUS_ONE execute on specified CPU in interrupt + * context. + * If a _ONE target is specified, 'or' the op value with MSR_OP_CPUID(cpuid) + * to name the target CPU. _SAFE variants might return EFAULT if access to + * MSR faulted with #GP. Non-_SAFE variants most likely panic or reboot + * the machine if the MSR is not present or access is not tolerated by hw. + * + * The following operations can be specified: + * MSR_OP_ANDNOT *res = v = *msr; *msr = v & ~arg1 + * MSR_OP_OR *res = v = *msr; *msr = v | arg1 + * MSR_OP_READ *res = *msr + * MSR_OP_WRITE *res = *msr; *msr = arg1 + */ int x86_msr_op(u_int msr, u_int op, uint64_t arg1, uint64_t *res) { From nobody Fri Feb 13 09:35:00 2026 X-Original-To: dev-commits-src-main@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 4fC6TJ4csdz6RMng for ; Fri, 13 Feb 2026 09:35:00 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fC6TJ3ySLz3nXV for ; Fri, 13 Feb 2026 09:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770975300; 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=upj8x/467fYipQ89UrF9yV+UHYtPblivRA80PI2rGoA=; b=ktpGXrz9QBZmyR0lty2nf7and9VNUtkxQgSAWRN6sUCFVEkXMqyHH/AM4AoslzSJ/tjcC0 SwOJ8Gs2A4yxda4oLqc9BGl8nu7uhpE88wV2Arfo8XtOWxqujWQfW6Ka+T1BPmt+AmFNCf 8HbbxqUnt9ktvxfY743oiI7jBQJjECDB01Oqj5v5sLcLJPQqq/idfY8T7aj+iWMZP5TnPK 6BRf3J3GBh3eM8cceD8TxpjHBcXuJlxtI1tvgaSMnbMsSvEXYRnnSuA5qldsgvnTEgqY3H nxf9eSW5ZJ8PfjjnXFr5OvHt0P9qCJqb0LgYvz+BzYbxy4l3xcig6bq3IUi65A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770975300; a=rsa-sha256; cv=none; b=NYnGvBEbaFDgl5YVyW8vX4X7BcTAAzftfiY6t3MPAhfZWhkwfaT+P3yad4PrQeuLc9ZodR okCGr5e9YjzMEiuaNBu2yEhHvsCDpG6SSN118nCnLiSFlwFM4oDF6GvxQCCrq0Z9SF6jL7 5WWMCSlt4R44ykZ6jvpVFVM+PRoH2wa9zV4ZTqbsIPkRio8OYTazhril/Kf6l8W8j8OnLN /T+MBxHmgtpjXEiQJZn1cxH6grOiYeNKfalH4moZJoj1qy8nkFvmJwl2nJPcjAAmawhGlC /TP+g/IBT40RinUwsyNykCvg25bhcJMw0JV2kFXFYLy0TAculYI2sb/GZsyOdQ== 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=1770975300; 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=upj8x/467fYipQ89UrF9yV+UHYtPblivRA80PI2rGoA=; b=gcOw2+rR7kSU21Km6w78u13yrv2xDSBU+lZ4f/BCdHoirGb0uHxODFk4MrY2JLaRxPkuVp MydbAkFvvD3gSJFYpWJmlqnsTVmBwmch5W3A7lWU1nlDAIIL1ZxqHEAQwKSUkWvc3HXbIX zM2z2FNwurrNkyCNBdJUIHOtB+VFik3tfNjkHaHPwQrQ6CwdiH3RZQwAa+TYEUqEHf43b1 PjTFSFePwoUOcwm9IxbTU5U9vW4/qv/ArLPbX7Vaf4CUhrvg5zXvqje7pV/83Os/90mcEj mbJYvGM6UM/grJFO6ono1OpfSfUFX8tgeDR4zcLjBE63x+v1gXUDNBivnvHfqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fC6TJ3YNlz1NF for ; Fri, 13 Feb 2026 09:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46cdf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 09:35:00 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 8d442cf32e4f - main - diff3: fix diff3 -A List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d442cf32e4fb29fbb85090ac29d32d1e30fd824 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 09:35:00 +0000 Message-Id: <698ef044.46cdf.27f37b83@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8d442cf32e4fb29fbb85090ac29d32d1e30fd824 commit 8d442cf32e4fb29fbb85090ac29d32d1e30fd824 Author: Baptiste Daroussin AuthorDate: 2026-02-13 08:33:17 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-13 09:34:15 +0000 diff3: fix diff3 -A for cases where file2 differs but file1 and file3 agrees, the code stored the file2 and file3 line numbers in the de[] editing script entries but used them as if they were file1 line numbers. Reviewed by: thj Differential Revision: https://reviews.freebsd.org/D55276 --- usr.bin/diff3/diff3.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index d010a0b1d067..4f3239b10625 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -118,6 +118,7 @@ static struct diff *d23; */ static struct diff *de; static char *overlap; +static int *de_delta; /* file1-file3 line number delta per edit */ static int overlapcnt; static FILE *fp[3]; static int cline[3]; /* # of the last-read line in each file (0-2) */ @@ -365,6 +366,7 @@ merge(int m1, int m2) d1 = d13; d2 = d23; j = 0; + int f1f3delta = 0; for (;;) { t1 = (d1 < d13 + m1); @@ -383,6 +385,8 @@ merge(int m1, int m2) } else if (eflag == EFLAG_OVERLAP) { j = edit(d2, dup, j, DIFF_TYPE1); } + f1f3delta += (d1->old.to - d1->old.from) - + (d1->new.to - d1->new.from); d1++; continue; } @@ -394,9 +398,10 @@ merge(int m1, int m2) change(3, &d2->new, false); change(2, &d2->old, false); } else if (Aflag || mflag) { - // XXX-THJ: What does it mean for the second file to differ? - if (eflag == EFLAG_UNMERGED) + if (eflag == EFLAG_UNMERGED) { j = edit(d2, dup, j, DIFF_TYPE2); + de_delta[j] = f1f3delta; + } } d2++; continue; @@ -436,6 +441,8 @@ merge(int m1, int m2) j = edit(d1, dup, j, DIFF_TYPE3); } dup = false; + f1f3delta += (d1->old.to - d1->old.from) - + (d1->new.to - d1->new.from); d1++; d2++; continue; @@ -723,7 +730,7 @@ Ascript(int n) prange(old, deletenew); printrange(fp[2], new); } else { - startmark = new->to - 1; + startmark = new->to - 1 + de_delta[n]; printf("%da\n", startmark); printf("%s %s\n", newmark, f3mark); @@ -811,7 +818,9 @@ mergescript(int i) else if (de[n].type == DIFF_TYPE3 && (old->from == old->to)) { r.from = old->from - 1; r.to = new->from; - } else + } else if (de[n].type == DIFF_TYPE2) + r.to = new->from + de_delta[n]; + else r.to = old->from; printrange(fp[0], &r); @@ -859,7 +868,9 @@ mergescript(int i) exit(EXIT_FAILURE); } - if (old->from == old->to) + if (de[n].type == DIFF_TYPE2) + r.from = new->to + de_delta[n]; + else if (old->from == old->to) r.from = new->to; else r.from = old->to; @@ -870,7 +881,7 @@ mergescript(int i) * additions to this file should have been handled by now. * * If the ranges are the same we need to rewind a line. - * If the new range is 0 length (from == to), we need to use the old + * If the new range is 0 length (from == to), we need to use the new * range. */ new = &de[n-1].new; @@ -879,7 +890,7 @@ mergescript(int i) if (old->from == new->from && old->to == new->to) r.from--; else if (new->from == new->to) - r.from = old->from; + r.from = new->from; r.to = INT_MAX; printrange(fp[2], &r); @@ -891,6 +902,7 @@ increase(void) { struct diff *p; char *q; + int *s; size_t newsz, incr; /* are the memset(3) calls needed? */ @@ -917,6 +929,11 @@ increase(void) err(1, NULL); memset(q + szchanges, 0, incr * 1); overlap = q; + s = reallocarray(de_delta, newsz, sizeof(*s)); + if (s == NULL) + err(1, NULL); + memset(s + szchanges, 0, incr * sizeof(*s)); + de_delta = s; szchanges = newsz; } From nobody Fri Feb 13 12:35:04 2026 X-Original-To: dev-commits-src-main@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 4fCBT43YL3z6Rgwt for ; Fri, 13 Feb 2026 12:35:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCBT42dNkz46h0 for ; Fri, 13 Feb 2026 12:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770986104; 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=6LtL1CBNxOOQee9bR9gbkZLnRAmbn0NQVkpBDkja6LY=; b=o7VYhYRgIWTFEMDB+TE5jP0QLCzS3IgVTk3zAM3ZTwRmgY2/2jYkByNi/rp+b3n5y5BA3X lTEYSWt09Ma5xFP4c6VKrBpqxeT94KezepQSxXJBcLgdzEjgImsfM8tTlXcFplY9hIbHGd qrcGuD2CeJCMICpI/wOcUuMnjhvcHl5F23bwkPwS9xKEmLSErqQQRkNoVfcCeH2zH6KXHd HzH+NttmIWw+tE36Su1kVxrTBoA60WpJLMdf3Mj94XiupVMphbfjD6o3loW9ZGWQoCA3WP NgFRlOPo2QO0AvoRoH/kV1Y/jzLSErUpETSl1Yw1GxwfwM522290xhu/wBBBWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770986104; a=rsa-sha256; cv=none; b=i/0ECKipQPthkyQjQq1AyDVoAqKDBMs9FK4C4eBjV5q6m9oxVUWGbLEGa9tK2id4t7eMMt 1HnsCKcxP++x5FD1ondxehosFGR+MAV9fRXu9vLS9YQX+n3/BZC3ytcxQyomLV8Pd26YSt pKn2IOxAISM9oSD08PwrJGSj7OYdOfMZk2gbbPy6PrqV3qaiq1dvoLXxTz/VI8QcnzNous 8155N+ZcaZLyamqItHPpJ9CsMHIiYqZqj0UP9flVQZFbeEONZimIJj0bYV7h3u/R23Ikvx uTmJ7GE+/kMb+S2kXSd6LaEwbNuyEDRCu9mxE92DHvkEcU1Q9oeopHj4U9zbYA== 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=1770986104; 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=6LtL1CBNxOOQee9bR9gbkZLnRAmbn0NQVkpBDkja6LY=; b=MbbCD8TZG8g8ZlfbxQ8vnHcXTviSH3eJC/4YuHh2BdJTCZs/pJOoyQOLSNDWrQ5wYcV2CM d96rfDVGZk/bilnb1eUlgh1o8hMeYTaxReclNHVFh9R6wdNO7CSi9fTZvfPXM4UR2thmMX OVUgATRGzOcrAUiFYig4VJRNg1lhAWxLKP3hHJ+Wkk2VKXnmrIi100kt4aaMfEquDCHFu9 4UHup/k9r5EGSk05VdamwFRL7QNvniWYnLiNMkKXzXkwVL1ocI2OPYn/r1KUg0Lkiv+IdG zRh25PrrhHJC3VZkRFjca3RZWmTyvdClZd4WFZEQiywnpqWJzYm6q0R7QDwBEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCBT42B63z64Z for ; Fri, 13 Feb 2026 12:35:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3140e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 12:35:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 1e2eea55c455 - main - nvme: Change fail_on_reset to bool List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e2eea55c4559544b68c99e95641097983230611 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 12:35:04 +0000 Message-Id: <698f1a78.3140e.725b9d85@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1e2eea55c4559544b68c99e95641097983230611 commit 1e2eea55c4559544b68c99e95641097983230611 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 12:34:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 12:34:51 +0000 nvme: Change fail_on_reset to bool This is safe since sysctl_handle_bool() handles ints transparently. Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55263 --- sys/dev/nvme/nvme_private.h | 2 +- sys/dev/nvme/nvme_sysctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 96ab5cc553e3..d06862ba5f4a 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -300,8 +300,8 @@ struct nvme_controller { struct nvme_async_event_request aer[NVME_MAX_ASYNC_EVENTS]; uint32_t is_resetting; - u_int fail_on_reset; + bool fail_on_reset; bool is_failed; bool is_failed_admin; bool is_dying; diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index 50d19e730a16..1b64ebddb9b2 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -425,7 +425,7 @@ nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr) CTLFLAG_RD, &ctrlr->cap_hi, 0, "Hi 32-bits of capacities for the drive"); - SYSCTL_ADD_UINT(ctrlr_ctx, ctrlr_list, OID_AUTO, "fail_on_reset", + SYSCTL_ADD_BOOL(ctrlr_ctx, ctrlr_list, OID_AUTO, "fail_on_reset", CTLFLAG_RD, &ctrlr->fail_on_reset, 0, "Pretend the next reset fails and fail the controller"); From nobody Fri Feb 13 12:43:08 2026 X-Original-To: dev-commits-src-main@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 4fCBfN6360z6Rhfs for ; Fri, 13 Feb 2026 12:43:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCBfN3xwnz49Sf for ; Fri, 13 Feb 2026 12:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770986588; 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=mbntCfgko4e3oYMYA0CGO3LPQmJIxW3dCt0f/M8QsyI=; b=yCsTdfJkU8/gKh++WNvQ4mv9q56VnjEFUH00Cy1eb8qYNpgE31lbTWYRRlZoHI4AKB1zcu Ps/JfK3734lGgbYD5jNxwRXyhTTXT78rZOwUzQ438wzyj+jJpaH9Mvr2wJAJlPvlPXM/wz SftsTJZsW1Z6WDZbkN4a+lWfeuvsI5mtOA0BACVckmUX37T2CeRWlrZOPz+y9FSxBJxoLM wNOIkv8hZuG3Us4NEBDHdijovmEy5tsxzeO0+bOJnMto2icf9LxJBFUD29HI2YHMmsCCBk nd6S9Z5zN/j05bGS3ajU6sr5wHyHvHxPESBsj7ML3/C4ROqjeDA5cCH2jRr0Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770986588; a=rsa-sha256; cv=none; b=dWmMhRYkU4IhRvygXr3OLjh46LMcJ/ib9nlrdl8x+w2GNfu/hQlRc63Xt6Nepqqh8uSFrj voLlfON4+1n7/i9pAIumOYMmHJ74TSnc60eoUK9cSI46L/C7adOTud6Z3yw+a/nD6JSLm7 CFoLiiBo/TeNZAIpCtJM6pv980zitImFiLZ92//VA3IHIwlGFkb1JhAcvC421t9+3oIB7X heOeLxuSZoyTSQ7/vZ3zr7W1E5Ox6I9SyaLcZttVh+oer2wCTKV30WHUwY1UZKx3xTWNSG 9VvrPeWmP2t1oTDXD5rJ/3bX54RABSzcgw+UHPYN7AqOwa2BSMwIAciE6LL1HA== 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=1770986588; 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=mbntCfgko4e3oYMYA0CGO3LPQmJIxW3dCt0f/M8QsyI=; b=eMR3zzQt2jHjk3v9+WmXVpbJ/XbSzqQ+459N7an3pGTLNmGjdd1T4xpB3LFen9NQFRtM+1 iCqb9AEc2v9RkXg3LgHGQkES5ZW8XE6mVgnbwNu84wSTu8b1KfTPW2dSy5qUWmjUbI9Uia pDIbC8ukFV4AadQUXPybx1BO/SoqFaffXaTVokQMuTEpr+fHdzQGFbneCgmincNsRO0l8F iQfmEycuhtJc/nwxTo0mF+qIniqrKIykEwQcnRnUsXAJQbEhVcdjyuF5GN0TaT9h0qD+Cr enebdd1GrZhlg71hDIvELa2nXMRKF7+6AdvUThMflr9+ODDHo5ob3WFD2jfO4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCBfN3PHmz6pV for ; Fri, 13 Feb 2026 12:43:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34826 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 12:43:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 394201ce5b4e - main - tests: Simplify libarchive tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 394201ce5b4e2f84f1e39a7ce8bdc3f5a5ef8390 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 12:43:08 +0000 Message-Id: <698f1c5c.34826.59b18c2f@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=394201ce5b4e2f84f1e39a7ce8bdc3f5a5ef8390 commit 394201ce5b4e2f84f1e39a7ce8bdc3f5a5ef8390 Author: Dag-Erling Smørgrav AuthorDate: 2025-12-06 13:48:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 12:40:57 +0000 tests: Simplify libarchive tests The ATF tests work by first running the test program with an invalid flag, which causes it to print an error message, a summary of options, and a list of available test cases. Switch to the new -l option which simply prints the list, and simplify the awk script used to parse the output. No functional change. MFC after: 1 week --- lib/libarchive/tests/functional_test.sh | 2 +- usr.bin/bsdcat/tests/functional_test.sh | 2 +- usr.bin/cpio/tests/functional_test.sh | 2 +- usr.bin/tar/tests/functional_test.sh | 4 ++-- usr.bin/unzip/tests/functional_test.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libarchive/tests/functional_test.sh b/lib/libarchive/tests/functional_test.sh index 191eae65f4dc..db3845b5e6f7 100755 --- a/lib/libarchive/tests/functional_test.sh +++ b/lib/libarchive/tests/functional_test.sh @@ -40,7 +40,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/bsdcat/tests/functional_test.sh b/usr.bin/bsdcat/tests/functional_test.sh index efed232374e2..27bf51298bb8 100755 --- a/usr.bin/bsdcat/tests/functional_test.sh +++ b/usr.bin/bsdcat/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/cpio/tests/functional_test.sh b/usr.bin/cpio/tests/functional_test.sh index a915cc91faea..6bc58e5236ae 100755 --- a/usr.bin/cpio/tests/functional_test.sh +++ b/usr.bin/cpio/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/tar/tests/functional_test.sh b/usr.bin/tar/tests/functional_test.sh index 39a73abd0a79..11f3cb6dd122 100755 --- a/usr.bin/tar/tests/functional_test.sh +++ b/usr.bin/tar/tests/functional_test.sh @@ -25,9 +25,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -export BSDTAR=$(which tar) SRCDIR=$(atf_get_srcdir) TESTER="${SRCDIR}/bsdtar_test" +export BSDTAR=$(which tar) check() { @@ -41,7 +41,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" diff --git a/usr.bin/unzip/tests/functional_test.sh b/usr.bin/unzip/tests/functional_test.sh index e668453d8882..c6b25cfc2e7e 100755 --- a/usr.bin/unzip/tests/functional_test.sh +++ b/usr.bin/unzip/tests/functional_test.sh @@ -46,7 +46,7 @@ atf_init_test_cases() # Redirect stderr to stdout for the usage message because if you don't # kyua list/kyua test will break: # https://github.com/jmmv/kyua/issues/149 - testcases=$(${TESTER} -h 2>&1 | awk 'p != 0 && $1 ~ /^[0-9]+:/ { print $NF } /Available tests:/ { p=1 }') + testcases=$(${TESTER} -l 2>&1 | awk '/^ [0-9]+: / { print $2 }') for testcase in ${testcases}; do atf_test_case ${testcase} eval "${testcase}_body() { check ${testcase}; }" From nobody Fri Feb 13 15:43:25 2026 X-Original-To: dev-commits-src-main@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 4fCGfV2Lgjz6S1ZH for ; Fri, 13 Feb 2026 15:43:30 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCGfV1wQbz3fK1 for ; Fri, 13 Feb 2026 15:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770997410; 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=t7GlH3hKIEUCEiyBs6qmk6lvm6obFQ9tTye4xiAIrl8=; b=Bgdz9iFc/e2LpW8nI1ZQkwtCoHk98GqbJv2XJfYK5HUAVD7H3c81aPc7wUimmpVT8PdieW mzrbFgoPtjoApp3mCxoljy2T1n1Nb9LIRlNmY+jl6C5HHP/OwX2GlwelfwK2LZXsafN+f1 gxYz96vBFEk1tvo1fEEpAKEMl2LoK7WIQM5hbuoUNlPORmrvmpraVALlHjMqXXLg89j3kj k81LFbu6nyHZ5eQi0mP8Ur2TJ2+cweKOHp8P6sBEtlLoO52yeY11HgBJ+5kYYgazJZUM9h N45viFQVNJYgUycsSJrsV2rRvAHMWDnpnqH+mAXXAW0WwOXb9wp663RIvq0XZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770997410; a=rsa-sha256; cv=none; b=MjYAPMelpaRroN1A/isrMTgw9+dSlF23+0EzuzASNzTyNU4/gPr3SI/e/aa1EN4Uf1DxCW JfVzk1KWwrFStDjleFLGcFaTQJE1MEX5vwRlUh7JWu3mbj2ZWCArwA94W2DrHCG5+rSmGI NnIlgGqTTgIQnbs2SJQhFKsStXg77H6hWEqvh0bPC4b4xpOgFyhvHeqU/E4yofQzgM2ueC Jsq+KfKjFb726pbejG3A3hDyIwVO0L8k9TvPzc7iLwAZYWdqf9j9owZMCfBn63k+8Wa4Za l+z579sPgfH+geJWI9fVUiMgNFXEhVK79FpeoGm88UAQKt5yFbFOoshTi2SOAQ== 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=1770997410; 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=t7GlH3hKIEUCEiyBs6qmk6lvm6obFQ9tTye4xiAIrl8=; b=Ugw0uoEPLj92LJym4nYmTQBrXQIk8clYwvltepWIVjdofFQzbnpDgYL1ti9JydeA2oeiIV SFR4p7FuGD3laHrpGjvIQXoMbxVJEpPA7jSpdNXT1kOPokUeMize1FmRZw6ZBVlPxV/HbL YpBdIdw/pwOdXIoZ/Mmua57QSs5iB9JwLbNrqcrn+IP9kKKHY3yQhUGbMyZ5/SpWPez1PA 72v5R+HSmaDbj7njPGQKdCQT6EG2DPxRD+CCV/R3ZMR5V1NlboXVOSsEjH2NYvpOAP8QpF sz9ts+zck8QnsOfiv6ArYjUgZjP4Xa+PkY/qcRB/M4aSYDaZ52FqDiEiM1HbEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCGfV1JbxzC09 for ; Fri, 13 Feb 2026 15:43:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f058 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 15:43:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bf149f2e88cb - main - kmsan: Implement __msan_test_shadow() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf149f2e88cb3836e02ddabd9944eb58650a72ae Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 15:43:25 +0000 Message-Id: <698f469d.1f058.9562ea7@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bf149f2e88cb3836e02ddabd9944eb58650a72ae commit bf149f2e88cb3836e02ddabd9944eb58650a72ae Author: Mark Johnston AuthorDate: 2026-02-13 15:42:19 +0000 Commit: Mark Johnston CommitDate: 2026-02-13 15:42:19 +0000 kmsan: Implement __msan_test_shadow() This is needed when building OpenZFS with KMSAN enabled, as the bundled zstd uses it. MFC after: 1 week --- sys/kern/subr_msan.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 883dbd2b7604..dd69375f4ed1 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -662,6 +662,7 @@ void __msan_poison_alloca(const void *, uint64_t, const char *); void __msan_unpoison_alloca(const void *, uint64_t); void __msan_warning(msan_orig_t); msan_tls_t *__msan_get_context_state(void); +intptr_t __msan_test_shadow(const void *, size_t); void __msan_instrument_asm_store(const void *addr, size_t size) @@ -726,6 +727,23 @@ __msan_get_context_state(void) return (&mtd->tls[mtd->ctx]); } +intptr_t +__msan_test_shadow(const void *addr, size_t len) +{ + uint8_t *shad; + + if (__predict_false(!kmsan_enabled)) + return (-1); + if (__predict_false(kmsan_md_unsupported((vm_offset_t)addr))) + return (-1); + + shad = (uint8_t *)kmsan_md_addr_to_shad((vm_offset_t)addr); + for (size_t i = 0; i < len; i++) + if (shad[i] != 0) + return (i); + return (-1); +} + /* -------------------------------------------------------------------------- */ /* From nobody Fri Feb 13 15:46:48 2026 X-Original-To: dev-commits-src-main@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 4fCGkJ5xD2z6S1Xq for ; Fri, 13 Feb 2026 15:46:48 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCGkJ3DTGz3fcm for ; Fri, 13 Feb 2026 15:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770997608; 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=05QheqqnwGMrltdFwI5bFCZW4PwusaVxp1e4S5cSRDM=; b=boEp/iliwreJqLZKNiYCqk6lbO6WsGFJNIR4KV/+UfOGzJ13PJgTG6PA97RpOhWk9XB3wr h33k5TcY0PsEcFeqt6ikijEZml17zCOENy6XjETxjEjk9j1XfMafCRfLuQY52ayo4ahOWE dfTpt5X0awr+jyoTaPS6M84wy+c+jmDFvgDr5UL0vuxT7dycCXfwijJ7WI3A2sr/gqgEBo Zscs2Phl9m7OcEx6BNgYr0YEi3ZV4+w9PfwhfSf7L1Que+QLJdkKHLQJgyZCM6tOrU8O85 PmV8KSuDQij7YkSVTGbyJ83L9ElRf0WLgEnv2FBzw91zEwutGSDSoGeC2POzgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770997608; a=rsa-sha256; cv=none; b=LwW4WcD+a+sGisn4hS6BXgc+pqKS0cSOVHCdOR2g8IWrco2Yex3AsAG6jFcDuMhzThLRwQ iY6MTV/K2x/5Jy1GnrPDcDY5F29q35j1K8ROhvf1kj92DNdoxJq9ZZyjUvTm/1pTeU63Rs kHfNesg4GZlk98/qE9vABrZ28V1F2FzZi1a2vMbR61GWFRTBorA8rFghIKJMa6pmx5NhWX q0FADzfhmqwZ7anvJoCTeUgSvc+sEozEXuBYr958eHhppv9Z2utJ+JESQe3lFHzDaNkRSy kODastDnRuQ2s1DGko+DWq+sNvg7lPSEFZ+EScbKn3C9u4+71tYeAiw+JN6bFA== 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=1770997608; 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=05QheqqnwGMrltdFwI5bFCZW4PwusaVxp1e4S5cSRDM=; b=Qo2Ok7ggwuPlvSZMTo3CkUukyY5MqazBFMW0zKqsW/3mNTonr3UEpb4N++lGUlIEPrG8R6 b1ms5AOVduwddQ0zWiuXF0DnQkRZdNCA9bc27MNMACwQueK0kjilH1DjPEgH4iIPcT1c87 lWtA/wkJiBiUBM5+JAFzauAKV89Ylm7o9EzoHy2ox9CTZh28n9lsExYeJ7q+h2QWqiR+tl VfopJ7JtQE15jnqkiTHNZpPa0fsjWqJWtSXD9JiCw/r95JoIvGYk69SLKThsTcEo45LQ2C /CiXhgm+bva6WS8SD56Rrbj1vbL+aPlB38b7CuA2wB2tmcJxF/w89L0k1Ox7eA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCGkJ1s3JzBtY for ; Fri, 13 Feb 2026 15:46:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20cbc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 15:46:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 75a30ea09f4e - main - filt_timerexpire_l(): re-insert restarted timer into head instead of tail List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 75a30ea09f4e75480743fae5c2369d50a6d8526c Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 15:46:48 +0000 Message-Id: <698f4768.20cbc.53f3cde2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=75a30ea09f4e75480743fae5c2369d50a6d8526c commit 75a30ea09f4e75480743fae5c2369d50a6d8526c Author: Konstantin Belousov AuthorDate: 2026-02-12 20:24:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-13 15:46:41 +0000 filt_timerexpire_l(): re-insert restarted timer into head instead of tail of the resumed timers list, so that kqtimer_proc_continue() does not iterated into the same timer again. PR: 293141 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55264 --- sys/kern/kern_event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index a48408fd482a..85b7b6c953af 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -873,8 +873,13 @@ filt_timerexpire_l(struct knote *kn, bool proc_locked) PROC_LOCK(p); if (P_SHOULDSTOP(p) || P_KILLED(p)) { if ((kc->flags & KQ_TIMER_CB_ENQUEUED) == 0) { + /* + * Insert into head so that + * kqtimer_proc_continue() does not + * iterate into us again. + */ kc->flags |= KQ_TIMER_CB_ENQUEUED; - TAILQ_INSERT_TAIL(&p->p_kqtim_stop, kc, link); + TAILQ_INSERT_HEAD(&p->p_kqtim_stop, kc, link); } if (!proc_locked) PROC_UNLOCK(p); From nobody Fri Feb 13 15:46:49 2026 X-Original-To: dev-commits-src-main@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 4fCGkL0Md7z6S1tW for ; Fri, 13 Feb 2026 15:46:50 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCGkK2JCXz3fpC for ; Fri, 13 Feb 2026 15:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770997609; 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=NCkk3wHNi1gDcFNG/iuPS017UBTv5U3bRiy0Nu3gw1w=; b=ERK3HN9Qr9T/rrUMsL1z6r8brc2p4KgNQ4dXs4TOyAaB78qPwvHVwpIUTdTefOEL3tnQm2 mlDh6QPxj3dfMs37m99o6FZYAVRVCxHf/+fF08AHuXqdBKUGbCNPpxEdmSUBm65258GH+a +c5jK12+SWzFXgyCjTABr471UdzDpG1/qIddgTeTNbZb2z0qdiqNfZvKoH0CZ4gajHbedH kq9cWKIYwObwU6ku+PB7+oxq8hESSwPSdHA9mRfIXV0+DQfywZAq/7k12AazOA+oA8I6hF iFOalR5BmxSWJsDnOrQr9H2FfJmhA7ahH5/+jeeeJMZhtsTG51da1ZfRYnW8KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770997609; a=rsa-sha256; cv=none; b=HtvIqG8DGMNu1hH0mAtSdPw/fn3+LrcIgyx9jpvPBglDJYwBdQrSmgGmVRsN/RPj+td/1R fleqcQ24HXp/V9e26ZagOcOK9s2M5TlGGLevJv0PSYZGW9CNg/ofja4qs9i+kSXBcqnvhK adUjdfRQshwUc/UZc49ETYum6fYej8XQDo4LFCigi3Rk4RQuxjFllfqw+/Xssyoc5OBkaZ LXo52kqy5LAZRP1Dj3lajBgo8g1ah19Fl+/aKHQPTAKbvZIdRhwo+9SLYswVO2i6m5ZdNr SoF3sYl0VA6Vhd2pB39V9QjCJx6juVBAaiGmxuseijR9UjI1G1csANKb4kXtiA== 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=1770997609; 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=NCkk3wHNi1gDcFNG/iuPS017UBTv5U3bRiy0Nu3gw1w=; b=U3MJgfDrMer+0y52yT4VtJmZXqyZ2UseUocMQ05z/LE6jAcixlFcRBf3nNqRlNzZX9cH5M PaUTmhmsdwusUCfpybmmcJOb+4MRq+xxaCqeFg5MkIeU2o9dZI2b8SpDLWosqAj4+VmP7K PqqvEhIDXd8TuP+U9Kea4BDeFKk/4n3bZHAfcVI7j9UWuEnxTcMjcYryaOJZRcsrim8891 7yNG7qjTPIfoBbrt7OCjt8BOrXTQ18oH3t01krolapCjOT/rDh7HjWmXlW9vsqsaksQObd FemunnX28VmhkSQ3GxZOCBaYm/gg22Vq+n0mwKvyz7ECwQri4YmoyOvJQ0eoZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCGkK1jlfzCVR for ; Fri, 13 Feb 2026 15:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 20776 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 15:46:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e7f86f8b1383 - main - kqtimer_proc_continue(): correct calculation of 'now' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e7f86f8b1383d278fff1d973230972325072ead6 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 15:46:49 +0000 Message-Id: <698f4769.20776.6a8b38b0@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e7f86f8b1383d278fff1d973230972325072ead6 commit e7f86f8b1383d278fff1d973230972325072ead6 Author: Konstantin Belousov AuthorDate: 2026-02-13 15:32:40 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-13 15:46:41 +0000 kqtimer_proc_continue(): correct calculation of 'now' It must be sbinuptime(), this is how kc->next is set up. PR: 293141 Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D55264 --- sys/kern/kern_event.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 85b7b6c953af..a1cd409c53d9 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -814,14 +814,11 @@ void kqtimer_proc_continue(struct proc *p) { struct kq_timer_cb_data *kc, *kc1; - struct bintime bt; sbintime_t now; PROC_LOCK_ASSERT(p, MA_OWNED); - getboottimebin(&bt); - now = bttosbt(bt); - + now = sbinuptime(); TAILQ_FOREACH_SAFE(kc, &p->p_kqtim_stop, link, kc1) { TAILQ_REMOVE(&p->p_kqtim_stop, kc, link); kc->flags &= ~KQ_TIMER_CB_ENQUEUED; From nobody Fri Feb 13 16:01:42 2026 X-Original-To: dev-commits-src-main@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 4fCH3V75gDz6S3TV for ; Fri, 13 Feb 2026 16:01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCH3V6KYsz3jNg for ; Fri, 13 Feb 2026 16:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770998502; 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=R5Ywq9bLAfW4cazQB0cOsvsWAeE7bvwuzLCXssDBOqo=; b=Zz9RJJPddbgrxbBIu0/JIE4rl012NhEt8+1GA/SiY1V3E1G6odFBnUtsHmppvYWNBAhdl+ p9m85GHIhT1rQhERc2i3i5Qx/d5OwHre4OJl9YFVxN186+8PP0SO8wVaSGFFMDUn6s0A+o N6GJ9mbFah+5j/hV9gsaxWUXOwG2by2sodCStBDSGZm/maFfJpRH6uAJC7CHypTDPg7QUs LeIqxViw2VlNX/trnZ1ToC6hNBsnqVW+dgJAswystqBBzWghjT1lXiEr6+Th38apZqZ6rV nZ/y/rikKdFj0AhosrP0YCg8xGl/ZCP95CWvXGk+deDC2KIOIYkIeSmmllfv9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770998502; a=rsa-sha256; cv=none; b=Sn/m/N/biFPax+FMAZb7eHUNdRLGI+GLjcWYp5sCQEFKVYNjjavj24yc/OnUqAcvk1Lun2 Ihs+3CzBjSSjbht/e+QySO1ROUYdqFOzhzenfgF+1EDurMdii9hd+TnG9fv+uLW4i13gYT jed1sHMtPrBupelvuqNvvNdtOhpVhfot/DlBhasky/QeGfYlJAyuU9WY4CC/FbEcl8Yl94 V7LN8GTQ0vikRyxotcWgea7C856YGPs+n8gum3qRXIC4wKomQEakrQmwGPEboQYUjPD5Ui T9samMy33E6pYnTucgueylogI6tg+kg0jvhsQPbY+io7xI19bu7VjagfnQlcIQ== 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=1770998502; 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=R5Ywq9bLAfW4cazQB0cOsvsWAeE7bvwuzLCXssDBOqo=; b=BS217JEqyMWjytgPK2tNyykh+A1t+qZ5+z53x9tO7aCxygkIlNREw/1SIjys6Tq58SAF40 4PR7uZeEH0uvhovEqPr2XSu0XjjXWD4fZ6Ixm+XnHEtwcopZ18jgwWZU5CJV70lXDT71Nd vt1KOeTq8mwHG+PsdyOpzBvg9ADzdZkBD7KKowHeC5SHr5NQy+XrwqXMOHlAU1rLrsadzv d0AwTdmhBgvumtNzv1s3QnQ1yWxm6wSs2+w9ikT+y2A+QWCLite5ezEBNJq+qpmAUhOYVF HJWmf77LPWqK1BhuwvxBw6exta7FLgEQk7Sa8rTr1Q6TLQVeXOBOsfD1xILT/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCH3V5wt1zCj7 for ; Fri, 13 Feb 2026 16:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22e20 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 16:01:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3cbdcabf714d - main - ngctl: Modernize code somewhat List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cbdcabf714d5187e22d8ff1cbfbc261dc8622eb Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 16:01:42 +0000 Message-Id: <698f4ae6.22e20.59da6769@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3cbdcabf714d5187e22d8ff1cbfbc261dc8622eb commit 3cbdcabf714d5187e22d8ff1cbfbc261dc8622eb Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 15:57:58 +0000 ngctl: Modernize code somewhat * Replace fgets(3) with getline(3) * Replace select(2) with poll(2) * Avoid needlessly copying text around * Correct use of getopt(3) * Pick some style and whitespace nits MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55257 --- usr.sbin/ngctl/config.c | 9 +- usr.sbin/ngctl/connect.c | 6 +- usr.sbin/ngctl/debug.c | 6 +- usr.sbin/ngctl/dot.c | 7 +- usr.sbin/ngctl/list.c | 14 ++- usr.sbin/ngctl/main.c | 243 ++++++++++++++++++++++------------------------ usr.sbin/ngctl/mkpeer.c | 6 +- usr.sbin/ngctl/msg.c | 39 +++----- usr.sbin/ngctl/name.c | 6 +- usr.sbin/ngctl/rmhook.c | 6 +- usr.sbin/ngctl/show.c | 9 +- usr.sbin/ngctl/shutdown.c | 7 +- usr.sbin/ngctl/status.c | 10 +- usr.sbin/ngctl/types.c | 6 +- usr.sbin/ngctl/write.c | 10 +- 15 files changed, 168 insertions(+), 216 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 261bc950f570..25cd841494d1 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -3,7 +3,7 @@ * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -14,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -94,8 +94,8 @@ ConfigCmd(int ac, char **av) return (CMDRTN_ERROR); } } else { - if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 - || (resp->header.flags & NGF_RESP) == 0) + if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 || + (resp->header.flags & NGF_RESP) == 0) nostat = 1; } @@ -106,4 +106,3 @@ ConfigCmd(int ac, char **av) printf("Config for \"%s\":\n%s\n", path, status); return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/connect.c b/usr.sbin/ngctl/connect.c index 7f538e0a442d..c3e7d0b5a1b4 100644 --- a/usr.sbin/ngctl/connect.c +++ b/usr.sbin/ngctl/connect.c @@ -1,10 +1,9 @@ - /* * connect.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -85,4 +84,3 @@ ConnectCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/debug.c b/usr.sbin/ngctl/debug.c index bbc329acdcd2..1f64dfd466e9 100644 --- a/usr.sbin/ngctl/debug.c +++ b/usr.sbin/ngctl/debug.c @@ -1,10 +1,9 @@ - /* * debug.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -79,4 +78,3 @@ DebugCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/dot.c b/usr.sbin/ngctl/dot.c index 95132a5d0785..9893dc27f845 100644 --- a/usr.sbin/ngctl/dot.c +++ b/usr.sbin/ngctl/dot.c @@ -1,4 +1,3 @@ - /* * dot.c * @@ -6,7 +5,7 @@ * Copyright (c) 2004 Brian Fundakowski Feldman * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -17,7 +16,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -71,13 +70,13 @@ DotCmd(int ac, char **av) u_int i; /* Get options */ + optreset = 1; optind = 1; while ((ch = getopt(ac, av, "c")) != -1) { switch (ch) { case 'c': compact = 1; break; - case '?': default: return (CMDRTN_USAGE); break; diff --git a/usr.sbin/ngctl/list.c b/usr.sbin/ngctl/list.c index d13de1c4c57f..77fc7a4bbcf5 100644 --- a/usr.sbin/ngctl/list.c +++ b/usr.sbin/ngctl/list.c @@ -1,10 +1,9 @@ - /* * list.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -70,6 +69,7 @@ ListCmd(int ac, char **av) int ch, rtn = CMDRTN_OK; /* Get options */ + optreset = 1; optind = 1; while ((ch = getopt(ac, av, "ln")) != -1) { switch (ch) { @@ -79,7 +79,6 @@ ListCmd(int ac, char **av) case 'n': named_only = 1; break; - case '?': default: return (CMDRTN_USAGE); break; @@ -114,11 +113,11 @@ ListCmd(int ac, char **av) ninfo = nlist->nodeinfo; if (list_hooks) { char path[NG_PATHSIZ]; - char *argv[2] = { "show", path }; + char *argv[] = { "show", path, NULL }; while (nlist->numnames > 0) { - snprintf(path, sizeof(path), - "[%lx]:", (u_long)ninfo->id); + snprintf(path, sizeof(path), "[%lx]:", + (unsigned long)ninfo->id); if ((rtn = (*show_cmd.func)(2, argv)) != CMDRTN_OK) break; ninfo++; @@ -143,4 +142,3 @@ ListCmd(int ac, char **av) free(resp); return (rtn); } - diff --git a/usr.sbin/ngctl/main.c b/usr.sbin/ngctl/main.c index b86f1ca27e71..b58de1e042b3 100644 --- a/usr.sbin/ngctl/main.c +++ b/usr.sbin/ngctl/main.c @@ -1,10 +1,9 @@ - /* * main.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -39,12 +38,12 @@ #include #include -#include #include #include #include #include +#include #include #include #include @@ -71,7 +70,8 @@ /* Internal functions */ static int ReadFile(FILE *fp); -static void ReadSockets(fd_set *); +static void ReadCtrlSocket(void); +static void ReadDataSocket(void); static int DoParseCommand(const char *line); static int DoCommand(int ac, char **av); static int DoInteractive(void); @@ -146,6 +146,7 @@ main(int ac, char *av[]) FILE *fp = NULL; #ifdef JAIL const char *jail_name = NULL; + int jid; #endif int ch, rtn = 0; @@ -174,7 +175,6 @@ main(int ac, char *av[]) case 'n': snprintf(name, sizeof(name), "%s", optarg); break; - case '?': default: Usage((char *)NULL); break; @@ -185,8 +185,6 @@ main(int ac, char *av[]) #ifdef JAIL if (jail_name != NULL) { - int jid; - if (jail_name[0] == '\0') Usage("invalid jail name"); @@ -239,18 +237,25 @@ main(int ac, char *av[]) static int ReadFile(FILE *fp) { - char line[LINE_MAX]; - int num, rtn; - - for (num = 1; fgets(line, sizeof(line), fp) != NULL; num++) { + char *line = NULL; + ssize_t len; + size_t sz = 0; + unsigned int lineno = 0; + int rtn = CMDRTN_OK; + + while ((len = getline(&line, &sz, fp)) > 0) { + lineno++; if (*line == '#') continue; - if ((rtn = DoParseCommand(line)) != 0) { - warnx("line %d: error in file", num); - return (rtn); + if ((rtn = DoParseCommand(line)) != CMDRTN_OK) { + warnx("line %d: error in file", lineno); + break; } } - return (CMDRTN_OK); + if (len < 0) + rtn = CMDRTN_ERROR; + free(line); + return (rtn); } #ifdef EDITLINE @@ -258,7 +263,6 @@ ReadFile(FILE *fp) static void Unblock(int signal __unused) { - unblock = 1; } @@ -269,8 +273,11 @@ Unblock(int signal __unused) static void * Monitor(void *v __unused) { + struct pollfd pfds[2] = { + { .fd = csock, .events = POLLIN }, + { .fd = dsock, .events = POLLIN }, + }; struct sigaction act; - const int maxfd = MAX(csock, dsock) + 1; act.sa_handler = Unblock; sigemptyset(&act.sa_mask); @@ -279,22 +286,19 @@ Monitor(void *v __unused) pthread_mutex_lock(&mutex); for (;;) { - fd_set rfds; - - /* See if any data or control messages are arriving. */ - FD_ZERO(&rfds); - FD_SET(csock, &rfds); - FD_SET(dsock, &rfds); unblock = 0; - if (select(maxfd, &rfds, NULL, NULL, NULL) <= 0) { + if (poll(pfds, 2, INFTIM) <= 0) { if (errno == EINTR) { if (unblock == 1) pthread_cond_wait(&cond, &mutex); continue; } - err(EX_OSERR, "select"); + err(EX_OSERR, "poll"); } - ReadSockets(&rfds); + if (pfds[0].revents != 0) + ReadCtrlSocket(); + if (pfds[1].revents != 0) + ReadDataSocket(); } return (NULL); @@ -303,7 +307,6 @@ Monitor(void *v __unused) static char * Prompt(EditLine *el __unused) { - return (PROMPT); } @@ -376,49 +379,48 @@ DoInteractive(void) static int DoInteractive(void) { - const int maxfd = MAX(csock, dsock) + 1; + struct pollfd pfds[3] = { + { .fd = csock, .events = POLLIN }, + { .fd = dsock, .events = POLLIN }, + { .fd = STDIN_FILENO, .events = POLLIN }, + }; + char *line = NULL; + ssize_t len; + size_t sz = 0; (*help_cmd.func)(0, NULL); - while (1) { - struct timeval tv; - fd_set rfds; - + for (;;) { /* See if any data or control messages are arriving */ - FD_ZERO(&rfds); - FD_SET(csock, &rfds); - FD_SET(dsock, &rfds); - memset(&tv, 0, sizeof(tv)); - if (select(maxfd, &rfds, NULL, NULL, &tv) <= 0) { - + if (poll(pfds, 2, 0) <= 0) { /* Issue prompt and wait for anything to happen */ printf("%s", PROMPT); fflush(stdout); - FD_ZERO(&rfds); - FD_SET(0, &rfds); - FD_SET(csock, &rfds); - FD_SET(dsock, &rfds); - if (select(maxfd, &rfds, NULL, NULL, NULL) < 0) - err(EX_OSERR, "select"); - - /* If not user input, print a newline first */ - if (!FD_ISSET(0, &rfds)) - printf("\n"); + if (poll(pfds, 3, INFTIM) < 0 && errno != EINTR) + err(EX_OSERR, "poll"); + } else { + pfds[2].revents = 0; } - ReadSockets(&rfds); + /* If not user input, print a newline first */ + if (pfds[2].revents == 0) + printf("\n"); + + if (pfds[0].revents != 0) + ReadCtrlSocket(); + if (pfds[1].revents != 0) + ReadDataSocket(); /* Get any user input */ - if (FD_ISSET(0, &rfds)) { - char buf[LINE_MAX]; - - if (fgets(buf, sizeof(buf), stdin) == NULL) { + if (pfds[2].revents != 0) { + if ((len = getline(&line, &sz, stdin)) <= 0) { printf("\n"); break; } - if (DoParseCommand(buf) == CMDRTN_QUIT) + if (DoParseCommand(line) == CMDRTN_QUIT) break; } } + free(line); return (CMDRTN_QUIT); } #endif /* !EDITLINE */ @@ -427,29 +429,28 @@ DoInteractive(void) * Read and process data on netgraph control and data sockets. */ static void -ReadSockets(fd_set *rfds) +ReadCtrlSocket(void) { - /* Display any incoming control message. */ - if (FD_ISSET(csock, rfds)) - MsgRead(); - - /* Display any incoming data packet. */ - if (FD_ISSET(dsock, rfds)) { - char hook[NG_HOOKSIZ]; - u_char *buf; - int rl; - - /* Read packet from socket. */ - if ((rl = NgAllocRecvData(dsock, &buf, hook)) < 0) - err(EX_OSERR, "reading hook \"%s\"", hook); - if (rl == 0) - errx(EX_OSERR, "EOF from hook \"%s\"?", hook); - - /* Write packet to stdout. */ - printf("Rec'd data packet on hook \"%s\":\n", hook); - DumpAscii(buf, rl); - free(buf); - } + MsgRead(); +} + +static void +ReadDataSocket(void) +{ + char hook[NG_HOOKSIZ]; + u_char *buf; + int rl; + + /* Read packet from socket. */ + if ((rl = NgAllocRecvData(dsock, &buf, hook)) < 0) + err(EX_OSERR, "reading hook \"%s\"", hook); + if (rl == 0) + errx(EX_OSERR, "EOF from hook \"%s\"?", hook); + + /* Write packet to stdout. */ + printf("Rec'd data packet on hook \"%s\":\n", hook); + DumpAscii(buf, rl); + free(buf); } /* @@ -561,6 +562,8 @@ ReadCmd(int ac, char **av) /* Process it */ rtn = ReadFile(fp); + if (ferror(fp)) + warn("%s", av[1]); fclose(fp); return (rtn); } @@ -572,7 +575,9 @@ static int HelpCmd(int ac, char **av) { const struct ngcmd *cmd; - int k; + const char *s; + const int maxcol = 63; + int a, k, len; switch (ac) { case 0: @@ -580,13 +585,11 @@ HelpCmd(int ac, char **av) /* Show all commands */ printf("Available commands:\n"); for (k = 0; cmds[k] != NULL; k++) { - char *s, buf[100]; - cmd = cmds[k]; - snprintf(buf, sizeof(buf), "%s", cmd->cmd); - for (s = buf; *s != '\0' && !isspace(*s); s++); - *s = '\0'; - printf(" %-10s %s\n", buf, cmd->desc); + for (s = cmd->cmd; *s != '\0' && !isspace(*s); s++) + /* nothing */; + printf(" %.*s%*s %s\n", (int)(s - cmd->cmd), cmd->cmd, + (int)(10 - (s - cmd->cmd)), "", cmd->desc); } return (CMDRTN_OK); default: @@ -594,40 +597,29 @@ HelpCmd(int ac, char **av) if ((cmd = FindCommand(av[1])) != NULL) { printf("usage: %s\n", cmd->cmd); if (cmd->aliases[0] != NULL) { - int a = 0; - printf("Aliases: "); - while (1) { - printf("%s", cmd->aliases[a++]); - if (a == MAX_CMD_ALIAS - || cmd->aliases[a] == NULL) { - printf("\n"); - break; - } - printf(", "); + for (a = 0; a < MAX_CMD_ALIAS && + cmd->aliases[a] != NULL; a++) { + if (a > 0) + printf(", "); + printf("%s", cmd->aliases[a]); } + printf("\n"); } printf("Summary: %s\n", cmd->desc); - if (cmd->help != NULL) { - const char *s; - char buf[65]; - int tot, len, done; - - printf("Description:\n"); - for (s = cmd->help; *s != '\0'; s += len) { - while (isspace(*s)) - s++; - tot = snprintf(buf, - sizeof(buf), "%s", s); - len = strlen(buf); - done = len == tot; - if (!done) { - while (len > 0 - && !isspace(buf[len-1])) - buf[--len] = '\0'; - } - printf(" %s\n", buf); - } + if (cmd->help == NULL) + break; + printf("Description:\n"); + for (s = cmd->help; *s != '\0'; s += len) { + while (isspace(*s)) + s++; + /* advance to the column limit */ + for (len = 0; s[len] && len < maxcol; len++) + /* nothing */; + /* back up to previous interword space */ + while (len > 0 && s[len] && !isblank(s[len])) + len--; + printf(" %.*s\n", len, s); } } } @@ -649,34 +641,27 @@ QuitCmd(int ac __unused, char **av __unused) void DumpAscii(const u_char *buf, int len) { - char ch, sbuf[100]; int k, count; for (count = 0; count < len; count += DUMP_BYTES_PER_LINE) { - snprintf(sbuf, sizeof(sbuf), "%04x: ", count); + printf("%04x: ", count); for (k = 0; k < DUMP_BYTES_PER_LINE; k++) { if (count + k < len) { - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), - "%02x ", buf[count + k]); + printf("%02x ", buf[count + k]); } else { - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), " "); + printf(" "); } } - snprintf(sbuf + strlen(sbuf), sizeof(sbuf) - strlen(sbuf), " "); + printf(" "); for (k = 0; k < DUMP_BYTES_PER_LINE; k++) { if (count + k < len) { - ch = isprint(buf[count + k]) ? - buf[count + k] : '.'; - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), "%c", ch); + printf("%c", isprint(buf[count + k]) ? + buf[count + k] : '.'); } else { - snprintf(sbuf + strlen(sbuf), - sizeof(sbuf) - strlen(sbuf), " "); + printf(" "); } } - printf("%s\n", sbuf); + printf("\n"); } } diff --git a/usr.sbin/ngctl/mkpeer.c b/usr.sbin/ngctl/mkpeer.c index b16260a7cce1..5884c898a165 100644 --- a/usr.sbin/ngctl/mkpeer.c +++ b/usr.sbin/ngctl/mkpeer.c @@ -1,10 +1,9 @@ - /* * mkpeer.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -85,4 +84,3 @@ MkPeerCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/msg.c b/usr.sbin/ngctl/msg.c index 2cc733408380..3be10293e82b 100644 --- a/usr.sbin/ngctl/msg.c +++ b/usr.sbin/ngctl/msg.c @@ -1,10 +1,9 @@ - /* * msg.c * * Copyright (c) 1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -37,9 +36,9 @@ * $Whistle: msg.c,v 1.2 1999/11/29 23:38:35 archie Exp $ */ -#include #include #include +#include #include #include #include @@ -64,6 +63,9 @@ const struct ngcmd msg_cmd = { static int MsgCmd(int ac, char **av) { + struct pollfd pfds[1] = { + { .fd = csock, .events = POLLIN }, + }; char *buf; char *path, *cmdstr; int i, len; @@ -95,22 +97,14 @@ MsgCmd(int ac, char **av) free(buf); /* See if a synchronous reply awaits */ - { - struct timeval tv; - fd_set rfds; - - FD_ZERO(&rfds); - FD_SET(csock, &rfds); - memset(&tv, 0, sizeof(tv)); - switch (select(csock + 1, &rfds, NULL, NULL, &tv)) { - case -1: - err(EX_OSERR, "select"); - case 0: - break; - default: - MsgRead(); - break; - } + switch (poll(pfds, 1, 0)) { + case -1: + err(EX_OSERR, "poll"); + case 0: + break; + default: + MsgRead(); + break; } /* Done */ @@ -135,8 +129,8 @@ MsgRead(void) /* Ask originating node to convert message to ASCII */ if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_BINARY2ASCII, m, sizeof(*m) + m->header.arglen) < 0 - || NgAllocRecvMsg(csock, &m2, NULL) < 0) { + NGM_BINARY2ASCII, m, sizeof(*m) + m->header.arglen) < 0 || + NgAllocRecvMsg(csock, &m2, NULL) < 0) { printf("Rec'd %s %d from \"%s\":\n", (m->header.flags & NGF_RESP) != 0 ? "response" : "command", m->header.cmd, path); @@ -160,4 +154,3 @@ MsgRead(void) printf("No arguments\n"); free(m2); } - diff --git a/usr.sbin/ngctl/name.c b/usr.sbin/ngctl/name.c index 79ddcad2f0c7..56c2040c3961 100644 --- a/usr.sbin/ngctl/name.c +++ b/usr.sbin/ngctl/name.c @@ -1,10 +1,9 @@ - /* * name.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -76,4 +75,3 @@ NameCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/rmhook.c b/usr.sbin/ngctl/rmhook.c index 5591d39cb078..d8fbbec18579 100644 --- a/usr.sbin/ngctl/rmhook.c +++ b/usr.sbin/ngctl/rmhook.c @@ -1,10 +1,9 @@ - /* * rmhook.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -81,4 +80,3 @@ RmHookCmd(int ac, char **av) } return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/show.c b/usr.sbin/ngctl/show.c index 35d1aa2e5192..3536a5c39ae4 100644 --- a/usr.sbin/ngctl/show.c +++ b/usr.sbin/ngctl/show.c @@ -1,10 +1,9 @@ - /* * show.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -67,13 +66,13 @@ ShowCmd(int ac, char **av) int ch, no_hooks = 0; /* Get options */ + optreset = 1; optind = 1; while ((ch = getopt(ac, av, "n")) != -1) { switch (ch) { case 'n': no_hooks = 1; break; - case '?': default: return (CMDRTN_USAGE); break; @@ -133,5 +132,3 @@ ShowCmd(int ac, char **av) free(resp); return (CMDRTN_OK); } - - diff --git a/usr.sbin/ngctl/shutdown.c b/usr.sbin/ngctl/shutdown.c index fd38b9dc152b..9e221d1b0ba5 100644 --- a/usr.sbin/ngctl/shutdown.c +++ b/usr.sbin/ngctl/shutdown.c @@ -1,10 +1,9 @@ - /* * shutdown.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -73,5 +72,3 @@ ShutdownCmd(int ac, char **av) } return (CMDRTN_OK); } - - diff --git a/usr.sbin/ngctl/status.c b/usr.sbin/ngctl/status.c index 10007255d551..3af258f00a7d 100644 --- a/usr.sbin/ngctl/status.c +++ b/usr.sbin/ngctl/status.c @@ -1,10 +1,9 @@ - /* * status.c * * Copyright (c) 1996-1999 Whistle Communications, Inc. * All rights reserved. - * + * * Subject to the following obligations and disclaimer of warranty, use and * redistribution of this software, in source or object code forms, with or * without modifications are expressly permitted by Whistle Communications; @@ -15,7 +14,7 @@ * Communications, Inc. trademarks, including the mark "WHISTLE * COMMUNICATIONS" on advertising, endorsements, or otherwise except as * such appears in the above copyright notice or in the software. - * + * * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, @@ -84,8 +83,8 @@ StatusCmd(int ac, char **av) return (CMDRTN_ERROR); } } else { - if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 - || (resp->header.flags & NGF_RESP) == 0) + if (NgRecvMsg(csock, resp, sizeof(sbuf), NULL) < 0 || + (resp->header.flags & NGF_RESP) == 0) nostat = 1; } @@ -96,4 +95,3 @@ StatusCmd(int ac, char **av) printf("Status for \"%s\":\n%s\n", path, status); return (CMDRTN_OK); } - diff --git a/usr.sbin/ngctl/types.c b/usr.sbin/ngctl/types.c index 555960a59c02..dbbb8c60c84d 100644 --- a/usr.sbin/ngctl/types.c +++ b/usr.sbin/ngctl/types.c @@ -1,10 +1,9 @@ - /* * types.c *** 62 LINES SKIPPED *** From nobody Fri Feb 13 16:01:43 2026 X-Original-To: dev-commits-src-main@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 4fCH3X3bGtz6S3H2 for ; Fri, 13 Feb 2026 16:01:44 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCH3X0074z3jR1 for ; Fri, 13 Feb 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770998504; 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=HzXEVrx70gFpSRvQYRNhGXMCdC70lAMaAkQYoVwQa/k=; b=FvRyeMzho2nSZmT+Ru2f+9c9ItYtb0AMkLopXegMDUJnfP8YTDUuTeZaGK/swjPjIWQJap j0Zu1saSz1fSU8i5wv49AdWIeamYU47BgWmJc6/73FLIHacxYIsYWItAZ/4csqS8zMXhN9 e5V4I8uIPzCY2Q4pOV0/PG8qPx3CO2xUAHqd8FYWNcUQOyoPajYPhNMzvqTZxxS2UOp3zU DYbWKfhgfDWEZBSYmRBHbHoIYhkIpSZBNSxt+PnQa4qBXTk/blt0meEeNX6QlwA7LzOalC PMY+tWFF4/iMJ2vsk7jqlcNv8Xft8U6eYYGfi5xzwcaxLwJJQdfpUagI2rrxFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770998504; a=rsa-sha256; cv=none; b=sWEJklZZo/i14FG0iySJe7d9Du/jBDuWkUxmTH9mpi8xXE0ryMSGW7I463YvldENkDOs7D cX1pOG/0AB8loTQmudpePoGzI6Cy/K9uBR+mRe3cYe6cirZ0Tgy/gc74ScTrE4HjdYtePX dhILgEWos0wHoqUCLPJ5f+q9WbUc+D1cFvHW7+9Qlsj9Ijq3Vmfp1bIUpm5PPNAfZSqGTz KyEvT5cwpALujoODoBM14xx9X28Ca0OcCrXphfHQEJDbthl3qrpgjc9dCL0Tggp8n1WEyA I9/ZWdqbg9pbAqmI6/IfOZLNaKymRZ4do3sEB4w7Jpecw0BwwZlyFuo1WB5RWQ== 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=1770998504; 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=HzXEVrx70gFpSRvQYRNhGXMCdC70lAMaAkQYoVwQa/k=; b=DzwJNxTvCs+ezUkPgrUP+L5yAI8k+nutCIPjlgCwqzqTSEjT7y8db7TMNGIGz7MCabbS8t J7WmNnQLPatsmFioAyynco/osDya0LCoc8Aa00Wv2gbpi5YrYp7GZ0iZYYvxDWQaqKR/Ib ewWY7Bj7A9L+Uat5uI11P6epaAdE6GxRP5c4BWHk0X+wDt0+hf8M7OtEkYPoFFtASy7JtO lNYRiZwUeKgxnZj+crPj7qIFdp36Y9FCgWYyBQ9XIWAupepVvtX8a+vzBNEaUqk3X+K3yW GdW5npu5H9KojubisfUL5eYXe53ftuh2hEe8+KyK0AAHEWYob9Ldx2iuZkh3pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCH3W6htjzCs3 for ; Fri, 13 Feb 2026 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229b0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 16:01:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 585190dff436 - main - ngctl: Check hook name length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 585190dff436eeea3be97300e36c82559028d3dd Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 16:01:43 +0000 Message-Id: <698f4ae7.229b0.495b63f2@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=585190dff436eeea3be97300e36c82559028d3dd commit 585190dff436eeea3be97300e36c82559028d3dd Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:46 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 15:57:58 +0000 ngctl: Check hook name length Check the length of the hook name when copying it into the sockaddr. MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D55258 --- usr.sbin/ngctl/write.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/ngctl/write.c b/usr.sbin/ngctl/write.c index 98bf213a2dad..b86533eca49c 100644 --- a/usr.sbin/ngctl/write.c +++ b/usr.sbin/ngctl/write.c @@ -34,10 +34,12 @@ #include #include +#include #include #include #include +#include #include #include "ngctl.h" @@ -62,6 +64,7 @@ WriteCmd(int ac, char **av) struct sockaddr_ng *sag = (struct sockaddr_ng *)sagbuf; u_char buf[BUF_SIZE]; const char *hook; + size_t hooklen; FILE *fp; u_int len; int byte; @@ -71,6 +74,14 @@ WriteCmd(int ac, char **av) if (ac < 3) return (CMDRTN_USAGE); hook = av[1]; + _Static_assert(sizeof(sagbuf) >= + offsetof(struct sockaddr_ng, sg_data) + NG_HOOKSIZ, + "sagbuf is too small for NG_HOOKSIZ"); + hooklen = strlcpy(sag->sg_data, hook, NG_HOOKSIZ); + if (hooklen >= NG_HOOKSIZ) { + warnx("hook name \"%s\" too long", hook); + return (CMDRTN_ERROR); + } /* Get data */ if (strcmp(av[2], "-f") == 0) { @@ -103,11 +114,10 @@ WriteCmd(int ac, char **av) } /* Send data */ - sag->sg_len = 3 + strlen(hook); + sag->sg_len = 3 + hooklen; sag->sg_family = AF_NETGRAPH; - strlcpy(sag->sg_data, hook, sizeof(sagbuf) - 2); - if (sendto(dsock, buf, len, - 0, (struct sockaddr *)sag, sag->sg_len) == -1) { + if (sendto(dsock, buf, len, 0, (struct sockaddr *)sag, + sag->sg_len) < 0) { warn("writing to hook \"%s\"", hook); return (CMDRTN_ERROR); } From nobody Fri Feb 13 16:01:44 2026 X-Original-To: dev-commits-src-main@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 4fCH3Y2lZRz6S3dg for ; Fri, 13 Feb 2026 16:01:45 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCH3Y0PXlz3jJY for ; Fri, 13 Feb 2026 16:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770998505; 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=J1/9gimrONuCWgttqCPoiWWjS1PDY8ohg8iVe8SogpQ=; b=ao3F4eFKQfGK9l4c9RUwnwK6xoIK8fOFucrWK34dhY5dqT77FpnK8yqkX0ojwCaEQRIj67 IBfRQqnfm/FMmvETRYKha0V7YO96K9dEr8mV3vg+xo9h6NN9mvZQ11jnXA4o+qyKav/EhR KOnK2WxwLGLD8XMU6n5EEzNx5vu5V631IswEwcuKXEacTnfL+glptVh8aq8iUD7qFkP2DF TaXCTq0Gmdj0a2tTDiL3Gx1dHei0Uu4Zzf6T3JzeQPqR5kl18iQEHzh+v1Vs4QiY1/oG1Z deDzGocTiMZV1B27+04UJndYnYIosHlv1wkcePuBJ1O7OPYu4s+/AAml+EuOJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770998505; a=rsa-sha256; cv=none; b=YAYUXRHE0hyj8KsaI5Vztr780t6OJqf67gpf8L+I3yIz6yS+IdafmZE8t403EkyOs6bfKi 39Doeor1LY5438bYYKKSYHxX/YST6PeutnoQLKHgsh61o7qT2MsQz7QoK1RhBwxAkCPPE8 R41+LWS06WlezyZuXCqHwstzO6Adww/0Pk2KcgT3GR2A3y2KrKiB+S//ZEKkK4R6kLwig8 sIUlTpgo86IqStoO/wBsd1slJu8xyGbug9R8XGa/kTS/jBroqolhcnArbmuVgVBjA0LSTe FAzcrmffuN5icCDq20ln8EiPYnR2LbJ8T3XaB4AMMVMqGNCQ2ch7vhX4QARI9g== 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=1770998505; 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=J1/9gimrONuCWgttqCPoiWWjS1PDY8ohg8iVe8SogpQ=; b=g8o1/ig3e8krwYHSYTkNePWnOlI/yM9zhnRibDG0VBjBx8Zf4OqftLUPl1KFf2BgTWPGHe tJToM+SLpoqDDf8IgEYD4OFDbKpnI5X6CV8emcrQugu2JEzo8AVz847C079y9Gq7m402bE O4cki/E0fVRL8uOMmsV8YBda46znm/uYvNHAjXRJpOAthc9bCEKs9EjwIOryEoaNARXei5 e12e3pt1Nfku+YT924xhSn686+fbQWSeft/fk6W4foufhMFVL+S86naSe0NohiFpd8Yk/D vchNQziLcxySsfnpoQFI9S05wdvek/QmJjWogj7PppFM9p1NXLfHQT8VHkdTBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCH3X75bRzCfS for ; Fri, 13 Feb 2026 16:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22608 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 16:01:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 59906a163e47 - main - ngctl: Fix buffer overflow in config command List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59906a163e474c8d00bdebe226c4d47332b91bad Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 16:01:44 +0000 Message-Id: <698f4ae8.22608.7a14ac4@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=59906a163e474c8d00bdebe226c4d47332b91bad commit 59906a163e474c8d00bdebe226c4d47332b91bad Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 15:57:50 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 15:57:58 +0000 ngctl: Fix buffer overflow in config command Keep track of our buffer length when assembling the argument list. PR: 293075 MFC after: 1 week Reviewed by: zlei, markj Differential Revision: https://reviews.freebsd.org/D55259 --- usr.sbin/ngctl/config.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/usr.sbin/ngctl/config.c b/usr.sbin/ngctl/config.c index 25cd841494d1..0c9096738efa 100644 --- a/usr.sbin/ngctl/config.c +++ b/usr.sbin/ngctl/config.c @@ -62,7 +62,7 @@ ConfigCmd(int ac, char **av) struct ng_mesg *const resp = (struct ng_mesg *) sbuf; char *const status = (char *) resp->data; char *path; - char buf[NG_TEXTRESPONSE]; + char buf[NG_TEXTRESPONSE], *pos, *end; int nostat = 0, i; /* Get arguments */ @@ -70,20 +70,26 @@ ConfigCmd(int ac, char **av) return (CMDRTN_USAGE); path = av[1]; - *buf = '\0'; + pos = buf; + end = buf + sizeof(buf); for (i = 2; i < ac; i++) { - if (i != 2) - strcat(buf, " "); - strcat(buf, av[i]); + if (i > 2) { + if (pos == end) + return (CMDRTN_USAGE); + *pos++ = ' '; + } + if ((pos += strlcpy(pos, av[i], end - pos)) >= end) + return (CMDRTN_USAGE); } - + *pos = '\0'; + /* Get node config summary */ if (*buf != '\0') i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, buf, strlen(buf) + 1); + NGM_TEXT_CONFIG, buf, pos - buf + 1); else i = NgSendMsg(csock, path, NGM_GENERIC_COOKIE, - NGM_TEXT_CONFIG, NULL, 0); + NGM_TEXT_CONFIG, NULL, 0); if (i < 0) { switch (errno) { case EINVAL: From nobody Fri Feb 13 16:02:36 2026 X-Original-To: dev-commits-src-main@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 4fCH4Y3sRbz6S3dy for ; Fri, 13 Feb 2026 16:02:37 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCH4Y06lSz3kfc for ; Fri, 13 Feb 2026 16:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770998557; 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=6+mzeKBS+ywzDoAQ/+w/E1vnR1Ho3bwSevouIRXtz44=; b=nS2Y2VYhp7ERCgDrUszBdMNpn/I06yw0hOJIXGjFddXbySff93Yub3CCqgFHZJq57t+dCq umWTs/rwG/jQP7QEzrpUvfkpIwx64X5QLdkplkPGfP8Ms/RbEt0ycQuC3nhRvOG37ntKsB P2S25WoaErukRQXYQZ5PZ4fo2WfrLOkO+2RC1+kk+so9awO8wWgxvArcK3lOTVhNqVml2b 3V0126OrtmyqSbG7FyTOLsio+Qv+zSwzfKmdA/bW3FXSfYkXY6LsSBHjH04CsTSyBcnJpx r5VhTUCO5veghPPd9fSyWxz8uzQoAFFQVVqPzbyn3BBfeCCbbbU/hD2ne0TnWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770998557; a=rsa-sha256; cv=none; b=IY54r0wTUEeCnm1sj0T0D2xcB1pqODE8Jq3PWVM/a1SZeCUuQErs30iIcaNlz2jeLuVG+y Nq7tYac5/eUSd3qp7jT8weox0n0JciKmRyW5yX9AwCiAzAAIAkWW/pqS70hXcKWTDlXdyD ZdipQV/2tDNUNsQIXnzfUZnhaPD1UgJ7mD1g8jdQiBgu6LyPSuGy727l7fESfFDDc2eLb9 /j7SBnoGcO/Rd7rg1v8cDq/VLCAYTzbgjWUX3ESAL59j6rLeJ05ccEJyFYPzvLWCNcbt7D kwAuEjdC9O6KlVa4YqOZI//uEAPL6tvhUYXPRJrPuEtjpA2E+tZc+hdgtULf0A== 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=1770998557; 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=6+mzeKBS+ywzDoAQ/+w/E1vnR1Ho3bwSevouIRXtz44=; b=VifGDXT5vPxVk7C5qvlT77o+NyC6CZF+9Wn3ZL7SflKIXSEuUuoFFIdQy4hpb62Le1HvTk E6l5Q85VXF50hdCmYfAnViMtMgf5qSWk1FzGSPgms4wzhH7byCDwlCy0zPWsn//jJ7gtYe 3sUHq6ccMq+P4WnCYYHaTwhslkiCRbm6C7KUOG0GFsCsw/vcX1lHEFxNwbM80NNyiRSPjh 9h5yKSKVmzKXPewOwYoBCKO+oQpRvkJLnqmOcCq12NnmU2PcQ9MbgIepUvLlaUUbn6drnG +3ruoCi73Cg5zPys6Q+CfbzGRI2fs4y6wkbYjKyLSPC/raBNkHFnDoa9cZD3Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCH4X6r6LzCv3 for ; Fri, 13 Feb 2026 16:02:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fa7c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 16:02:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a8b8feced998 - main - atf_python/vnet: Make it possible to set the FIB of vnet interfaces List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8b8feced998c8c74f9a572f069bcb689cabd09d Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 16:02:36 +0000 Message-Id: <698f4b1c.1fa7c.35299909@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a8b8feced998c8c74f9a572f069bcb689cabd09d commit a8b8feced998c8c74f9a572f069bcb689cabd09d Author: Mark Johnston AuthorDate: 2026-02-13 15:50:39 +0000 Commit: Mark Johnston CommitDate: 2026-02-13 16:02:09 +0000 atf_python/vnet: Make it possible to set the FIB of vnet interfaces Reviewed by: zlei, ngie MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D54972 --- tests/atf_python/sys/net/vnet.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py index a6e620b49d59..029813fbc587 100644 --- a/tests/atf_python/sys/net/vnet.py +++ b/tests/atf_python/sys/net/vnet.py @@ -57,6 +57,7 @@ class VnetInterface(object): self.addr_map: Dict[str, Dict] = {"inet6": {}, "inet": {}} self.prefixes4: List[List[str]] = [] self.prefixes6: List[List[str]] = [] + self.fib: int if iface_name.startswith("lo"): self.iftype = self.IFT_LOOP else: @@ -106,7 +107,7 @@ class VnetInterface(object): run_cmd("/sbin/ifconfig {} -txcsum -txcsum6".format(name)) if2 = cls(alias_name, name[:-1] + "b") if1.epairb = if2 - ret.append(if2); + ret.append(if2) return ret def set_mtu(self, mtu): @@ -141,6 +142,10 @@ class VnetInterface(object): cmd = "/sbin/ifconfig {} up".format(self.name) self.run_cmd(cmd) + def setfib(self, fib: int): + cmd = "/sbin/ifconfig {} fib {}".format(self.name, fib) + self.run_cmd(cmd) + def enable_ipv6(self): cmd = "/usr/sbin/ndp -i {} -- -disabled".format(self.name) self.run_cmd(cmd) @@ -375,6 +380,9 @@ class VnetTestTemplate(BaseTest): prefixes6 = topo[iface.alias].get("prefixes6", []) prefixes4 = topo[iface.alias].get("prefixes4", []) mtu = topo[iface.alias].get("mtu", 0) + if "fib" in topo[iface.alias]: + fib = topo[iface.alias]["fib"] + iface.setfib(fib[idx]) if prefixes6 or prefixes4: ipv6_ifaces.append(iface) iface.turn_up() @@ -423,16 +431,22 @@ class VnetTestTemplate(BaseTest): for obj_name, obj_data in topo.items(): if obj_name.startswith("vnet"): vnet_ifaces = [] + maxfib = 0 for iface_alias in obj_data["ifaces"]: # epair creates 2 interfaces, grab first _available_ # and map it to the VNET being created idx = len(iface_map[iface_alias].vnet_aliases) iface_map[iface_alias].vnet_aliases.append(obj_name) vnet_ifaces.append(iface_map[iface_alias].ifaces[idx]) + fib = topo[iface_alias].get("fib", (0, 0)) + maxfib = max(maxfib, fib[idx]) opts = [] if "opts" in obj_data: opts = obj_data["opts"] vnet = vnet_factory.create_vnet(obj_name, vnet_ifaces, opts) + if maxfib != 0: + # Make sure the VNET has enough FIBs. + vnet.run_vnet_cmd("/sbin/sysctl net.fibs={}".format(maxfib + 1)) vnet_map[obj_name] = vnet # Allow reference to VNETs as attributes setattr(self, obj_name, vnet) From nobody Fri Feb 13 17:36:45 2026 X-Original-To: dev-commits-src-main@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 4fCK9B2BgBz6SC69 for ; Fri, 13 Feb 2026 17:36:46 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCK9B0Rxmz3tmf for ; Fri, 13 Feb 2026 17:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771004206; 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=1Iqhy0jkkRX/QHhvZG/R+IeMjuWtVKjbsDLrfEG0vh4=; b=O6smGTRYc0Duh0Bq/C/+qgxrm1HT+H2aApfAV00LnVc4kc5zKeahMJjEqQyJjDKa008FJR UTbaQIEy02jEiYJCOuMssbctu/Xbif9yB72wcYNy/frnxPCtdVGQ4cR0pvZhGma71hAjdt NMjOc+f0mQrrAAVmxt0Z2pMbKy+LZPpzcxRVHjcf8JgiSUsqPqqQkCEC4Uy4auBsSekXyd +gQc02XJpKPs0ga7cyclhkqKD5XTUSS1qHFlq1kA/XIWze5j1t2SMlDP7kmi3SAr9zvjhM BDTRJup/Wtiy+4CjRNLciJc6lXyksJrm7dE7QVlLg/4kD0Ct1SNECq+opOigEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771004206; a=rsa-sha256; cv=none; b=Nw6RASbFkmcXbaW6r/NJyudRNwDSaVtGiaAvWObTgPsJr2fdblolNQ+B8f+YkbuxMqqy/Z rqGLVu7kbqq2HFJshvNY/H6G4X+nepjNS56/wkhFb2KR9ecGKmAWhlfoaPmF5ZAitehlk+ ppcdxH43YfjLqbQpRkqqRqSX8KSlfLuBd47qXmCf1v953SlrvBSiWZGB/Xh4bGXygv6zm1 4jMQFnL8UMVwviohBKCoTOzIzjazKwmlDXOpwqT0Y4HbyT1VxEyKK7n73NQ+ubCxaGMGaO 8boVV0IATRdUl6V9Jqg7W1/7J/CE5hCrhG1ttMDqpreHj1jOWD0vC2joiCjopw== 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=1771004206; 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=1Iqhy0jkkRX/QHhvZG/R+IeMjuWtVKjbsDLrfEG0vh4=; b=PnB8sT2dweAHrbLETeO75T6u+c14PalOIFpzL4D8EVgyAbaa9fGtWGl268FNreA8uoOpka GoM0syX3xyHAW8Bja3fZTklMwQQhn3DWVfrvuDhRNzEL1PoEd5Oj2R8Y+oHqQ8rZhU37PV uq10IyEz6NJL0XuQHpZ973SaE2itTW88A472Gud1DAt9NpFygH5U3696t8klsjEIxuTejr aOFbvwoT9nmBlIr6Ic2GoCLHSsqiD3ns1eMkCgJ6+UcboGMXlu4gFGhTx+4AxBzYSOBtmv RDxEo53OBjO+fRAxQkxkN+tb51I8jhHND07wb4BNUc84ca1D76rLij8MH/eV+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCK996CThzX1X for ; Fri, 13 Feb 2026 17:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31770 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 17:36:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 2cfca8e710f2 - main - diff3: fix merge mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 17:36:45 +0000 Message-Id: <698f612d.31770.2e22521f@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b commit 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b Author: Baptiste Daroussin AuthorDate: 2026-02-13 16:10:44 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-13 17:36:42 +0000 diff3: fix merge mode Make the merge mode compatible with GNU diff3 Add tests for all the changes, those tests are extracted from the etcupdate testsuite. This version passes the etcupdate testsuite and the diffutils diff3 test suite. MFC After: 1 week --- usr.bin/diff3/diff3.c | 51 ++++++++++++++++++------------------ usr.bin/diff3/tests/Makefile | 16 ++++++++++- usr.bin/diff3/tests/conflict1.txt | 5 ++++ usr.bin/diff3/tests/conflict2.txt | 9 +++++++ usr.bin/diff3/tests/conflict3.txt | 5 ++++ usr.bin/diff3/tests/diff3_test.sh | 45 ++++++++++++++++++++++++++++--- usr.bin/diff3/tests/passwd-Em.out | 16 +++++++++++ usr.bin/diff3/tests/passwd-new.txt | 12 +++++++++ usr.bin/diff3/tests/passwd-old.txt | 11 ++++++++ usr.bin/diff3/tests/passwd-test.txt | 15 +++++++++++ usr.bin/diff3/tests/simple-Em.out | 3 +++ usr.bin/diff3/tests/simple-merge.out | 3 +++ usr.bin/diff3/tests/simple1.txt | 2 ++ usr.bin/diff3/tests/simple2.txt | 2 ++ usr.bin/diff3/tests/simple3.txt | 3 +++ 15 files changed, 168 insertions(+), 30 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index 4f3239b10625..9a01951e60ab 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -150,7 +150,7 @@ static void repos(int); static void separate(const char *); static void edscript(int) __dead2; static void Ascript(int) __dead2; -static void mergescript(int) __dead2; +static void mergescript(int, int) __dead2; static void increase(void); static void usage(void); static void printrange(FILE *, struct range *); @@ -361,12 +361,13 @@ merge(int m1, int m2) { struct diff *d1, *d2, *d3; int j, t1, t2; + int f1f3delta; bool dup = false; d1 = d13; d2 = d23; j = 0; - int f1f3delta = 0; + f1f3delta = 0; for (;;) { t1 = (d1 < d13 + m1); @@ -382,6 +383,12 @@ merge(int m1, int m2) change(1, &d1->old, false); keep(2, &d1->new); change(3, &d1->new, false); + } else if (mflag) { + j++; + de[j].type = DIFF_TYPE1; + de[j].old = d1->old; + de[j].new = d1->new; + overlap[j] = 0; } else if (eflag == EFLAG_OVERLAP) { j = edit(d2, dup, j, DIFF_TYPE1); } @@ -437,6 +444,14 @@ merge(int m1, int m2) change(2, &d2->old, false); d3 = d1->old.to > d1->old.from ? d1 : d2; change(3, &d3->new, false); + } else if (mflag) { + j++; + de[j].type = DIFF_TYPE3; + de[j].old = d1->old; + de[j].new = d1->new; + overlap[j] = !dup; + if (!dup) + overlapcnt++; } else { j = edit(d1, dup, j, DIFF_TYPE3); } @@ -468,7 +483,7 @@ merge(int m1, int m2) } if (mflag) - mergescript(j); + mergescript(j, f1f3delta); else if (Aflag) Ascript(j); else if (eflag) @@ -701,7 +716,7 @@ edscript(int n) if (iflag) printf("w\nq\n"); - exit(eflag == EFLAG_NONE ? overlapcnt : 0); + exit(oflag ? overlapcnt > 0 : 0); } /* @@ -795,11 +810,10 @@ Ascript(int n) * inbetween lines. */ static void -mergescript(int i) +mergescript(int i, int f1f3delta) { struct range r, *new, *old; int n; - bool delete = false; r.from = 1; r.to = 1; @@ -812,13 +826,9 @@ mergescript(int i) * Print any lines leading up to here. If we are merging don't * print deleted ranges. */ - delete = (new->from == new->to); - if (de[n].type == DIFF_TYPE1 && delete) - r.to = new->from - 1; - else if (de[n].type == DIFF_TYPE3 && (old->from == old->to)) { - r.from = old->from - 1; - r.to = new->from; - } else if (de[n].type == DIFF_TYPE2) + if (de[n].type == DIFF_TYPE1) + r.to = old->to; + else if (de[n].type == DIFF_TYPE2) r.to = new->from + de_delta[n]; else r.to = old->from; @@ -826,9 +836,7 @@ mergescript(int i) printrange(fp[0], &r); switch (de[n].type) { case DIFF_TYPE1: - /* If this isn't a delete print it */ - if (!delete) - printrange(fp[2], new); + /* Content included in "between" printing from fp[0] */ break; case DIFF_TYPE2: printf("%s %s\n", oldmark, f2mark); @@ -870,8 +878,6 @@ mergescript(int i) if (de[n].type == DIFF_TYPE2) r.from = new->to + de_delta[n]; - else if (old->from == old->to) - r.from = new->to; else r.from = old->to; } @@ -879,18 +885,11 @@ mergescript(int i) /* * Print from the final range to the end of 'myfile'. Any deletions or * additions to this file should have been handled by now. - * - * If the ranges are the same we need to rewind a line. - * If the new range is 0 length (from == to), we need to use the new - * range. */ new = &de[n-1].new; old = &de[n-1].old; - if (old->from == new->from && old->to == new->to) - r.from--; - else if (new->from == new->to) - r.from = new->from; + r.from -= f1f3delta; r.to = INT_MAX; printrange(fp[2], &r); diff --git a/usr.bin/diff3/tests/Makefile b/usr.bin/diff3/tests/Makefile index 864f27beede8..e35ab095f2f7 100644 --- a/usr.bin/diff3/tests/Makefile +++ b/usr.bin/diff3/tests/Makefile @@ -23,6 +23,20 @@ ${PACKAGE}FILES+= \ long-A.out \ long-merge.out \ fbsdid1.txt \ - fbsdid2.txt + fbsdid2.txt \ + conflict1.txt \ + conflict2.txt \ + conflict3.txt \ + conflict-merge.out \ + simple1.txt \ + simple2.txt \ + simple3.txt \ + simple-merge.out \ + simple-Em.out \ + conflict-Em.out \ + passwd-test.txt \ + passwd-old.txt \ + passwd-new.txt \ + passwd-Em.out .include diff --git a/usr.bin/diff3/tests/conflict1.txt b/usr.bin/diff3/tests/conflict1.txt new file mode 100644 index 000000000000..d5bde7598f68 --- /dev/null +++ b/usr.bin/diff3/tests/conflict1.txt @@ -0,0 +1,5 @@ +# root: me@my.domain + +# Basic system aliases -- these MUST be present +MAILER-DAEMON: postmaster +postmaster: root diff --git a/usr.bin/diff3/tests/conflict2.txt b/usr.bin/diff3/tests/conflict2.txt new file mode 100644 index 000000000000..9afb26959e35 --- /dev/null +++ b/usr.bin/diff3/tests/conflict2.txt @@ -0,0 +1,9 @@ +#root:me@my.domain + +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root + +#Generalredirectionsforpseudoaccounts +_dhcp:root +_pflogd:root diff --git a/usr.bin/diff3/tests/conflict3.txt b/usr.bin/diff3/tests/conflict3.txt new file mode 100644 index 000000000000..14ac33b41853 --- /dev/null +++ b/usr.bin/diff3/tests/conflict3.txt @@ -0,0 +1,5 @@ +root:someone@example.com + +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh index 3cbd7dac1ed9..4510653bcd47 100755 --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -5,6 +5,11 @@ atf_test_case diff3_ed atf_test_case diff3_A atf_test_case diff3_merge atf_test_case diff3_E_merge +atf_test_case diff3_merge_conflict +atf_test_case diff3_merge_simple +atf_test_case diff3_Em_simple +atf_test_case diff3_Em_conflict +atf_test_case diff3_Em_insert diff3_body() { @@ -20,10 +25,10 @@ diff3_body() atf_check -o file:$(atf_get_srcdir)/2.out \ diff3 -e $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt - atf_check -o file:$(atf_get_srcdir)/3.out \ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/3.out \ diff3 -E -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt - atf_check -o file:$(atf_get_srcdir)/4.out \ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/4.out \ diff3 -X -L 1 -L 2 -L 3 $(atf_get_srcdir)/1.txt $(atf_get_srcdir)/2.txt $(atf_get_srcdir)/3.txt atf_check -o file:$(atf_get_srcdir)/5.out \ @@ -75,7 +80,6 @@ expected="<<<<<<< 2 ======= # \$FreeBSD: head/local 12345 jhb \$ >>>>>>> 3 -# \$FreeBSD: head/local 12345 jhb \$ this is a file @@ -97,6 +101,36 @@ these are some local mods to the file } +diff3_merge_conflict_body() +{ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/conflict-merge.out \ + diff3 -m -L conflict3.txt -L conflict1.txt -L conflict2.txt $(atf_get_srcdir)/conflict3.txt $(atf_get_srcdir)/conflict1.txt $(atf_get_srcdir)/conflict2.txt +} + +diff3_merge_simple_body() +{ + atf_check -s exit:0 -o file:$(atf_get_srcdir)/simple-merge.out \ + diff3 -m $(atf_get_srcdir)/simple3.txt $(atf_get_srcdir)/simple1.txt $(atf_get_srcdir)/simple2.txt +} + +diff3_Em_simple_body() +{ + atf_check -s exit:0 -o file:$(atf_get_srcdir)/simple-Em.out \ + diff3 -E -m $(atf_get_srcdir)/simple3.txt $(atf_get_srcdir)/simple1.txt $(atf_get_srcdir)/simple2.txt +} + +diff3_Em_conflict_body() +{ + atf_check -s exit:1 -o file:$(atf_get_srcdir)/conflict-Em.out \ + diff3 -E -m -L conflict3.txt -L conflict1.txt -L conflict2.txt $(atf_get_srcdir)/conflict3.txt $(atf_get_srcdir)/conflict1.txt $(atf_get_srcdir)/conflict2.txt +} + +diff3_Em_insert_body() +{ + atf_check -s exit:0 -o file:$(atf_get_srcdir)/passwd-Em.out \ + diff3 -E -m $(atf_get_srcdir)/passwd-test.txt $(atf_get_srcdir)/passwd-old.txt $(atf_get_srcdir)/passwd-new.txt +} + atf_init_test_cases() { atf_add_test_case diff3 @@ -105,4 +139,9 @@ atf_init_test_cases() atf_add_test_case diff3_A atf_add_test_case diff3_merge atf_add_test_case diff3_E_merge + atf_add_test_case diff3_merge_conflict + atf_add_test_case diff3_merge_simple + atf_add_test_case diff3_Em_simple + atf_add_test_case diff3_Em_conflict + atf_add_test_case diff3_Em_insert } diff --git a/usr.bin/diff3/tests/passwd-Em.out b/usr.bin/diff3/tests/passwd-Em.out new file mode 100644 index 000000000000..2b52a6440f6b --- /dev/null +++ b/usr.bin/diff3/tests/passwd-Em.out @@ -0,0 +1,16 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin +john::1001:1001::0:0:John Baldwin:/home/john:/bin/tcsh +messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin +polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin +haldaemon:*:560:560::0:0:HAL Daemon User:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/passwd-new.txt b/usr.bin/diff3/tests/passwd-new.txt new file mode 100644 index 000000000000..8bec617219a3 --- /dev/null +++ b/usr.bin/diff3/tests/passwd-new.txt @@ -0,0 +1,12 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/passwd-old.txt b/usr.bin/diff3/tests/passwd-old.txt new file mode 100644 index 000000000000..7a6f936e90c9 --- /dev/null +++ b/usr.bin/diff3/tests/passwd-old.txt @@ -0,0 +1,11 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/passwd-test.txt b/usr.bin/diff3/tests/passwd-test.txt new file mode 100644 index 000000000000..f2b277fb3b4c --- /dev/null +++ b/usr.bin/diff3/tests/passwd-test.txt @@ -0,0 +1,15 @@ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin +john::1001:1001::0:0:John Baldwin:/home/john:/bin/tcsh +messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin +polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin +haldaemon:*:560:560::0:0:HAL Daemon User:/nonexistent:/usr/sbin/nologin diff --git a/usr.bin/diff3/tests/simple-Em.out b/usr.bin/diff3/tests/simple-Em.out new file mode 100644 index 000000000000..c9ad1c1bed8f --- /dev/null +++ b/usr.bin/diff3/tests/simple-Em.out @@ -0,0 +1,3 @@ +this is an new line + +this is a local line diff --git a/usr.bin/diff3/tests/simple-merge.out b/usr.bin/diff3/tests/simple-merge.out new file mode 100644 index 000000000000..c9ad1c1bed8f --- /dev/null +++ b/usr.bin/diff3/tests/simple-merge.out @@ -0,0 +1,3 @@ +this is an new line + +this is a local line diff --git a/usr.bin/diff3/tests/simple1.txt b/usr.bin/diff3/tests/simple1.txt new file mode 100644 index 000000000000..4c4c2cd1a4e7 --- /dev/null +++ b/usr.bin/diff3/tests/simple1.txt @@ -0,0 +1,2 @@ +this is an old line + diff --git a/usr.bin/diff3/tests/simple2.txt b/usr.bin/diff3/tests/simple2.txt new file mode 100644 index 000000000000..e880a8af5c39 --- /dev/null +++ b/usr.bin/diff3/tests/simple2.txt @@ -0,0 +1,2 @@ +this is an new line + diff --git a/usr.bin/diff3/tests/simple3.txt b/usr.bin/diff3/tests/simple3.txt new file mode 100644 index 000000000000..4ab38534cba1 --- /dev/null +++ b/usr.bin/diff3/tests/simple3.txt @@ -0,0 +1,3 @@ +this is an old line + +this is a local line From nobody Fri Feb 13 17:53:06 2026 X-Original-To: dev-commits-src-main@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 4fCKX24wG9z6SDjR for ; Fri, 13 Feb 2026 17:53:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCKX239Ntz3y0J for ; Fri, 13 Feb 2026 17:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771005186; h=from:from: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; bh=s8D1+siuMM+1KAFJIPk4qQ4k2tnihj6ytren8nb/nx4=; b=lsxaPKJHa5eQYw8W18kKCp3K96/1RDe617l6qbsTZO2v0Cv25WzFaRk6XD9Au8BQYBRyTA nskrO/G+XIBc2vRxquIU323oUyLEd/Km9G7SFEPFDylU46ofPBsNEHTF5qs0FdBpsYNOHw dSR7IOykqD8TrvkhYxioEGArCvjq7mKmOtOCC5ymdiTt/Tbu0me/ISLRoBKVI9/pR//zLo 0ecEF/6/UvwkaEjP2kKwSl+JPi/iftSNLUs3XoowxsI+dJE2R8M7QkwQ1wKBpEy+eA79Ad eadwIXsLjjnNzPatYF7DjCCa5BjgRSHs9KCMNMTozKee9786laHJHx3qZkeFGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771005186; a=rsa-sha256; cv=none; b=ZWgx/Yp0+QrszZ9X+cj9sY8KwhDhEsT0Cu4VRNs/N0PVwW1UvJUOxs/wK+4CF2H0uKI+8V Xnkh6xfPU5in2MklpOK3xwma4qVI+d7Zu58ehO2M6sLfliDiBaKEf4eTla64tLFrr45hhV w1j6/6TWt6RagM5EJMKOQNr+iVXUwt9qSzvsn5HykeDx9woZiLfYOuSb7z3kmv2BM7mk7m P7pGX1JeX/3rIcY2Fb7BGsogpZw0SWfXxs3PdIkdFPEN6InRJD3VVDcy7l9Qxrw13DEa54 UktkKJPuxIEUWPmUxRu+EYcFj130JuMVbRwbBmsyGoZ2AbXeBgLhvuFDrDPQ9Q== 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=1771005186; h=from:from: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; bh=s8D1+siuMM+1KAFJIPk4qQ4k2tnihj6ytren8nb/nx4=; b=bu/VTNAFAo+nRQMcsTcTqk+wVj2twMW3cwWYNyxBEp0kKNYv4KGB+leDX0RY3cP7TVjKq9 mr5IGg3AyBIloGdUyLxPGAU2iYXYU/dUlVs9ahNu0ILQWU+EOEUd33w6LaWi60dk0uivLJ TQhuBg/fo/BZIYfMNQFvQ33NVD0w3t0kL88ckYhgI+VxuXDiqpfjA2YrYYCdnLaIxZJ+Pb qANgeokC+1RBJZ0Cfr0n1hPlzPCvpm092w3sCNp7qzBHa7wQYuohAclkvIeeweUO8IVrXV BxQ1TMFSEOyoRbpU3FNR+qKYGKA4NjaJuTQzOi2/l6RtO6ipC1HGakRqg/xJzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCKX22kfpzXY9 for ; Fri, 13 Feb 2026 17:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37285 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 17:53:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Jessica Clarke From: Robert Clausecker Subject: git: 6265f30cd6b5 - main - libsys/arm: include ARM EABI unwind bits into libsys List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6265f30cd6b523d633efcc314f8952f24446861f Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 17:53:06 +0000 Message-Id: <698f6502.37285.1e070ded@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=6265f30cd6b523d633efcc314f8952f24446861f commit 6265f30cd6b523d633efcc314f8952f24446861f Author: Jessica Clarke AuthorDate: 2026-02-11 15:37:08 +0000 Commit: Robert Clausecker CommitDate: 2026-02-13 17:52:25 +0000 libsys/arm: include ARM EABI unwind bits into libsys libsys required ARM EABI unwind symbols like __aeabi_unwind_cpp_pr0. These symbols are normally provided by libc, but if a binary does not link libc, the symbol ends up not being resolved. Among other problems, this prevented gcc14 and newer from building on arm. Add the relevant symbols as hidden symbols into libsys to avoid this problem. (this patch was posted by jrtc27 who has asked me to move it along) PR: 292539 Tested by: fuz, Mark Millard Reviewed by: mmel Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55255 --- lib/libsys/arm/Makefile.sys | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libsys/arm/Makefile.sys b/lib/libsys/arm/Makefile.sys index 424d2f9cc9d8..e8b420932031 100644 --- a/lib/libsys/arm/Makefile.sys +++ b/lib/libsys/arm/Makefile.sys @@ -6,3 +6,8 @@ SRCS+= __vdso_gettc.c \ MDASM= \ cerror.S \ vfork.S + +.if ${LIB} == "sys" +.PATH: ${LIBSYS_SRCTOP}/../libc/arm/aeabi +SRCS+= aeabi_unwind_cpp.c +.endif From nobody Fri Feb 13 17:53:07 2026 X-Original-To: dev-commits-src-main@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 4fCKX40J9Zz6SDMc for ; Fri, 13 Feb 2026 17:53:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCKX340BGz3y37 for ; Fri, 13 Feb 2026 17:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771005187; 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=XWYBNxrF7C1pl/7X6LPvphh9Wsq5rHDTQizFcb0WA+U=; b=ehcCDC/dW6JRk3JfZo3DTAbUaAnYVz+HsoBBy85sQjtA0tjoXxhpRs5ixXtSO3M3liNrJ2 D5VSaBFTKuB+bH1CwbYSnVQvOZT/A3a8LPZ5C6dJ8Mg6ECDMvnIVvbDejMkQcOxnnNSLvs HvNz+NivnJfC7xsBbKYTA7EFibezhuPim/eSLfvgNixDiBJKglwQXRw54anOyvuMszoq3D VvHGiy9maDuiJWgYSCALAHnWmI6Q5axDGCBmovtHU3Pd9DaQD9Ij9zsg34JNWBYnjS9vNk ASSdKxEBg8y6H5W+QWx3lo4btNAQbiOufaBdMl65iuFbvrO7+yq6CkCv7LrxFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771005187; a=rsa-sha256; cv=none; b=lZMAt5SxSn0J41hEfr8ZGbvH0RKa0Yn3iQU/DIGw57iauns+JSJdLTBWvbz/0ZNTl09zNT dikDSmXD3zkUSOCCp/kMeqGAhP7u0ciLbypAGS+2MhcVHmeslInruY1/nugVq8W3ROnOrr 1IxFsA5c7bnRGTYPWibqesfrCmqZzfopvPg+v+4NsevHxKZJ1c17rW6UmSAQnZ5O+EjRiw H25JQmHziou06kRcm7HxIKfdjGmX8CFnK2pt0hupWTE+xwMQnqiLnfKDYwJ/83avB731WV M1H6bvES+DzX1ExKsCrdpIGsridxRbaHRqSXMwbHiLn6aCdebzq17lZtG6mu3A== 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=1771005187; 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=XWYBNxrF7C1pl/7X6LPvphh9Wsq5rHDTQizFcb0WA+U=; b=ksUvcSIM9y/0D5f2rHcRaNvIydTgQVRg3F/TbtH2I3fElfu2cNo4kMzW+QmMwqzmj3cQMk VJ3hbqoFqHKjAwqwGJMMXaH6dopIexeUauhxK0JF4lUn3gNsVD7Q//ur9+38hxJv8tzio3 YCmW9wXDeWIidLbQrX3j184Nf/qNr2latiKed9xvKinl4NHaRBK07rMSNBktXFE9uqdurz Uu0pfHSS3+64nGo629j5H9grZfdhfzaxVkY/chw0Uzpph1cDH4sfzPrrpsKBO0JbRGB1uB smY0VlSU2UaaBX4b6cswFmm4D6cjyZe5IvKu8fh6WPSE6M9OLgzatQWKESheLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCKX33YCTzXbD for ; Fri, 13 Feb 2026 17:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35c32 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 17:53:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 1782bc9a0a8d - main - libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1782bc9a0a8da2d6aca31b7790981e1980c9e4b9 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 17:53:07 +0000 Message-Id: <698f6503.35c32.6bf8878d@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=1782bc9a0a8da2d6aca31b7790981e1980c9e4b9 commit 1782bc9a0a8da2d6aca31b7790981e1980c9e4b9 Author: Robert Clausecker AuthorDate: 2026-02-11 18:50:18 +0000 Commit: Robert Clausecker CommitDate: 2026-02-13 17:52:25 +0000 libc/arm: use __builtin_trap() instead of abort() in aeabi_unwind stubs This avoids a dependency on the abort symbol in libsys. PR: 292539 Reviewed by: mmel Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55255 --- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c index efcace2c0675..3667b7d7e673 100644 --- a/lib/libc/arm/aeabi/aeabi_unwind_cpp.c +++ b/lib/libc/arm/aeabi/aeabi_unwind_cpp.c @@ -27,15 +27,15 @@ * */ +#include + /* * Provide an implementation of __aeabi_unwind_cpp_pr{0,1,2}. These are * required by libc but are implemented in libgcc_eh.a which we don't link - * against. The libgcc_eh.a version will be called so we call abort to + * against. The libgcc_eh.a version will be called so we trap to * check this. */ -#include - void __aeabi_unwind_cpp_pr0(void) __hidden; void __aeabi_unwind_cpp_pr1(void) __hidden; void __aeabi_unwind_cpp_pr2(void) __hidden; @@ -43,18 +43,18 @@ void __aeabi_unwind_cpp_pr2(void) __hidden; void __aeabi_unwind_cpp_pr0(void) { - abort(); + __builtin_trap(); } void __aeabi_unwind_cpp_pr1(void) { - abort(); + __builtin_trap(); } void __aeabi_unwind_cpp_pr2(void) { - abort(); + __builtin_trap(); } From nobody Fri Feb 13 17:53:05 2026 X-Original-To: dev-commits-src-main@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 4fCKX65VXLz6SDDv for ; Fri, 13 Feb 2026 17:53:10 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCKX62nq9z3y0k for ; Fri, 13 Feb 2026 17:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771005190; 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=DchRV7j7yHrrurFaWdyVV4zL7i6CqKEz2uUjfEW+dLw=; b=gl4iWhN7CHmdBQMmJdRzoa30E/Tl7jiIVDLrEnucnllc585HdNXeLkemIWlGOEDOACxcCX ikwGYRqRWTpQjq4D1nCyxsrn7jPpSPGR3pWRDzC9syJyPF+o4euONZIgRbDlVJ5pP9DPCh FbOWyu09A5K6oI2SqSJb+kDbIQ4OkSK3Zysw3AeKlImQUTemwOdISLVMVgj0HYI0v3opmC Z0WxgPwX61dbWspgVsWOWG99j2VvJEXWyTvNbUHsnPiOE52Ke4jTXyyvvvRA5gBE9XJDF9 qZmX4mBHP1t/lJkgP/iSF4s7h+yBGNV9tl3uyc8SHZheOOWy3nZStOpZZXqDsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771005190; a=rsa-sha256; cv=none; b=oRDVNfrzk9h/86l/LYvVdjXs0Qy9pIivagVGBleuOqQHn+grVyNrJ5T7U5hJlSbE9tqmHo +XPLsfZ9XjMtbeaafv5GgP2t02UectQJ8lL0IqgHaOB1uuyhOT2ojDyx9fIBE8XHJEhmYW iCaMGTT+6FO39xn/uEsZ2Mve9ZV9TP0NsjUO/9uSV+HJJ4I2o84UHsXhQUDj24+iCKDSNt qHbuTr9namA7jPrae+2RwENGtHetpPxq8/H1qupcEUDTj2M7kiTvslJuTwZAiq7uWGZx7l aHGAxwsd7W+vobrOpjv9FbPbOqk0QbdmTkopomNwVEndlNOY6svYUJC2li5qiQ== 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=1771005190; 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=DchRV7j7yHrrurFaWdyVV4zL7i6CqKEz2uUjfEW+dLw=; b=QP82fSY0m4191HcThZmC9EgYZVpMpmTlAex26dpfwzd8z+FeknV2DhFaFqf90jYr8cotH6 ndJ+/mMXWmPgfjOEeSjtFpkxdRwsxyeMF03cAjcwcgx94XkGssC6eAbnslwfJhFnuaStBm xzNmQSzFzUTVYqky795Hk5jeWe8I4G3rykCZK8TyCCXdb9lqylXYf6B2rfasMzgkn+AT3Q Y0X2BRASfVFoYv0QKWoJX8DcKrKQPZpAV/IlQkd3cHm2HY/5AFdzRTjS3Lqi+npQr0DXUa F9iohqRO/EkvCefVYLT99r8AAWbKgIZJJWZAr+pASCuhq9UsDRSj3wfhb8VCkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCKX62PQNzXqJ for ; Fri, 13 Feb 2026 17:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36702 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 17:53:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 8efcc64928f9 - main - Summary: *.3: misc man page fixes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8efcc64928f96bb26a58ec04750688110502227f Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 17:53:05 +0000 Message-Id: <698f6501.36702.449637b3@gitrepo.freebsd.org> The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=8efcc64928f96bb26a58ec04750688110502227f commit 8efcc64928f96bb26a58ec04750688110502227f Author: Robert Clausecker AuthorDate: 2025-12-01 15:19:33 +0000 Commit: Robert Clausecker CommitDate: 2026-02-13 17:52:12 +0000 Summary: *.3: misc man page fixes Approved by: markj (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55249 --- lib/libc/stdlib/reallocarray.3 | 2 +- share/man/man3/stdbit.3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdlib/reallocarray.3 b/lib/libc/stdlib/reallocarray.3 index 9a2ab5c7a840..d72513c2f301 100644 --- a/lib/libc/stdlib/reallocarray.3 +++ b/lib/libc/stdlib/reallocarray.3 @@ -176,4 +176,4 @@ The function first appeared in .Ox 6.1 and -.Fx 16.0 . +.Fx 15.1 . diff --git a/share/man/man3/stdbit.3 b/share/man/man3/stdbit.3 index ec647fea4a7f..bdee56cc8013 100644 --- a/share/man/man3/stdbit.3 +++ b/share/man/man3/stdbit.3 @@ -117,4 +117,4 @@ The header and the macros and functions defined therein where added in .Fx 15.1. .Sh AUTHOR -.Ah Robert Clausecker Aq Mt fuz@FreeBSD.org +.An Robert Clausecker Aq Mt fuz@FreeBSD.org From nobody Fri Feb 13 18:37:07 2026 X-Original-To: dev-commits-src-main@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 4fCLVr0slvz6RYPt for ; Fri, 13 Feb 2026 18:37:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCLVr00rdz46QL for ; Fri, 13 Feb 2026 18:37:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771007828; 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=ikyHZWpceC7LEyXi2qHPFZp55hnrRg6RADMaOFABl24=; b=RnRMx5AC3ED62pt6res8R22y+wX+WquzmbbStgCHC9U/v/6jVLaKzx8WuR3YL8V/q1JLAQ DGoUZmgcDhE6shU9oh7gX/pFLtY6vlHo6Ln7PTQGd9qiTnOkTyY1p3jBayve0zBFhxyOob 0BJq0FpMyy7h70YXF548aotOqhySjQPyEd81N4PAa7IXjwGMOqZnZ8GkhrMIYJY9DC7UtV 1yZ2+lf0tBekIbmU1vHpeQcg8RIUGdqwtUJ6lB298idoHCm1mFSE3qIhqPFiNRBqZylLBU QIvcPYG/MsDUVOjnK8U9lhEgxe2/V+CzsDs4dVsB9qN1djdenEqKT1EYpjhsVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771007828; a=rsa-sha256; cv=none; b=dipP4JZMLj/tCRBsKsjWK0AjOe6l++CtpUS9lHchZ6ZMxcwapJl8zKPjEsvx3lWCa3bCSU XeN7jRCGMoAN0F0IkFtWeKPw3czsgoNJe0D5mbvPHW3ahIAQNd5uDmoqHWDMnjAZo1FF+S m5lwbxvovSNZcBU21hYr1OB70yG/h/Ad/2w4wPeLKQnUgGuKRu21c/KgIF8/gtbHllBs0g Ya8aX4ZBr23Lld/0XgHWYp5RDTJ17+9Ot2VOcP+9sgOfdul28CorCKGcnnUAAyqPtGFD1P TZ7MPg/3s03aF3BNSEALegPavRrjwwRHmA35wmLFuGf/dOkZEJj5KylP3etcNw== 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=1771007828; 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=ikyHZWpceC7LEyXi2qHPFZp55hnrRg6RADMaOFABl24=; b=pbh0TUxyOnuoXdradQToVIkCsfL9/tsAaOz211e5Btix3e5JRXYCgvQpbbTUzMgR766SA0 O+l1xuFfVUmJZ/7PeRsAnryPZlVya7CJAlt4wLHvwc+44NVolRVfWzf+I70N2LL6X0vc54 0X7Z0ScObuY8TzfTvXg3JPOPTMsqN1o+3DvIx9+z0M4iu8KSTSk6mQt4MO5EipOeNEEOIq TH1v4U2uU9D6ML8Sb9kmmwqnr3nV9BrxQhzmPP12NhEZ4qYiNA4k0zNGTRtLEfF0zEZHR5 esad1WM+pc45QceXP1iScqdVNa6Ec+023jgobcXBzkC0O4VeiO6Ace0qcfBlBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCLVq6PjTzYkx for ; Fri, 13 Feb 2026 18:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3af29 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 18:37:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 10ac7413c060 - main - elf_common.h: Add some AArch32 relocations List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10ac7413c060b1496ef54e2338f487ea84f66206 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 18:37:07 +0000 Message-Id: <698f6f53.3af29.36170e5b@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=10ac7413c060b1496ef54e2338f487ea84f66206 commit 10ac7413c060b1496ef54e2338f487ea84f66206 Author: Ed Maste AuthorDate: 2026-02-12 21:18:32 +0000 Commit: Ed Maste CommitDate: 2026-02-13 18:37:01 +0000 elf_common.h: Add some AArch32 relocations Reviewed by: mmel Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55268 --- sys/sys/elf_common.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index 3782bfc2df9c..c768e1aac87d 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -1120,6 +1120,19 @@ typedef struct { #define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ #define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ #define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ +#define R_ARM_CALL 28 +#define R_ARM_JUMP24 29 +#define R_ARM_THM_JUMP24 30 +#define R_ARM_BASE_ABS 31 +#define R_ARM_MOVW_ABS_NC 43 +#define R_ARM_MOVT_ABS 44 +#define R_ARM_MOVW_PREL_NC 45 +#define R_ARM_MOVT_PREL 46 +#define R_ARM_THM_MOVW_ABS_NC 47 +#define R_ARM_THM_MOVT_ABS 48 +#define R_ARM_THM_MOVW_PREL_NC 49 +#define R_ARM_THM_MOVT_PREL 50 +#define R_ARM_THM_JUMP19 51 #define R_ARM_GNU_VTENTRY 100 #define R_ARM_GNU_VTINHERIT 101 #define R_ARM_IRELATIVE 160 From nobody Fri Feb 13 18:38:21 2026 X-Original-To: dev-commits-src-main@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 4fCLXG0z70z6RZ7S for ; Fri, 13 Feb 2026 18:38:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCLXG07Yzz46b6 for ; Fri, 13 Feb 2026 18:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771007902; 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=G2OdFymtIZaESJ4wOVli0xWostcgX5osXSa1ivzwxH4=; b=msxaM/Dxue1YuABVszqCNKhamjv/gKEvYQyhRJMPPx3O+EreGo7mFpc76S+Z3b71yIq/E0 d1g48y3mOBorKf4mVV2ttjuxVtwU9DPOgJ2tmBlSmRGh4/TgpkMP6Mu4Kpf8VMvJ0spMM2 l1n1GQaIWz/tfliYzZUH4Uq/ViBRfeqyI8qMZ8/tNGYdbkV62yPFfb9sTW3F6OiDBgGp6G dOg6HxM/+nrf8p+FfFZw3UFU3xBLj9sEIqYIcSR5xWDuVyOGhAtdG8FsOGfvAHu0xxOOjw 8Qjhvi36RIttX7cmTZFWlxpQQiO5gF+2dF2TKgp0ivP5Ev01zwQGfESjb+Sekw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771007902; a=rsa-sha256; cv=none; b=V27QzYam4HnX6FvoqVRM0rk9X3mJsMHs409yzXQfJ9WVR7W9enXNJPTSpkDvin/xf1cSG+ cRXOMjStCqDKmYQpyu1vPp8o+bDBpmtoMMq+yhk5s0cOIhCH79bJbCwOuftegnXh8QRszk EZVieNFRRELUFsV+Uvw7EZXpSg8rmktorF7bsrgR/8ogi0EmZfh6tnRr7IeYdbr0h946sC O2Nd99zhxasGvbf6Jxsb06T3qaq3g0GE9+UpKjlNqV3PWWYnhjaSNz8d+HwZoOWscocX2R qpGwd7gju0PvuBVcXgV7AqWKo0vgYJdPhQrPCgSbV7GsAL22yqMbJTYIyddNHQ== 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=1771007902; 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=G2OdFymtIZaESJ4wOVli0xWostcgX5osXSa1ivzwxH4=; b=bBvH7Se9AQj5ruFA4SH11tGipTGu9gBAINkZLDf4tHafCi+HyWff9Hl2A3dpp/V2BHwNNU ieP/6dSmCk2GHPFl19lNkcqKSylujAhbHBKMUUUlUpLJ8iYckehEefmiqdpoNUrmCrSJVq QURghSKw2qEwmiWqL8NxWaGaIQAdX94W+8i3E/0YlgsBLLIToyxx29w3LyKnYZOU+pvNX9 AYV/IvP5j4Xdmy5uZ/euroRJ+kuZKBFFq18vG7YxWAuDiJ1aCtlMNeZ6BLY/qK03J391de IE+MKJfwHX8qLh7muu+/NpjP6ZEJdKki9w0SGg7slvqajJPgwe3blVtuJzrzfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCLXF6s1gzYqr for ; Fri, 13 Feb 2026 18:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3be16 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 18:38:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: be7e4dc878ea - main - nvme: Use size_t for payload size List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be7e4dc878eab090cd411c9ef28880e4f62116f5 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 18:38:21 +0000 Message-Id: <698f6f9d.3be16.ebd150a@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=be7e4dc878eab090cd411c9ef28880e4f62116f5 commit be7e4dc878eab090cd411c9ef28880e4f62116f5 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 18:37:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 18:37:16 +0000 nvme: Use size_t for payload size Using uint32_t here can cause spurious compiler warnings. I assume it was done to constrain the range; use a KASSERT instead. Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55279 --- sys/dev/nvme/nvme_private.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index d06862ba5f4a..3dc62bc11384 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -502,11 +502,13 @@ _nvme_allocate_request(const int how, nvme_cb_fn_t cb_fn, void *cb_arg) } static __inline struct nvme_request * -nvme_allocate_request_vaddr(void *payload, uint32_t payload_size, +nvme_allocate_request_vaddr(void *payload, size_t payload_size, const int how, nvme_cb_fn_t cb_fn, void *cb_arg) { struct nvme_request *req; + KASSERT(payload_size <= UINT32_MAX, + ("payload size %zu exceeds maximum", payload_size)); req = _nvme_allocate_request(how, cb_fn, cb_arg); if (req != NULL) { req->payload = memdesc_vaddr(payload, payload_size); From nobody Fri Feb 13 18:40:09 2026 X-Original-To: dev-commits-src-main@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 4fCLZL09fSz6RZFX for ; Fri, 13 Feb 2026 18:40:10 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCLZK6W8bz479K for ; Fri, 13 Feb 2026 18:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771008010; 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=cYgKkljmiVGJiQRqH6tM/+N8D/TKPkxw3ZYXPMC/4cc=; b=pIP2mFfInDulCpV5jfZSi6GpiPcVNjA9K5DuDg/sfqaYoIYRVGKuWF0qJDYHQ7/D7nMd4M dfyVZBpfcZRQA+4o2QX+osNo93xlWYHVO3CE6J7p1P2HEGKozjLs2H5lPrp7RsIId3vh0c Pj7Cc0fs6b3l7EgYrFNKeGC0xPZN2JkV4VjCLKKFUNwKbwZ7u7NSsXGk7mi2ZcldVqe+PW sIDZQNdpzNEZSk7To7GVy0Mym69O8IfrVHTyYpoO5nZSmF1rebiWvFJBpFGvGcCJG+41GE aEvNSpxrhW4aKq7dp50dzukI1ihPFulUxPCWbQF6O+a9GI/GOWsLdn9tRqv3aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771008010; a=rsa-sha256; cv=none; b=XPfgTjC2WAnHXq22yj7zkxFk5/LtcajkBda0iNhj3T4JGDcYB9DIEGLtwSW3buHSRfseWv GaScFjkIJUf8SdSZ1KhT/SxzJwD9Ajb1lMCWuYMFXmG71HZsX7WW398RIl6hDCaGEioFfQ s1HlIMsVKZ/BIqkvV/q1+3Jt9H+9RV9vl32SmuzYyv6+ugBcnOJXp8I54pa3ejCT4EtsOZ N4MoS1meQ2kaNxVXqwGj4wrbf+WKmu7Z1xU2/dSvJ3WAbAlUculh61Ywecrsiyb4rqrztZ Z0llP9lpYj6Ycu631Z+UpBwDHOHifkUwrHj28KK2FQQl+kdhLQ6ZgvX25lFRvw== 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=1771008009; 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=cYgKkljmiVGJiQRqH6tM/+N8D/TKPkxw3ZYXPMC/4cc=; b=V7G6anzYM4QriopekCJMfQJ5V831T3Tt69XfMCKGHZWWDgq8X4JEGQerX8gjyAtmEIvrm1 okkGZb2AWC8e9FeHZtI8VFN0GZDhbIisB6f9c2SE2JbBfdgCv+sPIcc4hE351Bj5JGmUI4 xyNuM+OgXkm6/2D6XP00QRwnOKhpITZHTTQqHnYD6vf6mnv223k3UQ7x3aaGfBbb6Vh4fb uI3wmvEEnF/3bINm34LvQdlSOpBFJ+DIvelEsNXrcWZARe0XEk0iI8Nfq6eEu79AmThuOa rdbvNsCFNpfZAeOhhCl78mae8VbNHVTLt1LPo3QqQyfIJxinTgvk5NJ4je2s0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCLZK5tbyzYqt for ; Fri, 13 Feb 2026 18:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3acf4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 18:40:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 605af0640769 - main - cxgbe(4): Show correct range of tids in sysctl_tids List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 605af0640769b1d77d0d38bebee93fb35ee4101e Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 18:40:09 +0000 Message-Id: <698f7009.3acf4.7f27bea4@gitrepo.freebsd.org> The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=605af0640769b1d77d0d38bebee93fb35ee4101e commit 605af0640769b1d77d0d38bebee93fb35ee4101e Author: Navdeep Parhar AuthorDate: 2026-02-13 18:30:03 +0000 Commit: Navdeep Parhar CommitDate: 2026-02-13 18:39:09 +0000 cxgbe(4): Show correct range of tids in sysctl_tids The highest valid tid has to be adjusted for the hi-pri filter region. MFC after: 1 week Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index e14efc912de6..ecbe4d997278 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -11594,7 +11594,7 @@ sysctl_tids(SYSCTL_HANDLER_ARGS) if (hashen) { if (x) sbuf_printf(sb, "%u-%u, ", t->tid_base, x - 1); - sbuf_printf(sb, "%u-%u", y, t->ntids - 1); + sbuf_printf(sb, "%u-%u", y, t->tid_base + t->ntids - 1); } else { sbuf_printf(sb, "%u-%u", t->tid_base, t->tid_base + t->ntids - 1); From nobody Fri Feb 13 19:26:06 2026 X-Original-To: dev-commits-src-main@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 4fCMbL3l0Hz6Rf67 for ; Fri, 13 Feb 2026 19:26:06 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMbL1ssJz3F7d for ; Fri, 13 Feb 2026 19:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010766; 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=fmEwqh6HEypz6wh784UPD1fu+HFpSi+3zZHEuRjpAEs=; b=uTWOdTBx+HfIMtFez/hj3NCL0hGPaFTAG0HRc8B4uHleIJ+FClFGiLNQGAcKXrvLYigqYN yPGxAnEm8MY/yNYDrDQxQSDQ7AoOW5WElltxnFUjZq1st9R3QQTY7huOJd+amlUNxkH6F0 sSX4lE7t4ZpHBqDSFC47KVY6Pl4JS3qUY2XRRPcwal1U0iBJPEAT8l0ZFnayIy0h0HBTZC 2HhmG4pDZr2T598rJOPQ7BRO8emP4OP0SAkhGvHQklwShqP82uIj+YkNFetUKv8vgbOE2P vMLQOAs6Ew4GYPD2oavCz6d17zoWuGwptYDMsiSO0k2QQlVUZ5nu/IqLWEFD0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771010766; a=rsa-sha256; cv=none; b=pw1gIILiJyHuMee9o+U2fQIMFbuwXJnhCHSuOszRspBsCAOa8m8bbKtc45+rIYnjBToYTG H49IlW1IJxAbJmr53Fz8K+GujHIw0MfET+Trgy8Pvfqn5C1JpWPifNNKpy6qMdH+8Ww0HM te76hCFm+XTTgnBTySpXD0XnAJorXscLK0DFI0JxOLog7u7mYwXX4QjOsNMs74DmcGFUUK kx3ML+Ho8jpPhcwEmCL7q4mAUfwH91/YATaQfj+nJgf62e034uT9HmfXYuan7m2nR6BayX 9JONcEs4RdzQUsN6ikq7m21uBT2Ry2GX31WIszLONPXDpvXmiOafAtBdNbby0A== 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=1771010766; 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=fmEwqh6HEypz6wh784UPD1fu+HFpSi+3zZHEuRjpAEs=; b=tka0jg56+ncoEE4BTCR0Vecktv6OGUvU6CYYDuMRxE1zPgNs+xbRW+Ph5DZyHMMsklGeRD gblwAK2cb87W9+LagNVYh0qnsSc3EbibpBJGONPLJoVH53k8P8VsuU4MTRqgYU7/kaNXBj Zc9FsFMe3bpao6evUwXsOYB7jTHfBOTsGrI+BOsOB8TbEWKn2Rlr3SEvroqBAdPeIs8TQ0 +66b/qPj0rGJ0wgnTek118cKZ5pCwditsTqMwmyubcy2+zKzQXFf76E9lLvkGwdLCMhU/h v1K7D751ljHTaLzL5RFrdGfs9xoffo9rS4PVD2Q8m5xyUqyQ2NgslvSu0fC1mA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbL124dzZpm for ; Fri, 13 Feb 2026 19:26:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dff0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:26:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 4d5c434ed16e - main - diff3: use bsd diff3 by default List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:26:06 +0000 Message-Id: <698f7ace.3dff0.583e87ed@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 commit 4d5c434ed16e821003a9c2dc1c1ea245b8d0b678 Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:44:12 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-13 19:26:02 +0000 diff3: use bsd diff3 by default --- share/mk/src.opts.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 5aae1eafedd7..bd70c668ca6d 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -102,7 +102,6 @@ __DEFAULT_YES_OPTIONS = \ FREEBSD_UPDATE \ FTP \ GAMES \ - GNU_DIFF \ GOOGLETEST \ GPIO \ HAST \ @@ -209,6 +208,7 @@ __DEFAULT_NO_OPTIONS = \ DTRACE_ASAN \ DTRACE_TESTS \ EXPERIMENTAL \ + GNU_DIFF \ HESIOD \ IPFILTER_IPFS \ LOADER_VERBOSE \ From nobody Fri Feb 13 19:26:07 2026 X-Original-To: dev-commits-src-main@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 4fCMbM391mz6Rf3D for ; Fri, 13 Feb 2026 19:26:07 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMbM1cS8z3F19 for ; Fri, 13 Feb 2026 19:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010767; 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=5hn+4JJstBri5/KnWntOx5p9xyoW0fOVrrEeYvfwhno=; b=VQiOM/xS3wM1fz4gS1iRwg7YgbkmjWaUzANOrErWwgoRJyX6mVKYeb3EvVccBhz5kXotIx az4aywuy5uF/CdK1Sh94SVCKsj0gVdRj9E2q3mg213XUZr38UyXCPJfb62W1ZGPCGVJYYf RA28vvx859jW2IGYWHUBxs+nHBfaNtdpcOYkcqDj9CiinEZYcffccZogiGgJS8V94xGeRJ 8aUfTEczYk/dfXXOvcGg6bkHuTTgvaYQRwAfkmykl6+GQiaRSNLyFSqkIvUBDdrjPs6atY q7kkROPRcFt0V3kPLbGcIfMqImKitPSV243PSgNW2tM5uCXbqi3PUTUXH0b3bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771010767; a=rsa-sha256; cv=none; b=fisxOroLsQ1oDOUoG7es0Hq8SLh8YAjHJF/bfH9s1hcWpz8aMPkp5Qu4SNJh6YenPHr2cR /LwFSQGpSxsSEG6F5Gq/N8VygpJzxMsZhjqB+bfcOhHwL3OIYmxNEPQw15wRhGCTtk8FiL 71kEJyJTbyPlIFrtjlkaKwotMhDdPvprxlHXuzsZbmUxVD1nZzQR4yWyh5xQxq8oZCaMSr IaBSbDbLjuN/rU8ANVnpZTZfr2SWrhi1LkoBC0bqCJ1bn7sSfCiJqbDWXbD9slGejTICI0 BEJUpJBDc7TMaBmHjNHsVT0XpSKH7JfDFoFHNTYcEVkZ1cFYDLAW8+0eFZc0mw== 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=1771010767; 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=5hn+4JJstBri5/KnWntOx5p9xyoW0fOVrrEeYvfwhno=; b=LKxeItItPnZ6gUVucIPP0nJ2xb6NOz64kuNLhU0C/1fRBCl5JFubIZNRvaeYMWkABEXyqC aZeEmEyhf0ek0VbRvcFWUIFA7Uge9lEJTRe5Gukwk3LyMF9vOgmniScGiiaiZw6qluO/IN lL3VumY4pUsfVwwPVBDdbWDSNGKlGWNZ75xeZViaz0X2RU6TuzdD74XGtGUOfgoDJ5V7JZ aoPbwT7IQgGQJGkKOfYEZT1A28wTd/BUKpk5rdTMrlktihCTq3+zzCKJIC0AiaoSHrp9/2 W9ZmSUXVCF61no2lvYTCayrCZV6pfEL1Xtt2fizDDfTcgrurBQcW9SRcNMwxIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbM0ywHzbGZ for ; Fri, 13 Feb 2026 19:26:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ecd5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:26:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 06d07d4af1c9 - main - src.conf.5: regenerate after switch to BSD diff3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 06d07d4af1c9f9ea322b9363d1c8e70e250a7907 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:26:07 +0000 Message-Id: <698f7acf.3ecd5.5f972a5@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=06d07d4af1c9f9ea322b9363d1c8e70e250a7907 commit 06d07d4af1c9f9ea322b9363d1c8e70e250a7907 Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:44:26 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-13 19:26:02 +0000 src.conf.5: regenerate after switch to BSD diff3 --- share/man/man5/src.conf.5 | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 48896e761822..a08636c24c2b 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd January 29, 2026 +.Dd February 13, 2026 .Dt SRC.CONF 5 .Os .Sh NAME @@ -530,12 +530,6 @@ CTF data encapsulates a reduced form of debugging information similar to DWARF and the venerable stabs and is required for DTrace. .It Va WITHOUT_CUSE Do not build CUSE-related programs and libraries. -When set, it enforces these options: -.Pp -.Bl -item -compact -.It -.Va WITHOUT_SOUND -.El .It Va WITHOUT_CXGBETOOL Do not build .Xr cxgbetool 8 @@ -769,12 +763,11 @@ Do not build or install .Xr ftp 1 . .It Va WITHOUT_GAMES Do not build games. -.It Va WITHOUT_GNU_DIFF -Do not build GNU -.Xr diff3 1 ; -build BSD +.It Va WITH_GNU_DIFF +Build and install GNU .Xr diff3 1 -instead. +instead of BSD +.Xr diff3 1 . .It Va WITHOUT_GOOGLETEST Neither build nor install .Lb libgmock , From nobody Fri Feb 13 19:26:08 2026 X-Original-To: dev-commits-src-main@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 4fCMbN4TGWz6RfMp for ; Fri, 13 Feb 2026 19:26:08 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMbN29Qqz3F1C for ; Fri, 13 Feb 2026 19:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771010768; 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=7S/kH9gnPQURuyJ3s7gMgbSp309M3g33fU6MfJHAxrg=; b=KFZXam6iHDcGJRkHaGTzP7sGvI4eKgS7bHTxmxzyKlfytlCp1GRWKQcaL6ELRZqRUgFX6F +M7e6Hh25pWd20BffOnFzR3q8rw/LNoZn/SaGle4F30lGFPzI0nLMoDYwMj2vgppET73rv pWOS2buh+QdiRLcNBwq3006FGWiJWSzWerT0GNsY1hEc+5GHbA1NOXJ46nXGTHwl4E6kbL hFqwcIQgQ+dsuaur647kfOOKfUryxBe2MKc2vwgi8WpJ4Mn1D/Rom706LkgL+Hwo4HkDCk 2PFqRcF7CujoVAiPuTrxjp6ynCvVW4bfM1tczvLmwOfnNABCEL/9Lla8RAHorQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771010768; a=rsa-sha256; cv=none; b=h6Kr+S/so8ClHIFzqRdo77jd2UhwoQ7qn/C7MiuA2QHh4LY4i/bOFiSmaKifI/lRKK5eaJ 4ni6LbQ7MF3h2Xsrs1DL1LPkcCamCVbvVvMxHdLaoix9D0RdzLatq1mFrYKjLf/epOgz8m iTLB7CFphChpE5tcWLSP4SFclBPud6/9lqrKCU9/7UtrwZa1QPwVN/hw4X1OZD5Vg2wj3u ozxtu4l6y0kfHfWnNiLU+Yu3kkhPA+QMrwgp0K6T3ue8amnrhtlUQO2p0H4OBq9+0YPkCB /73yb8uAFAhJHJwBgWer1I5lM7kA3Zx7sCcPB+dpLYMi7UTHAX/5XGRjTNTILw== 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=1771010768; 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=7S/kH9gnPQURuyJ3s7gMgbSp309M3g33fU6MfJHAxrg=; b=FrkAn5rp8uSSIiPSh2K+syOzXh96sW7IfnkdR2OOU72HgJZlpNDKyakkRFg4wAzcCoLQD9 6OxzqhyqaP7fPQiypZeTkC8e8o+7ZfFSrtx8jCAvgP5zWMAFOnovwAt+k2gJNDTrdCigdG kvzg0+HeyOfcUsMqKabyCeNq7clxLv6gabml/ntun1uuondfn/ebWrMVGubDT01e6vFLv9 iY4PXztCl4K1dkclHSFyTEpQNQYOo5fbSPOyouXR+gwZcw0mUCsKhorjVzleosKiI51uX3 1SPBlChD140BADN5n83yf2vbwoGi1hKpxGmKug6iDyJ2tC/5b9eOkjlt3sjOXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMbN1l5MzbCL for ; Fri, 13 Feb 2026 19:26:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dff4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:26:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 284a0aa96eb6 - main - diff3: add 3 missing files from the testsuite List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 284a0aa96eb63f12831a9e06514a50b2cd80957f Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:26:08 +0000 Message-Id: <698f7ad0.3dff4.496faaf6@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=284a0aa96eb63f12831a9e06514a50b2cd80957f commit 284a0aa96eb63f12831a9e06514a50b2cd80957f Author: Baptiste Daroussin AuthorDate: 2026-02-13 17:45:39 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-13 19:26:02 +0000 diff3: add 3 missing files from the testsuite Fixes: 2cfca8e710f260b8a1bb1ee5e1836a52e468ef4b --- usr.bin/diff3/tests/conflict-Em.out | 19 +++++++++++++++++++ usr.bin/diff3/tests/conflict-merge.out | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/usr.bin/diff3/tests/conflict-Em.out b/usr.bin/diff3/tests/conflict-Em.out new file mode 100644 index 000000000000..dcc1ddaff6fb --- /dev/null +++ b/usr.bin/diff3/tests/conflict-Em.out @@ -0,0 +1,19 @@ +<<<<<<< conflict3.txt +root:someone@example.com +======= +#root:me@my.domain +>>>>>>> conflict2.txt + +<<<<<<< conflict3.txt +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root +======= +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root + +#Generalredirectionsforpseudoaccounts +_dhcp:root +_pflogd:root +>>>>>>> conflict2.txt diff --git a/usr.bin/diff3/tests/conflict-merge.out b/usr.bin/diff3/tests/conflict-merge.out new file mode 100644 index 000000000000..737cba7dc224 --- /dev/null +++ b/usr.bin/diff3/tests/conflict-merge.out @@ -0,0 +1,25 @@ +<<<<<<< conflict3.txt +root:someone@example.com +||||||| conflict1.txt +# root: me@my.domain +======= +#root:me@my.domain +>>>>>>> conflict2.txt + +<<<<<<< conflict3.txt +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root +||||||| conflict1.txt +# Basic system aliases -- these MUST be present +MAILER-DAEMON: postmaster +postmaster: root +======= +#Basicsystemaliases--theseMUSTbepresent +MAILER-DAEMON:postmaster +postmaster:root + +#Generalredirectionsforpseudoaccounts +_dhcp:root +_pflogd:root +>>>>>>> conflict2.txt From nobody Fri Feb 13 19:35:50 2026 X-Original-To: dev-commits-src-main@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 4fCMpb3PMDz6RgZk for ; Fri, 13 Feb 2026 19:35:51 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMpb0S9sz3HXv for ; Fri, 13 Feb 2026 19:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771011351; 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=sVHQDInGUEJAn9Kg6v0qIlWPqf0S9dMLLELtSOsdZ50=; b=oqLeaLyDX/B0cTbX3M+zoREIz+3fmiUL4/NSE5+7Ln7c1qEN3ZdkBfMFb05gq3TeMgfqpa 2KBCWFrHV2QXks2tLOnYLQdjKqmGBW8U+QmQ5FbX00Pywv8MzBPIwcKukjcS1zi27X0mM8 VSRXL96BVsiQfMjD6nYnorm1acbWa71gMkicigtRTIzXpVzHYLVJ6mOQ2NjB+DHbNTuAl0 LtM6wPRKqO7QLym8RtVtwHzoHjRcnJXwcxruvDdh6orX+dHwu0YeoCG4pRgMfe6u293/Uf 47qFnVusDJA8t9OStzLI5LuUUmU3VrGYPkOFuGOOUdxnQpNC3Crf7D6RNXurMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771011351; a=rsa-sha256; cv=none; b=G++xVjwexbwhSIqakH6cSVsiBwsNhCvUN5uox/sK9cbcD/ggEYi6riGZ1uZdJywnDS4GcQ p7HXQ3SIMkI5vptY5wBfvN8eHB3J30BETktRvX4hI3KcOvIl70vRnMrgxFKfKiQOZll7AQ Rw+qjFwEvonNZE12AiHZ2rV2BFCxEm3ytqhF0/OmOTrp0nfw+vDHI/Dt9GVedegl08hp/b e/nVC1V2GWnx4ZpZC80ji4DkWHehMC6lhqYoWasif7JqeTAPVOWoN4ldyuoHxyHANa36r4 Ij/31be1Bkw0fnVQft2z7fjVy6HciyThr9h3WWSV7vbLtqoSwjljKoYvJWY63w== 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=1771011351; 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=sVHQDInGUEJAn9Kg6v0qIlWPqf0S9dMLLELtSOsdZ50=; b=gSw/T5VAyP6aSFElsiQuVB2U/JHNG4bdQy9QnNb6I0rdzPIELi7tZ7JwKV1a+nuLly0Ru8 yCL2FmZHppgttUAyd/oJd+p3v+3LSIALKefVGkGR9/wHLQ3rN8mYhWIzHTJWLt16xRUkyT j6DePQuhjB9tp/gjvkoetpbGkZ4vxCNAEw5g8Ul2WNNbL64yxHwA9p6D3obqEwzAA4hJv0 9UV51kGr0LZ3BCubJscuMPvCVNQXWlpjQ0BYFuvQ4EAilKCVcSbjHRx9abNs2NJPWgDLU/ Ydv4xETsvIaysQgAZZ8e7bXUV4vo/wTK/YFN5PKa3wYd75KlelrBavlmJ+RvKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMpZ6W8CzbN1 for ; Fri, 13 Feb 2026 19:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40e88 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:35:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d19fd2f34922 - main - ip_mroute: Make the routing socket private List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d19fd2f349226116f7effb281baa1eb32b8292e7 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:35:50 +0000 Message-Id: <698f7d16.40e88.4eed2caa@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d19fd2f349226116f7effb281baa1eb32b8292e7 commit d19fd2f349226116f7effb281baa1eb32b8292e7 Author: Mark Johnston AuthorDate: 2026-02-13 16:50:18 +0000 Commit: Mark Johnston CommitDate: 2026-02-13 19:35:18 +0000 ip_mroute: Make the routing socket private I have some patches which make ip_mroute and ip6_mroute multi-FIB-aware. This enables running per-FIB routing daemons, each of which has a separate routing socket. Several places in the network stack check whether multicast routing is configured by checking whether the multicast routing socket is non-NULL. This doesn't directly translate in my proposed scheme, as each FIB would have its own socket. I'd like to modify the ip(6)_mroute code to store all state, including the socket, in a per-FIB structure. So, take a step towards that and 1) hide the socket, 2) add a boolean flag which indicates whether a multicast router is registered. Reviewed by: pouria, zlei, glebius, adrian MFC after: 2 weeks Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D55236 --- sys/netinet/igmp.c | 2 +- sys/netinet/ip_input.c | 3 ++- sys/netinet/ip_mroute.c | 29 +++++++++++++++-------------- sys/netinet/ip_mroute.h | 6 +++--- sys/netinet/ip_output.c | 3 ++- sys/netinet/raw_ip.c | 10 +++++----- sys/netinet6/ip6_input.c | 2 +- sys/netinet6/ip6_mroute.c | 35 ++++++++++++++++++++--------------- sys/netinet6/ip6_mroute.h | 6 +++--- sys/netinet6/ip6_output.c | 3 ++- sys/netinet6/mld6.c | 2 +- sys/netinet6/raw_ip6.c | 8 ++++---- 12 files changed, 59 insertions(+), 50 deletions(-) diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c index 35128dadffe6..00288356cb1f 100644 --- a/sys/netinet/igmp.c +++ b/sys/netinet/igmp.c @@ -3489,7 +3489,7 @@ igmp_intr(struct mbuf *m) imo.imo_multicast_ttl = 1; imo.imo_multicast_vif = -1; - imo.imo_multicast_loop = (V_ip_mrouter != NULL); + imo.imo_multicast_loop = V_ip_mrouting_enabled; /* * If the user requested that IGMP traffic be explicitly diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 4b8294c93967..7de3dc24dc53 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -772,7 +772,8 @@ passin: * RFC 3927 2.7: Do not forward multicast packets from * IN_LINKLOCAL. */ - if (V_ip_mrouter && !IN_LINKLOCAL(ntohl(ip->ip_src.s_addr))) { + if (V_ip_mrouting_enabled && + !IN_LINKLOCAL(ntohl(ip->ip_src.s_addr))) { /* * If we are acting as a multicast router, all * incoming multicast packets are passed to the diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index fb42c04548e7..7a197e20a62f 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -169,6 +169,9 @@ SYSCTL_VNET_PCPUSTAT(_net_inet_ip, OID_AUTO, mrtstat, struct mrtstat, mrtstat, "IPv4 Multicast Forwarding Statistics (struct mrtstat, " "netinet/ip_mroute.h)"); +VNET_DEFINE_STATIC(struct socket *, ip_mrouter); +#define V_ip_mrouter VNET(ip_mrouter) + VNET_DEFINE_STATIC(u_long, mfchash); #define V_mfchash VNET(mfchash) #define MFCHASH(a, g) \ @@ -305,7 +308,7 @@ VNET_DEFINE_STATIC(struct ifnet *, multicast_register_if); static u_long X_ip_mcast_src(int); static int X_ip_mforward(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); -static int X_ip_mrouter_done(void); +static void X_ip_mrouter_done(struct socket *); static int X_ip_mrouter_get(struct socket *, struct sockopt *); static int X_ip_mrouter_set(struct socket *, struct sockopt *); static int X_legal_vif_num(int); @@ -435,7 +438,7 @@ X_ip_mrouter_set(struct socket *so, struct sockopt *sopt) error = ip_mrouter_init(so, optval); break; case MRT_DONE: - error = ip_mrouter_done(); + ip_mrouter_done(so); break; case MRT_ADD_VIF: error = sooptcopyin(sopt, &vifc, sizeof vifc, sizeof vifc); @@ -624,8 +627,7 @@ if_detached_event(void *arg __unused, struct ifnet *ifp) struct ifnet *free_ptr, *multi_leave; MRW_WLOCK(); - - if (V_ip_mrouter == NULL) { + if (!V_ip_mrouting_enabled) { MRW_WUNLOCK(); return; } @@ -740,6 +742,7 @@ ip_mrouter_init(struct socket *so, int version) curvnet); V_ip_mrouter = so; + V_ip_mrouting_enabled = true; atomic_add_int(&ip_mrouter_cnt, 1); /* This is a mutex required by buf_ring init, but not used internally */ @@ -756,8 +759,8 @@ ip_mrouter_init(struct socket *so, int version) /* * Disable multicast forwarding. */ -static int -X_ip_mrouter_done(void) +static void +X_ip_mrouter_done(struct socket *so) { struct ifnet **ifps; int nifp; @@ -766,22 +769,22 @@ X_ip_mrouter_done(void) struct bw_upcall *bu; MRW_TEARDOWN_WLOCK(); - - if (V_ip_mrouter == NULL) { + if (so != V_ip_mrouter) { MRW_TEARDOWN_WUNLOCK(); - return (EINVAL); + return; } /* * Detach/disable hooks to the reset of the system. */ V_ip_mrouter = NULL; + V_ip_mrouting_enabled = false; atomic_subtract_int(&ip_mrouter_cnt, 1); V_mrt_api_config = 0; /* - * Wait for all epoch sections to complete to ensure - * V_ip_mrouter = NULL is visible to others. + * Wait for all epoch sections to complete to ensure the new value of + * V_ip_mrouting_enabled is visible to others. */ NET_EPOCH_WAIT(); @@ -856,8 +859,6 @@ X_ip_mrouter_done(void) free(ifps, M_TEMP); CTR1(KTR_IPMF, "%s: done", __func__); - - return 0; } /* @@ -2872,7 +2873,7 @@ ip_mroute_modevent(module_t mod, int type, void *unused) MRW_WLOCK(); if (ip_mrouter_cnt != 0) { MRW_WUNLOCK(); - return (EINVAL); + return (EBUSY); } ip_mrouter_unloading = 1; MRW_WUNLOCK(); diff --git a/sys/netinet/ip_mroute.h b/sys/netinet/ip_mroute.h index 6f09006ec9e2..5c2527ea64e5 100644 --- a/sys/netinet/ip_mroute.h +++ b/sys/netinet/ip_mroute.h @@ -356,8 +356,8 @@ struct bw_meter { }; #ifdef _KERNEL -VNET_DECLARE(struct socket *, ip_mrouter); /* multicast routing daemon */ -#define V_ip_mrouter VNET(ip_mrouter) +VNET_DECLARE(bool, ip_mrouting_enabled); +#define V_ip_mrouting_enabled VNET(ip_mrouting_enabled) struct ifnet; struct ip; @@ -369,7 +369,7 @@ struct sockopt; extern u_long (*ip_mcast_src)(int); extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); -extern int (*ip_mrouter_done)(void); +extern void (*ip_mrouter_done)(struct socket *); extern int (*ip_mrouter_get)(struct socket *, struct sockopt *); extern int (*ip_mrouter_set)(struct socket *, struct sockopt *); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 1edc4906b542..8af44c6a200d 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -610,7 +610,8 @@ again: * above, will be forwarded by the ip_input() routine, * if necessary. */ - if (V_ip_mrouter && (flags & IP_FORWARDING) == 0) { + if (V_ip_mrouting_enabled && + (flags & IP_FORWARDING) == 0) { /* * If rsvp daemon is not running, do not * set ip_moptions. This ensures that the packet diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index bfe608be6b36..e0e7aed04cd0 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -106,16 +106,16 @@ int (*ng_ipfw_input_p)(struct mbuf **, struct ip_fw_args *, bool); */ /* - * The socket used to communicate with the multicast routing daemon. + * A per-VNET flag indicating whether multicast routing is enabled. */ -VNET_DEFINE(struct socket *, ip_mrouter); +VNET_DEFINE(bool, ip_mrouting_enabled); /* * The various mrouter and rsvp functions. */ int (*ip_mrouter_set)(struct socket *, struct sockopt *); int (*ip_mrouter_get)(struct socket *, struct sockopt *); -int (*ip_mrouter_done)(void); +void (*ip_mrouter_done)(struct socket *); int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); int (*mrt_ioctl)(u_long, caddr_t, int); @@ -860,8 +860,8 @@ rip_detach(struct socket *so) ("rip_detach: not closed")); /* Disable mrouter first */ - if (so == V_ip_mrouter && ip_mrouter_done) - ip_mrouter_done(); + if (ip_mrouter_done != NULL) + ip_mrouter_done(so); INP_WLOCK(inp); INP_HASH_WLOCK(&V_ripcbinfo); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 656b3b996f90..acb690c2033d 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -891,7 +891,7 @@ passin: /* * Forward if desirable. */ - if (V_ip6_mrouter && + if (V_ip6_mrouting_enabled && IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { /* * If we are acting as a multicast router, all diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 46378cca5e21..a8313e1753a6 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -172,6 +172,9 @@ static struct sx mrouter6_mtx; #define MROUTER6_LOCK_INIT() sx_init(MROUTER6_LOCKPTR(), "mrouter6") #define MROUTER6_LOCK_DESTROY() sx_destroy(MROUTER6_LOCKPTR()) +VNET_DEFINE_STATIC(struct socket *, ip6_mrouter); +#define V_ip6_mrouter VNET(ip6_mrouter) + static struct mf6c *mf6ctable[MF6CTBLSIZ]; SYSCTL_OPAQUE(_net_inet6_ip6, OID_AUTO, mf6ctable, CTLFLAG_RD, &mf6ctable, sizeof(mf6ctable), "S,*mf6ctable[MF6CTBLSIZ]", @@ -335,7 +338,7 @@ static int get_sg_cnt(struct sioc_sg_req6 *); static struct callout expire_upcalls_ch; static int X_ip6_mforward(struct ip6_hdr *, struct ifnet *, struct mbuf *); -static int X_ip6_mrouter_done(void); +static void X_ip6_mrouter_done(struct socket *); static int X_ip6_mrouter_set(struct socket *, struct sockopt *); static int X_ip6_mrouter_get(struct socket *, struct sockopt *); static int X_mrt6_ioctl(u_long, caddr_t); @@ -383,7 +386,7 @@ X_ip6_mrouter_set(struct socket *so, struct sockopt *sopt) error = ip6_mrouter_init(so, optval, sopt->sopt_name); break; case MRT6_DONE: - error = X_ip6_mrouter_done(); + X_ip6_mrouter_done(so); break; case MRT6_ADD_MIF: error = sooptcopyin(sopt, &mifc, sizeof(mifc), sizeof(mifc)); @@ -556,6 +559,8 @@ ip6_mrouter_init(struct socket *so, int v, int cmd) return (EADDRINUSE); } + MFC6_LOCK(); + V_ip6_mrouting_enabled = true; V_ip6_mrouter = so; V_ip6_mrouter_ver = cmd; @@ -568,6 +573,7 @@ ip6_mrouter_init(struct socket *so, int v, int cmd) callout_reset(&expire_upcalls_ch, EXPIRE_TIMEOUT, expire_upcalls, NULL); + MFC6_UNLOCK(); MROUTER6_UNLOCK(); MRT6_DLOG(DEBUG_ANY, "finished"); @@ -578,8 +584,8 @@ ip6_mrouter_init(struct socket *so, int v, int cmd) /* * Disable IPv6 multicast forwarding. */ -static int -X_ip6_mrouter_done(void) +static void +X_ip6_mrouter_done(struct socket *so) { mifi_t mifi; u_long i; @@ -588,9 +594,9 @@ X_ip6_mrouter_done(void) MROUTER6_LOCK(); - if (V_ip6_mrouter == NULL) { + if (V_ip6_mrouter != so) { MROUTER6_UNLOCK(); - return (EINVAL); + return; } /* @@ -603,6 +609,7 @@ X_ip6_mrouter_done(void) if_allmulti(mif6table[mifi].m6_ifp, 0); } } + MFC6_LOCK(); bzero((caddr_t)mif6table, sizeof(mif6table)); nummifs = 0; @@ -611,7 +618,6 @@ X_ip6_mrouter_done(void) /* * Free all multicast forwarding cache entries. */ - MFC6_LOCK(); for (i = 0; i < MF6CTBLSIZ; i++) { rt = mf6ctable[i]; while (rt) { @@ -630,6 +636,10 @@ X_ip6_mrouter_done(void) } } bzero((caddr_t)mf6ctable, sizeof(mf6ctable)); + + V_ip6_mrouter = NULL; + V_ip6_mrouting_enabled = false; + V_ip6_mrouter_ver = 0; MFC6_UNLOCK(); callout_drain(&expire_upcalls_ch); @@ -644,13 +654,8 @@ X_ip6_mrouter_done(void) multicast_register_if6 = NULL; } - V_ip6_mrouter = NULL; - V_ip6_mrouter_ver = 0; - MROUTER6_UNLOCK(); MRT6_DLOG(DEBUG_ANY, "finished"); - - return (0); } static struct sockaddr_in6 sin6 = { sizeof(sin6), AF_INET6 }; @@ -1903,14 +1908,14 @@ ip6_mroute_modevent(module_t mod, int type, void *unused) break; case MOD_UNLOAD: - if (V_ip6_mrouter != NULL) - return EINVAL; + if (V_ip6_mrouting_enabled) + return (EBUSY); if (pim6_encap_cookie) { ip6_encap_detach(pim6_encap_cookie); pim6_encap_cookie = NULL; } - X_ip6_mrouter_done(); + ip6_mforward = NULL; ip6_mrouter_done = NULL; ip6_mrouter_get = NULL; diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h index 2f298df6a1ce..fda8c4308e86 100644 --- a/sys/netinet6/ip6_mroute.h +++ b/sys/netinet6/ip6_mroute.h @@ -273,8 +273,8 @@ struct rtdetq { /* XXX: rtdetq is also defined in ip_mroute.h */ #endif /* _KERNEL || KERNEL */ #ifdef _KERNEL -VNET_DECLARE(struct socket *, ip6_mrouter); /* multicast routing daemon */ -#define V_ip6_mrouter VNET(ip6_mrouter) +VNET_DECLARE(bool, ip6_mrouting_enabled); +#define V_ip6_mrouting_enabled VNET(ip6_mrouting_enabled) struct ifnet; struct ip6_hdr; @@ -286,7 +286,7 @@ extern int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, struct mbuf *); extern int (*ip6_mrouter_set)(struct socket *so, struct sockopt *sopt); extern int (*ip6_mrouter_get)(struct socket *so, struct sockopt *sopt); -extern int (*ip6_mrouter_done)(void); +extern void (*ip6_mrouter_done)(struct socket *so); extern int (*mrt6_ioctl)(u_long, caddr_t); #endif /* _KERNEL */ diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 4b0c08b4e493..b7ba3c4c080c 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -890,7 +890,8 @@ nonh6lookup: * above, will be forwarded by the ip6_input() routine, * if necessary. */ - if (V_ip6_mrouter && (flags & IPV6_FORWARDING) == 0) { + if (V_ip6_mrouting_enabled && + (flags & IPV6_FORWARDING) == 0) { /* * XXX: ip6_mforward expects that rcvif is NULL * when it is called from the originating path. diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c index d00a9c13ec8d..2b6cd3437d36 100644 --- a/sys/netinet6/mld6.c +++ b/sys/netinet6/mld6.c @@ -3063,7 +3063,7 @@ mld_dispatch_packet(struct mbuf *m) } im6o.im6o_multicast_hlim = 1; - im6o.im6o_multicast_loop = (V_ip6_mrouter != NULL); + im6o.im6o_multicast_loop = V_ip6_mrouting_enabled; im6o.im6o_multicast_ifp = ifp; if (m->m_flags & M_MLDV1) { diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 7deb605c07a2..f3153b5435e2 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -137,14 +137,14 @@ VNET_PCPUSTAT_SYSUNINIT(rip6stat); /* * The socket used to communicate with the multicast routing daemon. */ -VNET_DEFINE(struct socket *, ip6_mrouter); +VNET_DEFINE(bool, ip6_mrouting_enabled); /* * The various mrouter functions. */ int (*ip6_mrouter_set)(struct socket *, struct sockopt *); int (*ip6_mrouter_get)(struct socket *, struct sockopt *); -int (*ip6_mrouter_done)(void); +void (*ip6_mrouter_done)(struct socket *); int (*ip6_mforward)(struct ip6_hdr *, struct ifnet *, struct mbuf *); int (*mrt6_ioctl)(u_long, caddr_t); @@ -694,8 +694,8 @@ rip6_detach(struct socket *so) inp = sotoinpcb(so); KASSERT(inp != NULL, ("rip6_detach: inp == NULL")); - if (so == V_ip6_mrouter && ip6_mrouter_done) - ip6_mrouter_done(); + if (ip6_mrouter_done != NULL) + ip6_mrouter_done(so); /* xxx: RSVP */ INP_WLOCK(inp); free(inp->in6p_icmp6filt, M_PCB); From nobody Fri Feb 13 19:39:56 2026 X-Original-To: dev-commits-src-main@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 4fCMvQ0NBvz6Rh4s for ; Fri, 13 Feb 2026 19: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCMvP6qQqz3Hxn for ; Fri, 13 Feb 2026 19:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771011602; 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=RF/tqMiS+n9LEoEaql/sV0Sl9eBfjEfeA9ZkIvodpd8=; b=wRCvt+qoF8wfF2U1D6d5dD2wXaPeRuGmoLE5RbGVKwcJDVBJO+PVpLLZ21geAMhyP/gO8n uHDgeoZYgjWMfo7DKdORGyLpkUeShuLMKJE58g2K2uT2ztzxf6f9wPnRTk1kEIlEjB8bQa ZzHupH1U9Ln/ZUkD83Cc7hAon539XDhIiHdqNcTeKb29vx6el03NIMpRS3XrQSaw5Sr7OV RCkjCOe6KToGYun48YZnK3U16PF7Arqf4zXkDhvcniAwFHSOLLzixPKtRKPfNcCSnn1i+f Zt1OEueus1Yiy7isoNhaCI/VxmV2vdp8o3ESOWc+hP/HIXjH6h1mzNhQouYOAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771011602; a=rsa-sha256; cv=none; b=LS3u2U66gfGkdPgpgwSDa0hK4u2KoBMoCX2FO7De3FZ81IIQk36uyM8z85ajD07IjTktCV 1q/nJ3gVdS7+B7QpzYl10rR31WA7tztLejvpktTsFzpxnNMgdgcfgwnV5I0mhjg3kz3/BZ zDaWFz6l9mi/L6uGx/P3EDBSAo1kSQxtIaa3iR6/ojgPBrHHIDNiIsc19UHubD5YEp7Fir +7Sg5rFxxBz3xnfdxURd76zjpE7J/tlQcLpnDIFyVp0yXTrtPXiyRz0CDv84LS8XbER5b5 /y0eGSFwj6P3MM2MFThUgE4b8c+vfI6+X9j6sDcN0041fdr3drNBU1hz34/kBg== 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=1771011602; 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=RF/tqMiS+n9LEoEaql/sV0Sl9eBfjEfeA9ZkIvodpd8=; b=pBlJTJ0C6dnaZAOYpJACmP1eLI5Z0M05+bdgET5HAcr8HTOFztA3peXzhLHGCeF/M5gxPf UfMRR+7HFYFdoT9zwCCbZt0cXi5LKN2rZOvFxh6t1pHuKmPqFlTDp11JKpZ3nkV6NCjp8O bJ2eyROV2SXQdAzEH+ZVA4wztt+rxYECqYng4OSOY+EXN+hDgbdP7OU1mhWgfTLLQ/zbL0 27xa+twc/2bfGXUpClU76ov/78wGL65Q9sO13C/w3jqgSLrgP5PFj2vK7UfXk7rfUEyebB UupXyoBe4v6Q5x0A/L8HtBTJqajTQ94VYKcZwigCwdWrOgzy4GRVUZxOjpqWWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCMvP6QlQzbKZ for ; Fri, 13 Feb 2026 19:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41b00 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 19:39:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 596bf3485fe5 - main - bpf: don't call bpf_detachd() in bpf_setdlt() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 596bf3485fe5dd62991e0f49ee783bc91d83678c Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 19:39:56 +0000 Message-Id: <698f7e0c.41b00.34065fc8@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=596bf3485fe5dd62991e0f49ee783bc91d83678c commit 596bf3485fe5dd62991e0f49ee783bc91d83678c Author: Gleb Smirnoff AuthorDate: 2026-02-12 20:11:09 +0000 Commit: Gleb Smirnoff CommitDate: 2026-02-13 19:39:37 +0000 bpf: don't call bpf_detachd() in bpf_setdlt() The bpf_attachd() will perform bpf_detachd() itself. Performing it twice will lead to doing CK_LIST_REMOVE twice. Reported & tested by: bz --- sys/net/bpf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 228ac9867bd7..05877f6410a4 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -2821,7 +2821,6 @@ bpf_setdlt(struct bpf_d *d, u_int dlt) return (EINVAL); opromisc = d->bd_promisc; - bpf_detachd(d, false); bpf_attachd(d, bp); if (opromisc) { error = bp->bif_methods->bif_promisc(bp->bif_softc, true); From nobody Fri Feb 13 20:19:31 2026 X-Original-To: dev-commits-src-main@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 4fCNmz6F2gz6RlPj for ; Fri, 13 Feb 2026 20:19:31 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCNmz5HcMz3Mpw for ; Fri, 13 Feb 2026 20:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771013971; 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=u+jct1HMPilPlcaPNRYv0bSeK6C4KoMchRuCQeOLdJM=; b=NwfCZyf+8tHzkC7YJuvo5FBeZ6iq5WwMzVzU4W3Lw2bH5IyX05In9FNcHGpOIJnTv6i/Qv 4hB7pyZvycZAPkd8LVlPjx8ZdNfdYVanqqCwmDRUPdiaEgAuqsyyAmrZtT9XhTIRQ1ezL+ i8hgaG7pDE1aVV++b4nrIwymYaYoqUD0UveFNOp8dxrIIrr14IoDdjU7+iQAx12s0oCFad +EIvTYvZVGrDWUTkxB0U9wvDPvsZ/LhEU9ydSyrnstsGboTGMThWOXGkCncG6afrxcj6MC yJdnMRjmbljaBKbXKkW3rbQib3RsJrrVPDmFv64hKFz0+rCcwCqaYP46yoLB3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771013971; a=rsa-sha256; cv=none; b=v6geYo5VsdjPMgVs2eW5WafSj4aL9tWu/JUUFJKF9lk6r0YMCbif1kY16yAc1B1Nl9u+/W Nw0EbR0mY06LthvlAQqQqaSKGvqEnKnUzjDiWL+Ah/TILWbk1CY4kD6iYXkzXMKB/DMZ1A 3GkoFITsY3KVBRGHqJqiX47J0fUT5LnxC8ZDm9YvazokA1CBS94qvc4IOKDLdfRIRJbE+A x7tW8JpO+gDkRwyoyAh3ao40bHHI696rBKwpmb8YTb6vGgwaDkywE3ZFE71b/Iw2Wizqqf 3AEfQFZIxWDMgh9qbJ9HFxvN6M+NHQQIsQbzcpMAW5Z30XVqZzdZv9pXamK2ig== 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=1771013971; 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=u+jct1HMPilPlcaPNRYv0bSeK6C4KoMchRuCQeOLdJM=; b=qf/flq0LRb/SiJII+kGvX+EEb5YJCoJjtuxRrWjSi6kG5CkZmDeh4OHN5MIinigbljovaC eZCCQMIWpkP+H1CEE5frzfEy1LSJTKkIdF4ca80cOJcNxU7ojDfKy+js+tIUt9+LzS2YAW om3Sq7DKY22ozOWbFjfOdxQgPRL2GtgpGNPU764zsTTWPPAa9SXLedY1NcW8BcB7qbbBmV XeZQZqJTJNlbjCoKl+Bl1xHm9FtZE2Ew4gnTDeA1hgk6c5V9kUx1qh9E9SGMFR+FP2ZSqx v0AmcGRhNUVtILBfhVeqbBIEsLuY8bxwI8aa0xQomRIfsoBBB8/bM8MJV+TSCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCNmz4c1hzcm0 for ; Fri, 13 Feb 2026 20:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44d0a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 20:19:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 790f1d1cc5fa - main - diff: Tweak range of -C and -U arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 790f1d1cc5fa892ba59fd7f239b22064c8ab14c7 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 20:19:31 +0000 Message-Id: <698f8753.44d0a.36173b26@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=790f1d1cc5fa892ba59fd7f239b22064c8ab14c7 commit 790f1d1cc5fa892ba59fd7f239b22064c8ab14c7 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:24 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 20:19:16 +0000 diff: Tweak range of -C and -U arguments POSIX uses the terms “positive decimal integer” for -C and “non-negative decimal integer” for -U, which translates into lower bounds of 1 for -C and 0 for -U. POSIX does not specify a minimum upper bound for either mode, but as of 5fc739eb5949 both our backends support context sizes up to and including INT_MAX, so use that. Having had the opportunity to consult the Unix System Test Suite, the diff test cases found therein happen to precisely match these bounds. While here, switch to using strtonum() to parse numerical arguments, and try to be more consistent in how we report usage errors. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55261 --- usr.bin/diff/diff.c | 44 +++++++++++++++++------------ usr.bin/diff/tests/diff_test.sh | 62 +++++++++++++++++++++++++---------------- 2 files changed, 64 insertions(+), 42 deletions(-) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 9bf3f2ad79eb..b5fa12268bac 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -137,10 +137,9 @@ static bool do_color(void); int main(int argc, char **argv) { - const char *errstr = NULL; - char *ep, **oargv; - long l; - int ch, dflags, lastch, gotstdin, prevoptind, newarg; + const char *errstr; + char **oargv; + int ch, dflags, lastch, gotstdin, prevoptind, newarg; oargv = argv; gotstdin = 0; @@ -177,7 +176,7 @@ main(int argc, char **argv) } if (diff_algorithm == D_DIFFNONE) { - printf("unknown algorithm: %s\n", optarg); + warnx("unknown algorithm: %s", optarg); usage(); } break; @@ -194,10 +193,13 @@ main(int argc, char **argv) cflag = true; diff_format = D_CONTEXT; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 1, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'd': @@ -294,10 +296,13 @@ main(int argc, char **argv) conflicting_format(); diff_format = D_UNIFIED; if (optarg != NULL) { - l = strtol(optarg, &ep, 10); - if (*ep != '\0' || l < 0 || l >= INT_MAX) + diff_context = (int) strtonum(optarg, + 0, INT_MAX, &errstr); + if (errstr != NULL) { + warnx("context size is %s: %s", + errstr, optarg); usage(); - diff_context = (int)l; + } } break; case 'w': @@ -305,8 +310,8 @@ main(int argc, char **argv) break; case 'W': width = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) { - warnx("Invalid argument for width"); + if (errstr != NULL) { + warnx("width is %s: %s", errstr, optarg); usage(); } break; @@ -346,8 +351,8 @@ main(int argc, char **argv) break; case OPT_TSIZE: tabsize = (int) strtonum(optarg, 1, INT_MAX, &errstr); - if (errstr) { - warnx("Invalid argument for tabsize"); + if (errstr != NULL) { + warnx("tabsize is %s: %s", errstr, optarg); usage(); } break; @@ -364,9 +369,12 @@ main(int argc, char **argv) colorflag = COLORFLAG_ALWAYS; else if (strncmp(optarg, "never", 5) == 0) colorflag = COLORFLAG_NEVER; - else - errx(2, "unsupported --color value '%s' (must be always, auto, or never)", - optarg); + else { + warnx("unsupported --color value " + "(must be always, auto, or never): " + "%s", optarg); + usage(); + } break; case OPT_NO_DEREFERENCE: noderef = true; diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 0d3acf50edf9..3afd12355a80 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -24,8 +24,8 @@ atf_test_case functionname atf_test_case noderef atf_test_case ignorecase atf_test_case dirloop -atf_test_case bigc -atf_test_case bigu +atf_test_case crange +atf_test_case urange atf_test_case prleak atf_test_case same @@ -389,34 +389,48 @@ dirloop_body() atf_check diff -r a b } -bigc_head() +crange_head() { - atf_set "descr" "Context diff with very large context" + atf_set "descr" "Context diff context length range" } -bigc_body() +crange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -C$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'--- 1,3 ---' \ - diff -C$(((1<<31)-2)) a b - atf_check -s exit:1 -o match:'--- 1,3 ---' \ - diff -Astone -C$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -C-1 a b + atf_check -s exit:2 -e match:'too small' \ + diff -C0 a b + atf_check -s exit:1 -o match:'--- 2,4 ---' \ + diff -C1 a b + atf_check -s exit:1 -o match:'--- 2,4 ---' \ + diff -Astone -C1 a b + atf_check -s exit:2 -e match:'too large' \ + diff -C$((1<<31)) a b + atf_check -s exit:1 -o match:'--- 1,5 ---' \ + diff -C$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'--- 1,5 ---' \ + diff -Astone -C$(((1<<31)-1)) a b } -bigu_head() +urange_head() { - atf_set "descr" "Unified diff with very large context" + atf_set "descr" "Unified diff context length range" } -bigu_body() +urange_body() { - echo $'x\na\ny' >a - echo $'x\nb\ny' >b - atf_check -s exit:2 -e ignore diff -U$(((1<<31)-1)) a b - atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ - diff -U$(((1<<31)-2)) a b - atf_check -s exit:1 -o match:'^@@ -1,3 \+1,3 @@$' \ - diff -Astone -U$(((1<<31)-2)) a b + echo $'x\nx\na\ny\ny' >a + echo $'x\nx\nb\ny\ny' >b + atf_check -s exit:2 -e match:'too small' \ + diff -U-1 a b + atf_check -s exit:1 -o match:'^@@ -3 \+3 @@$' \ + diff -U0 a b + atf_check -s exit:2 -e match:'too large' \ + diff -U$((1<<31)) a b + atf_check -s exit:1 -o match:'^@@ -1,5 \+1,5 @@$' \ + diff -U$(((1<<31)-1)) a b + atf_check -s exit:1 -o match:'^@@ -1,5 \+1,5 @@$' \ + diff -Astone -U$(((1<<31)-1)) a b } prleak_head() @@ -485,8 +499,8 @@ atf_init_test_cases() atf_add_test_case noderef atf_add_test_case ignorecase atf_add_test_case dirloop - atf_add_test_case bigc - atf_add_test_case bigu + atf_add_test_case crange + atf_add_test_case urange atf_add_test_case prleak atf_add_test_case same } From nobody Fri Feb 13 20:19:32 2026 X-Original-To: dev-commits-src-main@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 4fCNn11KLYz6RlXS for ; Fri, 13 Feb 2026 20:19:33 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCNn05pKMz3MkW for ; Fri, 13 Feb 2026 20:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771013972; 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=O9xeOvlwq53kj/FRNCa/M1CjigxedZn1UGFgZnHOsUw=; b=EnXh1pO0w0lk859zI9CMWUTMETFIDcT6UMF00Yz38F3tNI3RX8cGrwYVfMLoXpUDwIJ0dz D/TCe65rt2oKlOjJBiliK/BauzMKctVxDjfLXGFMPL3bmF5JWe7KOLFzgCJozo/x7vVAPe NYyoWY5Rwm37GQ1hBrqAPcqiMWMf3GOKi3HaPb8F0+iRo90ALLt4GSBUHjTtbhX9YCMkrc B2aCFnq6ZNXnMHsHBHTvXH3o0b93wdQENXqHwV/DSUxfbp7kd59bhxjvfjcSdBT2MuyTwH +Hw1ljP0DOl+dRBZixXpJ3SFvRua9Y3zveuH5xNLFO+AQiQAkkPIaRisjbnvRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771013972; a=rsa-sha256; cv=none; b=pPwmhESE+IbQPtay3+6tUI2jXQ3SMJa0hresCjTmMupfLk39gqTPjuTo2E+zDm0q9Fcktf kPSm6d0PrAuDYCHOJsKikrXR90GQ9Ol64e7jYeBKIjitMoMwZ5gNsc6QgS0WT9/zKfABLy hBYCO1FGkLTZzHJkzIWfezMvwaIcIJ6B3ppP9JTbu0dbQ3hd9Xwpz9QHfUW6Y67JOs+yIm lkvXy4aDGx04xhmmzhOQVbXgdfU0qK+y/DPy4Qg/8Y+j26OZEwSlXIPQtRO0XZ8PL8NgV/ ccAWUIbc0cVbgBdo6dozpeXgVKqHaZl02B37EAJ62RNTF78OnxQEGb+p+zjsEA== 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=1771013972; 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=O9xeOvlwq53kj/FRNCa/M1CjigxedZn1UGFgZnHOsUw=; b=NYKu00VUIt3MfhHTJyO1qU/4lHZcfPrXqvJvsCcOFUXnC8/1Gtqr+Fra/CADN19kZpXdAO fRTebS3z+Hi9rTWLnGFZC1YGAbW2Ya1mbph6F4KOGru+lajUHC6gGhrj6+RktDaOqfsjah 0V9TY4sGs0XcKcXQWjqsFBatCvwl2Y488o5gvAqzXPITBSyOQlgbQXhuh1L1cNE0dEQ3K/ TmhJMqjGPeeDnoPg3TK6aBHPnmfxRluV6WM8LnwnVio9CKKh3WKaA4CUt5Hj77q3IVkffm n+18Iv8tZFQUDvD16wlyU+ZDtMes6/PucNsKG6xPxF6xfEhj5ImzxVNOgBy56g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCNn05PFhzcm1 for ; Fri, 13 Feb 2026 20:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44e85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 20:19:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b2532432971f - main - diff: Tweak recursion tests List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2532432971fbd9339a9a49eca1b532978bb6d48 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 20:19:32 +0000 Message-Id: <698f8754.44e85.e3b0f75@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b2532432971fbd9339a9a49eca1b532978bb6d48 commit b2532432971fbd9339a9a49eca1b532978bb6d48 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 20:19:16 +0000 diff: Tweak recursion tests The -r flag is not required to compare two directories; it is only required to compare them recursively, i.e. descend into their common subdirectories. Adjust tests that use -r needlessly, and adjust the dirloop test to verify that these two cases remain distinct. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55262 --- usr.bin/diff/tests/diff_test.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/usr.bin/diff/tests/diff_test.sh b/usr.bin/diff/tests/diff_test.sh index 3afd12355a80..872103b24cef 100755 --- a/usr.bin/diff/tests/diff_test.sh +++ b/usr.bin/diff/tests/diff_test.sh @@ -1,4 +1,3 @@ - atf_test_case simple atf_test_case unified atf_test_case header @@ -191,19 +190,19 @@ brief_format_body() atf_check \ -s exit:1 \ -o inline:"Files A/test-file and B/test-file differ\n" \ - diff -rq A B + diff -q A B atf_check diff -rq A C atf_check \ -s exit:1 \ -o inline:"Only in D: another-test-file\n" \ - diff -rq A D + diff -q A D atf_check \ -s exit:1 \ -o inline:"Files A/another-test-file and D/another-test-file differ\n" \ - diff -Nrq A D + diff -Nq A D } Bflag_body() @@ -225,9 +224,9 @@ Nflag_body() { atf_check -x 'printf "foo" > A' - atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE - atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A - atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 + atf_check -s exit:1 -o ignore -e ignore diff -N A NOFILE + atf_check -s exit:1 -o ignore -e ignore diff -N NOFILE A + atf_check -s exit:2 -o ignore -e ignore diff -N NOFILE1 NOFILE2 } tabsize_body() @@ -339,23 +338,23 @@ noderef_body() atf_check ln -s $(pwd)/test-file B/test-file - atf_check -o empty -s exit:0 diff -r A B + atf_check -o empty -s exit:0 diff A B atf_check -o inline:"File A/test-file is a file while file B/test-file is a symbolic link\n" \ - -s exit:1 diff -r --no-dereference A B + -s exit:1 diff --no-dereference A B # both test files are now the same symbolic link atf_check rm A/test-file atf_check ln -s $(pwd)/test-file A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o empty -s exit:0 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o empty -s exit:0 diff --no-dereference A B # make test files different symbolic links, but same contents atf_check unlink A/test-file atf_check ln -s $(pwd)/test-file2 A/test-file - atf_check -o empty -s exit:0 diff -r A B - atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff -r --no-dereference A B + atf_check -o empty -s exit:0 diff A B + atf_check -o inline:"Symbolic links A/test-file and B/test-file differ\n" -s exit:1 diff --no-dereference A B } ignorecase_body() @@ -366,7 +365,7 @@ ignorecase_body() atf_check -x "echo hello > A/foo" atf_check -x "echo hello > B/FOO" - atf_check -o empty -s exit:0 diff -u -r --ignore-file-name-case A B + atf_check -o empty -s exit:0 diff -u --ignore-file-name-case A B } dirloop_head() @@ -378,6 +377,9 @@ dirloop_body() atf_check mkdir -p a/foo/bar atf_check ln -s .. a/foo/bar/up atf_check cp -a a b + atf_check \ + -o inline:"Common subdirectories: a/foo and b/foo\n" \ + diff a b atf_check \ -e match:"a/foo/bar/up: Directory loop detected" \ -e match:"b/foo/bar/up: Directory loop detected" \ From nobody Fri Feb 13 20:19:33 2026 X-Original-To: dev-commits-src-main@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 4fCNn26zg1z6RlSJ for ; Fri, 13 Feb 2026 20:19:34 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCNn24Tmtz3Mt1 for ; Fri, 13 Feb 2026 20:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771013974; 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=8d3TSHxFfGM35Mc3Qs4NocbkFNx9YAZFu96+GxYDh0g=; b=C9FtAGTf1y5wb09EA9qZuvVuleNAHd/5BvWEDAzaxoZX4Js2C/iIR7ZnJiJdQZtHQf9Rh0 Wh5y9m56TjMJGvlgUeuxVAxKBbOVWOaHzRHJYGbid8hmLt5Wv4f7JItszSd9SMlHAEWWlJ MCpuSBnhPJItgcVFtOuEPX5fD4aXx6dM3dEG8x7OqYdOe2matTSFWGXJXG8Rvl4p83VCau gyppeXqjedLBxS3vvnuwBuvA3mW4gZNFatJOmAAsLfyYmPnyJaAaqUkbkZC8Hx05hdm4VF OdDoKS8G4ZtC6vMXi24DOq45ebzZAJiAnwx2PsV/ZnookijEIWh6CZUXvOAMsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771013974; a=rsa-sha256; cv=none; b=M+6eUuBmZog5vksMUDWdOBpIf2345tQm6PdEUIdJMPH9BZbVN9up9j9aGCREfcwcVVq33H k2rtafgwM3nGRcRB6p0g5IgXmhuCAtm7+ROx0qEXbi28tfffnWn2SwGHj3mE1YVXjvmxQ0 RkAhdy1Gf9FbPUDfnZDwuCUG6t/UXi5sEUq1Rex2xhFIQoCWDP9jWR2AUhWv46sIjO6pj4 pCT0cM5nm7JPchi1EYLegrp5g2pu4JW0MoLRcK27G4n+kCokeI3cCHjm0w4OHBOjp86hE5 U9f3FBuLzHZQm3aXTpoI7XBi85iYAm0PTXY54c3c8LuFaQhlMdL0BWakHdVjXw== 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=1771013974; 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=8d3TSHxFfGM35Mc3Qs4NocbkFNx9YAZFu96+GxYDh0g=; b=dtYitVmy0endTcr/QqMwbyvyCifzp6Zt9RHl7VfYoZoiSSKnDB5Bq/u394QVOOEARgxb7p lciLhIhbKSFA3CJbJJoFlaNF2W0zKE/dRfa1Fbfno+NIftecaMLXcvuDZULK8od/sM9doY +T7y8WKyfyyATDX79z04TCLidzWAZ+Ka336pm8icsS8QAPX5Ksz9bHvcgpmOtgmh3nrl43 NYvRXrBsRl/4rOliamNtCSGSqDz4hGZWfvU6ojJ969hQpLXF7RxruZV/CQP4jqAqkCTE0b pvdqr/uUkSyiSBoxov8GXJRVhAGoDvosyS53Xs8o90cJBZ2Qf5uluRqgn4KAlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCNn16Bnbzcjd for ; Fri, 13 Feb 2026 20:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45482 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 20:19:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 08208cd69481 - main - timeout: Clean up List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08208cd694815cc855835960f55231342eb35934 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 20:19:33 +0000 Message-Id: <698f8755.45482.40251fe5@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=08208cd694815cc855835960f55231342eb35934 commit 08208cd694815cc855835960f55231342eb35934 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-13 20:18:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-13 20:19:16 +0000 timeout: Clean up * Annotate logv() and fix format string bug. * Don't reinvent str2sig(3). * Reorganize kill_self() so we unblock signals as late as possible, and use raise(2) instead of kill(2). * Explicitly close unused pipe descriptors. * Use correct type to collect result of read(2) and write(2). * Compare return values to 0, not -1. * Sort local variables according to style(9). * Reduce unnecessary nesting. * Reindent. * Fix typo in manual page. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D55277 --- bin/timeout/timeout.1 | 2 +- bin/timeout/timeout.c | 156 +++++++++++++++++++++++--------------------------- 2 files changed, 73 insertions(+), 85 deletions(-) diff --git a/bin/timeout/timeout.1 b/bin/timeout/timeout.1 index 6486ccf99a36..0a9754a2cc4e 100644 --- a/bin/timeout/timeout.1 +++ b/bin/timeout/timeout.1 @@ -188,7 +188,7 @@ will terminate itself with the same signal if the is terminated by a signal. .Pp If an error occurred, the following exit values are returned: -.Bl -tag -offset indent with indent -compact +.Bl -tag -offset indent -width indent -compact .It 125 An error other than the two described below occurred. For example, an invalid duration or signal was specified. diff --git a/bin/timeout/timeout.c b/bin/timeout/timeout.c index 58a5797f3eaf..5f045653f35b 100644 --- a/bin/timeout/timeout.c +++ b/bin/timeout/timeout.c @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include #include #include +#include #include #include #include @@ -60,14 +60,14 @@ static void __dead2 usage(void) { fprintf(stderr, - "Usage: %s [-f | --foreground] [-k time | --kill-after time]" - " [-p | --preserve-status] [-s signal | --signal signal] " - " [-v | --verbose] [arg ...]\n", - getprogname()); + "Usage: %s [-f | --foreground] [-k time | --kill-after time]" + " [-p | --preserve-status] [-s signal | --signal signal] " + " [-v | --verbose] [arg ...]\n", + getprogname()); exit(EXIT_FAILURE); } -static void +static void __printflike(1, 2) logv(const char *fmt, ...) { va_list ap; @@ -118,26 +118,6 @@ parse_duration(const char *duration) return (ret); } -static int -parse_signal(const char *str) -{ - int sig, i; - const char *errstr; - - sig = strtonum(str, 1, sys_nsig - 1, &errstr); - if (errstr == NULL) - return (sig); - - if (strncasecmp(str, "SIG", 3) == 0) - str += 3; - for (i = 1; i < sys_nsig; i++) { - if (strcasecmp(str, sys_signame[i]) == 0) - return (i); - } - - errx(EXIT_INVALID, "invalid signal"); -} - static void sig_handler(int signo) { @@ -188,28 +168,22 @@ static void send_sig(pid_t pid, int signo, bool foreground) { struct procctl_reaper_kill rk; - int error; logv("sending signal %s(%d) to command '%s'", - sys_signame[signo], signo, command); + sys_signame[signo], signo, command); if (foreground) { - if (kill(pid, signo) == -1) { - if (errno != ESRCH) - warn("kill(%d, %s)", (int)pid, - sys_signame[signo]); - } + if (kill(pid, signo) < 0 && errno != ESRCH) + warn("kill(%d, %s)", (int)pid, sys_signame[signo]); } else { memset(&rk, 0, sizeof(rk)); rk.rk_sig = signo; - error = procctl(P_PID, getpid(), PROC_REAP_KILL, &rk); - if (error == 0 || (error == -1 && errno == ESRCH)) - ; - else if (error == -1) { + if (procctl(P_PID, getpid(), PROC_REAP_KILL, &rk) < 0 && + errno != ESRCH) { warn("procctl(PROC_REAP_KILL)"); - if (rk.rk_fpid > 0) - warnx( - "failed to signal some processes: first pid=%d", - (int)rk.rk_fpid); + if (rk.rk_fpid > 0) { + warnx("failed to signal some processes:" + " first pid=%d", (int)rk.rk_fpid); + } } logv("signaled %u processes", rk.rk_killed); } @@ -222,7 +196,7 @@ send_sig(pid_t pid, int signo, bool foreground) */ if (signo != SIGKILL && signo != SIGSTOP && signo != SIGCONT) { logv("sending signal %s(%d) to command '%s'", - sys_signame[SIGCONT], SIGCONT, command); + sys_signame[SIGCONT], SIGCONT, command); if (foreground) { kill(pid, SIGCONT); } else { @@ -245,7 +219,7 @@ set_interval(double iv) tim.it_value.tv_usec = (suseconds_t)(iv * 1000000UL); } - if (setitimer(ITIMER_REAL, &tim, NULL) == -1) + if (setitimer(ITIMER_REAL, &tim, NULL) < 0) err(EXIT_FAILURE, "setitimer()"); } @@ -261,20 +235,20 @@ kill_self(int signo) sigset_t mask; struct rlimit rl; + logv("killing self with signal %s(%d)", sys_signame[signo], signo); + + /* Disable core generation. */ + memset(&rl, 0, sizeof(rl)); + setrlimit(RLIMIT_CORE, &rl); + /* Reset the signal disposition and make sure it's unblocked. */ signal(signo, SIG_DFL); sigfillset(&mask); sigdelset(&mask, signo); sigprocmask(SIG_SETMASK, &mask, NULL); - /* Disable core generation. */ - memset(&rl, 0, sizeof(rl)); - setrlimit(RLIMIT_CORE, &rl); - - logv("killing self with signal %s(%d)", sys_signame[signo], signo); - kill(getpid(), signo); - err(128 + signo, "signal %s(%d) failed to kill self", - sys_signame[signo], signo); + raise(signo); + err(128 + signo, "raise(%d)", signo); } static void @@ -285,7 +259,7 @@ log_termination(const char *name, const siginfo_t *si) } else if (si->si_code == CLD_DUMPED || si->si_code == CLD_KILLED) { logv("%s: pid=%d, sig=%d", name, si->si_pid, si->si_status); } else { - logv("%s: pid=%d, reason=%d, status=%d", si->si_pid, + logv("%s: pid=%d, reason=%d, status=%d", name, si->si_pid, si->si_code, si->si_status); } } @@ -293,22 +267,23 @@ log_termination(const char *name, const siginfo_t *si) int main(int argc, char **argv) { + struct procctl_reaper_status info; + siginfo_t si, child_si; + struct sigaction sa; + sigset_t zeromask, allmask, oldmask; + double first_kill; + double second_kill = 0; + ssize_t error; + pid_t pid; + int pp[2]; int ch, sig; int pstat = 0; - pid_t pid; - int pp[2], error; char c; - double first_kill; - double second_kill = 0; bool foreground = false; bool preserve = false; bool timedout = false; bool do_second_kill = false; bool child_done = false; - sigset_t zeromask, allmask, oldmask; - struct sigaction sa; - struct procctl_reaper_status info; - siginfo_t si, child_si; const char optstr[] = "+fhk:ps:v"; const struct option longopts[] = { @@ -334,7 +309,8 @@ main(int argc, char **argv) preserve = true; break; case 's': - killsig = parse_signal(optarg); + if (str2sig(optarg, &killsig) != 0) + errx(EXIT_INVALID, "invalid signal"); break; case 'v': verbose = true; @@ -358,22 +334,22 @@ main(int argc, char **argv) if (!foreground) { /* Acquire a reaper */ - if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) == -1) + if (procctl(P_PID, getpid(), PROC_REAP_ACQUIRE, NULL) < 0) err(EXIT_FAILURE, "procctl(PROC_REAP_ACQUIRE)"); } /* Block all signals to avoid racing against the child. */ sigfillset(&allmask); - if (sigprocmask(SIG_BLOCK, &allmask, &oldmask) == -1) + if (sigprocmask(SIG_BLOCK, &allmask, &oldmask) < 0) err(EXIT_FAILURE, "sigprocmask()"); - if (pipe2(pp, O_CLOEXEC) == -1) + if (pipe2(pp, O_CLOEXEC) < 0) err(EXIT_FAILURE, "pipe2"); pid = fork(); - if (pid == -1) { + if (pid < 0) err(EXIT_FAILURE, "fork()"); - } else if (pid == 0) { + if (pid == 0) { /* * child process * @@ -382,11 +358,12 @@ main(int argc, char **argv) * inherited, except for the signal to be sent upon timeout. */ signal(killsig, SIG_DFL); - if (sigprocmask(SIG_SETMASK, &oldmask, NULL) == -1) + if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0) err(EXIT_FAILURE, "sigprocmask(oldmask)"); + (void)close(pp[1]); error = read(pp[0], &c, 1); - if (error == -1) + if (error < 0) err(EXIT_FAILURE, "read from control pipe"); if (error == 0) errx(EXIT_FAILURE, "eof from control pipe"); @@ -396,6 +373,7 @@ main(int argc, char **argv) } /* parent continues here */ + (void)close(pp[0]); /* Catch all signals in order to propagate them. */ memset(&sa, 0, sizeof(sa)); @@ -403,25 +381,36 @@ main(int argc, char **argv) sa.sa_handler = sig_handler; sa.sa_flags = SA_RESTART; for (sig = 1; sig < sys_nsig; sig++) { - if (sig == SIGKILL || sig == SIGSTOP || sig == SIGCONT || - sig == SIGTTIN || sig == SIGTTOU) - continue; - if (sigaction(sig, &sa, NULL) == -1) - err(EXIT_FAILURE, "sigaction(%d)", sig); + switch (sig) { + case SIGTTIN: + case SIGTTOU: + /* Don't stop if background child needs TTY */ + if (signal(sig, SIG_IGN) == SIG_ERR) + err(EXIT_FAILURE, "signal(%d)", sig); + break; + case SIGKILL: + case SIGSTOP: + case SIGCONT: + /* These can't be caught or ignored */ + break; + default: + if (sigaction(sig, &sa, NULL) < 0) + err(EXIT_FAILURE, "sigaction(%d)", sig); + } } - /* Don't stop if background child needs TTY */ - signal(SIGTTIN, SIG_IGN); - signal(SIGTTOU, SIG_IGN); - + /* Start the timer */ set_interval(first_kill); + + /* Let the child know we're ready */ error = write(pp[1], "a", 1); - if (error == -1) + if (error < 0) err(EXIT_FAILURE, "write to control pipe"); if (error == 0) errx(EXIT_FAILURE, "short write to control pipe"); - sigemptyset(&zeromask); + (void)close(pp[1]); + sigemptyset(&zeromask); for (;;) { sigsuspend(&zeromask); @@ -430,9 +419,8 @@ main(int argc, char **argv) for (;;) { memset(&si, 0, sizeof(si)); - error = waitid(P_ALL, -1, &si, WEXITED | - WNOHANG); - if (error == -1) { + if (waitid(P_ALL, -1, &si, + WEXITED | WNOHANG) < 0) { if (errno != EINTR) break; } else if (si.si_pid == pid) { @@ -456,7 +444,7 @@ main(int argc, char **argv) break; } else { procctl(P_PID, getpid(), - PROC_REAP_STATUS, &info); + PROC_REAP_STATUS, &info); if (info.rs_children == 0) break; } @@ -471,7 +459,7 @@ main(int argc, char **argv) sig = sig_term; sig_term = 0; logv("received terminating signal %s(%d)", - sys_signame[sig], sig); + sys_signame[sig], sig); } send_sig(pid, sig, foreground); From nobody Fri Feb 13 20:20:04 2026 X-Original-To: dev-commits-src-main@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 4fCNnc6MCCz6RlgW for ; Fri, 13 Feb 2026 20:20:04 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCNnc5dkzz3Nwk for ; Fri, 13 Feb 2026 20:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771014004; 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=3+56xX5dlLXj+I2NOLsfrknX2RnoMYqSX1gccQfzpHo=; b=DKqKfRZfBqmAOPsEKbvjpXSTOLzPOyBOqsegC0F5pjOb0t6wx8Cwtm9tjCXVigYI8HkH4n Iwino7FkEAGdjypytbuqfFRR0wSLKaC/ZCqJcRABLy9RIYaSbaeayyG5dO5/cxeJ8Sgpqb OVnXppQKg2PhdVrnAOeanbZtdMyYIrN9vIl3Yo7lE3qYfWYZLLKXMWbitsaRG5spj9m4gr jEXEewX5NRdlXr8UXWEMACRtqGomD8tKwe+BtiuX/XW2NghB9XY8L2qib1em9lxiZXSIbA UDtZi++X7kYVJgAt3D88wfWnaI/MJn4xDHzbQk/jALYvbOaesN1lfDtVqW/ubw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771014004; a=rsa-sha256; cv=none; b=VTBwyaICgC0rrphitmqAOcqix5J9j7XzVyvWmhAaR2GVRc/YJdjacUne7y9z+THD+7ph2l j2QfvuPyFVGXBvkpGNE2YUkv4C9eICUNC1/+/DfxJs3xdCmrxeMWEl0BzN1BMeaAzGXO20 UG6+lrt73mYG2WFwyq3P3ofpur3VXJzDYpEFgR1FOetBFkHpDcefjwdTn6cpL15akaWLVN MNh1JQH2Xc3BJOncrdnKKng/NeG8Rd2MnFDZ62mPErZP8Y4hhoGYDfbpx4tmrzuwU3VOAn EkkHVOsTYOXNkdpOpVhbnBWE9J7NSLXU4l63VYH2jWGUdgq5sVWnfsq4jrqFJQ== 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=1771014004; 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=3+56xX5dlLXj+I2NOLsfrknX2RnoMYqSX1gccQfzpHo=; b=RQ+rYOq+T5MdmXD9ZdVNauI0Tw7Z71+X7w9UFtxCs/utBDXnN4k3HjHntdqUs+WNRZCUCp s1Hjx1ddQgjHMK5NAwFopb4Hl7jZSViPxF78v/bI2XvBMEKXaLTjeskQ0cQ/Kq/aMBY/RH EhbqgGG0NVMqQYhkmmPI1DRaZGw0pTsFDFkP3osqHMBfzej4DTVoD+Ih2kv8yswkiEwB2y 9HN52chjshAhLxk4v24h2FhKHhRl0BzQFaGO0htPHhhzNRKXLAD/BPhlYpUWJ9nKepWMNw xMZUTyEZz1/jGdNQm3QS35nzC62dgAdd5gPYOm2cYniCN1L9ECwVPJrIsM9Caw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCNnc55lTzcjg for ; Fri, 13 Feb 2026 20:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 454b3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 20:20:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fd52a9becc62 - main - diff3: Use a format string to quiet a compiler warning List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd52a9becc62f721ad6a61c7301559afaedee010 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 20:20:04 +0000 Message-Id: <698f8774.454b3.4117bf11@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fd52a9becc62f721ad6a61c7301559afaedee010 commit fd52a9becc62f721ad6a61c7301559afaedee010 Author: Ed Maste AuthorDate: 2025-11-18 13:21:03 +0000 Commit: Ed Maste CommitDate: 2026-02-13 20:19:58 +0000 diff3: Use a format string to quiet a compiler warning And bump WARNS to 2 --- contrib/diff/src/diff3.c | 2 +- gnu/usr.bin/diff3/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/diff/src/diff3.c b/contrib/diff/src/diff3.c index d0e8137756db..3062f3419865 100644 --- a/contrib/diff/src/diff3.c +++ b/contrib/diff/src/diff3.c @@ -1405,7 +1405,7 @@ output_diff3 (FILE *outputfile, struct diff3_block *diff, line = 0; do { - fprintf (outputfile, line_prefix); + fprintf (outputfile, "%s", line_prefix); cp = D_RELNUM (ptr, realfile, line); length = D_RELLEN (ptr, realfile, line); fwrite (cp, sizeof (char), length, outputfile); diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 568733801a6b..8774039b5d08 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -17,6 +17,6 @@ CFLAGS+=-I${SRCTOP}/contrib/diff/lib CFLAGS+=-DHAVE_CONFIG_H CFLAGS+=-DDEFAULT_DIFF_PROGRAM=\"/usr/bin/diff\" -WARNS?= 0 +WARNS?= 2 .include From nobody Fri Feb 13 22:05:15 2026 X-Original-To: dev-commits-src-main@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 4fCR6z6thwz6RxZK for ; Fri, 13 Feb 2026 22:05:15 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCR6z6F90z3XkT for ; Fri, 13 Feb 2026 22:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771020315; 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=e2A7JTbTZF8Wf9O6zK/JF4zvGpCs8AiFSGrn5iQAC24=; b=O7mpmSOjltFqDBGXcNM4kQnKi/XN76ej0SwA+C3R23Zg5nhcd8ZlTjhAYkV7jtgQNp5XOS +cPtn4fQCtYBmLsOy7cPBOIOQ+ydHmpRzXL31QIdXiJnFhx71OaPnmpjcPFvb8RPjt6ML6 nc0tL/TuSgfxCrUZ2r+tLjhfHKzmK/n3CQ7YkV0VA5PWS4xL1cObjeo12ek1kIocZNNHwT fy4Em5xogrZ38NYxPvKjyAwT8pUgr6tBVXgKFTE6kgM9Uj42JojhJr9L8G2fAh/ptmO8FY yGUI9ANyROr4bEDCVcvrA8B0lPDJjEJFVlgTKkOigkoRCwzMyVfSXelXQr0+VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771020315; a=rsa-sha256; cv=none; b=ibKY+iExL73rB2SaesgbYeuEURN4CnxLEiV1J/2BMmGdNjBnTlVqucXJoljLQUPiQSLhAN 13wXfyBmU5D5CgYF/sfihixR7bm39Q+SxpncG4L00M3vvvO89EQ4USAvgT7PY+uBIgbX+Z k7pBOhaVenfpy3uvT285k2ykeKWSW5CfRJYXBepPD8FCob84WyppfaMeB7PPpkAAjetdNC sysg2eShS/xDIe+S1y0IHzDb0X77PwCUL6JNh4TQoaeMQHZJ6+biLmoSCbke4rKgJp7F/1 Q5/abRLGEgmJt0HSq/2vyz0gMYvEOqKoPako2uznW7C900bRItVr3wdnPafY/w== 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=1771020315; 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=e2A7JTbTZF8Wf9O6zK/JF4zvGpCs8AiFSGrn5iQAC24=; b=VFjrIFJUmCejhzbuIyWYHWPPyLdN7KA103jwflFpSEQDVZ5yl2HGhQ3MQ6ZCELdPpcZJse 3X+C3QQzPW7ZUGiipxqGr/eMCnnbnyrR3aCpQjiIF4t3yPzgX6n6UD2TOSGF0vjMVYlmq9 IRWbgZzlvBHGmQ4psmBn5or0Yl+cELauTQg0eGscEy02zbfRB7TDN7KzkQPyd5aitHkB+6 NtZBbJ2s1RZQJB0+9fnttbwILayFv+nbfu+z8QkaOBhXTVyjwkZnSt7IbLYgC8ZSgP8MSM N5TMbHZ2rH35KDrgX2gFDvScAfImt+4ppO1t7slEKPWwPS2TfO8dQLXJ5b9DiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCR6z5GYtzfvS for ; Fri, 13 Feb 2026 22:05:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 216e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 22:05:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Pouria Mousavizadeh Tehrani Subject: git: f2c2e5b0bf9d - main - multicast.4: Fix disabling multicast forwarding List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pouria X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2c2e5b0bf9def01b10651b9802fa38d07d9d265 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 22:05:15 +0000 Message-Id: <698fa01b.216e0.a0954c3@gitrepo.freebsd.org> The branch main has been updated by pouria: URL: https://cgit.FreeBSD.org/src/commit/?id=f2c2e5b0bf9def01b10651b9802fa38d07d9d265 commit f2c2e5b0bf9def01b10651b9802fa38d07d9d265 Author: Pouria Mousavizadeh Tehrani AuthorDate: 2026-02-12 23:06:15 +0000 Commit: Pouria Mousavizadeh Tehrani CommitDate: 2026-02-13 22:02:04 +0000 multicast.4: Fix disabling multicast forwarding Reviewed by: markj, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55266 --- share/man/man4/multicast.4 | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/share/man/man4/multicast.4 b/share/man/man4/multicast.4 index aa3293e107eb..84c6c5c4199b 100644 --- a/share/man/man4/multicast.4 +++ b/share/man/man4/multicast.4 @@ -23,7 +23,7 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.Dd May 27, 2009 +.Dd February 13, 2026 .Dt MULTICAST 4 .Os .\" @@ -124,15 +124,15 @@ Therefore, for portability reason the multicast routing socket should be reused for IGMP and MLD messages as well. .Pp After the multicast routing socket is open, it can be used to enable -or disable multicast forwarding in the kernel: +multicast forwarding in the kernel: .Bd -literal /* IPv4 */ -int v = 1; /* 1 to enable, or 0 to disable */ +int v = 1; setsockopt(mrouter_s4, IPPROTO_IP, MRT_INIT, (void *)&v, sizeof(v)); .Ed .Bd -literal /* IPv6 */ -int v = 1; /* 1 to enable, or 0 to disable */ +int v = 1; setsockopt(mrouter_s6, IPPROTO_IPV6, MRT6_INIT, (void *)&v, sizeof(v)); \&... /* If necessary, filter all ICMPv6 messages */ @@ -142,6 +142,24 @@ setsockopt(mrouter_s6, IPPROTO_ICMPV6, ICMP6_FILTER, (void *)&filter, sizeof(filter)); .Ed .Pp +When applied to the multicast routing socket, the +.Dv MRT_DONE +and +.Dv MRT6_DONE +socket options disable multicast forwarding in the kernel: +.Bd -literal +/* IPv4 */ +int v = 1; +setsockopt(mrouter_s4, IPPROTO_IP, MRT_DONE, (void *)&v, sizeof(v)); +.Ed +.Bd -literal +/* IPv6 */ +int v = 1; +setsockopt(mrouter_s6, IPPROTO_IPV6, MRT6_DONE, (void *)&v, sizeof(v)); +.Ed +.Pp +Closing the socket has the same effect. +.Pp After multicast forwarding is enabled, the multicast routing socket can be used to enable PIM processing in the kernel if we are running PIM-SM or PIM-DM From nobody Fri Feb 13 22:22:19 2026 X-Original-To: dev-commits-src-main@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 4fCRVg2Pjhz6S06G for ; Fri, 13 Feb 2026 22:22:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCRVg15XYz3Z34 for ; Fri, 13 Feb 2026 22:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771021339; 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=NuY8erCUEdCenb7JHnR2saOjjRLoYZOq9zDFHDKwluw=; b=Dser3EBZfG1e7uOx4lZr436cJJtF6PIajTH/o4J7zQpBoyuB1pfZWuqbt6yS3IrSuVluCP VAymwac2uAsSZkv9LC59OKRmN73TdMsYhstYREu6Z/KOZBRVqymD8SfBvl368/ZwhXOzXY w20JHBvYlcM3qncyVIsTfXEwO95qvO7zH1WE0jgNpIE6h8bBl6T7OcKURlekRJB6vs/yBI 0TTEJG9HWi5jnRnoSaaj66sb9xN2fdeIUHjIPmdMG/t8RirUQ0yJVnuY/K7P6tFP4H1dGQ lfk6P+BHAXQxrOTUvF+Zazn00TZDJJXzcPzx9Hm3XF2bWOdytb5+iVlFfqrM1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771021339; a=rsa-sha256; cv=none; b=vRGx+11NsBB6v4wPHqzvQaY+lzKQCWQYQB+NH6UzDKJthldnXx9jG/qb3MvVsLP7SRVQO+ qbE2D9iV0NXMNcgLYQYz/oNNrFPWzX98Zg4CbTn008q7TZmarzegZixPD01yxawZScA8nM 32+cwho3jgZgCpyS1zRaNcM8LyTWbBkok5JeT6/NSoY8cu8g4mGEd6Kpg9/uZFnBGzG7Os 78Cc3uy8HFVOk7Uf8xxoV65KnCdMyMo/5YW2wclOyUhtviy5aH4eeoZu1Etu943kci73Xa IyzwfHlR2Sis7OhskfhUbWvlkWoMjwb3uVwOKFiaryyynk1e5Kyr0GylQZjNZQ== 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=1771021339; 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=NuY8erCUEdCenb7JHnR2saOjjRLoYZOq9zDFHDKwluw=; b=NxHn9zakqClUNBXbYusHmUPMcM8LLHwSjWTaEpaG4X1lC/X+DIzaEPc0zeJAQQYnnOFCZd O9zm/eCFU6SiMXxjCn9Dwo3BfrdSQROj1IFWN3eTuCo3BLBFTaJ3M6DeqNiVAOpxm+Sv7/ 46fN6gY5v2FEeB7tLhGCecxIwNjmf/dHiQpT3xNuC2weTB8l0SVbKG8nPXey0BAg7djXRA uWb49e7X4y9PbkZQtvacPAtluFLlBQJXAkT75G184pwTQdd6F7tsjj9BmcAT827gTlzeMY f9ycJEMdxt052scqkrbUScIZ6tKHUsixlbPshAk8kMsRXPzePI4UmJ4trcDzXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCRVg0YC7zhHd for ; Fri, 13 Feb 2026 22:22:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23016 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 22:22:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 07c4eb506be4 - main - sys/compat/freebsd32: Fix i386 compilation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07c4eb506be45a4b836665e14ad63034ef3d573a Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 22:22:19 +0000 Message-Id: <698fa41b.23016.79a6cf2d@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=07c4eb506be45a4b836665e14ad63034ef3d573a commit 07c4eb506be45a4b836665e14ad63034ef3d573a Author: Olivier Certner AuthorDate: 2026-02-13 16:37:21 +0000 Commit: Olivier Certner CommitDate: 2026-02-13 22:21:51 +0000 sys/compat/freebsd32: Fix i386 compilation The compile assertion now failing is due to the change '__int64_t' => '__int32_t' as the type of 'time32_t' on i386, which is the correct value. The use of 'freebsd32.h' on i386 may seem strange, but it comes from 'kern_umtx.c' including it unconditionally as it needs 'struct umutex32'. Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") Sponsored by: The FreeBSD Foundation --- sys/compat/freebsd32/freebsd32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index e746a6e027ec..5210ce55b228 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -74,7 +74,7 @@ struct ffclock_estimate32 { __attribute__((packed)) #endif ; -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); #else _Static_assert(sizeof(struct ffclock_estimate32) == 56, "ffclock_estimate32 size"); From nobody Fri Feb 13 22:22:17 2026 X-Original-To: dev-commits-src-main@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 4fCRVm0JBwz6S080 for ; Fri, 13 Feb 2026 22:22:24 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCRVl1Lw4z3ZGj for ; Fri, 13 Feb 2026 22:22:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771021343; 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=LKMe1dlbJ0k8Vwfb2Co7QP3y4M8+mcStMm8tLIBaOeU=; b=OQxwv09Q20v0DM3hhEQDid5rhBvrWWUKkw7GBqSKkgLFgYTcntF3zaettF7C3aji8dlfgX 8BPE2N2j/qs2pox85v5vvCWI1LaSFPbgzYgoBW8FY5Cq726TQ4JJQ96eg38A4xd6YnfJ7O lvVh9L9eawV+Gp9ROiFtPkgt7o/PFW46Qm1qn40txf4vZavTP4t1D8vNN9yKlJw0jLZgwZ +G7faM99UWtlDoeFJnrdGmkzf11XTycRwfWbR6+5w2y0cu0QQBlQv7M+uyumUuzev1uVZ6 EwQnQAhhasSteJwj1V91CcFIcUn02Rh1GMUPrKVJcoBKX5JGB5T/Jz/xrjSXbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771021343; a=rsa-sha256; cv=none; b=mHzYgGAd9mhphHYE+eyw2pPJIGL2/91UNfrBJaYJ69l0g+aonZHyl3mzAq0fC1dqVu0p5+ m+vZqY3HQcr9np5D8UNi+RDD2AiLgHfVB++ZrJ6zoxmQyn+lYryluIH9s0E+Mt/G8SR8pC kVAHpkFzHsO0E3cVCibFweBAuBCtYULEcB4BizJFVTjFmCsx5gsd/anh319G46y7AXZMyd 4D5v0ndW7E3BJ5eliO8A1Yv6l93QZub2o1yMn8dvD5T7HHXidypaYhZhAYGpmkL0e/0vWU qVzHvgiY1AgvNS0rxji2TAxBT2dRfed7kZI0+o3eDjwVFFUxveSaWapg8eZ92Q== 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=1771021343; 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=LKMe1dlbJ0k8Vwfb2Co7QP3y4M8+mcStMm8tLIBaOeU=; b=lnsZXWzMT/URwJeIE0WbMlZqogjhNyXNJ/vsBuDaGixX54/qFBewWmuANEr2FlfCilhSLS slPLyJLjbAobl4RCBHxGlppcYwhZToH6LfvoJJYihPu0nkh6H4iq/tbJdLOYUm+iNg8ZYG p0wDRHWXt8CFezOguflgDYLIUTMrxUe6w8tOCvgrbQXexu2e7SfAZqAbE6Vty6UkyM1AwB 1fYt3c4vXkAmnShlgrlcy7ytT2DyPA1w9zJueOaWC2RzOUPN9YkbYcqC82v/2PenrMoeug xVfQ8c1xsvtM846JMkoyczcP+hKOLESfyai+FWQ4n9yk93cF8OoFBY0zyrJjRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCRVk6wZzzh2H for ; Fri, 13 Feb 2026 22:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23135 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Feb 2026 22:22:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 2ce028e8a265 - main - sys: ELF: Rename SHN_FBSD_CACHED => SHN_FREEBSD_CACHED List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ce028e8a2655d0e2e3435ae24cb00c1c51b5027 Auto-Submitted: auto-generated Date: Fri, 13 Feb 2026 22:22:17 +0000 Message-Id: <698fa419.23135.2bdb17ab@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce028e8a2655d0e2e3435ae24cb00c1c51b5027 commit 2ce028e8a2655d0e2e3435ae24cb00c1c51b5027 Author: Olivier Certner AuthorDate: 2026-02-04 11:02:18 +0000 Commit: Olivier Certner CommitDate: 2026-02-13 22:21:46 +0000 sys: ELF: Rename SHN_FBSD_CACHED => SHN_FREEBSD_CACHED All other FreeBSD-specific constants have FREEBSD fully spelled out in their names. Be consistent. No functional change (intended). Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55224 --- sys/kern/link_elf_obj.c | 4 ++-- sys/sys/elf_common.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 4128baa5a909..cb96046694ef 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -1716,7 +1716,7 @@ elf_obj_cleanup_globals_cache(elf_file_t ef) for (i = 0; i < ef->ddbsymcnt; i++) { sym = ef->ddbsymtab + i; - if (sym->st_shndx == SHN_FBSD_CACHED) { + if (sym->st_shndx == SHN_FREEBSD_CACHED) { sym->st_shndx = SHN_UNDEF; sym->st_value = 0; } @@ -1785,7 +1785,7 @@ elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps, Elf_Addr *res) * above. */ if (res1 != 0) { - sym->st_shndx = SHN_FBSD_CACHED; + sym->st_shndx = SHN_FREEBSD_CACHED; sym->st_value = res1; *res = res1; return (0); diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index c768e1aac87d..9520bd63cbea 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -419,7 +419,8 @@ typedef struct { #define SHN_LOPROC 0xff00 /* First processor-specific. */ #define SHN_HIPROC 0xff1f /* Last processor-specific. */ #define SHN_LOOS 0xff20 /* First operating system-specific. */ -#define SHN_FBSD_CACHED SHN_LOOS /* Transient, for sys/kern/link_elf_obj +#define SHN_FREEBSD_CACHED SHN_LOOS + /* Transient, for sys/kern/link_elf_obj linker only: Cached global in local symtab. */ #define SHN_HIOS 0xff3f /* Last operating system-specific. */ From nobody Sat Feb 14 04:22:42 2026 X-Original-To: dev-commits-src-main@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 4fCbVV5JFXz6SYgj for ; Sat, 14 Feb 2026 04:22: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCbVV41Ykz4CN7 for ; Sat, 14 Feb 2026 04:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771042962; 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=RoPHiFOF/IJrsOjPri9mEZFKx7kNW77ggtUtLaPsvjw=; b=poIG59+94Xgif9Pz18S+PfpAbFiIE0gGHGMEmln0av+Vlic/N0ER6Pgjdc9Cv2xnn7g0v3 FbsaOUL5lAg5o5HI9B84XIfBxrsQ5dD1RYKHdfL1Ko9y9Ga2TGDV9tJzKjS0gF64GFLMeH 3NtcNDueFPMPwsJ/KaiiVQtkxPD//u1b73I8GQdux661BzT44jzFTIOg6cD15bEnybgChJ cmtwQxmJrOm6MnpTt+FEdrZlujJeptOakfvn/Rm/+GCshzj1ey8p417Av73TAIKx9Auldq So4qtWL+FGEsgncgvOu0P3EXVA24Gm84aMnzVQfNZXkB3RedNfsnOJ3AU8Zepg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771042962; a=rsa-sha256; cv=none; b=CzJ6lUkZIgLBS4AIv9oKpHoPJBlYWsF6yYvCUtkC1G0zJsYC3Dfnt0/2DpUZN2BiXOR0Nd crTG1LXRHcZMaEeh5A0eysjrYduSvzLzT2QuOodPnZvR/DgjlFFUcTzPtvE34wOgwnBqnZ lSBUCqJOTu5ky6Nw2POjaTEg4ZEPsPwpC3pfF1eop6S9tsOpOaUFC1XwBH7R/FW7OqEdRN DeLJjLDnnBeSY7vDxt+UUIA+3TFHR8sFmdAgUpdIVOZ7yGkdctS7c5jLfpzrHR9ov7vHDZ +hYTMLRw5kOKUQ7hNCIoSN85VnBcch/YE0QxTztiXrpobY4g22Ad4CGxqMJ6ww== 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=1771042962; 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=RoPHiFOF/IJrsOjPri9mEZFKx7kNW77ggtUtLaPsvjw=; b=vjI7LX5tbYHsdOVOERTtkUv6XHhq7ueB+CbUYPsGa8Im19jZVFLkdIH31cL1L0Zd3ypE2q bztb0ReSH+mwJ92kVjrPZ0SfmaDUvmGgaUMOIrkuQLJ/J3xcO5ByLWtwpTcvox1dtv5CtJ SQ9zuhJLwE9cQRKKhQcXTI22dmCobWCEnBoKY4KvKgUOPNyeYGB4nxX9gzK5l3+uPJzZ5d fQW9Hnb9iHUUjZlp89IfDP0lEMT87vcrguHfQRjlpXX21z/PEels18MKiv8ecUiblMPOvK XnHsSgR48N/Ri8kl45qN49zjBxMujGCt5l9SarZznRTOY+9fY1DDV4TrJT5iHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCbVV2q7tzs8w for ; Sat, 14 Feb 2026 04:22:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2172f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Feb 2026 04:22:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 99e138f20a9b - main - kern: mac: add a prison_cleanup entry point List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99e138f20a9bad8276e9ebbb1e155daadf201272 Auto-Submitted: auto-generated Date: Sat, 14 Feb 2026 04:22:42 +0000 Message-Id: <698ff892.2172f.466ee06c@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=99e138f20a9bad8276e9ebbb1e155daadf201272 commit 99e138f20a9bad8276e9ebbb1e155daadf201272 Author: Kyle Evans AuthorDate: 2026-02-14 04:19:18 +0000 Commit: Kyle Evans CommitDate: 2026-02-14 04:20:52 +0000 kern: mac: add a prison_cleanup entry point The MAC framework provides a lot of useful functionality that can be configured per-jail without requiring the use of labels. Having another entry point that we invoke just for general prison cleanup rather than freeing the label is useful to allow a module that can otherwise work off of a series of MAC entry points + sysctls for configuration to free its per-jail configuration without having to bring in osd(9). One such example in the wild is HardenedBSD's secadm, but some of my own personal use had wanted it as well- it was simply overlooked in the final version because my first policy made more sense with labels. On that note, it's expected that prison_cleanup and prison_destroy_label will effectively be mutually exclusive -- the former only used when a label isn't needed, the latter when it is. Note that prison_cleanup isn't perfectly symmetrical w.r.t. prison_created: the latter takes a label as well, because it's called later in jail setup and a better point for propagation than when the label is created. As discussed with olce@, we may want to later revisit the notion that struct labels get passed around explicitly along with the referenced object and consider stripping them from all entry points in favor of an object -> label accessor or something. __FreeBSD_version bumped to force a rebuild of MAC policies. Reviewed by: olce Differential Revision: https://reviews.freebsd.org/D54833 --- sys/security/mac/mac_policy.h | 3 +++ sys/security/mac/mac_prison.c | 3 +++ sys/security/mac_stub/mac_stub.c | 7 +++++++ sys/security/mac_test/mac_test.c | 9 +++++++++ sys/sys/param.h | 2 +- 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index 0078138d472f..a080d8cc4b8b 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -436,6 +436,8 @@ typedef int (*mpo_prison_check_remove_t)(struct ucred *cred, struct prison *pr, struct label *prlabel); typedef void (*mpo_prison_created_t)(struct ucred *cred, struct prison *pr, struct label *prlabel); +typedef void (*mpo_prison_cleanup_t)(struct ucred *cred, + struct prison *pr); typedef void (*mpo_prison_attached_t)(struct ucred *cred, struct prison *pr, struct label *prlabel, struct proc *p, struct label *proclabel); @@ -909,6 +911,7 @@ struct mac_policy_ops { mpo_prison_check_set_t mpo_prison_check_set; mpo_prison_check_remove_t mpo_prison_check_remove; mpo_prison_created_t mpo_prison_created; + mpo_prison_cleanup_t mpo_prison_cleanup; mpo_prison_attached_t mpo_prison_attached; mpo_priv_check_t mpo_priv_check; diff --git a/sys/security/mac/mac_prison.c b/sys/security/mac/mac_prison.c index 68ffd7a3cda3..810160994f7b 100644 --- a/sys/security/mac/mac_prison.c +++ b/sys/security/mac/mac_prison.c @@ -94,6 +94,9 @@ void mac_prison_destroy(struct prison *pr) { mtx_assert(&pr->pr_mtx, MA_OWNED); + + /* Symmetry with prison_created */ + MAC_POLICY_PERFORM_NOSLEEP(prison_cleanup, curthread->td_ucred, pr); mac_prison_label_free(pr->pr_label); pr->pr_label = NULL; } diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index 4a567c68b2be..1e1220300259 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -914,6 +914,12 @@ stub_prison_created(struct ucred *cred, struct prison *pr, } +static void +stub_prison_cleanup(struct ucred *cred, struct prison *pr) +{ + +} + static void stub_prison_attached(struct ucred *cred, struct prison *pr, struct label *prlabel, struct proc *p, struct label *proclabel) @@ -1923,6 +1929,7 @@ static struct mac_policy_ops stub_ops = .mpo_prison_check_set = stub_prison_check_set, .mpo_prison_check_remove = stub_prison_check_remove, .mpo_prison_created = stub_prison_created, + .mpo_prison_cleanup = stub_prison_cleanup, .mpo_prison_attached = stub_prison_attached, .mpo_priv_check = stub_priv_check, diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index 47dd7d1326a3..f16073cfdf72 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -1737,6 +1737,14 @@ test_prison_created(struct ucred *cred, struct prison *pr, COUNTER_INC(prison_created); } +COUNTER_DECL(prison_cleanup); +static void +test_prison_cleanup(struct ucred *cred, struct prison *pr) +{ + + COUNTER_INC(prison_cleanup); +} + COUNTER_DECL(prison_attached); static void test_prison_attached(struct ucred *cred, struct prison *pr, @@ -3378,6 +3386,7 @@ static struct mac_policy_ops test_ops = .mpo_prison_check_set = test_prison_check_set, .mpo_prison_check_remove = test_prison_check_remove, .mpo_prison_created = test_prison_created, + .mpo_prison_cleanup = test_prison_cleanup, .mpo_prison_attached = test_prison_attached, .mpo_proc_check_debug = test_proc_check_debug, diff --git a/sys/sys/param.h b/sys/sys/param.h index 27e8e0f14e77..99c1af5e55bf 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -74,7 +74,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1600011 +#define __FreeBSD_version 1600012 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sat Feb 14 05:19:54 2026 X-Original-To: dev-commits-src-main@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 4fCcmp6HcPz6SdZM; Sat, 14 Feb 2026 05:20:10 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4fCcmp0lkTz4HDP; Sat, 14 Feb 2026 05:20:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61E5JsSQ006439; Sat, 14 Feb 2026 07:19:57 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61E5JsSQ006439 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61E5JssK006438; Sat, 14 Feb 2026 07:19:54 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 14 Feb 2026 07:19:54 +0200 From: Konstantin Belousov To: Olivier Certner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c4eb506be4 - main - sys/compat/freebsd32: Fix i386 compilation Message-ID: References: <698fa41b.23016.79a6cf2d@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <698fa41b.23016.79a6cf2d@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4fCcmp0lkTz4HDP X-Spamd-Bar: ---- On Fri, Feb 13, 2026 at 10:22:19PM +0000, Olivier Certner wrote: > The branch main has been updated by olce: > > URL: https://cgit.FreeBSD.org/src/commit/?id=07c4eb506be45a4b836665e14ad63034ef3d573a > > commit 07c4eb506be45a4b836665e14ad63034ef3d573a > Author: Olivier Certner > AuthorDate: 2026-02-13 16:37:21 +0000 > Commit: Olivier Certner > CommitDate: 2026-02-13 22:21:51 +0000 > > sys/compat/freebsd32: Fix i386 compilation > > The compile assertion now failing is due to the change '__int64_t' => > '__int32_t' as the type of 'time32_t' on i386, which is the correct > value. The use of 'freebsd32.h' on i386 may seem strange, but it comes > from 'kern_umtx.c' including it unconditionally as it needs 'struct > umutex32'. So this is probably the wrong direction, it is not going to scale. If the issue is with userspace (kdump and some test), then perhaps we should only turn on _WANT_KEVENT32 for LP64, in these sources? > > Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") > Sponsored by: The FreeBSD Foundation > --- > sys/compat/freebsd32/freebsd32.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h > index e746a6e027ec..5210ce55b228 100644 > --- a/sys/compat/freebsd32/freebsd32.h > +++ b/sys/compat/freebsd32/freebsd32.h > @@ -74,7 +74,7 @@ struct ffclock_estimate32 { > __attribute__((packed)) > #endif > ; > -#if defined(__amd64__) > +#if defined(__amd64__) || defined(__i386__) > _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); > #else > _Static_assert(sizeof(struct ffclock_estimate32) == 56, "ffclock_estimate32 size"); From nobody Sat Feb 14 05:25:55 2026 X-Original-To: dev-commits-src-main@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 4fCcvj3Nxwz6SfFj; Sat, 14 Feb 2026 05:26:09 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4fCcvh2KdBz4Hng; Sat, 14 Feb 2026 05:26:08 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 61E5PtLn006663; Sat, 14 Feb 2026 07:25:58 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 61E5PtLn006663 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 61E5PtmE006662; Sat, 14 Feb 2026 07:25:55 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 14 Feb 2026 07:25:55 +0200 From: Konstantin Belousov To: Olivier Certner Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c4eb506be4 - main - sys/compat/freebsd32: Fix i386 compilation Message-ID: References: <698fa41b.23016.79a6cf2d@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Result: default: False [-0.64 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_SPAM_SHORT(0.43)[0.429]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-0.07)[-0.074]; ARC_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; HAS_XAW(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4fCcvh2KdBz4Hng X-Spamd-Bar: / On Sat, Feb 14, 2026 at 07:20:01AM +0200, Konstantin Belousov wrote: > On Fri, Feb 13, 2026 at 10:22:19PM +0000, Olivier Certner wrote: > > The branch main has been updated by olce: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=07c4eb506be45a4b836665e14ad63034ef3d573a > > > > commit 07c4eb506be45a4b836665e14ad63034ef3d573a > > Author: Olivier Certner > > AuthorDate: 2026-02-13 16:37:21 +0000 > > Commit: Olivier Certner > > CommitDate: 2026-02-13 22:21:51 +0000 > > > > sys/compat/freebsd32: Fix i386 compilation > > > > The compile assertion now failing is due to the change '__int64_t' => > > '__int32_t' as the type of 'time32_t' on i386, which is the correct > > value. The use of 'freebsd32.h' on i386 may seem strange, but it comes > > from 'kern_umtx.c' including it unconditionally as it needs 'struct > > umutex32'. > So this is probably the wrong direction, it is not going to scale. > If the issue is with userspace (kdump and some test), then perhaps we should > only turn on _WANT_KEVENT32 for LP64, in these sources? But I also run tinderbox on this series of patches, and i386 buildworld passed for me. So I am even less sure what is the problem. If it is for i386 kernel, then even more we should just guard its usage with LP64 (__SIZEOF_LONG__ == 8 in modern parlance). Trying to make COMPAT32 valid for 32bit host is not sustainable. > > > > > Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") > > Sponsored by: The FreeBSD Foundation > > --- > > sys/compat/freebsd32/freebsd32.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h > > index e746a6e027ec..5210ce55b228 100644 > > --- a/sys/compat/freebsd32/freebsd32.h > > +++ b/sys/compat/freebsd32/freebsd32.h > > @@ -74,7 +74,7 @@ struct ffclock_estimate32 { > > __attribute__((packed)) > > #endif > > ; > > -#if defined(__amd64__) > > +#if defined(__amd64__) || defined(__i386__) > > _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); > > #else > > _Static_assert(sizeof(struct ffclock_estimate32) == 56, "ffclock_estimate32 size"); From nobody Sat Feb 14 05:56:22 2026 X-Original-To: dev-commits-src-main@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 4fCdZZ5hfSz6Shg9 for ; Sat, 14 Feb 2026 05:56:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCdZZ2znyz4M8w for ; Sat, 14 Feb 2026 05:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771048582; 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=NM8wuCLDTXbN5ZF0qDLYkDxh21T9lpaF5UrMxpCKqQM=; b=XnpKNHobL4+FfzahlJ9qi6C9oAUt7AzYQEL6Q2InZ+O9eUUa8h7s+7dkNSJBhff1ZDFk+d yb7Dir2P5uUbTcESwfotnvm53H5+cLA3Bnn9+Pq4AYUW3HLbavMjpkrhdCXj6Tt6SZqqSs R7+CgsPUBKJnYzXBSpZUC84o0eOGxdEw+w+esJYBGWMmbjTyWnTRSFVe82ibCSTvSgm/EK 2hIWLpV4VezfKqJ3sVQbFaVkq2J9B+QpFlMSOcHhOKSm/SkzE6uSQgTVj9cCO9nWlXy5ob pK3b0kNwQbq0YkNpotzlEfvtWq9Rctc6BRwdOwdeFZSzfL4R2TrPfSGigLMsGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771048582; a=rsa-sha256; cv=none; b=m1WsI0BtBPOSDon+ZaOeXwXnjcRedNNoYEv+TZQV6IaREau22RnlM46QP/rBxk4vH8WBhV 26Yljj5TW74EjWPPJ+aD3KeyGYRsIxkvmmpnELweMAWITkdopilkn6AZDjbgsYwXgiRLBn PrHHw/eZteij/fWzpTzzjpPYx73QpAgw/Na9WTISNvSdM12GiBLydJ4a3B163//WkwTnFt Krn3jXsQTVJ7ojMEIQufTSOcVrZCicya3aRn1RqTIlTj1PY7J/ogewbY0lGyWnNwG+GWBx ENKuia5L5hvPu98FRUWk077qrf4Qu0g6LLV3riBFjzh42mKNwGDyjCi0s/dnxA== 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=1771048582; 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=NM8wuCLDTXbN5ZF0qDLYkDxh21T9lpaF5UrMxpCKqQM=; b=S2V8iqIoN/0qxmNBWcTLzg+vlaTsWV9oFEjdS7IpfZtQxAlRMeXYooMoJ07mmjfhgZuKtU blWol1bu87xPBSvylyMK1DithfjWBWpzCehVkWakW45JAfhYmP9dD57+CGkWD2IN4olmse 940mJl0PHfmuhIO6LWMX6BJ6Xbk1w9WCgBS/VcHr6Gt19i8LzS8jirOQQqQiW9DpG+IPeh RErmWBBEYOL3CtYjCinfpJNkQ0JYMlhU/BCZnTOCrpsgJkwNWAo3L/iwMNi/q1ZiTnbHCv S2+W/R57m8CGVtasQZSA9/RW1Ht3whXohCwslvcbBwakp68WvJgf4kkg1WE8rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCdZZ27m2zvxc for ; Sat, 14 Feb 2026 05:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31f93 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Feb 2026 05:56:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 625dc44832cd - main - tr: fix class handling in unicode world List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 625dc44832cd760be3d7242d8e21a530c7e32bfc Auto-Submitted: auto-generated Date: Sat, 14 Feb 2026 05:56:22 +0000 Message-Id: <69900e86.31f93.7504efa8@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=625dc44832cd760be3d7242d8e21a530c7e32bfc commit 625dc44832cd760be3d7242d8e21a530c7e32bfc Author: Baptiste Daroussin AuthorDate: 2026-02-14 05:54:08 +0000 Commit: Baptiste Daroussin CommitDate: 2026-02-14 05:56:00 +0000 tr: fix class handling in unicode world toupper/tolower logic was only handled for CCLASS_TOUPPER and CCLASS_TOLOWER, add support for CCLASS ([:alpha:]) PR: 219900 MFC After: 1 week --- usr.bin/tr/tr.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index d31a51a73542..75b7cd8be7c0 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -242,6 +242,40 @@ main(int argc, char **argv) break; } while (s2.state == CCLASS_LOWER && s2.cnt > 1); goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_UPPER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towupper(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswupper(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip upper set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_UPPER && s2.cnt > 1); + goto again; + } else if (s1.state == CCLASS && + s2.state == CCLASS_LOWER && + s1.cnt == 1 && s2.cnt == 1) { + do { + ch = towlower(s1.lastch); + cmap_add(map, s1.lastch, ch); + if (sflag && iswlower(ch)) + cset_add(squeeze, ch); + if (!next(&s1)) + goto endloop; + } while (s1.state == CCLASS && s1.cnt > 1); + /* skip lower set */ + do { + if (!next(&s2)) + break; + } while (s2.state == CCLASS_LOWER && s2.cnt > 1); + goto again; } else { cmap_add(map, s1.lastch, s2.lastch); if (sflag) From nobody Sat Feb 14 09:47:45 2026 X-Original-To: dev-commits-src-main@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 4fCkjj0FMPz6Rch7; Sat, 14 Feb 2026 09:47:53 +0000 (UTC) (envelope-from olce@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCkjh6qw1z3XZ2; Sat, 14 Feb 2026 09:47:52 +0000 (UTC) (envelope-from olce@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771062473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Jv+rBO0gimk8xfjUosxoqSCDk/QAQrEV/N9gu76+AhA=; b=mUSpoM3xdqPu+MxruI/2MJ7PNaFS3HAvRSkBPlLiyq/4WO60IAYUeyun9iknQw15wnnA4i aPT87xyIcNqOgF3/W+8oCd4Cn1FTsrXQF3n1f6Ep54HwqT+Rkpfqmu+8W68F9V6+5U0N/0 hgbatCttDjR20Ma7CSECZhL4fdzor9Ku55LnA6Rapemehojx2eQSuJ/TpDo5I0ROF437ZD tMe19MSxyXKpXYdmQXPH0TsTfhcd4h/4MY0FJTAYgqITGl58LSIirNnVHF3FLpOldor8KY ETzt6ieA8csL2FM97HkAzE9Qn8Zb6XYE6Z807hezFUP8Bpt8KTzA3VpL6T73Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771062473; a=rsa-sha256; cv=none; b=CZVTjcJaZdk0XuAoa+MBYUJr2hR3yULHq6V5EQG4i3BvasGqHrGpxp5788kr1MUC1Y3sxz Emjc7G9xZ/vCIvq3jilawHUTX3coM3ecwsSpYZ3QvcE8me0WXBYvm1+SXEaiGmgfSjwA/R 8lnKy93VinfXlVWAiOjgVk+nSI37AtRNnHeSlIZsznrIMnBM4sk6Cq9GmJPjyfD4AZARrv NetvX8Wm8IiE/kp72pUzdm7eXX6dPQ3oC0A/bfRJxgRkkOja8Pyoe72IZUjKbiyMt55dL6 Fvg/aIGcaIqGBrn4ezkj9+hD1IhXBa1bqLie0qiHJyjBiKE7BZWLQt08EQOBlQ== 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=1771062473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Jv+rBO0gimk8xfjUosxoqSCDk/QAQrEV/N9gu76+AhA=; b=p7MAniHrWQjrn71A7MKB2ny5b/CMits9MbIHFtO+UlD1Swy8d7ez10Qei8QkXsK1DMYX/B YVfeLUfpAMjUoiCO1QSLsQeoDmSg8DF9fuw+zzy/5GS4brGa7fLFxING5zhndx5C5zuZZL xpEm7n2ptsxSP0YBrYqADBaqQ8iahqvHjgT7UPU9JNPuu1HWHOtmUWujxSSbMxNKMdHGUI nXqpx1rvMoazO3Uy83qrS+FSO4b8aFoEWyGsebTcrzPbheWb8vLRwihnXzaiE6cmFiadvh e2cV9aEyA0yxckKXGOSEmg3JuZRmDxqeeb95rSxQdl7bfsAyhomPKaX8P/iWsg== Received: from ravel.localnet (aclermont-ferrand-653-1-222-123.w90-14.abo.wanadoo.fr [90.14.66.123]) (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) (Authenticated sender: olce/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fCkjh2Pb2zp8S; Sat, 14 Feb 2026 09:47:52 +0000 (UTC) (envelope-from olce@freebsd.org) From: Olivier Certner To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 07c4eb506be4 - main - sys/compat/freebsd32: Fix i386 compilation Date: Sat, 14 Feb 2026 10:47:45 +0100 Message-ID: <2406567.sMrx5ctUpN@ravel> In-Reply-To: References: <698fa41b.23016.79a6cf2d@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3341014.ZmR5Pbtf01"; micalg="pgp-sha384"; protocol="application/pgp-signature" --nextPart3341014.ZmR5Pbtf01 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Olivier Certner To: Konstantin Belousov Date: Sat, 14 Feb 2026 10:47:45 +0100 Message-ID: <2406567.sMrx5ctUpN@ravel> In-Reply-To: MIME-Version: 1.0 > > So this is probably the wrong direction, it is not going to scale. > If it is for i386 kernel, then even more we should just guard its usage > with LP64 (__SIZEOF_LONG__ == 8 in modern parlance). > Trying to make COMPAT32 valid for 32bit host is not sustainable. Yes, that's for i386 kernel compilation. I'm not trying to make the whole of COMPAT_FREEBSD32 valid on 32-bit platforms (that does not make any sense to me). But since there are uses of 'freebsd32.h' unconditionally on all platforms (in 'kern_umtx.c' at least), and since we also check sizes of structures, I think we should at least ensure that 'struct foo32' on a 32-bit arch is type compatible with 'struct foo' on the same arch. And I do not see that as unsustainable, on the contrary, it is very simple to achieve: Have all 'foo32' types boil down to exactly 'foo' on 32-bit architectures, which is what we are supposed to do already for structures by compat' design. 'freebsd32_uint64_t' you introduced typically supports that. That's the why of https://reviews.freebsd.org/D55283, which fixes commit 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") where defining 'time32_t' to 'in32_t' for 32-bit architectures appears to have been an arbitrary choice of yours, which in practice by luck does not change the whole size of 'struct ffclock_estimate32' because 'struct bintime32''s one does not change either as even if its field 'sec' was incorrectly sized after you commit (this is what D55283 fixes), the 'frac' one is 64-bit and 64-bit aligned on all non-x86 architectures so its offset in 'struct bintime32' stays the same. So, again, I think the rule of thumb should just be: Type 'foo32' is compatible with 'foo' on 32-bit architectures and has same alignment. That's the only thing that makes sense if 'struct *32' are visible on 32-bit architectures. That does not impair the alternative, which is to remove visibility of all 'struct *32' on 32-bit architectures. If you want to do that, please go ahead. Regards. -- Olivier Certner --nextPart3341014.ZmR5Pbtf01 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCQAdFiEEmNCxHjkosai0LYIujKEwQJceJicFAmmQRMEACgkQjKEwQJce JifNfA//WzYQdEe6TdYVmwK5P/HZo7+2gInZWj8lPGv0I8n9/pv/ndQNi2p8mSNf IQ2s1Aqe7QOGmzz3ZQV0r6MNtOaN14eXKcBtRnKbB63nSR8JTt/Wr0MtttWWNrZ+ HSZKUcU38K9A0gbO8vksuhaFV9OKe0gYvHfOfYB8Rd0+q5LkJvHK52hTm6dlHQFT svrkJN3JS3vlBjmSM6pCOCjqNLhdYDitEal6u/7nqm3PX02fipcyAjzkUq5Yj20y y0LxztcFTjSxN1nNK2cCSvYhsZwv16wOtfxvwT9Lc/Uz2MRBgJu9HL9T6a9ozKXt gEkvKHIJ60jnznVxeKBleZxGRdw3SbrzpqjIEf1MUqWhUaV+sxnzvOhgJxFGchfc m28pA9YzWKPmbvJPHhp+716RaFiWulSj6k82x4yADNdNTSiRZKHVVOvQHguSJVL8 Rn+VfDf9+9nVlGzGmSD9Cc3QlLtaBzTd01heVXi+XGG5lGiY05EogzPdjkZOU//J l1z5LQcKSizN8UCLKDuqxDcCf5WO398un2btWrCVKuoTEH5EUCaJhzrZZOMv1qO1 jNwC4IBmPRTcnlFVCxS3nTSWsiL7RQ11AmPJT6vsO0BFAK7Q5CTC3XRCO3SsKz+7 FffTfEzHU6tJJofMrUazKcyML181mdBve4cMtP62ssn4FTDY7+Q= =JQ5Z -----END PGP SIGNATURE----- --nextPart3341014.ZmR5Pbtf01-- From nobody Sat Feb 14 16:03:58 2026 X-Original-To: dev-commits-src-main@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 4fCv3f3Kvrz6SHTb for ; Sat, 14 Feb 2026 16:03:58 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fCv3f1KK4z3HGq for ; Sat, 14 Feb 2026 16:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771085038; 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=yVAcoCZ7nvGy8qZtSZ0lzXzPl96uCJrOlwF+difu7wo=; b=oqv+eV93QCRILDKR+AQB6cs2uRi3yMAo23s84kr1nwEBSl3vf/zmcROC6sl8o3UXMkwyUo 2JzdNGJjFjqY1UfQQry5OkNC1+lItAC6NHwQhBd2xTkd5xDdhMwIXna/qecMtHjixM5G/f 1sltxcfIFPYV0nquuFLCcfQsUgjgoKBfsNaxper4NJGX9Bg1KEzkon8Poz8Y348Yi/t2tC wdlpIIKR+TrCT+FKYGVdIIyi8FXJb47gNSjcDqgVYjgqjLvqbyCjL/d6v3NsJD/LHiedCh Yg7Igl1e1tdX1BhaO2kUXcVMhg6FsIhMCCX+DqEkLKv1a/9pMvncVp+BnavvOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771085038; a=rsa-sha256; cv=none; b=UeIVFv4/+80Dz29bTVFHUJZjjipxYsHDguV7ON0/+5oCx9KXSdQBLff3xkTE6mbvi+RupN iILV5Qh0up51XgJ+/DwfKdDJvLQcRo/7tR8Z2oByX+IzbBf1fpRuef0rdmzCoBPymTuB58 x0OfpqOiqsYxZC7QfNTLa285LTCcINYOPFN7s3Oz6YrNIg46uIyEN+Jb4UDAWvtx+O0Lmt HbDOQdN8SpV4bKh1gNFRuuvmEyUomXzbhHizZ/KxqQiHnhjphjln9xB1VBCN+XXW9j71X4 jLwrhWqTKK9gCHCW8S/RavKCxEjuYP1PYhYLxJWovRv7ScTASz1I3vu200ALxQ== 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=1771085038; 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=yVAcoCZ7nvGy8qZtSZ0lzXzPl96uCJrOlwF+difu7wo=; b=yjGV8dBoqPApVhVbGINTDV6FfixRubCL1NeOlsvYCnMiP2s/to8kUBcbHgOre1mTVKzZG2 ayvFdhzf40EuvSSq3tDrLkgjSmPQd28XqO5oNnwdJgOQeBROib2gmck05jX0niaoHGCC3z 6ibDcvyS73q0SU09eoVvn0PmvlZh87OPfb9NEWsHn3QjRq0boEPLVpCJILlL5rUmXIV8/E ruFpwPJMNSdPghFaU/fY3epI0oVjEtaR2T7DVS+6S0AvWAawxrx+ud2XFadAMwSXc/WUjZ Gn7mbSyr3Tj7/37k273hGIoHHuetPMAjFjekouCpu+eSI0tlCQpom9qTX17hlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fCv3f07kHzJD for ; Sat, 14 Feb 2026 16:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 235b6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Feb 2026 16:03:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bruce M Simpson Subject: git: 79eff4ad64fc - main - netinet6: Return EAFNOSUPPORT for non-IPv6 addresses in mcast sockopts. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bms X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79eff4ad64fc445ea78ed733e16482c45dbd5b50 Auto-Submitted: auto-generated Date: Sat, 14 Feb 2026 16:03:58 +0000 Message-Id: <69909cee.235b6.76aa3a8b@gitrepo.freebsd.org> The branch main has been updated by bms: URL: https://cgit.FreeBSD.org/src/commit/?id=79eff4ad64fc445ea78ed733e16482c45dbd5b50 commit 79eff4ad64fc445ea78ed733e16482c45dbd5b50 Author: Bruce M Simpson AuthorDate: 2026-02-14 15:36:47 +0000 Commit: Bruce M Simpson CommitDate: 2026-02-14 16:00:58 +0000 netinet6: Return EAFNOSUPPORT for non-IPv6 addresses in mcast sockopts. This is a non-functional change; it just returns the correct errno value where IPv6 multicast socket options were passed non-AF_INET6 arguments, in preparation for handling PR 193246 with a side-call into netinet as xnu currently does. Reviewed by: glebius Approved by: glebius PR: 193246 (with refinements) Differential revision: https://reviews.freebsd.org/D55233 --- sys/netinet6/in6_mcast.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c index 4075e75eac85..4e770079e64e 100644 --- a/sys/netinet6/in6_mcast.c +++ b/sys/netinet6/in6_mcast.c @@ -1455,11 +1455,11 @@ in6p_block_unblock_source(struct inpcb *inp, struct sockopt *sopt) if (gsa->sin6.sin6_family != AF_INET6 || gsa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); if (ssa->sin6.sin6_family != AF_INET6 || ssa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); /* * XXXGL: this function should use ifnet_byindex_ref, or @@ -1684,7 +1684,7 @@ in6p_get_source_filters(struct inpcb *inp, struct sockopt *sopt) if (msfr.msfr_group.ss_family != AF_INET6 || msfr.msfr_group.ss_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); gsa = (sockunion_t *)&msfr.msfr_group; if (!IN6_IS_ADDR_MULTICAST(&gsa->sin6.sin6_addr)) @@ -1963,12 +1963,13 @@ in6p_join_group(struct inpcb *inp, struct sockopt *sopt) if (gsa->sin6.sin6_family != AF_INET6 || gsa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); if (sopt->sopt_name == MCAST_JOIN_SOURCE_GROUP) { if (ssa->sin6.sin6_family != AF_INET6 || ssa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); + if (IN6_IS_ADDR_MULTICAST(&ssa->sin6.sin6_addr)) return (EINVAL); /* @@ -2265,11 +2266,13 @@ in6p_leave_group(struct inpcb *inp, struct sockopt *sopt) if (gsa->sin6.sin6_family != AF_INET6 || gsa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); + if (sopt->sopt_name == MCAST_LEAVE_SOURCE_GROUP) { if (ssa->sin6.sin6_family != AF_INET6 || ssa->sin6.sin6_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); + if (IN6_IS_ADDR_MULTICAST(&ssa->sin6.sin6_addr)) return (EINVAL); /* @@ -2509,7 +2512,7 @@ in6p_set_source_filters(struct inpcb *inp, struct sockopt *sopt) if (msfr.msfr_group.ss_family != AF_INET6 || msfr.msfr_group.ss_len != sizeof(struct sockaddr_in6)) - return (EINVAL); + return (EAFNOSUPPORT); gsa = (sockunion_t *)&msfr.msfr_group; if (!IN6_IS_ADDR_MULTICAST(&gsa->sin6.sin6_addr)) From nobody Sun Feb 15 02:12:17 2026 X-Original-To: dev-commits-src-main@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 4fD8Yf756Pz6RLpg for ; Sun, 15 Feb 2026 02:12:22 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fD8Yf6S3Kz3TtK for ; Sun, 15 Feb 2026 02:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771121542; h=from:from: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; bh=TI4+f4kOQamSttzjVWcV2VrCXO0Feg3cjhTbt/5uSJE=; b=N3pkVljE4j8CCrUUdQH/Ud9ZdiPSAEAPwL1f2csY0x05iLAGhzrgIPdOfDYPgalzCMhI2W dn7fEpPoVjYr2xdgTxvDdweTeMJVA8XjbG2xxS1JHKhhgx6f5EYftyKdS6RL9XmLOTzJlR KUObnJG0xbkaGQ4hk0GIMN5MUk0iFZzC9lE+XVfOtyG0k0DzUZRSFCTxZJ9Mnq/P2vGTvG CHHebBMJ7nHHuXBkygha5n4ttKsfxwH49idIFh/wKq2JFVUDzUdOWkcMPolfe+bow0QL4V ++B8pxHoAUvnujtHcmfKypVyiconEJhEFevYPg2YHRC0lrPTManh0A/sX+S+VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771121542; a=rsa-sha256; cv=none; b=TFWgLGT4JXLka8QxRr7tW9T2/GCazcyMOq8eZsVR5xis1wyzfvqoQ8D7eKrhozv4GMWSUZ 0tVnFM3RdIKbdFLk/qcFgBXvpq/mcwZ9Y8PQBkQoI9jGMB2BjY/CEmwZVokWNujAF6qnk6 s3Jq8u2UDUo6HYao5Ztoo2/57ZO2NFisLeI8ufcq22OEhrJMjWtJkN7PnqJlasghCAxm7K 5kjeAimlL27LujsweqwzfKEZMBlbeXVmYuTSdqW44HAnkm9aqwX8h8hfG7oEu/2yzic8tn nYuq9kZzFAM8jxb3ZCyUPtCqv4E0YgMbtFpPah8bMspONTWEKX8MRReWndA0LQ== 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=1771121542; h=from:from: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; bh=TI4+f4kOQamSttzjVWcV2VrCXO0Feg3cjhTbt/5uSJE=; b=b9o71NM39wH1UWydeIvQiM3K0V5XFIdHK7GVxY/yDnrU0kysvqg0IFPt4uDvCe7PJuds57 5OsPUMUlade6WszSpX488f99gjYmHTwsHu7f2tGfgefQrmwOT+4m9nX/QWlIIiSHon7x/Q BgFpmHCInA9pvoDBk6R2W7CtsrtiMrJB62WZN+Co181bU7pY3MvntpotXx/1RxwdeORqRN YTDtapssyNufDEq3Eh77xGUBWn7XZo18NwEsojsb+kqSHHFFEuIsdekJdLq7R9ms6DrOwl HHx+QxrOz+W1q8mVEFjUL2dVHjAn2XU24Sizbh+1yEEOAaPf8qe/1Z56z8XTDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fD8Yf63fKzZhx for ; Sun, 15 Feb 2026 02:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4239a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 02:12:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 90d79dd54946 - main - asmc: Add MacPro3,1 temperature sensor support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90d79dd549461dac053b34d47ae32968afb2834c Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 02:12:17 +0000 Message-Id: <69912b81.4239a.2462f547@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=90d79dd549461dac053b34d47ae32968afb2834c commit 90d79dd549461dac053b34d47ae32968afb2834c Author: Abdelkader Boudih AuthorDate: 2026-02-15 01:44:50 +0000 Commit: Adrian Chadd CommitDate: 2026-02-15 01:45:10 +0000 asmc: Add MacPro3,1 temperature sensor support Test and verified with Sonicblue7 Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D54952 --- sys/dev/asmc/asmc.c | 9 +++++++ sys/dev/asmc/asmcvar.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index c0ff555b7b65..ef924ba8ba76 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -395,6 +395,15 @@ static const struct asmc_model asmc_models[] = { ASMC_MP1_TEMPS, ASMC_MP1_TEMPNAMES, ASMC_MP1_TEMPDESCS }, + /* Idem for the Mac Pro (Early 2008) */ + { + "MacPro3,1", "Apple SMC Mac Pro (Early 2008)", + NULL, NULL, NULL, + ASMC_FAN_FUNCS, + NULL, NULL, NULL, + ASMC_MP31_TEMPS, ASMC_MP31_TEMPNAMES, ASMC_MP31_TEMPDESCS + }, + /* Idem for the Mac Pro (8-core) */ { "MacPro2", "Apple SMC Mac Pro (8-core)", diff --git a/sys/dev/asmc/asmcvar.h b/sys/dev/asmc/asmcvar.h index 102bee8a15b7..a6e9c75017e0 100644 --- a/sys/dev/asmc/asmcvar.h +++ b/sys/dev/asmc/asmcvar.h @@ -756,6 +756,75 @@ struct asmc_softc { "Power Supply, Location 2", \ "Tv0S", "Tv1S", } +#define ASMC_MP31_TEMPS { "TA0P", \ + "TC0C", "TC0D", "TC0P", \ + "TC1C", "TC1D", \ + "TC2C", "TC2D", \ + "TC3C", "TC3D", \ + "TCAG", "TCAH", "TCBG", "TCBH", \ + "TH0P", "TH1P", "TH2P", "TH3P", \ + "TM0P", "TM0S", "TM1P", "TM1S", \ + "TM2P", "TM2S", "TM3S", \ + "TM8P", "TM8S", "TM9P", "TM9S", \ + "TMAP", "TMAS", "TMBS", \ + "TN0C", "TN0D", "TN0H", \ + "TS0C", \ + "Tp0C", "Tp1C", \ + "Tv0S", "Tv1S", NULL } + +#define ASMC_MP31_TEMPNAMES { "ambient", \ + "cpu_core0", "cpu_diode0", "cpu_a_proximity", \ + "cpu_core1", "cpu_diode1", \ + "cpu_core2", "cpu_diode2", \ + "cpu_core3", "cpu_diode3", \ + "cpu_a_pkg", "cpu_a_heatsink", \ + "cpu_b_pkg", "cpu_b_heatsink", \ + "hdd_bay0", "hdd_bay1", \ + "hdd_bay2", "hdd_bay3", \ + "mem_riser_a_prox0", "mem_riser_a_slot0", \ + "mem_riser_a_prox1", "mem_riser_a_slot1", \ + "mem_riser_a_prox2", "mem_riser_a_slot2", \ + "mem_riser_a_slot3", \ + "mem_riser_b_prox0", "mem_riser_b_slot0", \ + "mem_riser_b_prox1", "mem_riser_b_slot1", \ + "mem_riser_b_prox2", "mem_riser_b_slot2", \ + "mem_riser_b_slot3", \ + "northbridge_core", "northbridge_diode", \ + "northbridge_heatsink", \ + "expansion_slots", \ + "power_supply0", "power_supply1", \ + "vrm0", "vrm1", } + +#define ASMC_MP31_TEMPDESCS { "Ambient Air", \ + "CPU Core 1", "CPU Diode 1", \ + "CPU A Proximity", \ + "CPU Core 2", "CPU Diode 2", \ + "CPU Core 3", "CPU Diode 3", \ + "CPU Core 4", "CPU Diode 4", \ + "CPU A Package", "CPU A Heatsink", \ + "CPU B Package", "CPU B Heatsink", \ + "Hard Drive Bay 1", "Hard Drive Bay 2", \ + "Hard Drive Bay 3", "Hard Drive Bay 4", \ + "Memory Riser A, Proximity 1", \ + "Memory Riser A, Slot 1", \ + "Memory Riser A, Proximity 2", \ + "Memory Riser A, Slot 2", \ + "Memory Riser A, Proximity 3", \ + "Memory Riser A, Slot 3", \ + "Memory Riser A, Slot 4", \ + "Memory Riser B, Proximity 1", \ + "Memory Riser B, Slot 1", \ + "Memory Riser B, Proximity 2", \ + "Memory Riser B, Slot 2", \ + "Memory Riser B, Proximity 3", \ + "Memory Riser B, Slot 3", \ + "Memory Riser B, Slot 4", \ + "Northbridge Core", "Northbridge Diode", \ + "Northbridge Heatsink", \ + "Expansion Slots", \ + "Power Supply 1", "Power Supply 2", \ + "VRM 1", "VRM 2", } + #define ASMC_MP2_TEMPS { "TA0P", "TCAG", "TCAH", "TCBG", "TCBH", \ "TC0C", "TC0D", "TC0P", "TC1C", "TC1D", \ "TC2C", "TC2D", "TC3C", "TC3D", "THTG", \ From nobody Sun Feb 15 13:56:11 2026 X-Original-To: dev-commits-src-main@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 4fDS9l5mmJz6RWjB for ; Sun, 15 Feb 2026 13:56:11 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDS9l3hZHz3Ssf for ; Sun, 15 Feb 2026 13:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771163771; 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=TPDNg3aVAEXhT4MJCkF3RdXkXeR8Q1SkTzVsqiiN/Fk=; b=UKnfYvqUdxVHsZK16mefd1xQB2PHyc5cGYF0V0mdubPa58UqP+1KCAcS4YT27toXVB7FLm kjmHGZESoi8SXm7Tl4W6P3y68cjTy5OFA0KNcFAxMYMTH4VpicJiTQNvjx7NhEVxw0xMpm TWRQV0eo4BRBS6+fp21gUeChJr4psr6m+RPKRhT9sftFG5JoXxOEog8fa9XUFzkc7pWrgL YyHyybypj11iGb7VmE/B580bd21dkoqtiKnaLTOC2fbdtFYY98UMoOSaMGcX8Fp5liJBAo O6lqm9CJGbGf9w/39SEy/zjRc9bjaW/Oeq6Ad6rk0FrVyNBYtOHPucZX4zLSng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771163771; a=rsa-sha256; cv=none; b=W47yLX6h2uviCTDfQGitiAdnzZh0GdemUtSYWJXfGhM4aT2t7YZNBLjwuppncg4I6wN05/ yyZkFVClDIaCKqMkCW3Ww7oxcZezuJbkO3Zfx+G77q14F1BUIefvkqA7I5faraJ/F/ur5+ EPdELlmptYJ2N6TJ8dO+yh7/AA+C6rM4omu2AFLXB/LHeZaxp2qROJu49oWH2mUL0fhHoi ebyiPkyZQowi5LCbQso34JB4mZyYBtfH1F6fIBxRYvIDXdU3qn6itFWZrxR1YKq2nQNdM/ DId1jUCMfGhu5VI5GpKBJQo2hEUIucwCrBzL77NMvwh10yuJ2xFNKPP9fYLQ1g== 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=1771163771; 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=TPDNg3aVAEXhT4MJCkF3RdXkXeR8Q1SkTzVsqiiN/Fk=; b=HltQnxYMNQO9SszjgZk4V3FH4Z/wsMvSgSdgKS67vGWxO2qptgheLNpCj9xA3FZ6G7oYPR kXYfMwi8tV9v4C2sfjjGxrVNi+mXQ5iy/Hx9C6Krgy+UPTvS5S9TiKKl+pVPDBPQhb3XwH o0AfDVg11lBQbakzauYJ4WQBSHJUGVitwZX03j+a3Wd1yfLGFHzyfKzqC42wvdTridVh1Z Ab2WQ0z9VcgxHHKxT4hpMg7JYXBxz3wLapLbcm5QV4QdvFtfN9RkrhnTNxquzDs+s3aV6G XTQWHpi3BdFBSDt9in7eZJkWAxijpUObpkZhQwIC/WyjSDWyX2Pro4hCwm0otg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDS9l2fL4zvtn for ; Sun, 15 Feb 2026 13:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43f21 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 13:56:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 13:56:11 +0000 Message-Id: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d Author: Ahmad Khalifa AuthorDate: 2026-02-15 12:23:26 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-15 13:30:06 +0000 stand: compile ia32 EFI loader with -malign-double The UEFI spec says: > Structures are aligned on boundaries equal to the largest internal > datum of the structure and internal data are implicitly padded to > achieve natural alignment. By default, structs containing members of type "long long" have 4 byte alignment on i386. This caused some EFI structures to be subtly wrong. Fix this by compiling the ia32 EFI loader with -malign-double, which bumps the alignment up to 8 if such members are present. MFC after: 3 days --- stand/efi/loader/arch/i386/Makefile.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stand/efi/loader/arch/i386/Makefile.inc b/stand/efi/loader/arch/i386/Makefile.inc index e27b553c6bab..89fcb2a3c093 100644 --- a/stand/efi/loader/arch/i386/Makefile.inc +++ b/stand/efi/loader/arch/i386/Makefile.inc @@ -7,3 +7,5 @@ SRCS+= amd64_tramp.S \ SRCS+= nullconsole.c \ comconsole.c \ spinconsole.c + +CFLAGS+= -malign-double From nobody Sun Feb 15 14:02:32 2026 X-Original-To: dev-commits-src-main@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 4fDSKR3nb9z6RXgx for ; Sun, 15 Feb 2026 14:02:51 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDSKR1vrNz3VSM for ; Sun, 15 Feb 2026 14:02:46 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-43591b55727so2687053f8f.3 for ; Sun, 15 Feb 2026 06:02:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771164165; x=1771768965; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=r2mK9jtLPZXbxcd6kVyQVs9jmqYwoY3TzfsvGmFCef0=; b=gh/mnJqQJexT/F33wegf/rICydbjMmbtHN8psLH2+dS0CHY21odOu3PPF4D56Ibt20 xHdBAURDTNxVjyng26+akluuS0Mv1wIKVTO2R0mlEP6cmBDboV4JpMHlrI6PnaGxNDSD 707RG56SGA90+ZEQ35LoNzZiG+2H50lriYRusX/1EnDDXqnEYSY81be11kdIjDZOaegz 0wT1WYMvr5NqkiiVygmd8El5gc+lpEixlsggO/2eCSmYjFnROBjZGwZulV8FOYOUS/8n LxsrOADjGbVV0/XCSRUzYg2JxXvidVQTSdlnV7eXCvUAydo3reLT8ZGUwiRK94CR2HtU 79SA== X-Forwarded-Encrypted: i=1; AJvYcCX6G3tToaeNgx+teLGmZtEx0M9dxHoOiArlKgrhQ1n4vnDePtctgp9CWkW5WScD+x9sk0/3Ogmh3rCAl6AduBIjfSPTMw==@freebsd.org X-Gm-Message-State: AOJu0YxVqO8L/2uBLYp6M60U/PT4RJOWzeiF8OGAQ0q1WtM9+YjHTSbg yvjpMRLOheQ5fyGBA8Obhqnlh8QKnCM7irZod2tFN4DFfrBbMf/z/t1eQA6F+2ozVBI= X-Gm-Gg: AZuq6aKti3cPxU2PY73aDQTUtnA6kVpT3ytkrBerLbFhiBpVRnMvWZLLU9WkJmRv+oA 9glWOJlPkba6GkmHSy4ufsX/a8HNrfZMDdIOOU9sY/Td8ozUn2W3hmZ1rxx2jpI3Qg52fUI/AGE MzvVWQpXwZii1yNO0EtogJ6WpFS42/DZN8VX2RppdD4qRgZnIaUq2+RZMRcM5eNopGQaxMGV93a DeJfIuZ2pSFCkGafz4DKyqc0O2J1LuccqCrNmZ/2O7rgb5kcp3na1ujHJl4nMWTsDmLTLQrcNDL +PULIU4pcyKwyqizOUWcwZrEAMoYTRXW3BiYXnLpXMiQR6+61eA0OdeUhFdr5Vd/y895Jfwrry6 gg+exKzMVlfXOo1S7aoB9tsPR7jkiuUmW3IBiB3ThTSu9hGXvQSPj9cN8rEltH6vD9+VFjyx8jN YpF3gyEHqgiOD5UpUFFYvVd4LIXbin8OvhWLBVRJ4IWpMvqAd/bisISnhYrCxMrDibYA== X-Received: by 2002:a05:6000:420e:b0:437:7168:af4d with SMTP id ffacd0b85a97d-4379db93a8cmr11465764f8f.38.1771164164383; Sun, 15 Feb 2026 06:02:44 -0800 (PST) Received: from smtpclient.apple (nat-184-7.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796acffcesm18010907f8f.37.2026.02.15.06.02.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Feb 2026 06:02:43 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3864.300.41.1.7\)) Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double From: Jessica Clarke In-Reply-To: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> Date: Sun, 15 Feb 2026 14:02:32 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> To: Ahmad Khalifa X-Mailer: Apple Mail (2.3864.300.41.1.7) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4fDSKR1vrNz3VSM X-Spamd-Bar: ---- On 15 Feb 2026, at 13:56, Ahmad Khalifa wrote: >=20 > The branch main has been updated by vexeduxr: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Da60e7e6ff0ec1fdd66c2568ac6c03b84= 3dbb3c9d >=20 > commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d > Author: Ahmad Khalifa > AuthorDate: 2026-02-15 12:23:26 +0000 > Commit: Ahmad Khalifa > CommitDate: 2026-02-15 13:30:06 +0000 >=20 > stand: compile ia32 EFI loader with -malign-double >=20 > The UEFI spec says: >> Structures are aligned on boundaries equal to the largest internal >> datum of the structure and internal data are implicitly padded to >> achieve natural alignment. >=20 > By default, structs containing members of type "long long" have 4 = byte > alignment on i386. This caused some EFI structures to be subtly = wrong. >=20 > Fix this by compiling the ia32 EFI loader with -malign-double, = which > bumps the alignment up to 8 if such members are present. This seems like a dangerously big hammer. Are there any types shared with libsa or the kernel itself that would change layout? (I suppose for the latter they already need to be aligned as the kernel is 64-bit?) Annotating just the EFI types would seem more appropriate, like how we annotate function pointers to use the Microsoft calling convention. Jessica > MFC after: 3 days > --- > stand/efi/loader/arch/i386/Makefile.inc | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/stand/efi/loader/arch/i386/Makefile.inc = b/stand/efi/loader/arch/i386/Makefile.inc > index e27b553c6bab..89fcb2a3c093 100644 > --- a/stand/efi/loader/arch/i386/Makefile.inc > +++ b/stand/efi/loader/arch/i386/Makefile.inc > @@ -7,3 +7,5 @@ SRCS+=3D amd64_tramp.S \ > SRCS+=3D nullconsole.c \ > comconsole.c \ > spinconsole.c > + > +CFLAGS+=3D -malign-double >=20 From nobody Sun Feb 15 14:27:42 2026 X-Original-To: dev-commits-src-main@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 4fDSt91Vjwz6RZXK for ; Sun, 15 Feb 2026 14:27:45 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Received: from mail-yx1-xb133.google.com (mail-yx1-xb133.google.com [IPv6:2607:f8b0:4864:20::b133]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDSt86fNQz3Xvv for ; Sun, 15 Feb 2026 14:27:44 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yx1-xb133.google.com with SMTP id 956f58d0204a3-64aea64bf15so2154230d50.2 for ; Sun, 15 Feb 2026 06:27:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771165663; cv=none; d=google.com; s=arc-20240605; b=Du56KWFEgm7a1rGGXfAkXKM3XISfhvnHdg3WeIkJhcffQ8LIgJ/5C+FyGGUtAANgnX qngbl5nvSb3AA2ThhE59gtxNVqpUhM7IsLPPkZsF0j78M8DZrRMsdvKCcOGM/ZD4CQY+ yMWguxHJtAhg7wKdJ+YIgW+DBkPyPexa30UgQ8ZRpkFRlQ1utzd7vQjcrV4+wqsHkKe6 YNp1ILMiNwP44DO3+R97Kr+QzKNiVI6IewUV/3uOuk5wuQRXctf6wR2jQ6IajIoYBjjW r7wM25sLYAaZXT93C8d+NoDpOTdkgdpA/jRcW16xEE8UD67m8ZPWmMpijHgOummOaOz0 nPIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:dkim-signature; bh=g+gPeCSRYBAzeJPeyzMHrrbnF29LoImHvjGODHflglo=; fh=Y+2AfcGHWnlTUP/TXNsfSJ4liRnTVfwEUi2A1LNt9QE=; b=Us03bE6cNzFS8Jm8S8K7dOcwU015QxApkMHUHMwq/+hBcTVTkfIm1KJuuPqv7zJCli ehXfclQi1YldMomgbICVBQAouuaxXveTyXg4wDxnqx8KHMQZd4rH+IfRin5+sRmrkjjm W0F/ABEz6E8wyWEw1y97mASyRp0836jWbsSDpY2GJsDoCJcGV0C+HZGjMBst95N8sTXs GI/vsbCArvnKIpNJQsYfmFA+51HmpIFJ+FQsLKL4K+VMd8MTpixx/CxjIJ8F3OF9G/bb lRub0yjHAK33mXW+2oJtWlt3i9649Sj4r3BxD41GYlpfwc42Ps0TMbpwc+g2jxvrMHnd J9Vg==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771165663; x=1771770463; darn=freebsd.org; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=g+gPeCSRYBAzeJPeyzMHrrbnF29LoImHvjGODHflglo=; b=ZX1v29BHSvTUbtYJCwK9gBuBTIw12w6xSgiuz3qVtT8lpdEzvpKJnv3L5w4Aq1sqEu pQqCcMyZQMaY/vsF7zwkYZWfVvffmeovlbznSBVD9l/xofeUjg7oOZGyp8HbeJgdfIET H8Kc41FMlyY5qvLkooF3G5e1xiCBR2p1+xgTbkA9RtIHzYTRzyB4sLvT5xAZU777LVau 78F4fCFk/iMC7ElVpOklx0zNNN1Htg99HA+D40b9CZ77JrZyABew/EKSbjkRVLq+It3n pwWY19DatMTS7Ps3VJGvx60vRhfaFut3UcxGUUDFEflFjE/H7NFb0HaAvem4nOtyUupV WSUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771165663; x=1771770463; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=g+gPeCSRYBAzeJPeyzMHrrbnF29LoImHvjGODHflglo=; b=w1ou4JvUD0HHrjbXtS663b5syEvGIfMdR41epbBqCEgOXz8TcXuJk/sJHmqz/pnpdr w1ewEkV7SUU4kQUiHMhIdz7GCJlhp9YDdu+iC7wHrzyZRGBG+98wGMgmNb4F/IapSv9Q CIaCYzsVBQzCcsmVC9nk/apmIbtdeJ0FkL3Eh6gJ97BsDA98DbS4+6riAz9igsVqCN8u FjhSoMPs+tWMjKA2dWRwtwMG3wDGQlsGJCN4mAGQNJ/fYkpTytu9sbJLh3XstaoLKsRY ffcbUcHqq7/3/Fc+ZJHyzB0Sylq8fXMRsmdRcr7RCpmIN0VIJiOLxoayC3by7AE6Vo83 fppw== X-Forwarded-Encrypted: i=1; AJvYcCXs+OTWKMcv7JIdV2XYOwj1Fssc640j7R7fKAFf3MnwMdo7Ua/z1qE9HfR1Dd2HpTYnEtt9nQZ0Qo7sB8qK2mwkwEfuzg==@freebsd.org X-Gm-Message-State: AOJu0YxlWv6PhjHVCS2vHmQ3gUEC69UndzjvR6a8asalayAFdwxnXz3r YvYZx8wYN/GJAZXOTHcYlZFGDNW5zYZ0hiIWV609/9M4ghHmaejyLF0+sc8QH195nvk3obkQVpt 1a17pwPDjrJnd0YVfJ292sJxbftuNNUk= X-Gm-Gg: AZuq6aJYQtcpjkqElwsf6mEjYcLC19EsBzBP19EJ4eZo7wHBvKBCvtnXNBCzurqdQ6F uSnabTsp0saWODvSq46WxItKsjcU6PkAWoagUP3o1hXIh6xR8/j+m+ADEoXXc+DBfPE9X3NxeY4 /uuV+MKwdKsWq1VYdSKXPG6WVa6doQrl8+d7Z9YOwASOLeJ4NBJtVKNnKkh73xc7xaYelKxk2j0 pQlofitzRsYLNGxvp06A+iYWfug3ulaBuWiDsslvWWs0+yENujXwVtzsAGf5C4cCozBS2Yc4Um4 K/T2UOCL X-Received: by 2002:a05:690c:9d:b0:796:4ab9:f29b with SMTP id 00721157ae682-797a0cacb4bmr129923987b3.39.1771165662816; Sun, 15 Feb 2026 06:27:42 -0800 (PST) Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Sun, 15 Feb 2026 06:27:42 -0800 Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Sun, 15 Feb 2026 06:27:42 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 From: Ahmad Khalifa X-Mailer: aerc 0.21.0 References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> In-Reply-To: <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> Date: Sun, 15 Feb 2026 06:27:42 -0800 X-Gm-Features: AaiRm50A6Evfo-lFB3jAxw2q0xfEaHUttqrmUp6zoCVxp-8IkPWQTRqXh6pdDAE Message-ID: Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4fDSt86fNQz3Xvv X-Spamd-Bar: ---- On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: > On 15 Feb 2026, at 13:56, Ahmad Khalifa wrote: >> >> The branch main has been updated by vexeduxr: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d >> >> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d >> Author: Ahmad Khalifa >> AuthorDate: 2026-02-15 12:23:26 +0000 >> Commit: Ahmad Khalifa >> CommitDate: 2026-02-15 13:30:06 +0000 >> >> stand: compile ia32 EFI loader with -malign-double >> >> The UEFI spec says: >>> Structures are aligned on boundaries equal to the largest internal >>> datum of the structure and internal data are implicitly padded to >>> achieve natural alignment. >> >> By default, structs containing members of type "long long" have 4 byte >> alignment on i386. This caused some EFI structures to be subtly wrong. >> >> Fix this by compiling the ia32 EFI loader with -malign-double, which >> bumps the alignment up to 8 if such members are present. > > This seems like a dangerously big hammer. Are there any types shared > with libsa or the kernel itself that would change layout? (I suppose > for the latter they already need to be aligned as the kernel is 64-bit?) For the kernel, any shared types would have already needed to be aligned, yes. I didn't consider shared types with either libsa or libefi though, I'll look into it now. Nice catch. > > Annotating just the EFI types would seem more appropriate, like how we > annotate function pointers to use the Microsoft calling convention. They're all under contrib unfortunately. Not sure if we want to introduce that big of a diff with upstream. > > Jessica From nobody Sun Feb 15 15:56:21 2026 X-Original-To: dev-commits-src-main@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 4fDVrV1fynz6RmNF for ; Sun, 15 Feb 2026 15:56:26 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Received: from mail-yw1-x1135.google.com (mail-yw1-x1135.google.com [IPv6:2607:f8b0:4864:20::1135]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDVrT0wzGz3hJl for ; Sun, 15 Feb 2026 15:56:25 +0000 (UTC) (envelope-from ahmadkhalifa570@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=F5v5jFEh; dmarc=pass (policy=none) header.from=gmail.com; arc=pass ("google.com:s=arc-20240605:i=1"); spf=pass (mx1.freebsd.org: domain of ahmadkhalifa570@gmail.com designates 2607:f8b0:4864:20::1135 as permitted sender) smtp.mailfrom=ahmadkhalifa570@gmail.com Received: by mail-yw1-x1135.google.com with SMTP id 00721157ae682-7945838691aso57120637b3.0 for ; Sun, 15 Feb 2026 07:56:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771170982; cv=none; d=google.com; s=arc-20240605; b=bfa7XBmPg5XmQ+OB9Aui1ntzcqmGYPQqD1tf6W7QneDt3r1LynMQhIspHZgBFzvpSp zHw0jEItEq6SeAiLnCFhe+5Xfpl35dyA73s+nE0ZvXTxRxFDuXDRsDj+MeVEamOOiDcr ozcs1ABTbyBJKUtAY8wOAn/OUvQvhzCkqjx6SWSmeW0PkpPPLSHVseRPMVcWyd9X21ZZ XF6sxwKJQp72fKHnHeoNtJvXwIo8yo7NyUPsUnkIgP0e7ssnEsa1uU8na6tSO+h/WY7H /uMD3uQ9O2xpyLb7XvsVN0LmYQKDKUD1TN2aAhCMybbQiGLkb+84YvrK14GdXWnIfpPW K/HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:dkim-signature; bh=/99BRy876RnYDsqpxycBa1uqovz6g0buIhN09MjZebw=; fh=wY0QAskNAXMeRRln6kAOXFcrL8DnmCfc1sZ04xEecvg=; b=R3sQNroAKOqpUVVZuWGZ5lXMPYJIrx0O0NBAgr4vziRzxV2jZFiYlR+d/pvW0wMYa2 a3PwwnBBQMmgkoTNf0yUAAyF0uK0OvteoDDSLLg6O7n9/iSi2xqDS87bxaZAWoEFmrgp na/GmZZextDtf6PzkbrDPcNqICh65encPCcim73nSS3EpQRlmWIgV2WBD9UTEg0rhQ9i p4Nes8L7+EaD2GaO5MuDYfF3eNGttjQbGeisw5juSZEGqk6WwWXTGzFj13a9Qq210gm6 2L52vOcpCq0Fd+0XeYmHcjKhn1GV6vKGUJl1CattDdIJaUGOrTIyzMTpcv3bL7S3uHsF x0Wg==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771170982; x=1771775782; darn=freebsd.org; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=/99BRy876RnYDsqpxycBa1uqovz6g0buIhN09MjZebw=; b=F5v5jFEhoiyRNC24mWRjkNVe7vwFygB7AHhUwM6PGMRSio55Bz2Rpyx/N1L1HdTwvP xnp0KD57ew+iukkmwy2GArarl+LAeeM7x5inQ7L0/wA1DXmOEdfvUf+WWdIchdMRLGoi 5tAxWyZ7t+e09KEwr4LSEuEp6077OC8zrca2l9ZiXuO/6DTgBkD3pWdbFI1g8iN+Nq7L t5U5KsfJWVzu2DtonJrImWoVAGljuxd38oM3MdF8Qo1Kd7YaBAPnK2MPepiZ8Jf8BZuM /VCRt7WYfC9DTjJEuK6wByExVAu8h+eSbfwbhYfoxIujhvV4q2OyUhJ8cznQYjm2+c57 gM4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771170982; x=1771775782; h=cc:to:subject:message-id:date:in-reply-to:references:from :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/99BRy876RnYDsqpxycBa1uqovz6g0buIhN09MjZebw=; b=oRowaEKj9EC56v+duXeO1tDgx5ac4AudQa1ugMeUZJiShCAYvEAwc+k2l/5Eftmk3v cAZrLBJ2hPM5r2ScX0arOlioigh8KpfItHhDMgOsA0Hocqhbb4eDDbSBMXc7uUQsg9I8 MKyin+uboVGBX1pfb330uyinJ0BDbdjNQgcwowrxBi7zvhwNBTvIwO26jwslZpwIZwXs qBYylKArSMb0moeCjBXLkzh2wmiZqpaAbkF0QEoar7+Om/6GE0Cznmhb2uJtHTGapbxb huCqbTgy0woAnWmAAfZ9jrl5C90jgFR5MgFPkoPccvTQkwiyYhly4H3hRYqstCaWAeAE b/ow== X-Forwarded-Encrypted: i=1; AJvYcCXk9iZaU6+doeTglcIhM0G7brP5JSWPX7u7Gv+ThdEQQ5Xh09LuqDAxRefX8npH/TqauaQlSnRMmblE6Fm2AMpD0cENJQ==@freebsd.org X-Gm-Message-State: AOJu0YzedYunKW1ksvs7hfD2sEASzLsZfFj0oyzyNGIc8PbIlbNrnKdW jH+oNc08Boib2an7fPEOlz4XvMQY/M5j6lNqB68+Whj2JrYqxLXW4uSeifI8RhFESEYZLeLCJtV RYWjFih0951rPeojKL/UTFcinOUQVm8Y= X-Gm-Gg: AZuq6aLzF29C+gmNpVYOuKdqirBHuJnoKl7Uipukr2WCOtyj/k0pYQRDMqjjDz2h41x HWoqrnulefyVCvAqICtPFZ/pShxyL0Wi6IaMoJwK4C6iyrzhaGC1PHbnbANfo8FJuRMNcSesBKr JYw5K2u/MTs5r+rUTNORNKyrDcr0S36Zh7YTmdp1dhK8OptzyVHqvQVG4Uf4oFaXneDf2HqfXd7 velIN7vCGzOeSUAhURzcsmMAfecN2pQb59/1OBgRHhVGaTdNbT+MWNh4yelh8iVieRoak6DqulO WPXDW097 X-Received: by 2002:a05:690e:134c:b0:644:7b19:c207 with SMTP id 956f58d0204a3-64c202ba6ccmr4549512d50.38.1771170981852; Sun, 15 Feb 2026 07:56:21 -0800 (PST) Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Sun, 15 Feb 2026 07:56:21 -0800 Received: from 490177373942 named unknown by gmailapi.google.com with HTTPREST; Sun, 15 Feb 2026 07:56:21 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 From: Ahmad Khalifa X-Mailer: aerc 0.21.0 References: <6991d07b.43f21.696cde4f@gitrepo.freebsd.org> <0B6A645E-D9E4-4337-B280-7E3CBA1FDC1B@freebsd.org> In-Reply-To: Date: Sun, 15 Feb 2026 07:56:21 -0800 X-Gm-Features: AaiRm53gWqqunYsX5ZPIGrM0_U1nrD5kRboJDntsJCJD_F7nPTjqVdI7zm61ym4 Message-ID: Subject: Re: git: a60e7e6ff0ec - main - stand: compile ia32 EFI loader with -malign-double To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-4.47 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; ARC_ALLOW(-1.00)[google.com:s=arc-20240605:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.974]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1135:from]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4fDVrT0wzGz3hJl X-Spamd-Bar: ---- On Sun Feb 15, 2026 at 4:27 PM +0200, Ahmad Khalifa wrote: > On Sun Feb 15, 2026 at 4:02 PM +0200, Jessica Clarke wrote: >> On 15 Feb 2026, at 13:56, Ahmad Khalifa wrote: >>> >>> The branch main has been updated by vexeduxr: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d >>> >>> commit a60e7e6ff0ec1fdd66c2568ac6c03b843dbb3c9d >>> Author: Ahmad Khalifa >>> AuthorDate: 2026-02-15 12:23:26 +0000 >>> Commit: Ahmad Khalifa >>> CommitDate: 2026-02-15 13:30:06 +0000 >>> >>> stand: compile ia32 EFI loader with -malign-double >>> >>> The UEFI spec says: >>>> Structures are aligned on boundaries equal to the largest internal >>>> datum of the structure and internal data are implicitly padded to >>>> achieve natural alignment. >>> >>> By default, structs containing members of type "long long" have 4 byte >>> alignment on i386. This caused some EFI structures to be subtly wrong. >>> >>> Fix this by compiling the ia32 EFI loader with -malign-double, which >>> bumps the alignment up to 8 if such members are present. >> >> This seems like a dangerously big hammer. Are there any types shared >> with libsa or the kernel itself that would change layout? (I suppose >> for the latter they already need to be aligned as the kernel is 64-bit?) > > For the kernel, any shared types would have already needed to be > aligned, yes. I didn't consider shared types with either libsa or libefi > though, I'll look into it now. Nice catch. > Okay, so libsa, libefi, liblua and ficl all share types with the loader. Quite obvious in hindsight... I'll back this out until I come up with something better. >> >> Annotating just the EFI types would seem more appropriate, like how we >> annotate function pointers to use the Microsoft calling convention. > > They're all under contrib unfortunately. Not sure if we want to > introduce that big of a diff with upstream. > >> >> Jessica From nobody Sun Feb 15 16:05:41 2026 X-Original-To: dev-commits-src-main@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 4fDW3931q5z6RnpR for ; Sun, 15 Feb 2026 16:05:41 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDW390rtRz3jlX for ; Sun, 15 Feb 2026 16:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771171541; 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=WmjvoNLmjo+lsBqvpS1MZm0TwgP8b4/hlRRSs7oHLrU=; b=gu1UsMdpgItQu+QxACp1lDs1DbwryzUuctYk0o8pflvHFYnIUI+eAwTYNZ4xUKgZpp2guP 7Bzw6Gy+CvR7SxWF/dWPBzceC7rpqMbcewPjlAmEgWHrAXyHurBLUE4WYQO0tEwzxHi/7U HF4ck0iZDxAOLMbbGYcACPu55kKMu+2gSLsPc63Er8fubudN0jsg7m3zE7B++lOYJQWmUV fqysghv9kFrEW7ev70ugfF2cDbaghJ4bbiQisU07T29Q2iFq8QesUhv6CC0FQsGjukDoGj bqP0Hnsm6DV7LQrDk5MEFqpM3E50aecwZJPTWf3bdqFMZSlgVvkp5EP6pqCOnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771171541; a=rsa-sha256; cv=none; b=cmtZwG10L0nvxYnYLxyaBCcW+D2XVYF6hOvfI9AOzMVlo4ZcTlz55qw5bLIma6mSrIqjx9 YQA9p+RKhpQza9XYuHGbiATXube7VjCqTntOPr5M4X8qonA4ATZV8hIo+BZO9CcVx9C+A3 vIuT3KStdAOJ29N4db3mUY9tp5CAXKl8lrx7HvX9XTO0x258JMcV6mr2PcLbMlfVpCm+fm zYxkLsFWvRQz1HSdL/0+TEWdag88sWsRSxdv1rBDk+zAXCccXHQ+qnVEOmtTDKbR+kbrZ9 WJRcn3e0HPDU8gbKinC5/0w+gLqXQ1YMDSxjYoH32mfWdTzyM1DNtKDmrSYwEg== 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=1771171541; 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=WmjvoNLmjo+lsBqvpS1MZm0TwgP8b4/hlRRSs7oHLrU=; b=A/HRnMTc/5U0A5+mjiB3p9sSIjVEz6dqno/0rZLyiJuwC9YTiOkefc/hX4WL/lojN9Vq/p 4z5Y624lg016LdT2bsXa5A47kh7glLm0UiZf+FmBzxFTJbdnIOJT63cW+lZpBMEtUy60Pr M5JdsXfvGoZ6it02cYmi7H0jyp7LwI3DBZ7kUYtYSSxAOwiPM8J7Cm/lQ8CSRCOul9yZVo ByBPc82qekBYI3wgtrYbBaTIA6nEgPjoLjd8PJOAf3401NWFG9iIRbXZAnrkT9fj2YBtfj CHpgIftJUUj2/utKJXbuBWwqQO8+DyWU8bZvz9Mz2GZuwfHWbV1ffdTWNrBNRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDW390S6bz10d6 for ; Sun, 15 Feb 2026 16:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22997 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 16:05:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: a404c2315b0a - main - Revert "stand: compile ia32 EFI loader with -malign-double" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a404c2315b0a22d46faf193a556f186e97bddab2 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 16:05:41 +0000 Message-Id: <6991eed5.22997.355bcc58@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=a404c2315b0a22d46faf193a556f186e97bddab2 commit a404c2315b0a22d46faf193a556f186e97bddab2 Author: Ahmad Khalifa AuthorDate: 2026-02-15 15:57:22 +0000 Commit: Ahmad Khalifa CommitDate: 2026-02-15 16:02:59 +0000 Revert "stand: compile ia32 EFI loader with -malign-double" The loader shares types with various libraries that don't compile with this flag. Revert for now. Reported by: jrtc27 --- stand/efi/loader/arch/i386/Makefile.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/efi/loader/arch/i386/Makefile.inc b/stand/efi/loader/arch/i386/Makefile.inc index 89fcb2a3c093..e27b553c6bab 100644 --- a/stand/efi/loader/arch/i386/Makefile.inc +++ b/stand/efi/loader/arch/i386/Makefile.inc @@ -7,5 +7,3 @@ SRCS+= amd64_tramp.S \ SRCS+= nullconsole.c \ comconsole.c \ spinconsole.c - -CFLAGS+= -malign-double From nobody Sun Feb 15 18:01:41 2026 X-Original-To: dev-commits-src-main@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 4fDYd20gLdz6S0lk for ; Sun, 15 Feb 2026 18:01: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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDYd16kxxz3t26 for ; Sun, 15 Feb 2026 18:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771178502; h=from:from: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; bh=7IobuN25zvkRmlpYo5QR7/yM3J5612t9qYA+SWPVl/0=; b=YRS7spxgjXjRjGuZdbzHPOM/bGbF6bZ7uBQ238xfU5FaKKj2uMIyS9hy3Txkdvbjdr8apg xtIh7zpcUx7vN1N8OhwdOS6Y0vfBkxVj2DRRRxwTU1179HMB+hOXNn5F2L9Ichix65YS5w W7x9vcMfP5trYk7DD0wj1S6dnq+capNTE7kGbm11/J2kWHQyfAaReKoE835vkeIT/xhPWV ODcHKkuMw0cgJwanBb0RLs5MMfiTWreZTgrAsj85jjRpPjzuRl7zMhdGU4OQK4hvmX2Uo/ 8Sh9BPKZaD7W8M5Ogw0udo8F+y4lWN9XrPad7NcWlM/NTPiv2tqL/HWYEF9J1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771178502; a=rsa-sha256; cv=none; b=voMjTY6DRpiUe3uuP0d3aA/Xmg5bOMJQKbxQrfLylKIVo1zGK0XRDjUUOAfCf57eWiKYLz LdJ9HC0Cr2xwn0oDI188iZwj+WNYYmUUt1HGQJN7I+kdBE/usE7pgRplMq9F0U4pGUe4f4 Xa3n8mCG4UlfiP595nrEdCGOJy4cwYiXYAJIJU0CHDHoAnK59H5DKfZMlxRGmpoNGSsoPm GbiXMtm7auDqL9C0nSWyY1GFoV/eGXpx4B7stNxckxajrPT+7SajNoTyhg7HTXLG7X9OhJ rM895V4Gog2fwXqHh3p1QP45/jcGXmDpdlj4mgcLYKpQOJs4+AbJGk23vJATFA== 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=1771178502; h=from:from: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; bh=7IobuN25zvkRmlpYo5QR7/yM3J5612t9qYA+SWPVl/0=; b=jRhQNSfJJzE1M1OrfG7CsO406wGnzbg2qjTfCcUIji8eMyJ8Te+s5sIqUT5J5YF49fd044 0mAiqo8d2XaEalMFDvM39mjpPx7TkqzILg1hmlJlkoph18nlB0e2B8vVhD5OYtN40wYBIf IEfmOUs3e9pkTmRNC5aI8r/WIWqyehM3OOqWOI6O2oAdBRCnl89MIYjQ40S6DqiCnQlVMz PRLUgyHz6vakSxnw31fiqUmBSJKUQSPWp5aHMItSrlYJ89ZV8K0y1tWoFSwaNcQ4NcbC/N OyaKXBb94Agfmv90HOlouURYFYiaLvIzYevvU2onFY0VKAvIjmnf71MSqBIQRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDYd167lFz143M for ; Sun, 15 Feb 2026 18:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 363ba by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 18:01:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Rick Parrish From: Alexander Ziaee Subject: git: caf23c8e0b79 - main - libusb20: Add dev_open + be_device_foreach manuals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caf23c8e0b7981dd022c52feaf6edfef232f7e27 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 18:01:41 +0000 Message-Id: <69920a05.363ba.36f95e1@gitrepo.freebsd.org> The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=caf23c8e0b7981dd022c52feaf6edfef232f7e27 commit caf23c8e0b7981dd022c52feaf6edfef232f7e27 Author: Rick Parrish AuthorDate: 2026-02-15 17:45:21 +0000 Commit: Alexander Ziaee CommitDate: 2026-02-15 18:00:28 +0000 libusb20: Add dev_open + be_device_foreach manuals Manual pages for libusb20_open(3) and libusb20_be_device_foreach(3). PR: 291675 MFC after: 3 days Reviewed by: adrian (usb), ziaee (manpages) Differential Revision: https://reviews.freebsd.org/D54231 --- lib/libusb/Makefile | 6 +-- lib/libusb/libusb20_be_device_foreach.3 | 56 ++++++++++++++++++++++++++ lib/libusb/libusb20_dev_open.3 | 69 +++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 4 deletions(-) diff --git a/lib/libusb/Makefile b/lib/libusb/Makefile index 4a0c392f0d8f..b3ef5a061584 100644 --- a/lib/libusb/Makefile +++ b/lib/libusb/Makefile @@ -1,5 +1,4 @@ # -# # Makefile for the FreeBSD specific LibUSB 2.0 # @@ -11,7 +10,8 @@ SRCS+= libusb20_desc.c SRCS+= libusb20_ugen20.c INCS+= libusb20.h INCS+= libusb20_desc.h -MAN= libusb.3 libusb20.3 +MAN= libusb.3 libusb20.3 libusb20_be_device_foreach.3 \ + libusb20_dev_open.3 MKLINT= no NOGCCERROR= PTHREAD_LIBS?= -lpthread @@ -229,7 +229,6 @@ MLINKS += libusb20.3 libusb20_dev_set_config_index.3 MLINKS += libusb20.3 libusb20_dev_get_debug.3 MLINKS += libusb20.3 libusb20_dev_get_fd.3 MLINKS += libusb20.3 libusb20_dev_kernel_driver_active.3 -MLINKS += libusb20.3 libusb20_dev_open.3 MLINKS += libusb20.3 libusb20_dev_process.3 MLINKS += libusb20.3 libusb20_dev_request_sync.3 MLINKS += libusb20.3 libusb20_dev_req_string_sync.3 @@ -261,7 +260,6 @@ MLINKS += libusb20.3 libusb20_be_get_quirk_name.3 MLINKS += libusb20.3 libusb20_be_add_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_remove_dev_quirk.3 MLINKS += libusb20.3 libusb20_be_alloc_default.3 -MLINKS += libusb20.3 libusb20_be_device_foreach.3 MLINKS += libusb20.3 libusb20_be_dequeue_device.3 MLINKS += libusb20.3 libusb20_be_enqueue_device.3 MLINKS += libusb20.3 libusb20_be_free.3 diff --git a/lib/libusb/libusb20_be_device_foreach.3 b/lib/libusb/libusb20_be_device_foreach.3 new file mode 100644 index 000000000000..bc741813ddb0 --- /dev/null +++ b/lib/libusb/libusb20_be_device_foreach.3 @@ -0,0 +1,56 @@ +.\" +.\" Copyright (c) 2025 Rick Parrish +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd December 14, 2025 +.Dt LIBUSB20 3 +.Os +.Sh NAME +.Nm libusb20_be_device_foreach +.Nd iterate connected USB devices +.Sh SYNOPSIS +.Lb libusb +.In libusb20.h +.Ft struct libusb20_device * +.Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev" +.Sh DESCRIPTION +The +.Nm +function iterates connected USB devices, one device at a time. +A backend pointer for +.Fa pbe +may be obtained by calling +.Xr libusb20_be_alloc_default 3 . +The starting value of +.Fa pdev +is NULL. +Calling +.Nm libusb20_be_device_foreach +again with +.Fa pdev +set to the return value of the previous call yields the next device. +To begin interacting with a USB device, pass the pointer in a call to +.Xr libusb20_dev_open 3 . +.Sh RETURN VALUES +.Nm +returns NULL for end of list. +Otherwise this is a pointer to the next device. +.Sh EXAMPLES +.Bd -literal + #include + struct libusb20_backend *be = libusb20_be_alloc_default(); + struct libusb20_device *device = NULL; + while ( (device = libusb20_be_device_foreach(be, device)) != NULL ) { + if (libusb20_dev_open(device, 0) == LIBUSB20_SUCCESS) { + /* do something */ + libusb20_dev_close(device); + } + } + libusb20_be_free(be); +.Ed +.Sh SEE ALSO +.Xr libusb20 3 , +.Xr libusb20_be_alloc_default 3 , +.Xr libusb20_be_free 3 , +.Xr libusb20_dev_open 3 diff --git a/lib/libusb/libusb20_dev_open.3 b/lib/libusb/libusb20_dev_open.3 new file mode 100644 index 000000000000..fa5d1746ff23 --- /dev/null +++ b/lib/libusb/libusb20_dev_open.3 @@ -0,0 +1,69 @@ +.\" +.\" Copyright (c) 2025 Rick Parrish +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd December 14, 2025 +.Dt LIBUSB20 3 +.Os +.Sh NAME +.Nm libusb20_dev_open +.Nd open a USB device to retrieve descriptors and initiate transfers +.Sh SYNOPSIS +.Lb libusb +.In libusb20.h +.Ft int +.Fn libusb20_dev_open "struct libusb20_device *pdev" "uin16_t transfer_max" +.Sh DESCRIPTION +The +.Nm +function opens a USB device to retrieve descriptors and initiate transfers. +.Nm +accepts a pointer as +.Fa pdev +to a libusb20_device obtained from +.Nm libusb20_be_device_foreach . +A zero for +.Fa transfer_max +limits the device to only control transfers. +Call +.Xr libusb20_dev_close 3 +to free resources taken by the open device handle. +.Sh RETURN VALUES +.Nm +returns one of the following to report success or failure: +.Pp +.Bl -tag -width "LIBUSB20_ERROR_NO_DEVICE," -compact +.It Er LIBUSB20_SUCCESS , +The operation succeeds. +.It Er LIBUSB20_ERROR_BUSY , +The device is in use elsewhere. +.It Er LIBUSB20_ERROR_ACCESS , +A permissions issue. +.It Er LIBUSB20_ERROR_NO_DEVICE , +The device detached. +.It Er LIBUSB20_ERROR_NO_MEM +The library couldn't allocate memory. +.El +.Pp +Errors not listed here may be found in +.Xr libusb20 3 +and +.In libusb20.h . +.Sh EXAMPLES +.Bd -literal + #include + struct libusb20_backend *be = libusb20_be_alloc_default(); + struct libusb20_device *device = NULL; + while ( (device = libusb20_be_device_foreach(be, device)) != NULL ) { + if (libusb20_dev_open(device, 0) == LIBUSB20_SUCCESS) { + /* do something */ + libusb20_dev_close(device); + } + } + libusb20_be_free(be); +.Ed +.Sh SEE ALSO +.Xr libusb20 3 , +.Xr libusb20_be_device_foreach 3 , +.Xr libusb20_dev_close 3 From nobody Sun Feb 15 18:38:54 2026 X-Original-To: dev-commits-src-main@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 4fDZRz4FFjz6S3jk for ; Sun, 15 Feb 2026 18:38:55 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDZRz0wfgz3wtk for ; Sun, 15 Feb 2026 18:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771180735; 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=sMbRI2344GeoE6HeYa7DxUmqNDx2K+PobhcFqVcFmCc=; b=OjG9NvmWUwzk4OSohBETVM2m2bhfK0/mWpXlM8nNFsDsdVgEMHEF2NcS4vZFnDHqgtDxCM JCC147PEWu3sJMaNcoPwwqnNLZm+RqkFJL7b1b10ar/ECvVRwV1uJ11+T6pq8PUWlgMUM+ W9dxgOF+I03u5JuwvkxYU9R+O1AODuQbgdfXGey/TITl4DuMvJ+rODXryz9GfTbZMxRUuw ALr/BrcpXrIq4ZnzjdC1/mOGBzN+sUWC0FtSZIu/CLRcScg+TjhZK6zMbHvR8i9jip+EXG MBgYk4aP9uDCw1WjCj2O4utE1AYGMhMqhrb6/BbjJyqWFLuwwAylrItG1K9Axg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771180735; a=rsa-sha256; cv=none; b=cjV8GIs7+1KQGirtzQgZLm1GCFeOIZpxwfCGD+r21UKO0JavC7/fuKTXAIQxRUz/0yLUtv soQMW0oUlVr7rZHUbsrUGzKFcWMSJBlMioOB1bN/x4SzvslfiLGlEg53Z4sTAjups9QEqr eC0WtwaV4ZE85v6SsPRjs4AREo5I8hr9Vzr3QROWtd4cuNbqsgEJwLOdcqD3jay6ptCwcu oPCf2ly6a5Hqv7+DjG0MRuC9Y+UeEMJLdV4jnbsxOZ4ve9ZiAdDPA/186VLWVnchh5eiq2 kmgKk+hYk9igdaisty+TbbNOY5nZT3AyZznApmxTKWiKsstYrZFHy83PhiqL+Q== 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=1771180735; 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=sMbRI2344GeoE6HeYa7DxUmqNDx2K+PobhcFqVcFmCc=; b=IG23FXABKawoDX5dFC4IkAiMh9PA+yVVB4uCIdUKQZ2c++mp5twLOZkscKoaAdLpPXVc+D rOJUCs/2Vsfj/8oI7ZjFZe7kyZwWeeVk4njgTEIeupvogYEqIKuK+hyoO1NzTITP9Fauqr ZW2u5RM69qZY5zCz0ruWfPF3WRicsxinFirERTbF0fxPhrcADnSAulepeRs4VpRFcjoD/k nPGIsuRMwLfOvnEFbWlgyUIgCWI8GTI3LFtWSyYvTfptLrRM3ZCtmthK7aXyOlxPGqJX41 LOZuaL9QIpyLXQipx1ZwUja1SgvJ1oJb/ODaMWbkkVVb6JsAnex9A+DfzuOMOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDZRy6nZMz14rJ for ; Sun, 15 Feb 2026 18:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38373 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 18:38:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 411a566d5652 - main - t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 411a566d565277e47c9644d19a5efa0fe5b00179 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 18:38:54 +0000 Message-Id: <699212be.38373.36f73286@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=411a566d565277e47c9644d19a5efa0fe5b00179 commit 411a566d565277e47c9644d19a5efa0fe5b00179 Author: Enji Cooper AuthorDate: 2026-02-15 18:26:52 +0000 Commit: Enji Cooper CommitDate: 2026-02-15 18:36:29 +0000 t_create.sh: use `ATF_TESTS_SH_SED` & remove local mods This particular change replaces all local modifications to the test script like so: - Use `ATF_TESTS_SH_SED_test` with a sed(1) statement in the Makefile, instead of the equivalent local modifications. - Remove the need for expecting the output of newfs_msdos to be empty. There isn't much to gain from deviating from the upstream NetBSD test--it's just another local modification that would need to be carried forward. If it's worth testing this FreeBSD-specific behavior, it should be in a FreeBSD-specific test. This makes moving new modifications to the script easier moving forward. MFC after: 1 week --- contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh | 14 ++------------ sbin/newfs_msdos/tests/Makefile | 2 ++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh index 61ed927b8889..dc431166a469 100755 --- a/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh +++ b/contrib/netbsd-tests/sbin/newfs_msdos/t_create.sh @@ -31,21 +31,11 @@ validfat32_head() { } validfat32_body() { - if true; then - # FreeBSD - exp_err=empty - fsck=fsck_msdosfs - else - # NetBSD - exp_err=ignore - fsck=fsck_msdos - fi - - atf_check -s eq:0 -o ignore -e $exp_err \ + atf_check -s eq:0 -o ignore -e ignore \ newfs_msdos -b 512 -C 33m -F 32 msdos.img # fsck_msdos/newfs_msdos have been fixed # atf_expect_fail "PR bin/46743" - atf_check -s eq:0 -o not-match:FIXED -e empty $fsck -p msdos.img + atf_check -s eq:0 -o not-match:FIXED -e empty fsck_msdos -p msdos.img atf_expect_pass } diff --git a/sbin/newfs_msdos/tests/Makefile b/sbin/newfs_msdos/tests/Makefile index 3f112c7f4710..47c77d8289de 100644 --- a/sbin/newfs_msdos/tests/Makefile +++ b/sbin/newfs_msdos/tests/Makefile @@ -2,5 +2,7 @@ TESTSRC=${SRCTOP}/contrib/netbsd-tests/sbin/newfs_msdos NETBSD_ATF_TESTS_SH+= create +ATF_TESTS_SH_SED_create= -e 's/fsck_msdos/fsck_msdosfs/' + .include .include From nobody Sun Feb 15 18:44:14 2026 X-Original-To: dev-commits-src-main@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 4fDZZ64RlTz6S48W for ; Sun, 15 Feb 2026 18:44:14 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDZZ63tvpz3xbf for ; Sun, 15 Feb 2026 18:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771181054; 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=3Szi/36SzoHyWDea3LZ68YECc9yKsijiklOy4AFWSPs=; b=ylautGvJl1COQUYdFhcHsNTVFcuoPxcekpYkUcQSKsIx2gWVMHeIkkW8WSUDhCBM1P3SUl Z698q8uqguyiQySM5mJUQnmMZpSGaembWtXhx9sVqS997hLvg4uCN7LLxSkkEnIsh3X0wh zhbkL2tcEq3fImiewizWLFaX9Th5xM/Rjk2JpTEVDSJ310y6aRw/JStPfT6jKOp3GHPfuE vQQyo+J++Yxcs8hllhLZp5ngAydD97HxwOPldatHOuY2ZRwzRJGH1Zvt1KptQ4A4mZJwS3 0kI4H/IaOBOpitxWEA6EXI17xJLbpvuMnTGTNKq7qsX2wYl2OxbXwRH4P8cgEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771181054; a=rsa-sha256; cv=none; b=lYb4oExV1Dor1uPW6mwNZQXhjzptwJE/h0+gHVz8k23qf+shpiG6Ic3lRGQzsaReO+Oau/ 2984e6FTBPAEuD8KyMRqSpjrghrRy5fu9l5f3ouwP/UEvW79v3mt6oCG+PmgEJgfSLnTqX a6l7NH8z39t5AJIAYCGiY9V3rav/orsJ19yAb5JJTPncN7IoQ1CQjAuUhIj2I2KUP0zmSP hEX8ThW3asNU63+Ly6O+fgbzY2dkkW0qTbd2aJ/tn5GE+/1DbFNYN/dI346iCS+WyUsR/A rdcvckIeZ28J06ybRgHVI5A9QbU/4q6JrH62ebBbpA/cTwJ4TEaJ7Lh/BokvPg== 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=1771181054; 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=3Szi/36SzoHyWDea3LZ68YECc9yKsijiklOy4AFWSPs=; b=aMxYewo+2fRAYtp0qa/shmSOh2hMbQOgfivE9cianEnWAtgrf+rd2YMSId6WpuUKN7Daa7 jLLHvTcl7dOjQcEqIO75XeU2Ph35bPlP5IiKfA7rpLlBJMyvahV5bUeeAsR5zj4+ADzXbf CM5jYWtqhPbVDwxbuyQC5+YRrpIhDsHWq50e4rPoTX6C3vJG1K9Bz1zFDqNaXpVM9ILtDp ugLd7VmPpiyejdTR/9glBnmbq1HTJGs4Pk2Orgt9IJkIVT36tHizUR/CkyOSSLQxut3WEF dEPI8yIGi/l4f9Vt44k1KqnClvCP3g7RlYQLQ17dR6ZWKYQUBTp36DRCE1x8fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDZZ63KKQz155Z for ; Sun, 15 Feb 2026 18:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 398ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 18:44:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: faaeb6e62ae2 - main - libnetbsd: import the `__nothing` macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: faaeb6e62ae2f7371ac3ed37aae102f8e066a4b9 Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 18:44:14 +0000 Message-Id: <699213fe.398ea.ed3f170@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=faaeb6e62ae2f7371ac3ed37aae102f8e066a4b9 commit faaeb6e62ae2f7371ac3ed37aae102f8e066a4b9 Author: Enji Cooper AuthorDate: 2026-02-15 18:41:43 +0000 Commit: Enji Cooper CommitDate: 2026-02-15 18:43:00 +0000 libnetbsd: import the `__nothing` macro This macro is widely used in new NetBSD tests. Please see the comment next to the imported macro for more details on its use. Obtained from: NetBSD (c26cc77b3a0b2) MFC after: 1 week --- lib/libnetbsd/sys/cdefs.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h index 8da812693961..fcc3cc6f15be 100644 --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -1,4 +1,3 @@ - /*- * SPDX-License-Identifier: BSD-3-Clause * @@ -81,4 +80,18 @@ #define __BITS(__m, __n) \ ((__BIT(MAX((__m), (__n)) + 1) - 1) ^ (__BIT(MIN((__m), (__n))) - 1)) +/* + * To be used when an empty body is required like: + * + * #ifdef DEBUG + * # define dprintf(a) printf(a) + * #else + * # define dprintf(a) __nothing + * #endif + * + * We use ((void)0) instead of do {} while (0) so that it + * works on , expressions. + */ +#define __nothing (/*LINTED*/(void)0) + #endif /* _LIBNETBSD_SYS_CDEFS_H_ */ From nobody Sun Feb 15 19:40:16 2026 X-Original-To: dev-commits-src-main@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 4fDbps6kHmz6SBlP for ; Sun, 15 Feb 2026 19:40:21 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDbps68gRz45Rp for ; Sun, 15 Feb 2026 19:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771184421; 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=1Si2SKLtGWQhBnIdjg3ouDK7ikHzpC2nLpk4nUj+1pg=; b=DvmZ56zSgIF1mIAj7TFbXmqt8kfRePTuBswStkmVSvpb9rMotqc7r57rDpyBtYDVDMkJfT wezNrBMxjAK3SUJdISvr5O1hubnArLepjrYSUbgUUWRmft0a+mO/PeSXnYcsx6pUXqQgtw fZgH0bwZL14fieRx2cbr/yqlz9aJ+3XVqbYAeA6UYPvMk2tYU5VOXWSrHleFeGOTDbw91c +QQCRzlOoXs3tqQgOjHEPAFp7yQ9N7m3QO39PDCSWBysbmJjEovatzrYkDrNApjNO1iqZU 1QpuDi43vp8FFkIsnRJh/BI46XdwuHhFirspThynDlxPXTGlEyi9EDboeflqPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771184421; a=rsa-sha256; cv=none; b=gh95zWxYH/lL4+GRqg9nJTGYzRPhwm04vhc+46dH3bFF0UB8Uj9tCxRh2xXbNsWBqAOhdx ZP0FMojanlp0uca8W3RLFt39/vt+R9rgU3kvlvmDlzElSeEm5W/vrhUSpexfOP6yMGxctb hIvA7akN+KqjaT/uGRaV11HtJkz8Drq4VAxcNi1zj2vDSHUTsLfYfFVXL8XEarM7+LRLu4 Ak+VK1uNzEi6Q0d51wsVuEpQmAbpyCFyJdkGvLkS+3+bOIGx5V404HfyBxyzHaQxoI3pq9 1SdxmU02amtZrJTob4dZ0Zy5Q4EpzqzD3Yyjo+V9/k3LpDTxobLa8dV6m9WAng== 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=1771184421; 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=1Si2SKLtGWQhBnIdjg3ouDK7ikHzpC2nLpk4nUj+1pg=; b=b+C+HW5Mc5cCsON7fxYmeYSwGmPKCmNLpPVbJ0QBwov0ZPkmA36SWAX3trv2XaNe9B4Rdl F+d3Wb9htYnRewrVkNJhMvTl3pp7eFiwh9H60djtxPdXxC4buWyCEy/pLoOPV9djpPkkk1 khmHQQDk8HLGm5U+A9cCc2MGtHYitkV/6MVtUCNva8zJSii78mZMQAOD5rEZzGIRV6o14q GyJ6sRMQRKjZe4wxIzqK+/TbPBVIu1vEGhufaUhiFUMxCTdGYD+GatNRcrP8U4TlBlj7yi EO7BeGTFWI30c07mfkx/qf2bLv2Wv8cNb7yGhV3gmY4bm/ORsyiVdbc3ZUMTOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDbps5P8Tz16BX for ; Sun, 15 Feb 2026 19:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 412a3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 15 Feb 2026 19:40:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 35237ff98714 - main - t_access.c: remove unnecessary local modification List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35237ff9871478a92b34ced28a75487afd3562ff Auto-Submitted: auto-generated Date: Sun, 15 Feb 2026 19:40:16 +0000 Message-Id: <69922120.412a3.59fb457@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=35237ff9871478a92b34ced28a75487afd3562ff commit 35237ff9871478a92b34ced28a75487afd3562ff Author: Enji Cooper AuthorDate: 2026-02-15 19:39:10 +0000 Commit: Enji Cooper CommitDate: 2026-02-15 19:40:00 +0000 t_access.c: remove unnecessary local modification FreeBSD 11.x is no longer supported; there's no reason why the `FreeBSD_version__` check is still required (now). MFC after: 1 week --- contrib/netbsd-tests/lib/libc/sys/t_access.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_access.c b/contrib/netbsd-tests/lib/libc/sys/t_access.c index f973aba3fb4a..9c6dabc20d4c 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_access.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_access.c @@ -31,10 +31,6 @@ #include __RCSID("$NetBSD: t_access.c,v 1.2 2017/01/10 22:36:29 christos Exp $"); -#ifdef __FreeBSD__ -#include /* For __FreeBSD_version */ -#endif - #include #include @@ -120,10 +116,6 @@ ATF_TC_HEAD(access_inval, tc) ATF_TC_BODY(access_inval, tc) { -#if defined(__FreeBSD__) && __FreeBSD_version < 1100033 - atf_tc_expect_fail("arguments to access aren't validated; see " - "bug # 181155 for more details"); -#endif errno = 0; ATF_REQUIRE(access("/usr", -1) != 0); From nobody Sun Feb 15 21:04:30 2026 X-Original-To: dev-commits-src-main@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 4fDdh11cyLz6SL0r; Sun, 15 Feb 2026 21:04:33 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDdh10sFDz3JRJ; Sun, 15 Feb 2026 21:04:33 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771189473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PsesJpCZ70QMsDabxcw8ebAQR4K7eHQFGPZqJaRW9zk=; b=Z5BUTN4dcdSU4y/1sweIUiwXRE8HC0a3WCKKUj2pF1noS5m+monO+mEhxwgGIFnQtXC7Bm 7+h/bSaF1O0NLhlYpKmnf2SCLs7UdhBO/GuWNrTt4+BP0BF/k0yVdv1/peMzHx8+8auhsl f6+40H2yMyD9sTxHwnOoNhSndub/z2o4Grfn9dSpBjAKzKRELKoD3tFQEZVnZWtuMCFI0E Dz4426C/4DwaFmUh0oYeqWhRg2hcoLAIzXlNEQX885P0qsWqvqB0o2OLEQGj6miBz4u6b3 rLHs/6AndmYX6rwN0qxF329u0LU9EtEcW3WLAkw1KG6KgqQXGu4Wj5r38RjwFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771189473; a=rsa-sha256; cv=none; b=QnTHkBKAQiZmr8TAJa6GjDrNc6tyuumxASZGyx7T3g21ofFabgEUof5GeTfICrHDtyp7c1 iySVWY/g6viI1EzygTIitkP+sjmfowFMUnQKo/zPwX601B/FaTJbRMwbCqk7N9EGTL0HxA xtioAQi1aHrorbjI35zZMztBNYPBXKr5x1NjP5kFxR77YJsbpvcbGdkiNAfTDSp7CTobOo IzC2LNuYwiVHJi20LrBtaw8ioU8zJlFacEriCqmiHg+yvDgxamGf3MMzHwcfI9qHI1Erhv OT7pz7dwg21N1Isr7LX4oQm0D/ZXiQ2kLd4Zc3PwIZWy9J0FARDMFgm4sh8G+g== 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=1771189473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PsesJpCZ70QMsDabxcw8ebAQR4K7eHQFGPZqJaRW9zk=; b=gnlERWamt5omggPKbEJMSRXf655v0KsakDMESzu3AVqlTOPpc/Wq4Nw0cI9DVmCCYRQrOv RIwte9MiKurZu3DzTPSytocTXMslLn5ocZRK2CGy6MMIBGYfkw8ddyIzpfHnDYLgZNRDbs 0LTkAp2GRsMvu2labbHAZAGR7gLY7t43C6JkpI0rrayf5jxFNMAxomDok53FmSp9B2Wqrf 6xs4qwhTMYOaY3zOXGcGVe+oabdt9Z99nqDqZSGrxpwZxfoJVoddFTEELSNG6pMzi4Imng v+55kINz5xbrcbRRW61EoPWU8AoqkSAoArbMTpRXDhEfqXVBX78juMnpFQ1kGg== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4fDdh02ww1z5rR; Sun, 15 Feb 2026 21:04:32 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Sun, 15 Feb 2026 13:04:30 -0800 From: Gleb Smirnoff To: Bruce M Simpson Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 79eff4ad64fc - main - netinet6: Return EAFNOSUPPORT for non-IPv6 addresses in mcast sockopts. Message-ID: References: <69909cee.235b6.76aa3a8b@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <69909cee.235b6.76aa3a8b@gitrepo.freebsd.org> On Sat, Feb 14, 2026 at 04:03:58PM +0000, Bruce M Simpson wrote: B> The branch main has been updated by bms: B> B> URL: https://cgit.FreeBSD.org/src/commit/?id=79eff4ad64fc445ea78ed733e16482c45dbd5b50 B> B> commit 79eff4ad64fc445ea78ed733e16482c45dbd5b50 B> Author: Bruce M Simpson B> AuthorDate: 2026-02-14 15:36:47 +0000 B> Commit: Bruce M Simpson B> CommitDate: 2026-02-14 16:00:58 +0000 B> B> netinet6: Return EAFNOSUPPORT for non-IPv6 addresses in mcast sockopts. B> B> This is a non-functional change; it just returns the correct errno value B> where IPv6 multicast socket options were passed non-AF_INET6 arguments, B> in preparation for handling PR 193246 with a side-call into netinet as B> xnu currently does. Note: this actually is a functional change, we return a different error. May be non-algorithmic change.... -- Gleb Smirnoff