git: ef3fa2a325a5 - main - net/wifi-firmware-{iwlwifi,*}-kmod: add missing firmware files
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 19 Mar 2025 14:34:03 UTC
The branch main has been updated by bz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ef3fa2a325a592baa6573782a72cf0d833589ffa
commit ef3fa2a325a592baa6573782a72cf0d833589ffa
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-03-18 14:49:26 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2025-03-19 14:33:36 +0000
net/wifi-firmware-{iwlwifi,*}-kmod: add missing firmware files
The firmware files for iwlwifi were lacking entries for some older
driver versions on 14.2-RELEASE and stable/14 [1] before
src:f4e352ef16d6.
In addition iwx(4) switched to using the same firmware file names
as iwlwifi so that fwget(8) would work for both of them (D49259).
We add the set of iwx(4) firmware files hard coded to the list of
files.
Given the list of supported revisions will grow and maintaining them
for all branches will be tedious without overlap we will simply create
the lists and let make do the job of :O:u (sort/uniq) in the common
Makefile.inc to filter out duplicates between branches.
the future not mandating that main is first as some of these are
created from scripts.
Installing newer firmware also on stable branches will allow forward
updates. For iwlwifi(4) it is less of a problem given it will use an
older version of firmware still (and we are not hoping to fall out
of the min/max window) but other drivers may not have such a
versioned scheme and we cannot easily run fwget(8) for a newer
release with the old kernel (and once we have an updated kernel/driver
the old firmware is not guaranteed to work anymore).
It would be helpful if we could forget about firmware once a release
is out (given kmod packages are built) but anyone else building the
packages themselves would still use a newer ports tree so we will have
to at least support older versions until the EoL date of the last
release using them.
Admittedly it was easier having the firmware files bundled with src
as most of these problems were solved naturally.
For iwlwifi flavors 22000, ax201, and bz also add a tunable to
automatically turn on hw_crypto, HT and VHT support given we
believe it works for these chipsets.
Dump PORTREVISION to 2 for all of them; mt7601u was already there but
is not affected by these changes so we can leave it at that revision.
Sponsored by: The FreeBSD Foundation
Reported by: Stephane D'Alu (sdalu sdalu.com) [1]
PR: 284475 [1]
Reviewed by: thj, jrm
Differential Revision: https://reviews.freebsd.org/D49403
---
net/wifi-firmware-iwlwifi-kmod/Makefile | 49 ++++++++++++++++++----
net/wifi-firmware-iwlwifi-kmod/distinfo | 74 +++++++++++++++++++++------------
net/wifi-firmware-kmod/Makefile.inc | 27 ++++++++----
net/wifi-firmware-mt7601u-kmod/Makefile | 1 -
4 files changed, 107 insertions(+), 44 deletions(-)
diff --git a/net/wifi-firmware-iwlwifi-kmod/Makefile b/net/wifi-firmware-iwlwifi-kmod/Makefile
index 1e9e85e78a61..6962fa626c5f 100644
--- a/net/wifi-firmware-iwlwifi-kmod/Makefile
+++ b/net/wifi-firmware-iwlwifi-kmod/Makefile
@@ -10,6 +10,9 @@ LICENSE_NAME= Intel firmware license (${FWDRV})
WHENCE_REGEX= iwlwifi -.*
+# Temporary list of flavours which we believe work with HW_CRYPTO/HT/VHT.
+COMPAT_LINUXKPI_IWL_HWCRYPTO_HT_VHT= 22000 ax210 bz
+
# Run iwlwifi-generate-fw-list.sh according to description.
# The flavor/firmware lists below are generated by a script
@@ -19,7 +22,7 @@ WHENCE_REGEX= iwlwifi -.*
# Note: we manually added (kept) some older versions (outside
# the generated template) to be able to support all branches.
#
-### >>>
+### >>> main
FWSUBS= \
7000 \
@@ -30,26 +33,26 @@ FWSUBS= \
bz
# Do not prefix with empty ${FWSUBDIR}/!
-DISTFILES_7000= \
+DISTFILES_7000+= \
iwlwifi-3160-17.ucode${DISTURL_SUFFIX} \
iwlwifi-3168-29.ucode${DISTURL_SUFFIX} \
iwlwifi-7260-17.ucode${DISTURL_SUFFIX} \
iwlwifi-7265D-29.ucode${DISTURL_SUFFIX} \
iwlwifi-7265-17.ucode${DISTURL_SUFFIX}
-DISTFILES_8000= \
+DISTFILES_8000+= \
iwlwifi-8000C-36.ucode${DISTURL_SUFFIX} \
iwlwifi-8265-36.ucode${DISTURL_SUFFIX}
-DISTFILES_9000= \
+DISTFILES_9000+= \
iwlwifi-9000-pu-b0-jf-b0-46.ucode${DISTURL_SUFFIX} \
iwlwifi-9260-th-b0-jf-b0-46.ucode${DISTURL_SUFFIX}
-DISTFILES_22000= \
+DISTFILES_22000+= \
iwlwifi-QuZ-a0-hr-b0-77.ucode${DISTURL_SUFFIX} \
iwlwifi-QuZ-a0-jf-b0-77.ucode${DISTURL_SUFFIX} \
iwlwifi-Qu-b0-hr-b0-77.ucode${DISTURL_SUFFIX} \
iwlwifi-Qu-b0-jf-b0-77.ucode${DISTURL_SUFFIX} \
iwlwifi-Qu-c0-hr-b0-77.ucode${DISTURL_SUFFIX} \
iwlwifi-cc-a0-77.ucode${DISTURL_SUFFIX}
-DISTFILES_ax210= \
+DISTFILES_ax210+= \
iwlwifi-ma-b0-gf4-a0.pnvm${DISTURL_SUFFIX} \
iwlwifi-ma-b0-gf4-a0-89.ucode${DISTURL_SUFFIX} \
iwlwifi-ma-b0-gf-a0.pnvm${DISTURL_SUFFIX} \
@@ -62,7 +65,7 @@ DISTFILES_ax210= \
iwlwifi-so-a0-jf-b0-77.ucode${DISTURL_SUFFIX} \
iwlwifi-ty-a0-gf-a0.pnvm${DISTURL_SUFFIX} \
iwlwifi-ty-a0-gf-a0-89.ucode${DISTURL_SUFFIX}
-DISTFILES_bz= \
+DISTFILES_bz+= \
iwlwifi-gl-c0-fm-c0.pnvm${DISTURL_SUFFIX} \
iwlwifi-gl-c0-fm-c0-92.ucode${DISTURL_SUFFIX}
@@ -74,11 +77,39 @@ DISTFILES_${FWDRV}= \
${DISTFILES_ax210} \
${DISTFILES_bz}
DISTFILES_${FWDRV}_lic=
-### <<<
+### <<< main
+### >>> 14.2, stable/14
DISTFILES_ax210+= \
- iwlwifi-ma-b0-hr-b0-83.ucode${DISTURL_SUFFIX}
+ iwlwifi-ma-b0-gf4-a0-83.ucode${DISTURL_SUFFIX} \
+ iwlwifi-ma-b0-gf-a0-83.ucode${DISTURL_SUFFIX} \
+ iwlwifi-ma-b0-hr-b0-83.ucode${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-gf-a0-83.ucode${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-hr-b0-83.ucode${DISTURL_SUFFIX} \
+ iwlwifi-ty-a0-gf-a0-83.ucode${DISTURL_SUFFIX}
DISTFILES_bz+= \
iwlwifi-gl-c0-fm-c0-83.ucode${DISTURL_SUFFIX}
+### <<< stable/14
+
+### >>> iwx(4)
+DISTFILES_22000+= \
+ iwlwifi-cc-a0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-Qu-b0-hr-b0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-Qu-b0-jf-b0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-Qu-c0-hr-b0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-QuZ-a0-hr-b0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-QuZ-a0-jf-b0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-Qu-c0-jf-b0-77.ucode${DISTURL_SUFFIX}
+
+DISTFILES_ax210+= \
+ iwlwifi-ty-a0-gf-a0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-ty-a0-gf-a0.pnvm${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-gf-a0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-gf-a0.pnvm${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-gf4-a0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-gf4-a0.pnvm${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-hr-b0-77.ucode${DISTURL_SUFFIX} \
+ iwlwifi-so-a0-jf-b0-77.ucode${DISTURL_SUFFIX}
+### <<< iwx
.include "${BASEDIR}/Makefile.inc"
diff --git a/net/wifi-firmware-iwlwifi-kmod/distinfo b/net/wifi-firmware-iwlwifi-kmod/distinfo
index 91d848fcd95b..5fe4ff00adf3 100644
--- a/net/wifi-firmware-iwlwifi-kmod/distinfo
+++ b/net/wifi-firmware-iwlwifi-kmod/distinfo
@@ -1,14 +1,14 @@
-TIMESTAMP = 1731028346
+TIMESTAMP = 1742309267
SHA256 (linux-firmware/iwlwififw/iwlwifi-3160-17.ucode?h=20241017) = 0e893c1ed74c3186047508e93442b2d71a07dd5fac00d9dbdb68f34407d7be14
SIZE (linux-firmware/iwlwififw/iwlwifi-3160-17.ucode?h=20241017) = 918268
SHA256 (linux-firmware/iwlwififw/iwlwifi-3168-29.ucode?h=20241017) = 3afae7bf4bb5fbb83a895ec7ad097b9fd20b7d8794f405c2823cbea5284e65c3
SIZE (linux-firmware/iwlwififw/iwlwifi-3168-29.ucode?h=20241017) = 1036288
SHA256 (linux-firmware/iwlwififw/iwlwifi-7260-17.ucode?h=20241017) = 5d81a6003df0228a497ad27f916ba2c979614b4c439b0f45a5f2873dc0607fe8
SIZE (linux-firmware/iwlwififw/iwlwifi-7260-17.ucode?h=20241017) = 1049340
-SHA256 (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20241017) = f6776a50107cba4f68362b5cf8455f5a0db6a4e8d1e34f4ede6f26803458e25e
-SIZE (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20241017) = 1036772
SHA256 (linux-firmware/iwlwififw/iwlwifi-7265-17.ucode?h=20241017) = 91f699308f102a9ed90217d813bfdb355464ece958a4f8ac96bba5e9d77fe870
SIZE (linux-firmware/iwlwififw/iwlwifi-7265-17.ucode?h=20241017) = 1180412
+SHA256 (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20241017) = f6776a50107cba4f68362b5cf8455f5a0db6a4e8d1e34f4ede6f26803458e25e
+SIZE (linux-firmware/iwlwififw/iwlwifi-7265D-29.ucode?h=20241017) = 1036772
SHA256 (linux-firmware/iwlwififw/iwlwifi-8000C-36.ucode?h=20241017) = a830767818a47b5c51ae3a763fa7a65b03703ce38d3ef5918d8cd7ba82859c64
SIZE (linux-firmware/iwlwififw/iwlwifi-8000C-36.ucode?h=20241017) = 2428004
SHA256 (linux-firmware/iwlwififw/iwlwifi-8265-36.ucode?h=20241017) = d7d84c9b6a3b1976acb97a2bec7102e24a6b5d794110c0dcbd107ab5d9877e5f
@@ -17,50 +17,70 @@ SHA256 (linux-firmware/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode?h=20241017) =
SIZE (linux-firmware/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode?h=20241017) = 1519568
SHA256 (linux-firmware/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode?h=20241017) = 05f4c12514fddfd56fea660b3d2eb6b6e6f4a87a324d5d40464050312ddca911
SIZE (linux-firmware/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode?h=20241017) = 1490508
-SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20241017) = c02fea12eb420a15541f8f3bd0e6c75ce4e3656f3ae55efff00580992c41a307
-SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20241017) = 1406124
-SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20241017) = 1cf6d9036b9d946406737551114701ce29287a79e4142c23df2f0e382685270b
-SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20241017) = 1322828
SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode?h=20241017) = fb35f94c8c5622af02928203a0113c13db1b9a5608c2d50c04437dd66b0df64c
SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-b0-hr-b0-77.ucode?h=20241017) = 1405988
SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode?h=20241017) = 8e4543e684fd0b954e3f5bf47cfbbd022a50ca05a0699ef3c71e975e1465db24
SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-b0-jf-b0-77.ucode?h=20241017) = 1322744
SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode?h=20241017) = 243c7fa6c0c4ff379d2d715d872efd5115ca6cc9cfb82c41238646a781d9e536
SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-c0-hr-b0-77.ucode?h=20241017) = 1406004
+SHA256 (linux-firmware/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode?h=20241017) = f369671ca0727c002f521dccb05bad1754ce9b5d0079326ed18fc561474b223f
+SIZE (linux-firmware/iwlwififw/iwlwifi-Qu-c0-jf-b0-77.ucode?h=20241017) = 1322760
+SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20241017) = c02fea12eb420a15541f8f3bd0e6c75ce4e3656f3ae55efff00580992c41a307
+SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-hr-b0-77.ucode?h=20241017) = 1406124
+SHA256 (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20241017) = 1cf6d9036b9d946406737551114701ce29287a79e4142c23df2f0e382685270b
+SIZE (linux-firmware/iwlwififw/iwlwifi-QuZ-a0-jf-b0-77.ucode?h=20241017) = 1322828
SHA256 (linux-firmware/iwlwififw/iwlwifi-cc-a0-77.ucode?h=20241017) = 945babfcd3cc55ab453445ad1ae6ab15808c567d7ec265ac595eae6936ada003
SIZE (linux-firmware/iwlwififw/iwlwifi-cc-a0-77.ucode?h=20241017) = 1367504
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20241017) = 861385c39a58d1d9a9abfb628ddb0e68e151f8d602ac3c5d55e5fe054124b7c9
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20241017) = 27828
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20241017) = b2387f270d23431538d4f6b39bd43d8e0a31cb22660f33d34cb39f4ea6b39727
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20241017) = 1599724
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20241017) = 6146aa6b0551d048dc57f149f98f2363ecf2d1e21b75ab944875a857fa5bab48
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20241017) = 55112
+SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20241017) = 1129761b5597077655996ec8590f100766e9d61ec9c331474b4febc6967f0e70
+SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20241017) = 1797996
+SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-92.ucode?h=20241017) = c7092f1f78676f9e9c2c4d12716401db2116b009c5d7c464e8387c5b1c645d6f
+SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-92.ucode?h=20241017) = 1913128
+SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20241017) = faee96e453d18d9e0433c5490afc8218d22cf02a745f2041c5fa00b35b686a9c
+SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20241017) = 295004
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-83.ucode?h=20241017) = 9386a8294457f527c6e0fa1eac440c50cbee801707fdb480a10889770c0d297b
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-83.ucode?h=20241017) = 1753308
SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-89.ucode?h=20241017) = 7e6aed48d2f0f7728c4981f6ab9c1736e78755bd370fb68784301faaab495687
SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0-89.ucode?h=20241017) = 1747384
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20241017) = 6146aa6b0551d048dc57f149f98f2363ecf2d1e21b75ab944875a857fa5bab48
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf-a0.pnvm?h=20241017) = 55112
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-83.ucode?h=20241017) = 6910e5f34c0922fd0460aa363d73d6295d6c866f3447b96e8eaad988c613c697
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-83.ucode?h=20241017) = 1721448
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20241017) = b2387f270d23431538d4f6b39bd43d8e0a31cb22660f33d34cb39f4ea6b39727
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0-89.ucode?h=20241017) = 1599724
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20241017) = 861385c39a58d1d9a9abfb628ddb0e68e151f8d602ac3c5d55e5fe054124b7c9
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-gf4-a0.pnvm?h=20241017) = 27828
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20241017) = 03b67d28b4916634c544e057abdc46b15b636a85064df993ca431fd92fe4a835
+SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20241017) = 1572104
SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-89.ucode?h=20241017) = efd1e01778db377208439c24bcaf898e1fe3c70785f56187d4fac398fac69d58
SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-89.ucode?h=20241017) = 1539472
-SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm?h=20241017) = f0b9bfd93a17b03133129b49ac6871d47a51d4d281bf7ecb67b332f6e317fdc2
-SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm?h=20241017) = 27868
-SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm?h=20241017) = 0ea5aeac107c88ff7371188d922fe5337c5060e7e1b4c65053398db798d9c0fd
-SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm?h=20241017) = 55192
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-77.ucode?h=20241017) = 87590ea9535a8939fddb296bc7622f3a900f28f47b45cb4e435a2a1d5f496ccd
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-77.ucode?h=20241017) = 1641260
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode?h=20241017) = 5e5eaa6d917ccc420bd695db32d94148b9aeef7d9c95c64550ede82ba946efed
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-83.ucode?h=20241017) = 1739988
SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-89.ucode?h=20241017) = 6ea5de73b02db47a2f3ad758e2b24d06d7006f23b6d0c9bc4becdd0a0503a154
SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0-89.ucode?h=20241017) = 1739904
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm?h=20241017) = 0ea5aeac107c88ff7371188d922fe5337c5060e7e1b4c65053398db798d9c0fd
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf-a0.pnvm?h=20241017) = 55192
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0-77.ucode?h=20241017) = d945bce539ee78033a85c288da9b988b2651a1623c5f6081b7db510d3967df76
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0-77.ucode?h=20241017) = 1669164
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm?h=20241017) = f0b9bfd93a17b03133129b49ac6871d47a51d4d281bf7ecb67b332f6e317fdc2
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-gf4-a0.pnvm?h=20241017) = 27868
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-77.ucode?h=20241017) = bed4958236366c3c451b3ec994a56b2ad83c08d70e0a1eae42fb00f2eaabbcc8
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-77.ucode?h=20241017) = 1500532
+SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-83.ucode?h=20241017) = 97ef27a1e5a18236617f845f333222b5b1e034c654144dfcdda2f72886847fb6
+SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-83.ucode?h=20241017) = 1552480
SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-89.ucode?h=20241017) = ac8744414535eda690adec05ea812de15deaaeb9aed575506a9268419a0e0158
SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-hr-b0-89.ucode?h=20241017) = 1530736
SHA256 (linux-firmware/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode?h=20241017) = 9dccba0a8ba98483cb8385398d013b693b5b37cbff9402763ba215cc4921386c
SIZE (linux-firmware/iwlwififw/iwlwifi-so-a0-jf-b0-77.ucode?h=20241017) = 1446036
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm?h=20241017) = 6ec769bb51449c1f1cbb0d528d8d5f3dc89de7546274913460e11a4b0da19e6c
-SIZE (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm?h=20241017) = 55036
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0-77.ucode?h=20241017) = fd8977dbfacfe50b8a6601479aa9ffd21d01e274e4a9efd13935dd9d667fd45b
+SIZE (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0-77.ucode?h=20241017) = 1594276
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode?h=20241017) = c90da88a6dc8b159e14e378f66d52f52eb553dacdb90f053da612fc68668b7a6
+SIZE (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0-83.ucode?h=20241017) = 1683076
SHA256 (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0-89.ucode?h=20241017) = b226e25ad6682bfd0cbf4d444c322d3fa9a48de435cc50d85a4007fb7c3763b2
SIZE (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0-89.ucode?h=20241017) = 1681772
-SHA256 (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20241017) = 03b67d28b4916634c544e057abdc46b15b636a85064df993ca431fd92fe4a835
-SIZE (linux-firmware/iwlwififw/iwlwifi-ma-b0-hr-b0-83.ucode?h=20241017) = 1572104
-SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20241017) = faee96e453d18d9e0433c5490afc8218d22cf02a745f2041c5fa00b35b686a9c
-SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0.pnvm?h=20241017) = 295004
-SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-92.ucode?h=20241017) = c7092f1f78676f9e9c2c4d12716401db2116b009c5d7c464e8387c5b1c645d6f
-SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-92.ucode?h=20241017) = 1913128
-SHA256 (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20241017) = 1129761b5597077655996ec8590f100766e9d61ec9c331474b4febc6967f0e70
-SIZE (linux-firmware/iwlwififw/iwlwifi-gl-c0-fm-c0-83.ucode?h=20241017) = 1797996
+SHA256 (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm?h=20241017) = 6ec769bb51449c1f1cbb0d528d8d5f3dc89de7546274913460e11a4b0da19e6c
+SIZE (linux-firmware/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm?h=20241017) = 55036
SHA256 (linux-firmware/iwlwififw/LICENCE.iwlwifi_firmware?h=20241017) = 16d5040c7cf851fc693b7542e20870935b99802533ea1bfd231c377a2305e5c5
SIZE (linux-firmware/iwlwififw/LICENCE.iwlwifi_firmware?h=20241017) = 2046
SHA256 (linux-firmware/iwlwififw/WHENCE?h=20241017) = 7851ae8e04d71ccfc741fd2df450ef5724c4a172a0a282f69e8a8ce44877ba84
diff --git a/net/wifi-firmware-kmod/Makefile.inc b/net/wifi-firmware-kmod/Makefile.inc
index cd38aa13b065..cc957a76fb6a 100644
--- a/net/wifi-firmware-kmod/Makefile.inc
+++ b/net/wifi-firmware-kmod/Makefile.inc
@@ -1,6 +1,6 @@
PORTNAME= wifi-firmware-${FWDRV}-kmod
PORTVERSION= ${FWDRV_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= net
MASTER_SITES= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/ \
https://ams.source.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/ \
@@ -69,7 +69,7 @@ ${f}_PKGNAMESUFFIX= -${f}
${f}_CONFLICTS_INSTALL= ${PORTNAME}
.endfor
-DISTFILES= ${DISTFILES_${FLAVOR}} \
+DISTFILES= ${DISTFILES_${FLAVOR}:O:u} \
${DISTFILES_${FLAVOR}_lic} \
${LICENSE_FILE}${DISTURL_SUFFIX} \
WHENCE${DISTURL_SUFFIX}
@@ -110,14 +110,23 @@ post-extract:
@${SED} -e "s@%%XXX%%@${WHENCE_REGEX:Q}@g" ${FILESDIR}/WHENCE.awk.in > ${WRKSRC}/WHENCE.awk
@${AWK} -f ${WRKSRC}/WHENCE.awk ${WRKSRC}/WHENCE.in > ${WRKSRC}/WHENCE
# Do we need to set a tunable?
+ # At the moment we consider these temporary hacks.
+ # Otherwise we need a better way to express this per-port/-flavor.
.if defined(COMPAT_LINUXKPI_SKB_MEM_LIMIT) && ${COMPAT_LINUXKPI_SKB_MEM_LIMIT} > 0
@${MKDIR} ${WRKSRC}/${BOOT_LOADERCONFD}
- @${ECHO_CMD} "compat.linuxkpi.skb.mem_limit=${COMPAT_LINUXKPI_SKB_MEM_LIMIT}" > ${WRKSRC}/${BOOT_LOADERCONFD}/${FLAVOR}.conf
+ @${ECHO_CMD} "compat.linuxkpi.skb.mem_limit=${COMPAT_LINUXKPI_SKB_MEM_LIMIT}" >> ${WRKSRC}/${BOOT_LOADERCONFD}/${FLAVOR}.conf
@${ECHO_CMD} "${BOOT_LOADERCONFD}/${FLAVOR}.conf" >> ${PLIST}
.endif
+.if defined(COMPAT_LINUXKPI_IWL_HWCRYPTO_HT_VHT) && (${COMPAT_LINUXKPI_IWL_HWCRYPTO_HT_VHT:M${FLAVOR}} != "")
+ @${MKDIR} ${WRKSRC}/${BOOT_LOADERCONFD}
+ @${ECHO_CMD} "compat.linuxkpi.80211.hw_crypto=1" >> ${WRKSRC}/${BOOT_LOADERCONFD}/iwlwifi-${FLAVOR}.conf
+ @${ECHO_CMD} "compat.linuxkpi.iwlwifi_11n_disable=0" >> ${WRKSRC}/${BOOT_LOADERCONFD}/iwlwifi-${FLAVOR}.conf
+ @${ECHO_CMD} "compat.linuxkpi.iwlwifi_disable_11ac=0" >> ${WRKSRC}/${BOOT_LOADERCONFD}/iwlwifi-${FLAVOR}.conf
+ @${ECHO_CMD} "${BOOT_LOADERCONFD}/iwlwifi-${FLAVOR}.conf" >> ${PLIST}
+.endif
################################################################################
.if (${OSVERSION} >= 1500014) || (${OSVERSION} < 1500000 && ${OSVERSION} >= 1402000)
-.for _f in ${DISTFILES_${FLAVOR}}
+.for _f in ${DISTFILES_${FLAVOR}:O:u}
# Create firmware source directory and copy in distfile.
@${MKDIR} ${WRKSRC}/fw/${_f:H}
${CP} ${DISTDIR}/${DIST_SUBDIR}/${_f} ${WRKSRC}/fw/${_f:C@(^[^?]*)${DISTURL_SUFFIX:Q}@\1@}
@@ -135,7 +144,7 @@ post-extract:
@${SED} -e "s@%%FWDRV%%@${FWDRV}@g" \
-e "s@%%FWSUBDIR%%@${FWSUBDIR}@g" \
${FILESDIR}/Makefile.inc.in > ${WRKSRC}/Makefile.inc
-.for _f in ${DISTFILES_${FLAVOR}}
+.for _f in ${DISTFILES_${FLAVOR}:O:u}
# We remove '.' and '-' as well as '/' as they don't work well in loader.conf.
@${MKDIR} ${WRKSRC}/${_f:C@(^[^?]*)${DISTURL_SUFFIX:Q}@\1@:S,.,_,g:S,-,_,g:S,/,_,g}
# Create subdir (firmware file) Makefile.
@@ -166,11 +175,15 @@ do-install:
(cd ${WRKSRC}/fw/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${BOOTFWDIR})
.endif
-.if defined(COMPAT_LINUXKPI_SKB_MEM_LIMIT) && ${COMPAT_LINUXKPI_SKB_MEM_LIMIT} > 0
post-install:
+.if defined(COMPAT_LINUXKPI_SKB_MEM_LIMIT) && ${COMPAT_LINUXKPI_SKB_MEM_LIMIT} > 0
@${MKDIR} ${STAGEDIR}/${BOOT_LOADERCONFD}
@${INSTALL_DATA} ${WRKSRC}/${BOOT_LOADERCONFD}/${FLAVOR}.conf ${STAGEDIR}/${BOOT_LOADERCONFD}/${FLAVOR}.conf
.endif
-
+.if defined(COMPAT_LINUXKPI_IWL_HWCRYPTO_HT_VHT) && (${COMPAT_LINUXKPI_IWL_HWCRYPTO_HT_VHT:M${FLAVOR}} != "")
+ @${MKDIR} ${STAGEDIR}/${BOOT_LOADERCONFD}
+ @${INSTALL_DATA} ${WRKSRC}/${BOOT_LOADERCONFD}/iwlwifi-${FLAVOR}.conf ${STAGEDIR}/${BOOT_LOADERCONFD}/iwlwifi-${FLAVOR}.conf
+.endif
+ @${DO_NADA}
.include <bsd.port.post.mk>
diff --git a/net/wifi-firmware-mt7601u-kmod/Makefile b/net/wifi-firmware-mt7601u-kmod/Makefile
index 4462d85747ed..8f97cc6fa075 100644
--- a/net/wifi-firmware-mt7601u-kmod/Makefile
+++ b/net/wifi-firmware-mt7601u-kmod/Makefile
@@ -1,5 +1,4 @@
BASEDIR= ${.CURDIR}/../wifi-firmware-kmod
-PORTREVISION=2
FWDRV=mt7601u
FWSUBDIR= mediatek
FWDRV_VERSION= 20241017