HardenedBSD/src 5c4a381sys/arm/ti/omap4 omap4_prcm_clks.c, sys/contrib/edk2/Include/IndustryStandard Acpi60.h Acpi51.h

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+1,465-1,304sys/contrib/edk2/Include/Library/BaseLib.h
+2,079-166sys/dev/bnxt/bnxt_en/hsi_struct_def.h
+959-942sys/contrib/edk2/Include/IndustryStandard/Acpi60.h
+824-807sys/contrib/edk2/Include/IndustryStandard/Acpi51.h
+764-753sys/contrib/edk2/Include/IndustryStandard/Acpi50.h
+0-1,499sys/arm/ti/omap4/omap4_prcm_clks.c
+6,091-5,47195 files not shown
+12,162-16,145101 files

HardenedBSD/src 52c3061sbin/ifconfig ifconfig.8, sys/netinet6 in6_pcb.c

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+15-6sbin/ifconfig/ifconfig.8
+4-5sys/netinet6/in6_pcb.c
+19-112 files

HardenedBSD/src 2a931f7include signal.h, lib/libc/gen psignal.3 sysctl.3

Merge branch 'freebsd/14-stable/main' into hardened/14-stable/master
DeltaFile
+21-1lib/libc/gen/psignal.3
+8-8lib/libc/gen/sysctl.3
+6-0lib/libc/gen/psignal.c
+2-1lib/libc/gen/Makefile.inc
+1-0lib/libc/gen/Symbol.map
+1-0include/signal.h
+39-106 files

HardenedBSD/src ca4b046sbin/ifconfig ifconfig.8, sys/netinet6 in6_pcb.c

netinet6: allow binding to anycast addresses

the restriction on sending packets from anycast source addresses was
removed in RFC4291, so there's no reason to forbid binding to such
addresses.  this allows anycast services (e.g., DNS) to actually use
anycast addresses, which was previously impossible.

RFC4291 also removes the restriction that only routers may configure
anycast addresses; this was never enforced in code but was documented in
ifconfig.8.  update ifconfig.8 to document both changes.

PR:     285545
Reviewed by:    des, adrian
Approved by:    des (mentor)
Differential Revision:  https://reviews.freebsd.org/D49905
DeltaFile
+15-6sbin/ifconfig/ifconfig.8
+4-5sys/netinet6/in6_pcb.c
+19-112 files

HardenedBSD/src 81fc946lib/libc/gen sysctl.3

sysctl.3: put KERN_PROC_RLIMIT_USAGE in the right spot

(cherry picked from commit 199a2be029e835c3b284d948e8168af378b06efc)
DeltaFile
+8-8lib/libc/gen/sysctl.3
+8-81 files

HardenedBSD/src 0ad5308include signal.h, lib/libc/gen psignal.3 psignal.c

Add POSIX psiginfo(3) call

PR:     286133

(cherry picked from commit 3b2f0bfc35167724a41c969c1823be6b1ede15ab)
DeltaFile
+21-1lib/libc/gen/psignal.3
+6-0lib/libc/gen/psignal.c
+2-1lib/libc/gen/Makefile.inc
+1-0include/signal.h
+1-0lib/libc/gen/Symbol.map
+31-25 files

HardenedBSD/src a8ca60c. Makefile.inc1

HBSD: Resolve merge conflict

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+1-5Makefile.inc1
+1-51 files

HardenedBSD/src b11acc5. Makefile.inc1

Merge remote-tracking branch 'origin/freebsd/14-stable/main' into hardened/14-stable/master

Conflicts:
        Makefile.inc1 (unresolved)
DeltaFile
+5-0Makefile.inc1
+5-01 files

HardenedBSD/src 52fa837sys/contrib/edk2/Include/IndustryStandard Acpi60.h Acpi51.h, sys/contrib/edk2/Include/Library BaseLib.h

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master
DeltaFile
+1,465-1,304sys/contrib/edk2/Include/Library/BaseLib.h
+2,079-166sys/dev/bnxt/bnxt_en/hsi_struct_def.h
+959-942sys/contrib/edk2/Include/IndustryStandard/Acpi60.h
+824-807sys/contrib/edk2/Include/IndustryStandard/Acpi51.h
+764-753sys/contrib/edk2/Include/IndustryStandard/Acpi50.h
+742-736sys/contrib/edk2/Include/Uefi/UefiInternalFormRepresentation.h
+6,833-4,70847 files not shown
+11,508-8,68853 files

HardenedBSD/src 2fe4242share/mk bsd.lib.mk bsd.suffixes-extra.mk

HBSD: Resolve merge conflict

With commit 9c4f1497dae7832e2727682e9161ca9572e56dfe, FreeBSD moved the
object file suffix transformation rules into a separate file. As part of
resolving this merge conflict, we need to remove references to the
PIE-related objects (.pieo and similar).

