FreeBSD/src 90f5772share/man/man4 mrsas.4

mrsas.4: Fix devid hex style

(cherry picked from commit c2b407244f3a939d8b09f9a22d872ebdce5f6b19)
DeltaFile
+1-1share/man/man4/mrsas.4
+1-11 files

FreeBSD/src 1f150b9share/man/man4 mrsas.4

mrsas.4: Fix devid hex style

(cherry picked from commit c2b407244f3a939d8b09f9a22d872ebdce5f6b19)
DeltaFile
+1-1share/man/man4/mrsas.4
+1-11 files

FreeBSD/src bbd0d92share/man/man7 freebsd-base.7

freebsd-base.7: Fix stray -r

Remote stray "-r" from the example of installing a toolchain
to alternate root.

Reviewed by:    ivy
Differential Revision:  https://reviews.freebsd.org/D54611

(cherry picked from commit a556feb99765a8eae96b2077067dd482c9dd3f57)
DeltaFile
+1-1share/man/man7/freebsd-base.7
+1-11 files

FreeBSD/src ec98cb5share/man/man4 smartpqi.4, sys/dev/smartpqi smartpqi_controllers.h smartpqi_main.c

smartpqi: update to version 4660.0.2002

This updates the smartpqi driver to Microchip's
latest available public release.

Reviewed by: imp
Approved by: imp

Sponsored by: Microchip Technology Inc.

Differential Revision: https://reviews.freebsd.org/D52507

(cherry picked from commit c558eca47970c8467ed0494145f08d1879050bbd)
DeltaFile
+371-0sys/dev/smartpqi/smartpqi_controllers.h
+31-289sys/dev/smartpqi/smartpqi_main.c
+58-109sys/dev/smartpqi/smartpqi_discovery.c
+52-52sys/dev/smartpqi/smartpqi_request.c
+84-4share/man/man4/smartpqi.4
+22-31sys/dev/smartpqi/smartpqi_cam.c
+618-48513 files not shown
+725-62519 files

FreeBSD/src 256d056share/man/man4 smartpqi.4, sys/dev/smartpqi smartpqi_controllers.h smartpqi_main.c

smartpqi: update to version 4660.0.2002

This updates the smartpqi driver to Microchip's
latest available public release.

Reviewed by: imp
Approved by: imp

Sponsored by: Microchip Technology Inc.

Differential Revision: https://reviews.freebsd.org/D52507

(cherry picked from commit c558eca47970c8467ed0494145f08d1879050bbd)
DeltaFile
+371-0sys/dev/smartpqi/smartpqi_controllers.h
+31-289sys/dev/smartpqi/smartpqi_main.c
+58-109sys/dev/smartpqi/smartpqi_discovery.c
+52-52sys/dev/smartpqi/smartpqi_request.c
+83-3share/man/man4/smartpqi.4
+22-31sys/dev/smartpqi/smartpqi_cam.c
+617-48413 files not shown
+724-62419 files

FreeBSD/src c558ecashare/man/man4 smartpqi.4, sys/dev/smartpqi smartpqi_controllers.h smartpqi_main.c

smartpqi: update to version 4660.0.2002

This updates the smartpqi driver to Microchip's
latest available public release.

Reviewed by: imp
Approved by: imp

Sponsored by: Microchip Technology Inc.

Differential Revision: https://reviews.freebsd.org/D52507
DeltaFile
+371-0sys/dev/smartpqi/smartpqi_controllers.h
+31-289sys/dev/smartpqi/smartpqi_main.c
+58-109sys/dev/smartpqi/smartpqi_discovery.c
+52-52sys/dev/smartpqi/smartpqi_request.c
+83-3share/man/man4/smartpqi.4
+22-31sys/dev/smartpqi/smartpqi_cam.c
+617-48413 files not shown
+724-62419 files

FreeBSD/src bae8324lib/libpmc/pmu-events/arch/x86/amdzen5 data-fabric.json floating-point.json

