FreeBSD/src 8bc0b97include glob.h

glob.h: Limit glob_b prototype visibility

Hide glob_b behind __BSD_VISIBLE as it is not a POSIX function.

Reported by:    kib
Reviewed by:    kib
Fixes:  1e0743f54d2d ("glob: Add blocks support")
Differential Revision:  https://reviews.freebsd.org/D50670
DeltaFile
+1-1include/glob.h
+1-11 files

FreeBSD/src a40d734share/mk stage-install.sh auto.obj.mk

Export SB_OBJROOT for later reference

The build varies MAKEOBJDIRPREFIX at times which
can make it difficult to track the original OBJROOT.
This is easier when we get the original from env as SB_OBJROOT.
If SB_OBJROOT did not come from env, set and export it
the first time we set OBJROOT.

This allows SB_OBJROOT to be used in .MAKE.META.IGNORE* variables
to tweak what should be considered as making a target out-of-date.

Update auto.obj.mk to latest from contrib/bmake - handles relative
objdirs more simply and reliably.

Also update jobs.mk and stage-install.sh

Reviewed by:    stevek
Differential Revision:  https://reviews.freebsd.org/D50313
DeltaFile
+57-14share/mk/stage-install.sh
+9-6share/mk/auto.obj.mk
+7-4share/mk/jobs.mk
+6-0share/mk/src.sys.obj.mk
+79-244 files

FreeBSD/src 08bc009share/man/man4 bridge.4

if_bridge.4: clarify how if_bridge assigns a MAC address

PR:             283400
MFC after:      1 week
DeltaFile
+6-4share/man/man4/bridge.4
+6-41 files

FreeBSD/src e578e65sys/compat/linuxkpi/common/src linux_80211_macops.c

linuxkpi: Improve LKPI_80211_TRACE_MO message

