git: 6e83e1ceadcd - stable/13 - iwlwifi: import firmware for Intel iwlwifi/mvm supported chipsets.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Dec 2021 19:22:34 UTC
The branch stable/13 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=6e83e1ceadcd8054ee4c2a4ac23789f0ff3321a0
commit 6e83e1ceadcd8054ee4c2a4ac23789f0ff3321a0
Author: Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2021-11-28 18:34:19 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2021-12-30 18:25:46 +0000
iwlwifi: import firmware for Intel iwlwifi/mvm supported chipsets.
Import the most recent versions of the firmware images for iwlwifi
chipsets supported by the "mvm" sub-driver.
This is based on linux-firmware at f5d519563ac9d2d1f382a817aae5ec5473811ac8.
The license of the firmware matches the previous iwnfw(4) and
iwmfw(4) firmware files and you can find a copy in
sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware .
Add build infrastructure to create the .ko files but do not yet hook
it up to the build until all parts are in the tree.
There is an open issue concerning kldxref that we need to resolve
(D32383).
Sponsored by: The FreeBSD Foundation
(cherry picked from commit f4c129f5fb1669b284d76a838b1e509f97c2d299)
---
sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware | 39 ++
sys/contrib/dev/iwlwififw/WHENCE | 442 +++++++++++++++++++++
sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode | Bin 0 -> 669872 bytes
sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode | Bin 0 -> 1036288 bytes
sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode | Bin 0 -> 680508 bytes
sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode | Bin 0 -> 697828 bytes
sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode | Bin 0 -> 1036772 bytes
sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode | Bin 0 -> 2428004 bytes
sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode | Bin 0 -> 2436632 bytes
.../iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode | Bin 0 -> 1519264 bytes
.../iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode | Bin 0 -> 1490096 bytes
.../dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-63.ucode | Bin 0 -> 1334856 bytes
.../dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-63.ucode | Bin 0 -> 1252748 bytes
.../dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-63.ucode | Bin 0 -> 1334872 bytes
.../dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-63.ucode | Bin 0 -> 1252764 bytes
.../dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-67.ucode | Bin 0 -> 1347524 bytes
.../dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-63.ucode | Bin 0 -> 1252744 bytes
sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-67.ucode | Bin 0 -> 1310488 bytes
.../dev/iwlwififw/iwlwifi-so-a0-gf-a0-67.ucode | Bin 0 -> 1524432 bytes
.../dev/iwlwififw/iwlwifi-so-a0-gf4-a0-67.ucode | Bin 0 -> 1541932 bytes
.../dev/iwlwififw/iwlwifi-so-a0-hr-b0-64.ucode | Bin 0 -> 1427384 bytes
.../dev/iwlwififw/iwlwifi-so-a0-jf-b0-64.ucode | Bin 0 -> 1365628 bytes
.../dev/iwlwififw/iwlwifi-ty-a0-gf-a0-67.ucode | Bin 0 -> 1482872 bytes
sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm | Bin 0 -> 41612 bytes
sys/modules/iwlwififw/Makefile | 57 +++
sys/modules/iwlwififw/Makefile.inc | 49 +++
sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile | 6 +
sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile | 6 +
.../iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile | 8 +
48 files changed, 721 insertions(+)
diff --git a/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware b/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware
new file mode 100644
index 000000000000..6bdd16d922b4
--- /dev/null
+++ b/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware
@@ -0,0 +1,39 @@
+Copyright (c) 2006-2021, Intel Corporation.
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+ following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+ is permitted.
+
+Limited patent license. Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses. The patent license shall not apply to
+any other combinations which include this software. No hardware per
+se is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff --git a/sys/contrib/dev/iwlwififw/WHENCE b/sys/contrib/dev/iwlwififw/WHENCE
new file mode 100644
index 000000000000..9b82780cf0a9
--- /dev/null
+++ b/sys/contrib/dev/iwlwififw/WHENCE
@@ -0,0 +1,442 @@
+Driver: iwlwifi - Intel Wireless Wifi
+
+File: iwlwifi-3945-2.ucode
+Version: 15.32.2.9
+
+File: iwlwifi-4965-2.ucode
+Version: 228.61.2.24
+
+File: iwlwifi-5000-1.ucode
+Version: 5.4.A.11 (aka 5.4.1.16)
+
+File: iwlwifi-5000-2.ucode
+Version: 8.24.2.12
+
+File: iwlwifi-5000-5.ucode
+Version: 8.83.5.1
+
+File: iwlwifi-5150-2.ucode
+Version: 8.24.2.2
+
+File: iwlwifi-1000-3.ucode
+Version: 128.50.3.1
+
+File: iwlwifi-1000-5.ucode
+Version: 39.31.5.1
+
+File: iwlwifi-6000-4.ucode
+Version: 9.221.4.1
+
+File: iwlwifi-6050-4.ucode
+Version: 9.201.4.1
+
+File: iwlwifi-6050-5.ucode
+Version: 41.28.5.1
+
+File: iwlwifi-6000g2a-5.ucode
+Version: 17.168.5.3
+
+File: iwlwifi-6000g2a-6.ucode
+Version: 18.168.6.1
+
+File: iwlwifi-6000g2b-5.ucode
+Version: 17.168.5.1
+
+File: iwlwifi-6000g2b-6.ucode
+Version: 18.168.6.1
+
+File: iwlwifi-135-6.ucode
+Version: 18.168.6.1
+
+File: iwlwifi-100-5.ucode
+Version: 39.31.5.1
+
+File: iwlwifi-105-6.ucode
+Version: 18.168.6.1
+
+File: iwlwifi-2030-6.ucode
+Version: 18.168.6.1
+
+File: iwlwifi-2000-6.ucode
+Version: 18.168.6.1
+
+File: iwlwifi-7260-7.ucode
+Version: 22.1.7.0
+
+File: iwlwifi-7260-8.ucode
+Version: 22.24.8.0
+
+File: iwlwifi-7260-9.ucode
+Version: 25.228.9.0
+
+File: iwlwifi-7260-10.ucode
+Version: 23.15.10.0
+
+File: iwlwifi-7260-12.ucode
+Version: 25.17.12.0
+
+File: iwlwifi-7260-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-7260-16.ucode
+Version: 16.242414.0
+
+File: iwlwifi-7260-17.ucode
+Version: 17.bfb58538.0
+
+File: iwlwifi-3160-7.ucode
+Version: 22.1.7.0
+
+File: iwlwifi-3160-8.ucode
+Version: 22.24.8.0
+
+File: iwlwifi-3160-9.ucode
+Version: 25.228.9.0
+
+File: iwlwifi-3160-10.ucode
+Version: 23.15.10.0
+
+File: iwlwifi-3160-12.ucode
+Version: 25.17.12.0
+
+File: iwlwifi-3160-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-3160-16.ucode
+Version: 16.242414.0
+
+File: iwlwifi-3160-17.ucode
+Version: 17.bfb58538.0
+
+File: iwlwifi-7265-8.ucode
+Version: 22.24.8.0
+
+File: iwlwifi-7265-9.ucode
+Version: 25.228.9.0
+
+File: iwlwifi-7265-10.ucode
+Version: 23.15.10.0
+
+File: iwlwifi-7265-12.ucode
+Version: 25.17.12.0
+
+File: iwlwifi-7265-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-7265-16.ucode
+Version: 16.242414.0
+
+File: iwlwifi-7265-17.ucode
+Version: 17.bfb58538.0
+
+Link: iwlwifi-7265D-10.ucode -> iwlwifi-7265-10.ucode
+
+File: iwlwifi-7265D-12.ucode
+Version: 25.17.12.0
+
+File: iwlwifi-7265D-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-7265D-16.ucode
+Version: 16.242414.0
+
+File: iwlwifi-7265D-17.ucode
+Version: 17.352738.0
+
+File: iwlwifi-7265D-21.ucode
+Version: 21.302800.0
+
+File: iwlwifi-7265D-22.ucode
+Version: 22.391740.0
+
+File: iwlwifi-7265D-27.ucode
+Version: 27.541033.0
+
+File: iwlwifi-7265D-29.ucode
+Version: 29.f2390aa8.0
+
+File: iwlwifi-3168-21.ucode
+Version: 21.302800.0
+
+File: iwlwifi-3168-22.ucode
+Version: 22.391740.0
+
+File: iwlwifi-3168-27.ucode
+Version: 27.541033.0
+
+File: iwlwifi-3168-29.ucode
+Version: 29.0bd893f3.0
+
+File: iwlwifi-8000C-13.ucode
+Version: 25.30.13.0
+
+File: iwlwifi-8000C-16.ucode
+Version: 16.242414.0
+
+File: iwlwifi-8000C-21.ucode
+Version: 21.302800.0
+
+File: iwlwifi-8000C-22.ucode
+Version: 22.391740.0
+
+File: iwlwifi-8000C-27.ucode
+Version: 27.541033.0
+
+File: iwlwifi-8000C-31.ucode
+Version: 31.560484.0
+
+File: iwlwifi-8000C-34.ucode
+Version: 34.610288.0
+
+File: iwlwifi-8000C-36.ucode
+Version: 36.ca7b901d.0
+
+File: iwlwifi-8265-21.ucode
+Version: 21.302800.0
+
+File: iwlwifi-8265-22.ucode
+Version: 22.391740.0
+
+File: iwlwifi-8265-27.ucode
+Version: 27.541033.0
+
+File: iwlwifi-8265-31.ucode
+Version: 31.560484.0
+
+File: iwlwifi-8265-34.ucode
+Version: 34.610288.0
+
+File: iwlwifi-8265-36.ucode
+Version: 36.ca7b901d.0
+
+File: iwlwifi-9000-pu-b0-jf-b0-33.ucode
+Version: 33.610294.0
+
+File: iwlwifi-9000-pu-b0-jf-b0-34.ucode
+Version: 34.ba501b11.0
+
+File: iwlwifi-9000-pu-b0-jf-b0-38.ucode
+Version: 38.755cfdd8.0
+
+File: iwlwifi-9000-pu-b0-jf-b0-41.ucode
+Version: 41.fc1a7aea.0
+
+File: iwlwifi-9000-pu-b0-jf-b0-43.ucode
+Version: 43.95eb4e97.0
+
+File: iwlwifi-9000-pu-b0-jf-b0-46.ucode
+Version: 46.5e069cbd.0
+
+File: iwlwifi-9260-th-b0-jf-b0-33.ucode
+Version: 33.610294.0
+
+File: iwlwifi-9260-th-b0-jf-b0-34.ucode
+Version: 34.ba501b11.0
+
+File: iwlwifi-9260-th-b0-jf-b0-38.ucode
+Version: 38.755cfdd8.0
+
+File: iwlwifi-9260-th-b0-jf-b0-41.ucode
+Version: 41.fc1a7aea.0
+
+File: iwlwifi-9260-th-b0-jf-b0-43.ucode
+Version: 43.95eb4e97.0
+
+File: iwlwifi-9260-th-b0-jf-b0-46.ucode
+Version: 46.5e069cbd.0
+
+File: iwlwifi-cc-a0-46.ucode
+Version: 46.3cfab8da.0
+
+File: iwlwifi-cc-a0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-Qu-b0-hr-b0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-Qu-b0-jf-b0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-Qu-c0-hr-b0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-Qu-c0-jf-b0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-QuZ-a0-hr-b0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-QuZ-a0-jf-b0-48.ucode
+Version: 48.4fa0041f.0
+
+File: iwlwifi-cc-a0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-Qu-b0-hr-b0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-Qu-b0-jf-b0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-Qu-c0-hr-b0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-Qu-c0-jf-b0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-QuZ-a0-hr-b0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-QuZ-a0-jf-b0-50.ucode
+Version: 50.3e391d3e.0
+
+File: iwlwifi-cc-a0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-Qu-b0-hr-b0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-Qu-b0-jf-b0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-Qu-c0-hr-b0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-Qu-c0-jf-b0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-QuZ-a0-hr-b0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-QuZ-a0-jf-b0-53.ucode
+Version: 53.c31ac674.0
+
+File: iwlwifi-cc-a0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-Qu-b0-hr-b0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-Qu-b0-jf-b0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-Qu-c0-hr-b0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-Qu-c0-jf-b0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-QuZ-a0-hr-b0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-QuZ-a0-jf-b0-55.ucode
+Version: 55.d9698065.0
+
+File: iwlwifi-cc-a0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-Qu-b0-hr-b0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-Qu-b0-jf-b0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-Qu-c0-hr-b0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-Qu-c0-jf-b0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-QuZ-a0-hr-b0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-QuZ-a0-jf-b0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-so-a0-gf-a0-64.ucode
+Version: 64.97bbee0a.0
+
+File: iwlwifi-so-a0-gf-a0-67.ucode
+Version: 67.8f59b80b.0
+
+File: iwlwifi-so-a0-gf4-a0-67.ucode
+Version: 67.8f59b80b.0
+
+File: iwlwifi-so-a0-gf-a0.pnvm
+
+File: iwlwifi-so-a0-gf4-a0.pnvm
+
+File: iwlwifi-so-a0-hr-b0-64.ucode
+Version: 64.97bbee0a.0
+
+File: iwlwifi-so-a0-jf-b0-64.ucode
+Version: 64.97bbee0a.0
+
+File: iwlwifi-ty-a0-gf-a0-59.ucode
+Version: 59.601f3a66.0
+
+File: iwlwifi-cc-a0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-Qu-b0-hr-b0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-Qu-b0-jf-b0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-Qu-c0-hr-b0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-Qu-c0-jf-b0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-QuZ-a0-hr-b0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-QuZ-a0-jf-b0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-ty-a0-gf-a0-62.ucode
+Version: 62.49eeb572.0
+
+File: iwlwifi-cc-a0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-cc-a0-67.ucode
+Version: 67.8f59b80b.0
+
+File: iwlwifi-Qu-b0-hr-b0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-Qu-b0-jf-b0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-Qu-c0-hr-b0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-Qu-c0-jf-b0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-QuZ-a0-hr-b0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-QuZ-a0-hr-b0-67.ucode
+Version: 67.8f59b80b.0
+
+File: iwlwifi-QuZ-a0-jf-b0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-ty-a0-gf-a0-63.ucode
+Version: 63.c04f3485.0
+
+File: iwlwifi-ty-a0-gf-a0-66.ucode
+Version: 66.55c64978.0
+
+File: iwlwifi-ty-a0-gf-a0-67.ucode
+Version: 67.8f59b80b.0
+
+File: iwlwifi-ty-a0-gf-a0.pnvm
+
+Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
+
+Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode
new file mode 100644
index 000000000000..287a3a5f1834
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode
new file mode 100644
index 000000000000..1759561ec203
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-3168-29.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode
new file mode 100644
index 000000000000..b271e861111f
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode
new file mode 100644
index 000000000000..bbca2fe44942
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode
new file mode 100644
index 000000000000..7c513f669790
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-7265D-29.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode
new file mode 100644
index 000000000000..e4988f6b421e
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-8000C-36.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode
new file mode 100644
index 000000000000..60fda3b7d45b
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-8265-36.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode
new file mode 100644
index 000000000000..14c1e150f6fd
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-46.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode
new file mode 100644
index 000000000000..b7f93abf7e9c
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-9260-th-b0-jf-b0-46.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-63.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-63.ucode
new file mode 100644
index 000000000000..69ea5679e552
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-hr-b0-63.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-63.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-63.ucode
new file mode 100644
index 000000000000..b5bf2d899a68
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-b0-jf-b0-63.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-63.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-63.ucode
new file mode 100644
index 000000000000..29ec7d24f2a4
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-hr-b0-63.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-63.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-63.ucode
new file mode 100644
index 000000000000..18fbd1bf7e48
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-Qu-c0-jf-b0-63.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-67.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-67.ucode
new file mode 100644
index 000000000000..4859dfdaba7a
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-hr-b0-67.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-63.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-63.ucode
new file mode 100644
index 000000000000..df20f459e030
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-QuZ-a0-jf-b0-63.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-67.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-67.ucode
new file mode 100644
index 000000000000..74d4e2bf4455
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-cc-a0-67.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-67.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-67.ucode
new file mode 100644
index 000000000000..1d9691dcc48f
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf-a0-67.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-67.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-67.ucode
new file mode 100644
index 000000000000..04b484695e41
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-gf4-a0-67.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-64.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-64.ucode
new file mode 100644
index 000000000000..afb15f5b58a4
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-hr-b0-64.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-64.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-64.ucode
new file mode 100644
index 000000000000..76d8b1beb171
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-so-a0-jf-b0-64.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-67.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-67.ucode
new file mode 100644
index 000000000000..3ef0643da8fa
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0-67.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm
new file mode 100644
index 000000000000..6b8ae3670e21
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-ty-a0-gf-a0.pnvm differ
diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile
new file mode 100644
index 000000000000..a885c8a237ba
--- /dev/null
+++ b/sys/modules/iwlwififw/Makefile
@@ -0,0 +1,57 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020-2021 The FreeBSD Foundation
+#
+# This software was developed by Björn Zeeb under sponsorship from
+# the FreeBSD Foundation.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+
+SUBDIR= \
+ iwlwifi-3160-fw \
+ iwlwifi-3168-fw \
+ iwlwifi-7260-fw \
+ iwlwifi-7265-fw \
+ iwlwifi-7265D-fw \
+ iwlwifi-8000C-fw \
+ iwlwifi-8265-fw \
+ iwlwifi-9000-pu-b0-jf-b0-fw \
+ iwlwifi-9260-th-b0-jf-b0-fw \
+ iwlwifi-Qu-b0-hr-b0-fw \
+ iwlwifi-Qu-b0-jf-b0-fw \
+ iwlwifi-Qu-c0-hr-b0-fw \
+ iwlwifi-Qu-c0-jf-b0-fw \
+ iwlwifi-QuZ-a0-hr-b0-fw \
+ iwlwifi-QuZ-a0-jf-b0-fw \
+ iwlwifi-cc-a0-fw \
+ iwlwifi-so-a0-gf-a0-fw \
+ iwlwifi-so-a0-gf4-a0-fw \
+ iwlwifi-so-a0-hr-b0-fw \
+ iwlwifi-so-a0-jf-b0-fw \
+ iwlwifi-ty-a0-gf-a0-fw \
+ iwlwifi-ty-a0-gf-a0-pnvm
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/iwlwififw/Makefile.inc b/sys/modules/iwlwififw/Makefile.inc
new file mode 100644
index 000000000000..3dddc965817e
--- /dev/null
+++ b/sys/modules/iwlwififw/Makefile.inc
@@ -0,0 +1,49 @@
+#-
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2020-2021 The FreeBSD Foundation
+#
+# This software was developed by Björn Zeeb under sponsorship from
+# the FreeBSD Foundation.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+#
+# Common rules for building iwlwifi firmware.
+
+EXT?= ucode
+_NAME?= iwlwifi-${NAME}-${FWVERSION}.${EXT}
+
+IMG= ${_NAME}
+KMOD= ${_NAME}
+
+CLEANFILES+= ${IMG}
+
+FIRMWS= ${IMG}:${IMG}:${FWVERSION}
+
+# License ack is not needed for iwlwifi (same as iwn/iwm).
+#FIRMWARE_LICENSE=
+
+${IMG}: ${SRCTOP}/sys/contrib/dev/iwlwififw/${IMG}
+ cp ${.ALLSRC} ${.TARGET}
+
diff --git a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
new file mode 100644
index 000000000000..f55bc1a8080c
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 9
+NAME= 3160
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile
new file mode 100644
index 000000000000..8d4a4e5c04a4
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 29
+NAME= 3168
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
new file mode 100644
index 000000000000..fa2d9d067e83
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 9
+NAME= 7260
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
new file mode 100644
index 000000000000..69fc2849cda4
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 9
+NAME= 7265
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile
new file mode 100644
index 000000000000..11bf5ae1687d
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 29
+NAME= 7265D
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile
new file mode 100644
index 000000000000..4931a64f06cc
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 36
+NAME= 8000C
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile
new file mode 100644
index 000000000000..f6cfafc557eb
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 36
+NAME= 8265
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile
new file mode 100644
index 000000000000..8aeb6a9b966c
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 46
+NAME= 9000-pu-b0-jf-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile
new file mode 100644
index 000000000000..d727f2f305a9
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 46
+NAME= 9260-th-b0-jf-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile
new file mode 100644
index 000000000000..f712419b5f81
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 63
+NAME= Qu-b0-hr-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile
new file mode 100644
index 000000000000..acb9b34f1b19
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 63
+NAME= Qu-b0-jf-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile
new file mode 100644
index 000000000000..5a959bab637a
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 63
+NAME= Qu-c0-hr-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile
new file mode 100644
index 000000000000..8d06ea7438fe
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 63
+NAME= Qu-c0-jf-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile
new file mode 100644
index 000000000000..f6bdb5285993
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 67
+NAME= QuZ-a0-hr-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile
new file mode 100644
index 000000000000..4c295e0eb64d
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 63
+NAME= QuZ-a0-jf-b0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile
new file mode 100644
index 000000000000..1f2fdcaacaa4
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 67
+NAME= cc-a0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile
new file mode 100644
index 000000000000..9f87f9bd1616
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+FWVERSION= 67
+NAME= so-a0-gf-a0
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile
new file mode 100644
index 000000000000..992b968033a8
--- /dev/null
+++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile
@@ -0,0 +1,6 @@
*** 56 LINES SKIPPED ***