libpmc: Import AMD Zen 5 PMU events.

Sponsored by:           Netflix

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1954
DeltaFile
+1,634-0lib/libpmc/pmu-events/arch/x86/amdzen5/data-fabric.json
+812-0lib/libpmc/pmu-events/arch/x86/amdzen5/floating-point.json
+517-0lib/libpmc/pmu-events/arch/x86/amdzen5/load-store.json
+457-0lib/libpmc/pmu-events/arch/x86/amdzen5/recommended.json
+266-0lib/libpmc/pmu-events/arch/x86/amdzen5/l2-cache.json
+177-0lib/libpmc/pmu-events/arch/x86/amdzen5/l3-cache.json
+3,863-07 files not shown
+4,518-013 files

FreeBSD/src 67599eesys/x86/conf NOTES

sys/x86/NOTES: Add vt_efifb

Contrary to what is stated in commit f224591746bd ("Add ASMC_DEBUG make
option"), the various NOTES files should list all available options.

Since vt_efifb is supported also on i386, add it back to x86/NOTES
instead of amd64/NOTES.

Fixes:          f224591746bd ("Add ASMC_DEBUG make option")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+1-0sys/x86/conf/NOTES
+1-01 files

FreeBSD/src fde9fe1sys/conf options.i386

i386: Fix kernel compilation after introduction of ASMC_DEBUG option

Fixes:          f224591746bd ("Add ASMC_DEBUG make option")
Sponsored by:   The FreeBSD Foundation
DeltaFile
+3-0sys/conf/options.i386
+3-01 files

FreeBSD/src 730b3e2bin/ps ps.c keyword.c

ps(1): Sort headers

Found these changes by chance in an old patch file.  Should have been
committed along with the ps(1) modifications done in March 2025.

No functional change (intended).

MFC after:      3 days
Sponsored by:   The FreeBSD Foundation
DeltaFile
+5-5bin/ps/ps.c
+2-2bin/ps/keyword.c
+7-72 files

FreeBSD/src 7a00382release/powerpc powerpcspe.conf

release: remove powerpcspe

Signed-off-by: Minsoo Choo <minsoochoo0122 at proton.me>
Reviewed by:    jhibbits, emaste
Pull request:   https://github.com/freebsd/freebsd-src/pull/1914
DeltaFile
+0-9release/powerpc/powerpcspe.conf
+0-91 files

FreeBSD/src 94d1731share/mk bsd.cpu.mk, stand defs.mk

Makefile*: remove powerpcspe

As reported on the freebsd-announce mailing list[1] FreeBSD is
continuing to retire 32-bit support.  Remove powerpcspe from build
infrastructure.

[1] https://lists.freebsd.org/archives/freebsd-announce/2024-February/000117.html

Signed-off-by: Minsoo Choo <minsoochoo0122 at proton.me>
Reviewed by:    jhibbits, emaste
Pull request:   https://github.com/freebsd/freebsd-src/pull/1914
DeltaFile
+3-5sys/modules/Makefile
+1-6share/mk/bsd.cpu.mk
+0-5sys/conf/kern.mk
+0-5stand/defs.mk
+0-5sys/conf/Makefile.powerpc
+2-2sys/modules/zfs/Makefile
+6-2810 files not shown
+14-4316 files

FreeBSD/src 0f937f1tools/boot universe.sh full-test.sh

tools: remove powerpcspe

As reported on the freebsd-announce mailing list[1] FreeBSD is
continuing to retire 32-bit support.  Remove powerpcspe from boot test
tools.

[1] https://lists.freebsd.org/archives/freebsd-announce/2024-February/000117.html

Signed-off-by: Minsoo Choo <minsoochoo0122 at proton.me>
Reviewed by:    jhibbits, emaste
Pull request:   698d3c98d8f5814f705908d5bc6d930e3d4c4eda
DeltaFile
+0-4tools/boot/universe.sh
+1-1tools/boot/full-test.sh
+1-52 files

FreeBSD/src 87b6549share/man/man4 mrsas.4

mrsas.4: Add Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116)

