FreeBSD/src 14a7a13sys/conf files.amd64 files.x86, sys/modules Makefile

asmc(4): Stop building it on i386, as it supports only 64-bit chipsets

Reported by:    ngie
Fixes:          fde9fe18219f ("i386: Fix kernel compilation after introduction of ASMC_DEBUG option")
Sponsored by:   The FreeBSD Foundation

(cherry picked from commit 8342d9f7b5f13d0623861cb8b88caf10a15571f6)
DeltaFile
+1-1sys/modules/Makefile
+1-0sys/conf/files.amd64
+0-1sys/conf/files.x86
+2-23 files

FreeBSD/src 06aeb11contrib/netbsd-tests/kernel t_ptrace_wait.c

t_ptrace_wait.c: clean up trailing whitespace

This is being done to aid with future potential updates of this file.

MFC after:      1 week

(cherry picked from commit fa3519d068d95f87e773d27f96e9f1e18f70075a)
DeltaFile
+12-12contrib/netbsd-tests/kernel/t_ptrace_wait.c
+12-121 files

FreeBSD/ports 444f42emath/octave pkg-plist distinfo, math/octave-forge-websockets Makefile

math/octave: Update to 11.1.0.

- Bump portrevision of dependent ports.
DeltaFile
+94-17math/octave/pkg-plist
+0-11math/octave/files/patch-liboctave_util_quit.h
+3-3math/octave/distinfo
+3-3math/octave/Makefile
+1-1math/octave-forge-zenity/Makefile
+1-1math/octave-forge-websockets/Makefile
+102-36131 files not shown
+233-119137 files

FreeBSD/src 887f0f1contrib/googletest/googlemock/include/gmock gmock-matchers.h, contrib/googletest/googlemock/test gmock-matchers-containers_test.cc gmock-matchers-arithmetic_test.cc

Revert "GoogleTest: import 1.17.0"

This reverts commit 227baf32d26360137492b108aba06c6a54c0949b.
DeltaFile
+76-343contrib/googletest/googlemock/include/gmock/gmock-matchers.h
+19-317contrib/googletest/googlemock/test/gmock-matchers-containers_test.cc
+27-210contrib/googletest/googlemock/test/gmock-matchers-arithmetic_test.cc
+34-157contrib/googletest/googletest/src/gtest.cc
+5-131contrib/googletest/googlemock/test/gmock-matchers-comparisons_test.cc
+39-95contrib/googletest/googletest/include/gtest/gtest-param-test.h
+200-1,25355 files not shown
+923-2,69161 files

FreeBSD/src d1a607dcontrib/googletest/googletest/src gtest.cc

Revert "gtest.cc: declare fail_if_no_test_linked flag"

This reverts commit 5a9164c4539dfea8e1120673b5da038c65b53958.
DeltaFile
+0-1contrib/googletest/googletest/src/gtest.cc
+0-11 files

FreeBSD/src 1a0002eshare/mk googletest.test.inc.mk

Revert "Bump CXXSTD to C++17 with GoogleTest tests"

This reverts commit 1bebef5c953a007244e16a9ba58a10e6137442b8.
DeltaFile
+1-1share/mk/googletest.test.inc.mk
+1-11 files

FreeBSD/src cc5c8b6contrib/netbsd-tests/kernel t_ptrace_wait.c

t_ptrace_wait.c: clean up trailing whitespace

This is being done to aid with future potential updates of this file.

MFC after:      1 week

(cherry picked from commit fa3519d068d95f87e773d27f96e9f1e18f70075a)
DeltaFile
+12-12contrib/netbsd-tests/kernel/t_ptrace_wait.c
+12-121 files

FreeBSD/src 12eecb3crypto/openssl/include/openssl ssl.h bio.h

OpenSSL: update vendor sources to match 3.5.5 content

MFC with:       f25b8c9fb4f58cf61adb47d7570abe7caa6d385d
MFC after:      1 week

