Add Intel wifi firmware images which were published on May 12, the day
https://fragattacks.com went live.
Unfortunately, the latest linux-firmware release tarball from May 11 (one
day before) doesn't include the latest images so I am fetching a generated
tarball from git.kernel.org. The checksum of this tarball seems to be stable
for now. Users will upgrade via fw_update anyway so I don't expect that this
will cause any big problems.
The only existing firmware file which changes is this one:
-SHA1 (iwm-3168-29) = 58c16bbf0afc0f5abd9fd41de486abbcd6b5e0a9
+SHA1 (iwm-3168-29) = e794ec644476e5ef049828e9a6f6124d4430cb1a
This file was last changed in October 2020 so I doubt this new firmware
image contains any fixes related to fragattacks.
An unknown amount of driver changes will be required to make use of the new
images added here because of firmware API changes. I cannot tell how much
time an implementation of the necessary driver changes will take, or whether
backporting such changes to -stable will be feasible given that they will be
layered on top of other large changes I committed to -current during the
fragattacks embargo which I was not made aware of before public release.
Given that no new images were added for any iwn devices and 7k iwm devices on
May 12 I can only hope that these devices don't require any firmware fixes.
diff b9e0d81ea94d7fc1cb3aa6b8ed9e6bac460f3fa2 /usr/ports
blob - 77d30f6780a610cef75fcaac53b14bd24741b0d7
file + sysutils/firmware/iwm/Makefile
--- sysutils/firmware/iwm/Makefile
+++ sysutils/firmware/iwm/Makefile
@@ -1,24 +1,30 @@
# $OpenBSD: Makefile,v 1.15 2020/05/18 20:41:05 kn Exp $
FW_DRIVER= iwm
-FW_VER= 20191022
-REVISION= 1
-DISTNAME= linux-firmware-${FW_VER}
-EXTRACT_SUFX= .tar.xz
+FW_VER= 20210512
+DISTNAME= linux-firmware-iwlwifi-fw-2021-05-12
EXTRACT_FILES= ${DISTNAME}/{LICENCE.\*,iwlwifi-\*-\*.ucode}
HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
-MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
+# MASTER_SITES was https://cdn.kernel.org/pub/linux/kernel/firmware/
+# but the latest available release (20210511) contains outdated images
+# which probably don't contain fixes for fragattacks
+MASTER_SITES=
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git/snapshot/
+
FW+= 3160 17 \
7260 17 \
7265 17 \
7265D 29 \
3168 29 \
8265 34 \
+ 8265 36 \
8000C 34 \
+ 8000C 36 \
9000-pu-b0-jf-b0 34 \
- 9260-th-b0-jf-b0 34
+ 9000-pu-b0-jf-b0 46 \
+ 9260-th-b0-jf-b0 34 \
+ 9260-th-b0-jf-b0 46
do-install:
${INSTALL_DATA} ${WRKSRC}/LICENCE.iwlwifi_firmware \
@@ -28,13 +34,4 @@ do-install:
${PREFIX}/firmware/iwm-${device:C/-.*//}-${api}
.endfor
-# also supported by iwlmvm (equivalent to our iwm) on linux:
-# Wi-Fi 6 AX200 160MHz: iwlwifi-cc-a0-${api}.ucode
-
-# "these devices have the same PCI device and subsystem IDs"
-# https://www.spinics.net/lists/linux-wireless/msg184271.html
-# https://bugs.launchpad.net/hwe-next/+bug/1833065
-# Wi-Fi 6 AX201 160MHz: iwlwifi-Qu-??-??-b0-${api}.ucode
-# integrated 22000 series ??? iwlwifi-Quz-a0-??-b0-${api}.ucode
-
.include <bsd.port.mk>
blob - 902fad8cb2d4fa8df158be0b192ac48a1888c878
file + sysutils/firmware/iwm/distinfo
--- sysutils/firmware/iwm/distinfo
+++ sysutils/firmware/iwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-20191022.tar.xz) =
SmtaFM7JHFUrV/oKKXWYUfAVuYH3OiXhksq4uzny+Xc=
-SIZE (firmware/linux-firmware-20191022.tar.xz) = 83419952
+SHA256 (firmware/linux-firmware-iwlwifi-fw-2021-05-12.tar.gz) =
KWK6ck9L5z2MkbnyZgmriuVfflD5g4JQ7RMTsjGztp4=
+SIZE (firmware/linux-firmware-iwlwifi-fw-2021-05-12.tar.gz) = 328392060
blob - dd144660b1c832c10f6e0fe3fead1cddf10d4dad
file + sysutils/firmware/iwm/pkg/PLIST
--- sysutils/firmware/iwm/pkg/PLIST
+++ sysutils/firmware/iwm/pkg/PLIST
@@ -5,7 +5,11 @@ firmware/iwm-7260-17
firmware/iwm-7265-17
firmware/iwm-7265D-29
firmware/iwm-8000C-34
+firmware/iwm-8000C-36
firmware/iwm-8265-34
+firmware/iwm-8265-36
firmware/iwm-9000-34
+firmware/iwm-9000-46
firmware/iwm-9260-34
+firmware/iwm-9260-46
firmware/iwm-license
blob - a835c99c9fec68652d5020c34a8663f568fe95e5
file + sysutils/firmware/iwx/Makefile
--- sysutils/firmware/iwx/Makefile
+++ sysutils/firmware/iwx/Makefile
@@ -1,19 +1,24 @@
# $OpenBSD: Makefile,v 1.6 2021/03/08 21:05:56 sthen Exp $
FW_DRIVER= iwx
-FW_VER= 20191022
-REVISION= 3
-DISTNAME= linux-firmware-${FW_VER}
-EXTRACT_SUFX= .tar.xz
-EXTRACT_FILES= ${DISTNAME}/{LICENCE.\*,\*.ucode}
+FW_VER= 20210512
+DISTNAME= linux-firmware-iwlwifi-fw-2021-05-12
+EXTRACT_FILES= ${DISTNAME}/{LICENCE.\*,iwlwifi-\*-\*.ucode}
HOMEPAGE= https://wireless.wiki.kernel.org/en/users/Drivers/iwlwifi
-MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/firmware/
-FW= cc-a0 46 \
- cc-a0 48 \
+# MASTER_SITES was https://cdn.kernel.org/pub/linux/kernel/firmware/
+# but the latest available release (20210511) contains outdated images
+# which probably don't contain fixes for fragattacks
+MASTER_SITES=
https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git/snapshot/
+
+
+FW= cc-a0 48 \
+ cc-a0 63 \
Qu-c0-hr-b0 48 \
- QuZ-a0-hr-b0 48
+ Qu-c0-hr-b0 63 \
+ QuZ-a0-hr-b0 48 \
+ QuZ-a0-hr-b0 63
do-install:
${INSTALL_DATA} ${WRKSRC}/LICENCE.iwlwifi_firmware \
blob - 902fad8cb2d4fa8df158be0b192ac48a1888c878
file + sysutils/firmware/iwx/distinfo
--- sysutils/firmware/iwx/distinfo
+++ sysutils/firmware/iwx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firmware/linux-firmware-20191022.tar.xz) =
SmtaFM7JHFUrV/oKKXWYUfAVuYH3OiXhksq4uzny+Xc=
-SIZE (firmware/linux-firmware-20191022.tar.xz) = 83419952
+SHA256 (firmware/linux-firmware-iwlwifi-fw-2021-05-12.tar.gz) =
KWK6ck9L5z2MkbnyZgmriuVfflD5g4JQ7RMTsjGztp4=
+SIZE (firmware/linux-firmware-iwlwifi-fw-2021-05-12.tar.gz) = 328392060
blob - 58390d7c48098131258e9903c4dbc379ffc12990
file + sysutils/firmware/iwx/pkg/PLIST
--- sysutils/firmware/iwx/pkg/PLIST
+++ sysutils/firmware/iwx/pkg/PLIST
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2021/03/08 18:26:28 sthen Exp $
firmware/iwx-Qu-c0-hr-b0-48
+firmware/iwx-Qu-c0-hr-b0-63
firmware/iwx-QuZ-a0-hr-b0-48
-firmware/iwx-cc-a0-46
+firmware/iwx-QuZ-a0-hr-b0-63
firmware/iwx-cc-a0-48
+firmware/iwx-cc-a0-63
firmware/iwx-license