The message used to have a prefix of the function and line, followed by
`:_` and the supplied message.  Commit 3206587a20de ("LinuxKPI: 802.11:
improve scan handling") changed the prefix to add the CPU, tid, and
ticks.  `_` and the caller-supplied message were joined to the ticks
value, resulting in a somewhat odd message.  Instead use `: ` to
separate them.

Reviewed by:    bz
Sponsored by:   The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D50667
DeltaFile
+1-1sys/compat/linuxkpi/common/src/linux_80211_macops.c
+1-11 files

FreeBSD/src cd46420share/man/man4 ure.4

ure.4: add a HARDWARE section + add RTL8156BG as a compatible controller

While here, rename all instances of "RealTek" to "Realtek" for
authenticity.

Approved by:    re (cperciva)
Reviewed by: imp, lwshu, zaiee
Pull Request: https://github.com/freebsd/freebsd-src/pull/1649

(cherry picked from commit 76ed6f2db316bf2240d36d3c92316da4d1e5b174)
(cherry picked from commit f336a04960b608d2caeaf964663c3a8425f31d71)
DeltaFile
+16-14share/man/man4/ure.4
+16-141 files

FreeBSD/src 6fe425bshare/man/man4 ure.4

ure.4: description consistencies + tag spdx

+ consistent document description languague with other USB-BaseT drivers
+ mention newly added adapters from 6ea4d9
+ attempt to mention rgephy(4) phys feed into ure interfaces

Approved by:    re (cperciva)
Fixes:          6ea4d9 (Move RTL8156 from cdce(4) to ure(4))
MFC after:      3 days

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1384

(cherry picked from commit 4c72525953fdf618a3fc0a45f3ef3f071dcc0c52)
(cherry picked from commit b529a06d1db4bb27895465ba8692d6c4427e32d8)
DeltaFile
+1-1share/man/man4/ure.4
+1-11 files

FreeBSD/src 9cac735sys/compat/linuxkpi/common/include/net mac80211.h

LinuxKPI: 802.11: add ieee80211_purge_tx_queue()

Add ieee80211_purge_tx_queue() dummy function needed by rtw88 SDIO.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+8-1sys/compat/linuxkpi/common/include/net/mac80211.h
+8-11 files

FreeBSD/src 84c5998sys/compat/linuxkpi/common/include/linux skbuff.h

LinuxKPI: skbuff: add dummy skb_copy_header()

There's one case which needs skb_copy_header();  add a dummy function
for now until we get to the code which uses it to test an implementation.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+7-0sys/compat/linuxkpi/common/include/linux/skbuff.h
+7-01 files

FreeBSD/src 4b6b9c1sys/compat/linuxkpi/common/include/linux netdev_features.h

LinuxKPI: netdev features style, annotate, and add %b decoding mask

Start to sort through the netdevice features to match them with
FreeBSD.  Annotate them a bit more verbose though the names are
pretty telling already.

While here adjust style(9) as well.

Lastly add the bit definitions for use with printf(9) %b as names
read easier than bitmasks.  We will use that in LinuxKPI 802.11.

No functional changes.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+14-10sys/compat/linuxkpi/common/include/linux/netdev_features.h
+14-101 files

FreeBSD/src 36ca217sys/compat/linuxkpi/common/include/linux skbuff.h

LinuxKPI: skbuff: make csum_unfold return __wsum

Given the internal field now stores a __wsum csum (after we added
the type) also make sure csum_unfold() returns a __wsum.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Fixes:          59481c7db234
DeltaFile
+1-1sys/compat/linuxkpi/common/include/linux/skbuff.h
+1-11 files

FreeBSD/src 34c150csys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: move rx_nss check to be at least 1 into sync function

We set rx_nss to at least 1 and the sync functions for HT and VHT are
careful not to set it to 0.   Rather than relying on that and any
possible future call to lkpi_sta_sync_from_ni() migrate the MAX()
call into the sync function after each standard level went through
to make sure that at the end we at least have rx_nss set to 1.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+7-1sys/compat/linuxkpi/common/src/linux_80211.c
+7-11 files

FreeBSD/src d87ee93sys/compat/linuxkpi/common/include/net cfg80211.h

LinuxKPI: 802.11: use macros for locking

Rather than using inline functions use macros so we know where we are
taking the lock in the code rather than only recording the inline
function location.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+4-13sys/compat/linuxkpi/common/include/net/cfg80211.h
+4-131 files

FreeBSD/src 02382a0sys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: switch to m_get3()

Start using m_get3() instead of m_get2() as we may get up to 11K
frames and m_get2() only gives us up to MJUMPAGESIZE (8K).

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
Discovered by:  adrian with rtwn(4) [see D50049].
DeltaFile
+1-1sys/compat/linuxkpi/common/src/linux_80211.c
+1-11 files

FreeBSD/src a02180c. UPDATING, sys/compat/linuxkpi/common/include/linux dma-mapping.h

LinuxKPI: Implement dma_map_resource/dma_unmap_resource functions

dma_map_resource() and dma_unmap_resource() functions are used to map
and unmap of memory-mapped IO resources so they can be accessed by
the device.

Required by drm-kmod v5.5 to be built.

While for drm-kmod 6.6-lts only amdgpu uses these in one place and
the code apparently has not been exercised a lot it has been around
like this for years.  With changing the underlying implementations
bring it into the tree; should we find errors with it they can also
be fixed here.

Bump __FreeBSD version to be able to detect this change.

Obtained from:  D30933 (by wulf)
Sponsored by:   The FreeBSD Foundation
MFC after:      3 days

    [2 lines not shown]
DeltaFile
+14-0sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+4-0UPDATING
+1-1sys/sys/param.h
+19-13 files

FreeBSD/src 9df0d1fsys/compat/linuxkpi/common/src linux_80211.c

LinuxKPI: 802.11: ensure bandwidth <= channel bandwidth

While we could select our own channel width and station bandwidth
indepedent of net80211 that is not a good idea and will lead to
trouble.  Make sure the station bandwidth we select does not
exceed the bandwidth of the channel we are tuned into.

Now that VHT160 work we may locally disable it (-vht160) and the
AP may still support it but we would be on a 80Mhz channel.
Or we do support VHT160 but the AP does not.  Again we would be
on a 80Mhz channel and not support 160Mhz.

Sponsored by:   The FreeBSD Foundation
MFC after:      3 days
DeltaFile
+23-3sys/compat/linuxkpi/common/src/linux_80211.c
+23-31 files

FreeBSD/src f99d393sys/compat/linuxkpi/common/include/linux dma-mapping.h, sys/compat/linuxkpi/common/src linux_pci.c

LinuxKPI: add missing bus_dmamap_sync() calls or exclude them

Rename linux_dma_unmap() to lkpi_dma_unmap(), and linux_dma_map_phys()
to lkpi_dma_map_phys() so that we get the full set of function
arguments (direction and attributes were missing).
Leave the old functions as wrappers as they are called from drm-kmod
linuxkpi/bsd still, and leaving them also allows us to MFC this
change.

Add missing bus_dmamap_sync() calls.  Rather than inlining them
in each inline function push them down to the actual implementation.
From there do not inline them either but call the appropriate
function dealing with the sync so that we do not have the same
code splattered in many places.

Adhere to the DMA_ATTR_SKIP_CPU_SYNC attribute and skip synching
when requested.

A previous, less complete version of this change already allowed

    [13 lines not shown]
DeltaFile
+27-23sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+43-6sys/compat/linuxkpi/common/src/linux_pci.c
+70-292 files

FreeBSD/src 9efdb08share/man/man4 puc.4

puc.4: Add a HARDWARE section based off device data from pucdata.c

While here, change applicable uses of "ports" to "adapters" to be more
precise and improve searchability.

This is a 14.3 candate since it affects (positively) the release notes
generated from the hardware secionts.

Approved by:    re (cperciva)
MFC After: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1663

(cherry picked from commit 794ee43e75066bfcbc00545b5bf600b9cda2d5f1)
(cherry picked from commit 827153d21219f76cf006d50af4cdf85f22b75de0)
DeltaFile
+549-2share/man/man4/puc.4
+549-21 files

FreeBSD/src f336a04share/man/man4 ure.4

ure.4: add a HARDWARE section + add RTL8156BG as a compatible controller

While here, rename all instances of "RealTek" to "Realtek" for
authenticity.

Reviewed by: imp, lwshu, zaiee
Pull Request: https://github.com/freebsd/freebsd-src/pull/1649

(cherry picked from commit 76ed6f2db316bf2240d36d3c92316da4d1e5b174)
DeltaFile
+16-14share/man/man4/ure.4
+16-141 files

FreeBSD/src b529a06share/man/man4 ure.4

ure.4: description consistencies + tag spdx

+ consistent document description languague with other USB-BaseT drivers
+ mention newly added adapters from 6ea4d9
+ attempt to mention rgephy(4) phys feed into ure interfaces

Fixes:          6ea4d9 (Move RTL8156 from cdce(4) to ure(4))
MFC after:      3 days

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1384

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

FreeBSD/src 827153dshare/man/man4 puc.4

puc.4: Add a HARDWARE section based off device data from pucdata.c

While here, change applicable uses of "ports" to "adapters" to be more
precise and improve searchability.

This is a 14.3 candate since it affects (positively) the release notes
generated from the hardware secionts.

MFC After: 3 days
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1663

(cherry picked from commit 794ee43e75066bfcbc00545b5bf600b9cda2d5f1)
DeltaFile
+549-2share/man/man4/puc.4
+549-21 files

FreeBSD/src 44a4ae3sbin/newfs newfs.c

newfs: don't warn() when newfs'ing plain file

Differential Revision:  https://reviews.freebsd.org/D50561
DeltaFile
+0-1sbin/newfs/newfs.c
+0-11 files

FreeBSD/src 03ad449sbin/newfs newfs.c

newfs: enable newfs to run on plain files without a bsdlabel

For awhile now it's been possible to newfs a plain file...however, newfs
errors out when the file doesn't have a bsdlabel - this commit changes
that.

Reviewed by:    mckusick
Differential Revision:  https://reviews.freebsd.org/D50562
DeltaFile
+6-1sbin/newfs/newfs.c
+6-11 files

FreeBSD/src ae08f93sys/amd64/vmm/io ppt.c

ppt: Fix panic when configuring unavailable MSI-X vector

In some cases VM may have different idea about number
of available MSI-X vectors then PPT driver. Return
an error when VM requests setup for more vectors
than expected.

It was observed while using SR-IOV on an Intel E810 Ethernet adapter.
VF driver in a VM sees a correct number of available MSI-X vectors,
which depends on num-queues assigned in iovctl.conf, while
pci_msix_count in the PPT driver always returns 1.

Signed-off-by: Krzysztof Galazka <kgalazka at FreeBSD.org>
Reviewed By:    #bhyve, jhb
Approved by:    erj (mentor), kbowling (mentor)
Sponsored by:   Intel Corporation
Differential Revision:  https://reviews.freebsd.org/D48812

(cherry picked from commit 413197cef9ccbf22831eb914c2ef469880468d97)
DeltaFile
+3-0sys/amd64/vmm/io/ppt.c
+3-01 files

FreeBSD/src db6f6ccusr.sbin/pkg FreeBSD.conf.quarterly-release FreeBSD.conf.latest

pkg.conf: add valid configurations for kmods for all branches

MFC After:      1 week
Reviewed by:    cperciva
Differential Revision:  https://reviews.freebsd.org/D50668
DeltaFile
+23-0usr.sbin/pkg/FreeBSD.conf.quarterly-release
+1-1usr.sbin/pkg/FreeBSD.conf.latest
+1-1usr.sbin/pkg/FreeBSD.conf.quarterly
+1-1usr.sbin/pkg/Makefile
+26-34 files

FreeBSD/src 786ced5lib/libc/gen glob.c

libc: Fix glob.c build with GCC

We don't expose the dummy struct pointer in the header file, so
gl_errblk is just a void * when lacking compiler support for blocks and
we need to cast to the former for CALL_BLOCK to work. If blocks support
is present this should be a redundant cast to the type that gl_errblk
already is.

Fixes:  1e0743f54d2d ("glob: Add blocks support")
DeltaFile
+2-1lib/libc/gen/glob.c
+2-11 files

FreeBSD/src 680f1a3lib/libc/include block_abi.h

libc: Allow more complex expressions for CALL_BLOCK first argument

For the case where the compiler supports blocks we only allow the first
expression to have an operator if it has as high precedence as a
function call, which for blocks effectively means member access and
subscripting only, not even a dereference nor a cast. Parenthesise this,
as is the case for the missing compiler support case, so that it's more
general.
DeltaFile
+1-1lib/libc/include/block_abi.h
+1-11 files

FreeBSD/src 5317335sys/dev/cxgb cxgb_sge.c

cxgb(4): Fix two typos in a source code comment

- s/cotaining/containing/

(cherry picked from commit e86d9dd6cee18b035a34d54dbab93fc1ad6b527e)
DeltaFile
+2-2sys/dev/cxgb/cxgb_sge.c
+2-21 files

FreeBSD/src 831c4e5sys/dev/syscons syscons.c

syscons(4): Fix a typo in a source code comment

- s/contants/constants/

(cherry picked from commit 62b3bac1a280e765f86901926c9e8d5f5b431bff)
DeltaFile
+1-1sys/dev/syscons/syscons.c
+1-11 files

FreeBSD/src 9b09a56sys/netipsec ipsec.h

ipsec(4): Fix a typo in a source code comment

- s/limitiation/limitation/

(cherry picked from commit 56a9d245eb16e774fece0334fcf0761058d59a0c)
DeltaFile
+1-1sys/netipsec/ipsec.h
+1-11 files

FreeBSD/src ac4c4c2release Makefile.oracle

release: Remove stray review reference

release/Makefile.oracle had a stray reference to the Phabricator review
in a comment.
DeltaFile
+1-1release/Makefile.oracle
+1-11 files