As part of the 2013-2015 ASLR work, we came up with a different method
for building with PIC/PIE. As such, we don't need to use FreeBSD's .pieo
and related.

Signed-off-by:  Shawn Webb <shawn.webb at hardenedbsd.org>
DeltaFile
+0-53share/mk/bsd.lib.mk
+2-20share/mk/bsd.suffixes-extra.mk
+2-732 files

HardenedBSD/src f2605f6sys/dev/mpi3mr mpi3mr_pci.c mpi3mr.h

mpi3mr: configure larger max I/O size if the HBA firmware supports it

The max I/O size that an mpi3mr HBA supports is reported in the IOCFacts
structure (with 0 representing the legacy max I/O size of 1 MB).
By default, set the max I/O size of devices attached to mpi3mr controllers
to the smaller of the HBA's max I/O size and the kernel's maxphys.
Allow this default to be overriden by a global tunable
"hw.mpi3mr.max_sgl_entries" or by a per-controller tunable
"dev.mpi3mr.N.max_sgl_entries".

Sponsored by:   Netflix
Reviewed by:    imp
Differential Revision:  https://reviews.freebsd.org/D49090
DeltaFile
+17-1sys/dev/mpi3mr/mpi3mr_pci.c
+9-3sys/dev/mpi3mr/mpi3mr.h
+9-2sys/dev/mpi3mr/mpi3mr.c
+6-4sys/dev/mpi3mr/mpi3mr_cam.c
+41-104 files

HardenedBSD/src 5e9af2blib/libefivar efivar.c

libefivar: Simplify Z / zero define

This really onl needs to be one zero long for the entire structure to be
initialized. Use this form instead.

Sponsored by:           Netflix
DeltaFile
+1-1lib/libefivar/efivar.c
+1-11 files

HardenedBSD/src fec0e20sys/dev/bnxt/bnxt_en bnxt_hwrm.c

bnxt_en: Thor2 Ring counters not incrementing during traffic

The ctx_hw_stats_ext DMA address was not correctly passed to the
firmware during the HWRM_STAT_CTX_ALLOC allocation, causing stats to not
populate for Thor2.  Passing the correct DMA length resolved the issue

MFC-After: 3 days
Differential-Revision: https://reviews.freebsd.org/D49732
DeltaFile
+4-1sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
+4-11 files

HardenedBSD/src 6450d93sys/dev/bnxt/bnxt_en if_bnxt.c

bnxt_en: Unhandled async event type 76

The completion event type 76 is not supported by the driver. Instead of
flooding the dmesg with "Unknown event type" messages when this event
occurs, move the print under debug level.

MFC-After: 3 days
Differential-Revision: https://reviews.freebsd.org/D49731
DeltaFile
+6-6sys/dev/bnxt/bnxt_en/if_bnxt.c
+6-61 files

HardenedBSD/src 39c0b8bsys/dev/bnxt/bnxt_en if_bnxt.c bnxt.h

bnxt_en: Thor2 Specific Doorbell related changes

Doorbell offset :
For Thor controllers doorbell offset was always hardcoded to 0x10000 for
PF devices where as for Thor2 controllers doorbell offset will be
legacy_l2_db_size_kb value provided by firmware through hwrm_func_qcfg
command.

CQ Toggle & Epoch bits support :
In order to handle out of order doorbell handling as part of Dropped
Doorbell Recovery, HW expects two changes in the driver in data path.

- First change is the epoch bit changes while updating the producer
indexes of Tx. This epoch bit is toggled by the driver, each time the
queue is wrapped for that specific doorbell.

- The second change is to add a toggle bit pair to each ARM type
doorbell.  This includes the CQ_ARMALL, CQ_ARMSE, CQ_ARMENA
doorbells. The toggle bit pair in context is incremented by the chip

    [12 lines not shown]
DeltaFile
+198-5sys/dev/bnxt/bnxt_en/if_bnxt.c
+63-25sys/dev/bnxt/bnxt_en/bnxt.h
+50-2sys/dev/bnxt/bnxt_en/bnxt_txrx.c
+311-323 files

HardenedBSD/src dac7833sys/dev/bnxt/bnxt_en if_bnxt.c bnxt_hwrm.c

bnxt_en: 400G speed support

Added 400G speed module support.

MFC-After: 3 days
Differential-Revision: https://reviews.freebsd.org/D49729
DeltaFile
+395-129sys/dev/bnxt/bnxt_en/if_bnxt.c
+29-5sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
+17-1sys/dev/bnxt/bnxt_en/bnxt.h
+441-1353 files