(cherry picked from commit 1731fc70f7344af08db49b06c63c963fa12ee354)
DeltaFile
+1,423-1,416crypto/openssl/include/openssl/ssl.h
+538-532crypto/openssl/include/openssl/bio.h
+451-462crypto/openssl/include/openssl/asn1t.h
+403-358crypto/openssl/include/openssl/x509v3.h
+344-346crypto/openssl/include/openssl/x509.h
+331-330crypto/openssl/include/openssl/x509_vfy.h
+3,490-3,444946 files not shown
+15,475-11,782952 files

FreeBSD/src 66aff32sys/crypto/openssl arm_arch.h, sys/crypto/openssl/aarch64 vpsm4_ex-armv8.S

OpenSSL: commit sys/crypto changes for 3.5.5

These files were changed as part of the 3.5.4 -> 3.5.5 upgrade. Please
see the upstream release notes linked in
1731fc70f7344af08db49b06c63c963fa12ee354, et al, for more details.

MFC after:      6 days
MFC with:       1731fc70f7344af08db49b06c63c963fa12ee354
Fixes:  1731fc70f7344af08d ("OpenSSL: update vendor sources to match 3.5.5 content")

(cherry picked from commit e6c8997a8958c7aaec8e266d2eeefbfaa137e218)
DeltaFile
+897-1,244sys/crypto/openssl/powerpc64/aes-gcm-ppc.S
+897-1,244sys/crypto/openssl/powerpc64le/aes-gcm-ppc.S
+897-1,243sys/crypto/openssl/powerpc/aes-gcm-ppc.S
+160-171sys/crypto/openssl/arm_arch.h
+13-1sys/crypto/openssl/aarch64/vpsm4_ex-armv8.S
+2,864-3,9035 files

FreeBSD/src f775385crypto/openssl/crypto/ec ecp_nistz256_table.c curve25519.c, crypto/openssl/ssl s3_lib.c

openssl: import 3.5.5

This change adds OpenSSL 3.5.5 from upstream [1].

The 3.5.5 artifact was been verified via PGP key [2] and by SHA256 checksum [3].

This is a security release, but also contains several bugfixes. All of
the CVE-worthy issues have already been addressed on the target
branch(es), so the net-result is that this is a bugfix release.

More information about the release (from a high level) can be found in
the release notes [4].

MFC after:      1 week

1. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz
2. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz.asc
3. https://github.com/openssl/openssl/releases/download/openssl-3.5.5/openssl-3.5.5.tar.gz.sha256
4. https://github.com/openssl/openssl/blob/openssl-3.5.5/NEWS.md

    [4 lines not shown]
DeltaFile
+14,894-9,513crypto/openssl/crypto/ec/ecp_nistz256_table.c
+10,184-10,183crypto/openssl/test/ecdsatest.h
+9,620-1,938crypto/openssl/test/quic_record_test.c
+3,601-3,206crypto/openssl/ssl/s3_lib.c
+2,877-2,722crypto/openssl/test/sslapitest.c
+2,625-2,478crypto/openssl/crypto/ec/curve25519.c
+43,801-30,0402,263 files not shown
+199,825-161,2952,269 files

FreeBSD/src 38917c4sys/dev/asmc asmc.c

chore: asmc: minor code cleanup

- Use symbolic names in Mac definitions in lieu of the unrolled values
  they represent.
- Delete trailing whitespace.
- Fix indentation.

No functional change intended.

MFC after:      1 week

(cherry picked from commit a8f3c3b5d4d9dac1dafe4094fe35b30ffdf26178)
DeltaFile
+37-35sys/dev/asmc/asmc.c
+37-351 files

FreeBSD/src dbeb513sys/dev/asmc asmcvar.h asmc.c

asmc: Add support for macmini 6,1 and 6,2 (late 2012) models

This adds the ASMC support for the macmini 6,1 and 6,2.

PR:             kern/268141
Differential Revision:  https://reviews.freebsd.org/D49929

(cherry picked from commit 93ca9e44b752e6a9aeb0f761a022d14281d1a4e3)
DeltaFile
+62-0sys/dev/asmc/asmcvar.h
+18-0sys/dev/asmc/asmc.c
+80-02 files

FreeBSD/src c200139sys/dev/asmc asmc.c

chore: asmc: additional style(9) cleanup

Pick out non-gratuitous style(9) changes suggested by `clang-format` on
the driver. This helps eliminate minor stylistic issues with spaces,
braces, line lengths, etc, so future functional changes in the driver
will be easier to pick out.