This is an OEM card from Fujitsu using an LSI SAS2208 ROC controller shipped
with many Fujitsu PRIMERGY servers like RX300 S7.

Controller description: https://www.fujitsu.com/global/products/computing/servers/primergy/blades/connection/cb-pmod-110426.html

Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54566

(cherry picked from commit ccec94bf63de8ee067b03b981a283d9f968c3667)
DeltaFile
+2-1share/man/man4/mrsas.4
+2-11 files

FreeBSD/src 653099bshare/man/man4 mrsas.4

mrsas.4: Add Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116)

This is an OEM card from Fujitsu using an LSI SAS2208 ROC controller shipped
with many Fujitsu PRIMERGY servers like RX300 S7.

Controller description: https://www.fujitsu.com/global/products/computing/servers/primergy/blades/connection/cb-pmod-110426.html

Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54566

(cherry picked from commit ccec94bf63de8ee067b03b981a283d9f968c3667)
DeltaFile
+2-1share/man/man4/mrsas.4
+2-11 files

FreeBSD/src 852a446share/man/man4 mrsas.4

mrsas.4: Add Fujitsu RAID Controller SAS 6Gbit/s 1GB (D3116)

This is an OEM card from Fujitsu using an LSI SAS2208 ROC controller shipped
with many Fujitsu PRIMERGY servers like RX300 S7.

Controller description: https://www.fujitsu.com/global/products/computing/servers/primergy/blades/connection/cb-pmod-110426.html

Reviewed by:    ziaee
MFC after:      3 days
Differential Revision:  https://reviews.freebsd.org/D54566

(cherry picked from commit ccec94bf63de8ee067b03b981a283d9f968c3667)
DeltaFile
+2-1share/man/man4/mrsas.4
+2-11 files

FreeBSD/src 0a64d16sys/sys _types.h

sys/_types.h: avoid use of __has_feature()

Only fairly recent GCC versions support and sys/_types.h must work with
quite old compilers and without sys/cdef.h being included.  The prior
workaround works fine, but we can have the same effect with compiler
macro definitions.  In this specific case, compilers that define the
__intcap_t builtin type will define __SIZEOF_INTCAP__.

This reverts commit 029a09f18032353a9ae874590b879322efc6e53a
This reverts commit 19728f31ae421f40e2b0b0c775f4eedd7f927be0

Reviewed by:    imp, des, kib, emaste
Effort:         CHERI upstreaming
Fixes:          85ab981a8e4e ("sys/_types.h: define fallback __(u)intcap_t")
Sponsored by:   Innovate UK
Differential Revision:  https://reviews.freebsd.org/D54009
DeltaFile
+1-4sys/sys/_types.h
+1-41 files

FreeBSD/src 31e7dc6sys/net iflib.c

iflib: remove convoluted custom zeroing code

Replace a collection of aliasing violations and ifdefs with memset
(which now expands to __builtin_memset and should be quite reliably
inlined.)  The old code is hard to maintain as evidenced by the most
recent change to if_pkt_info_t updating the defines, but not the zeroing
code.

Reviewed by:    gallatin, erj
Effort:         CHERI upstreaming
Sponsored by:   Innovate UK
Fixes:          43d7ee540efe ("iflib: support for transmit side nic KTLS offload")
Differential Revision:  https://reviews.freebsd.org/D54605
DeltaFile
+5-60sys/net/iflib.c
+5-601 files

FreeBSD/src 1b425afsys/kern vfs_cache.c

cache: avoid hardcoded CACHE_PATH_CUTOFF

Compute the cutoff at compile time instead which will avoid the need
for a CHERI case.

Correct the comment about CACHE_PATH_CUTOFF.  It dates to 5.2.0 not 4.4
BSD.  Historic values are:

32 - introduced (c2935410f6d5f)
35 - NUL terminated and bumped (5d5c174869104)
39 - sized to alignment (bb48255cf5eff)
45 - bumped to improve efficency on 64-bit (3862838921eb8)

No functional change.

Reviewed by:    markj
Suggested by:   jhb
Effort:         CHERI upstreaming
Sponsored by:   DARPA, AFRL
Differential Revision:  https://reviews.freebsd.org/D54554
DeltaFile
+18-14sys/kern/vfs_cache.c
+18-141 files

FreeBSD/src 258ad80sys/kern vfs_cache.c

cache: avoid hardcoded cache padding

Replace CACHE_LARGE_PAD with rounding up to the alignment of struct
namecache_ts.

No functional change.

Reviewed by:    olce, markj
Suggested by:   jhb
Effort:         CHERI upstreaming
Sponsored by:   DARPA, AFRL
Differential Revision:  https://reviews.freebsd.org/D54553
DeltaFile
+2-3sys/kern/vfs_cache.c
+2-31 files

FreeBSD/src fb0bdbesys/kern vfs_cache.c

cache: avoid hardcoded zone alignment

Previously, this was underaligned on CHERI system where pointers are
larger than time_t.

Use the alignment of struct namecache_ts which picks up time_t via strut
timespec and pointers via struct namecache.  This arguably overaligns
cache_zone_small and cache_zone_large on i386 kernels, but I suspect the
actual microarchitectures most i386 binaries are run on do better with
64-bit alignment.

Reviewed by:    olce, markj
Effort:         CHERI upstreaming
Sponsored by:   Innovate UK
Fixes:          cf8ac0de8150 ("cache: reduce zone alignment to 8 bytes")
Differential Revision:  https://reviews.freebsd.org/D54376
DeltaFile
+23-21sys/kern/vfs_cache.c
+23-211 files

FreeBSD/src 821c6c4share/mk src.libnames.mk, usr.bin/ofed/libibverbs Makefile.inc

librdmacm/libibverbs: Add bnxtre RDMA provider to OFED build infrastructure

Extend the FreeBSD OFED build framework to include the Broadcom bnxtre RDMA
provider library.

This change:

 -Registers libbnxtre in src.libnames.mk so it is built and installed as part
  of the OFED libraries.
 -Adds bnxtre to the OFED pcap dependency set when MK_OFED is enabled.
 -Declares proper dependency mappings for bnxtre (ibverbs, pthread).
 -Introduces LIBBNXTREDIR for consistent object directory handling.
 -Updates libibverbs and librdmacm build rules to link against libbnxtre,
  enabling Broadcom RoCE device support at runtime.
 -libbnxtre library uses below constructor to register with the libibverbs,
  static attribute((constructor)) void bnxt_re_register_driver(void)

These updates ensure that applications using libibverbs and librdmacm can
discover and use Broadcom bnxt RDMA devices on FreeBSD.

    [4 lines not shown]
DeltaFile
+5-2share/mk/src.libnames.mk
+1-1usr.bin/ofed/libibverbs/Makefile.inc
+1-1usr.bin/ofed/librdmacm/Makefile.inc
+7-43 files

FreeBSD/src 702b3a9share/mk src.libnames.mk, usr.bin/ofed/libibverbs Makefile.inc

Revert "librdmacm/libibverbs: Statically bound libbnxtre.so.1 to rping"

The commit message has to be rewritten as it is not clear and lacks
some key details about the change.

This reverts commit 35dd53a9e13265f7a479649776453efc5b737a0f.

Reported by: jrtc27
DeltaFile
+2-5share/mk/src.libnames.mk
+1-1usr.bin/ofed/libibverbs/Makefile.inc
+1-1usr.bin/ofed/librdmacm/Makefile.inc
+4-73 files

FreeBSD/src d53d7b4sys/dev/bnxt/bnxt_en bnxt_mgmt.h bnxt_mgmt.c

