git: 1158f08bc5cd - stable/13 - iwlwifi: import correct firmware versions for select Intel iwlwifi/mvm

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bjoern A. Zeeb <bz_at_FreeBSD.org>
Date: Sun, 09 Jan 2022 02:39:54 UTC
The branch stable/13 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=1158f08bc5cd15954aa1d153fa6c2874a9221bae

commit 1158f08bc5cd15954aa1d153fa6c2874a9221bae
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2021-12-31 11:51:18 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2022-01-09 02:37:01 +0000

    iwlwifi: import correct firmware versions for select Intel iwlwifi/mvm
    
    The firmware files for 3160, 7260, and 7265 imported contain old versions
    no longer supported by the driver.
    Replace with latest versions from linux-firmware to possibly also
    support these chip revisions.
    
    Reported by:    FreeBSD User (freebsd walstatt-de.de) on wireless (2021-12-30)
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 58101517cb3be0c47dba3696327e15f627765f02)
---
 sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode | Bin 0 -> 918268 bytes
 sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode  | Bin 669872 -> 0 bytes
 sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode | Bin 0 -> 1049340 bytes
 sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode  | Bin 680508 -> 0 bytes
 sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode | Bin 0 -> 1180412 bytes
 sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode  | Bin 697828 -> 0 bytes
 sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile  |   2 +-
 sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile  |   2 +-
 sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile  |   2 +-
 9 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode
new file mode 100644
index 000000000000..95b26df9d56d
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-3160-17.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode
deleted file mode 100644
index 287a3a5f1834..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-3160-9.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode
new file mode 100644
index 000000000000..b1a87d52cdd1
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-7260-17.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode
deleted file mode 100644
index b271e861111f..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-7260-9.ucode and /dev/null differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode
new file mode 100644
index 000000000000..f4a549cce6ed
Binary files /dev/null and b/sys/contrib/dev/iwlwififw/iwlwifi-7265-17.ucode differ
diff --git a/sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode b/sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode
deleted file mode 100644
index bbca2fe44942..000000000000
Binary files a/sys/contrib/dev/iwlwififw/iwlwifi-7265-9.ucode and /dev/null differ
diff --git a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
index f55bc1a8080c..5528a9f269c9 100644
--- a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
+++ b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FWVERSION=	9
+FWVERSION=	17
 NAME=		3160
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
index fa2d9d067e83..5f43dcd6c073 100644
--- a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
+++ b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FWVERSION=	9
+FWVERSION=	17
 NAME=		7260
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
index 69fc2849cda4..7893353a88c0 100644
--- a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
+++ b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FWVERSION=	9
+FWVERSION=	17
 NAME=		7265
 
 .include <bsd.kmod.mk>