Many of the other `clang-format` suggested changes were not taken because
they were considerably more gratuitous.

No functional change intended.

MFC after:      1 week

(cherry picked from commit d76bb14e0224e235209d8c07ec132d602b18648b)
DeltaFile
+56-49sys/dev/asmc/asmc.c
+56-491 files

FreeBSD/src ab3eaa6sys/amd64/conf NOTES, sys/conf options.amd64

Add ASMC_DEBUG make option

This allows folks to enable debug statements in asmc(4) using kernel
configs via the `options ASMC_DEBUG` directive.

While here, remove a duplicate `device vt_efifb` directive in `NOTES`
as it's already handled in the `GENERIC` config

MFC after:      1 week
Differential Revision:  https://reviews.freebsd.org/D54511

(cherry picked from commit f224591746bdaf14ad5f63de4738a3146cc2f55f)
DeltaFile
+11-10sys/dev/asmc/asmc.c
+4-3sys/amd64/conf/NOTES
+3-0sys/conf/options.amd64
+1-1sys/modules/asmc/Makefile
+19-144 files

FreeBSD/src cfd588asys/dev/asmc asmc.c

chore: asmc: additional style(9) cleanup

Pick out non-gratuitous style(9) changes suggested by `clang-format` on
the driver. This helps eliminate minor stylistic issues with spaces,
braces, line lengths, etc, so future functional changes in the driver
will be easier to pick out.

Many of the other `clang-format` suggested changes were not taken because
they were considerably more gratuitous.

No functional change intended.

MFC after:      1 week

(cherry picked from commit d76bb14e0224e235209d8c07ec132d602b18648b)
DeltaFile
+56-49sys/dev/asmc/asmc.c
+56-491 files

FreeBSD/src df4cc7dsys/dev/asmc asmc.c

chore: asmc: minor code cleanup

- Use symbolic names in Mac definitions in lieu of the unrolled values
  they represent.
- Delete trailing whitespace.
- Fix indentation.

No functional change intended.

MFC after:      1 week

(cherry picked from commit a8f3c3b5d4d9dac1dafe4094fe35b30ffdf26178)
DeltaFile
+37-35sys/dev/asmc/asmc.c
+37-351 files

FreeBSD/src a38f44fsys/dev/acpica acpi.c

Unbreak the build

Add the missing comma in the `device_printf` statement.

MFC after:      1 week
MFC with:       9c666de5b
Fixes:  9c666de5b ("Make message added for Darwin OSI quirk more terse")

(cherry picked from commit cc702c78f70f972cf2f8ea008752d96df1989988)
DeltaFile
+1-1sys/dev/acpica/acpi.c
+1-11 files

FreeBSD/src da481c5sys/dev/acpica acpi.c

Make message added for Darwin OSI quirk more terse

The verbose message was way too verbose. Make it terse.

MFC after:      1 week
MFC with:       052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware")
Requested by:   kib

(cherry picked from commit 9c666de5b339d3c8f9bf3963691e4310e7d159cb)
DeltaFile
+6-8sys/dev/acpica/acpi.c
+6-81 files

FreeBSD/src 964c97asys/dev/acpica acpi.c

acpi: add Darwin OSI quirk for Apple Mac hardware

Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86
systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not
installed via ACPI.

Prior to this change, FreeBSD always used the dGPU. This is fine in
practice, but consumed more power than when the iGPU is used,
resulting in reduced battery life.

Linux handles this in `drivers/acpi/osi.c` by detecting Apple
hardware via DMI, disabling all Windows OSI strings, and
by explicitly installing the Darwin OSI ACPI handler. This change
applies equivalent logic to the acpi(4) driver on FreeBSD.

This feature can be enabled/disabled using the
`hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0`
restores the previous behavior by explicitly disabling the added
support.

    [5 lines not shown]
DeltaFile
+72-0sys/dev/acpica/acpi.c
+72-01 files

FreeBSD/src 9ecdc69sys/dev/acpica acpi.c

Unbreak the build

Add the missing comma in the `device_printf` statement.

MFC after:      1 week
MFC with:       9c666de5b
Fixes:  9c666de5b ("Make message added for Darwin OSI quirk more terse")

