From nobody Sun Jan 09 02:39:54 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BA92819336BC; Sun, 9 Jan 2022 02:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JWh4p3R9Dz3qlj; Sun, 9 Jan 2022 02:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5265120A8; Sun, 9 Jan 2022 02:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2092dsmd095287; Sun, 9 Jan 2022 02:39:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2092dstb095286; Sun, 9 Jan 2022 02:39:54 GMT (envelope-from git) Date: Sun, 9 Jan 2022 02:39:54 GMT Message-Id: <202201090239.2092dstb095286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1158f08bc5cd - stable/13 - iwlwifi: import correct firmware versions for select Intel iwlwifi/mvm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1158f08bc5cd15954aa1d153fa6c2874a9221bae Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641695994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZQP3jKfEGxAcz+t9aZnvuriMtK0+Q4L6PACPF9IJQhU=; b=LaHx66r6P9g4AZJ9y4t9c1Fn1nLUfJUBrcUorTZjs5qMsRA6tcxKwozxkCzwDmsT30/89N +ttEkCgwvOsdqWKwSzY04K9VFBxtUW7bkDx8fmIypa0SWPrXIJhKNpCHZD6ec9WQI12Elm OoUKKC0gAg9T7w44m1vAKIfWU3TOFXL1aSWnC/oTey0jM9cCt+7KPa8AgphrwUmsS3UKXV RmedO8q6VA730N6GbCh11KV/O4/UEvn8E39dXUcxy5E7F3ICLUPtJL4a2mys7e3V3JLpcs fqm0PvIjqzqg/Kd2yB+BvTC5fropbMIK1zpo15aqjX27Ek99TokA+3XShDSJUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641695994; a=rsa-sha256; cv=none; b=dTeOlSKdMayj9wvlcSenCWMAMFAg8ESsH4c9q8PyNzsKIbOGtctRkWbuBWEurOQ2nWMswD UPMsNBONFvpS9BsGHHnVsEVySXbFMx6m22hwmBIlLvb2WU5NY2MqrSgzLjeCJWEnbTF8b0 xbvTLEuf8YS5kLFQrtK12dtMRynoLpPqT6UIx5ZKKHKZUY3NKiRyeAeuMVJLe2p53ZSFpp Orn/dqUGaShV73pMMSaKtci2vu8xbfxy3stmuCxGWiMjwhpfIT6BPUl7XHUv4WxMRECcOs pPeOvG4nesyVZgNsAdtueya2ztTdbFJoIVKLXbqTkny6+R2O/SxLpAhUN0mIig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1158f08bc5cd15954aa1d153fa6c2874a9221bae commit 1158f08bc5cd15954aa1d153fa6c2874a9221bae Author: Bjoern A. Zeeb AuthorDate: 2021-12-31 11:51:18 +0000 Commit: Bjoern A. Zeeb 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 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 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