HardenedBSD/src 526d74fsys/dev/bnxt/bnxt_en bnxt_txrx.c if_bnxt.c

if_bnxt: add support for RX completion record type V3

Added support for  RX V3 completion record types-
CMPL_BASE_TYPE_RX_TPA_START_V3 and CMPL_BASE_TYPE_RX_L2_V3.

MFC-After: 3 days
Differential-Revision: https://reviews.freebsd.org/D49728
DeltaFile
+3-0sys/dev/bnxt/bnxt_en/bnxt_txrx.c
+2-0sys/dev/bnxt/bnxt_en/if_bnxt.c
+5-02 files

HardenedBSD/src d5ce906sys/dev/bnxt/bnxt_en bnxt_hwrm.c if_bnxt.c

bnxt_en: Add backing store V2 support

Add backing store V2 support.
Thor2 controllers supports only the V2 support.

MFC-After: 3 days
Reviewed-by: Warner Losh <imp at FreeBSD.org>
Differential-Revision: https://reviews.freebsd.org/D49727
DeltaFile
+80-12sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
+62-3sys/dev/bnxt/bnxt_en/if_bnxt.c
+11-3sys/dev/bnxt/bnxt_en/bnxt.h
+153-183 files

HardenedBSD/src bb90baesys/dev/bnxt/bnxt_en hsi_struct_def.h bnxt.h

bnxt_en: Update HSI header

Update HSI header to support Thor2 controllers.

MFC-After: 3 days
Differential-Revision: https://reviews.freebsd.org/D49726
DeltaFile
+2,079-166sys/dev/bnxt/bnxt_en/hsi_struct_def.h
+3-3sys/dev/bnxt/bnxt_en/bnxt.h
+2,082-1692 files

HardenedBSD/src 26bd37dsys/dev/bnxt/bnxt_en if_bnxt.c bnxt_hwrm.c

bnxt_en: Add 5760X (Thor2) PCI IDs support

Add Thor2 PCI IDs.

Reviewed-by: Warner Losh <imp at FreeBSD.org>
Reviewed-by: Sumit Saxena <sumit.saxena at broadcom.com>
MFC-After: 3 days
Differential-Revision: https://reviews.freebsd.org/D49725
DeltaFile
+59-42sys/dev/bnxt/bnxt_en/if_bnxt.c
+18-14sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
+12-0sys/dev/bnxt/bnxt_en/bnxt.h
+3-3sys/dev/bnxt/bnxt_en/bnxt_sysctl.c
+1-1sys/dev/bnxt/bnxt_en/bnxt_ulp.c
+93-605 files

HardenedBSD/src 828e0eelib/libefivar uefi-dplib.h

libefivar: Prefer EFI_GUID to GUID

There's more references to EFI_GUID than to GUID, so prefer using
that. The EFI_GUID is closely relate to UUID, but not quite identical to
it and those slight differences matter sometimes as well (which is how I
found these). Since nearly all the EFI code (ours and EDK2) prefers
EGI_GUID, use that proactively here.

Sponsored by:           Netflix
DeltaFile
+4-4lib/libefivar/uefi-dplib.h
+4-41 files

HardenedBSD/src 99984e4sys/contrib/edk2/Include Base.h

edk2: #ifdef out STATIC_ASSERTS when !_STANDALONE

All FreeBSD ABIs do not conform to the EDK2 preconditions (except boot
loader). These asserts test those things. Since the code from EDK2 that
we use does not depend on L" and L' details, commenting them out is fine.

Note: This was not in the update since I had to redo it too many times
due to lost races and it was a tricky update.

Sponsored by:           Netflix
DeltaFile
+7-0sys/contrib/edk2/Include/Base.h
+7-01 files

HardenedBSD/src e35cc7blib Makefile

edk2: Update to not build libefivar for lib32 on amd64

This dropped from the last commit because I had to redo it so many
times...

edk2 headers just aren't setup for the weird, hybrid enviornment we're
compiling in when building i386 libraries for amd64 lib32. Since we
can't use it there anyway (there's no 32-bit efibootmgr or efivar), and
native i386 doesn't have them (we don't support EFI Runtime Services on
i386 because we don't support EFI booting there).

Sponsored by:           Netflix
DeltaFile
+3-0lib/Makefile
+3-01 files

HardenedBSD/src 580fcf6sys/contrib/edk2/Include/IndustryStandard Acpi60.h Acpi51.h, sys/contrib/edk2/Include/Library BaseLib.h

edk2: Merge edk2-stable202502

Merge in edk2 stable202502 to pick up latest definitions. This is a
subset import, as outlined in FREEBSD-update, since the full thing has
only gotten larger.