(cherry picked from commit cc702c78f70f972cf2f8ea008752d96df1989988)
DeltaFile
+1-1sys/dev/acpica/acpi.c
+1-11 files

FreeBSD/src cd93714sys/dev/acpica acpi.c

acpi: add Darwin OSI quirk for Apple Mac hardware

Mac firmware hides the Intel integrated GPU (iGPU) on dual GPU x86
systems, i.e., with AMD/NVIDIA dGPUs, when the Darwin OSI is not
installed via ACPI.

Prior to this change, FreeBSD always used the dGPU. This is fine in
practice, but consumed more power than when the iGPU is used,
resulting in reduced battery life.

Linux handles this in `drivers/acpi/osi.c` by detecting Apple
hardware via DMI, disabling all Windows OSI strings, and
by explicitly installing the Darwin OSI ACPI handler. This change
applies equivalent logic to the acpi(4) driver on FreeBSD.

This feature can be enabled/disabled using the
`hw.acpi.apple_darwin_osi` tunable. Setting this tunable to `0`
restores the previous behavior by explicitly disabling the added
support.

    [5 lines not shown]
DeltaFile
+72-0sys/dev/acpica/acpi.c
+72-01 files

FreeBSD/src a0d06f5sys/dev/acpica acpi.c

Make message added for Darwin OSI quirk more terse

The verbose message was way too verbose. Make it terse.

MFC after:      1 week
MFC with:       052a791b00 ("acpi: add Darwin OSI quirk for Apple Mac hardware")
Requested by:   kib

(cherry picked from commit 9c666de5b339d3c8f9bf3963691e4310e7d159cb)
DeltaFile
+6-8sys/dev/acpica/acpi.c
+6-81 files

FreeBSD/src 640c1eetools/build/mk OptionalObsoleteFiles.inc

Remove example tests when MK_EXAMPLES=no

This change cleans up example tests for atf, googletest, plain, and TAP
when MK_EXAMPLES=no. Not having this in results
`kyua test -k /usr/tests/share/examples/Kyuafile` being broken on a host
where the content in that directory tree is stale. I ran into that case
because at some point in time in the past I had specified
`MK_GOOGLETEST=no` one of my dev instances.

MFC after:      1 week

(cherry picked from commit cea2683bb691d6cbcfb7e342c497d018bba712c2)
DeltaFile
+26-0tools/build/mk/OptionalObsoleteFiles.inc
+26-01 files

FreeBSD/src fca1e5dtools/build/mk OptionalObsoleteFiles.inc

Remove example tests when MK_EXAMPLES=no

This change cleans up example tests for atf, googletest, plain, and TAP
when MK_EXAMPLES=no. Not having this in results
`kyua test -k /usr/tests/share/examples/Kyuafile` being broken on a host
where the content in that directory tree is stale. I ran into that case
because at some point in time in the past I had specified
`MK_GOOGLETEST=no` one of my dev instances.

MFC after:      1 week

(cherry picked from commit cea2683bb691d6cbcfb7e342c497d018bba712c2)
DeltaFile
+26-0tools/build/mk/OptionalObsoleteFiles.inc
+26-01 files

FreeBSD/src 5c361ebetc/mtree BSD.tests.dist, secure/lib/libcrypto Makefile

openssl: add a simple smoke test for the legacy provider

This change adds a simple smoke test for the legacy provider to ensure
that the provider doesn't break in the future when performing updates.

This is not a functional or system test; the OpenSSL test suite does a
much better job at doing this than we can.

MFC after:              1 week
Differential Revision:  https://reviews.freebsd.org/D53045

(cherry picked from commit 3b6442370a17c57c4c290b9a8e1e8328da820705)
DeltaFile
+40-0secure/lib/libcrypto/tests/libcrypto_test.sh
+5-0secure/lib/libcrypto/tests/Makefile
+3-0secure/lib/libcrypto/Makefile
+2-0etc/mtree/BSD.tests.dist
+50-04 files

FreeBSD/src 5111a75sys/dev/asmc asmcvar.h asmc.c