bnxt: Fix up ioctl opcodes to support IOC_VOID along with IOC_IN

The driver and applications currently use hard-coded numeric ioctl command
opcodes. These opcodes are interpreted as having the IOC_IN direction (data
copied from the user application to the driver), regardless of the actual packet
size. Consequently, when the packet size is zero and the direction is set to
IOC_IN, the kernel fails these ioctls if COMPAT is disabled.

While the driver and applications should ideally set the direction correctly—
for example, using IOC_VOID when the packet size is zero—the driver will now
be updated to define ioctl opcodes using the _IOC macro to support both
IOC_VOID and IOC_IN. This change ensures backward compatibility with older
applications that exclusively use IOC_IN.

Reviewed by: gallatin
Differential Revision: https://reviews.freebsd.org/D54601
MFC after: 3 days
DeltaFile
+8-3sys/dev/bnxt/bnxt_en/bnxt_mgmt.h
+6-3sys/dev/bnxt/bnxt_en/bnxt_mgmt.c
+14-62 files

FreeBSD/src a556febshare/man/man7 freebsd-base.7

freebsd-base.7: Fix stray -r

Remote stray "-r" from the example of installing a toolchain
to alternate root.

Reviewed by:    ivy
Differential Revision:  https://reviews.freebsd.org/D54611
DeltaFile
+1-1share/man/man7/freebsd-base.7
+1-11 files

FreeBSD/src d64db88release/tools vagrant.conf arm.subr

release: make sh the default shell

The default shell for root has been changed to sh(1) followup changing
in release images sh(1) the shell for the "freebsd" user.

MFC After:      1 week
Reviewed by:    manu, emaste (re)
Approved by:    manu, emaste (re)
Differential Revision:  https://reviews.freebsd.org/D54602
DeltaFile
+1-1release/tools/vagrant.conf
+1-1release/tools/arm.subr
+2-22 files

FreeBSD/src 92f251ftools/cam mpr.d mps.d

cam: Dtrace scripts to help diagnose weird things

These are sample dtrace scripts that likely need to be modified for
whatever problem you are chasing. Unfortuneately, you have to read the
driver extensively to understand them or how to use them. But studying
the completion routine of mpr/mps will help understand many of the error
and recovery paths.

Sponsored by:           Netflix
DeltaFile
+331-0tools/cam/mpr.d
+331-0tools/cam/mps.d
+8-0tools/cam/README
+670-03 files

FreeBSD/src 0e80273sys/dev/mpr mpr_sas.c

mpr: Add a probe on completion

cam::mpr:complete(union ccb *, struct mpr_command *, u_int, u32);
    Where u_int is scsas->flags u32 is the device_info.

This can't be done as an fbt because the data needed for it isn't
present out a function boundary.

Sponsored by:           Netflix
DeltaFile
+9-0sys/dev/mpr/mpr_sas.c
+9-01 files

FreeBSD/src 6f8e117sys/dev/mps mps_sas.c

mps: Add a probe on completion

cam::mps:complete(union ccb *, struct mps_command *, u_int, u32);
    Where u_int is scsas->flags u32 is the device_info.

This can't be done as an fbt because the data needed for it isn't
present out a function boundary.

Sponsored by:           Netflix
DeltaFile
+9-0sys/dev/mps/mps_sas.c
+9-01 files

FreeBSD/src d650b2csys/dev/mpr mpr.c mpr_config.c

mps/mpr: Remove bogus sys/cdefs.h includes

These are left over from the $FreeBSD$ stuff.

Sponsored by:           Netflix
DeltaFile
+0-1sys/dev/mpr/mpr.c
+0-1sys/dev/mpr/mpr_config.c
+0-1sys/dev/mpr/mpr_mapping.c
+0-1sys/dev/mpr/mpr_pci.c
+0-1sys/dev/mpr/mpr_sas.c
+0-1sys/dev/mpr/mpr_sas_lsi.c
+0-610 files not shown
+0-1616 files