I also had to disable building of libefivar for i386 build. The
precondition for EDK2 isn't met by our ABI there. And we can't call
EFIRT there anyway. We normally don't build the EFI binaries for i386
anyway. We likely never should have built this, but disabling one
library in 32-bit mode is hard.

I also had to ifdef the L" and L' asserts on _STANDALONE. In the boot
loader build enviornment, we met these conditions. All the other places
we do not. But we also are careful to massage the code so that we do not
depend on these preconditions.

Sponsored by:           Netflix
DeltaFile
+1,465-1,304sys/contrib/edk2/Include/Library/BaseLib.h
+959-942sys/contrib/edk2/Include/IndustryStandard/Acpi60.h
+824-807sys/contrib/edk2/Include/IndustryStandard/Acpi51.h
+764-753sys/contrib/edk2/Include/IndustryStandard/Acpi50.h
+742-736sys/contrib/edk2/Include/Uefi/UefiInternalFormRepresentation.h
+524-518sys/contrib/edk2/Include/IndustryStandard/Acpi40.h
+5,278-5,06030 files not shown
+8,349-8,23436 files

HardenedBSD/src 3f68c3e. Makefile.inc1

Fix build with WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG

When WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG are both set, the
cross-tools stage does not build a cross clang binary. This is because
the Makefile in usr.bin/clang checks for WITHOUT_CLANG, and skips
building the binary.

To fix this, ensure that WITH_CLANG is set for the cross-tools phase
whenever WITH_CLANG_BOOTSTRAP is set. While here, skip using the
Makefile in usr.bin/clang, and directly use the Makefile in
usr.bin/clang/clang instead.

PR:             286154
Reported by:    avg
Reviewed by:    avg, emaste
MFC after:      1 week
Differential Revision: https://reviews.freebsd.org/D49886

(cherry picked from commit ea231471d024e93279dc2196d6d5d87e199ad55b)
DeltaFile
+2-1Makefile.inc1
+2-11 files

HardenedBSD/src d0ab6ablibexec/rtld-elf rtld.c

rtld: symbolic and deepbind are equivalent for the refobj

Reported by:    avg
Sponsored by:   The FreeBSD Foundation
MFC after:      1 week
DeltaFile
+3-2libexec/rtld-elf/rtld.c
+3-21 files

HardenedBSD/src 2a24080libexec/rtld-elf rtld.c

rtld: fix indent in dlopen_object()

Sponsored by:   The FreeBSD Foundation
DeltaFile
+8-10libexec/rtld-elf/rtld.c
+8-101 files

HardenedBSD/src 4d57d51sys/arm/ti/omap4 omap4_prcm_clks.c omap4_reg.h, sys/arm/ti/twl twl_vreg.c twl_clks.c

Merge remote-tracking branch 'internal/freebsd/current/main' into hardened/current/master

Conflicts:
        share/mk/bsd.lib.mk (unresolved)
DeltaFile
+0-1,499sys/arm/ti/omap4/omap4_prcm_clks.c
+0-1,026sys/arm/ti/twl/twl_vreg.c
+0-647sys/arm/ti/twl/twl_clks.c
+0-540sys/arm/ti/omap4/omap4_reg.h
+385-114sys/compat/linuxkpi/common/src/linux_80211.c
+0-467sys/arm/ti/usb/omap_host.c
+385-4,29340 files not shown
+656-7,39646 files

HardenedBSD/src e3e5593sys/conf options.arm, sys/modules/dtb/omap4 Makefile

Remove OMAP4 support leftovers

Remove options.arm for OMAP3&4 and the makefile for building FDT

Approved by: manu (mentor)
Differential revision: https://reviews.freebsd.org/D49985
DeltaFile
+0-7sys/modules/dtb/omap4/Makefile
+0-2sys/conf/options.arm
+0-92 files

HardenedBSD/src 8f6bda9MdePkg/Include/IndustryStandard Ufs.h UfsHci.h, MdePkg/Library/PeiRngLib PeiRngLib.c

Import edk2 edk2-stable202502 (hash fbe0805b2091393406952e84724188f8c1941837)

Bring in the latest stable branch for updated defines (especailly
Loongson). Remove ^M as described in sys/contrib/edk2/FREEBSD-upgrade.
Not the absolute latest, but aligned to the edk2-stable202502 tag.

Sponsored by:           Netflix
DeltaFile
+1,022-0MdePkg/Include/IndustryStandard/Ufs.h
+1,001-0MdePkg/Test/Mock/Include/GoogleTest/Library/MockSafeIntLib.h
+533-0MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+533-0MdePkg/Include/IndustryStandard/UfsHci.h
+229-0MdePkg/Library/PeiRngLib/PeiRngLib.c
+126-75MdePkg/Library/StackCheckLib/Readme.md
+3,444-7583 files not shown
+6,053-34689 files