asmc: Add support for MacBookPro11,5

  Add support for the MacBookPro11,5 (Mid 2015, 15-inch with AMD Radeon R9 M370X GPU)
  to the Apple SMC driver.

  Debug testing revealed this model lacks several SMC keys present on MacBookPro11,4
  (IBLC, ICMC, IC2C), that model-specific sensor definitions.

Differential Revision:  https://reviews.freebsd.org/D54665
Reviewed by:    adrian

(cherry picked from commit c498eaa2f9090d7bdc6456181d8bf74869288bbb)
DeltaFile
+35-0sys/dev/asmc/asmcvar.h
+7-0sys/dev/asmc/asmc.c
+42-02 files

FreeBSD/src afa1058sys/dev/asmc asmc.c asmcvar.h

asmc: improve asmc_dumpall to read actual SMC key count

The asmc_dumpall debug function previously used a hardcoded loop limit
of 0x100 (256) keys with a "XXX magic number" comment.

This change improves asmc_dumpall to:

* Read the actual number of keys from the ASMC_NKEYS SMC key
* Print the key count being dumped for better debugging output
* Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1)

This provides more accurate debug output and removes the magic number.

Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT):

* Rebuild kernel with DEBUG enabled in asmc driver
* Boot with new kernel
* Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count)
* Verify all 297 keys are dumped

    [5 lines not shown]
DeltaFile
+17-8sys/dev/asmc/asmc.c
+1-0sys/dev/asmc/asmcvar.h
+18-82 files

FreeBSD/src 75045desys/dev/asmc asmcvar.h asmc.c

asmc: Add support for MacBookPro11,5

  Add support for the MacBookPro11,5 (Mid 2015, 15-inch with AMD Radeon R9 M370X GPU)
  to the Apple SMC driver.

  Debug testing revealed this model lacks several SMC keys present on MacBookPro11,4
  (IBLC, ICMC, IC2C), that model-specific sensor definitions.

Differential Revision:  https://reviews.freebsd.org/D54665
Reviewed by:    adrian

(cherry picked from commit c498eaa2f9090d7bdc6456181d8bf74869288bbb)
DeltaFile
+35-0sys/dev/asmc/asmcvar.h
+7-0sys/dev/asmc/asmc.c
+42-02 files

FreeBSD/src f0d2b37sys/dev/asmc asmc.c

asmc: add per-fan manual mode control via sysctl

Add per-fan manual mode control via dev.asmc.0.fan.N.manual sysctl.

Apple SMCs support manual fan control via the FS! SMC key,
a 16-bit bitmask where each bit controls one fan (0=auto, 1=manual).

This change adds a new sysctl per fan:
    dev.asmc.0.fan.N.manual (0=auto, 1=manual)

When set to manual mode (1), the fan runs at the speed set via
dev.asmc.0.fan.N.targetspeed instead of automatic thermal control.  When
set to auto mode (0), the SMC controls fan speed automatically.

The FS! key was already defined in asmcvar.h but not accessible.
This exposes it for debugging, testing, and advanced fan control.

Implementation uses read-modify-write to allow independent control of
each fan without affecting others.

    [6 lines not shown]
DeltaFile
+55-0sys/dev/asmc/asmc.c
+55-01 files

FreeBSD/src 26f41f8sys/dev/asmc asmc.c asmcvar.h

asmc: improve asmc_dumpall to read actual SMC key count

The asmc_dumpall debug function previously used a hardcoded loop limit
of 0x100 (256) keys with a "XXX magic number" comment.

This change improves asmc_dumpall to:

* Read the actual number of keys from the ASMC_NKEYS SMC key
* Print the key count being dumped for better debugging output
* Loop only up to the actual key count (e.g., 297 on Mac Mini 5,1)

This provides more accurate debug output and removes the magic number.

Tested on Mac Mini 5,1 (FreeBSD 16.0-CURRENT):

* Rebuild kernel with DEBUG enabled in asmc driver
* Boot with new kernel
* Verify dmesg shows "asmc_dumpall: dumping 297 keys" (or actual count)
* Verify all 297 keys are dumped

    [5 lines not shown]
DeltaFile
+17-8sys/dev/asmc/asmc.c
+1-0sys/dev/asmc/asmcvar.h
+18-82 files