Accepting request 1113030 from home:tiwai:branches:Kernel:HEAD

- Update to version 20230918 (commit f48da6da5507):
  * Run merge request pipelines for pre-commit.
  * linux-firmware: amd-ucode: Add note on fam19h warnings
  * i915: update MTL HuC to version 8.5.4
  * amdgpu: update DMCUB to 0.0.183.0 for various AMDGPU ASICs

- Update to version 20230907 (git commit c801b3b807d2):
  * Turn off textwidth check
  * linux-firmware: add link to sc8280xp audioreach firmware
  * qcom: sm8250: add RB5 sensors DSP firmware
  * qcom: Update vpu-1.0 firmware
  * qcom: sm8250: update DSP firmware
  * qcom: add firmware for the onboard WiFi on qcm2290 / qrb4210
  * qcom: add venus firmware files for v6.0
  * qcom: add firmware for QRB4210 platforms
  * qcom: add firmware for QCM2290 platforms
  * qcom: add GPU firmware for QCM2290 / QRB2210
  * ath10k/WCN3990: move wlanmdsp to qcom/sdm845
  * WHENCE: Don't compress qcom json files
  * WHENCE: amd-ucode: Use new RawFile keyword
  * check_whence: Recognize RawFile keyword
  * Only run ci-fairy on merge requests
  * Capture artifacts from `make dist` to save at release time.
  * Add new toplevel 'make dist' target.
  * Create symlinks for all firmware that is duplicate using rdfind
  * QCA: Update Bluetooth WCN685x 2.1 firmware to 2.1.0-00605
  * Add shellcheck pre-commit target
  * Fix carl9170fw shell scripts for shellcheck errors
  * Add a rule for automatic tagging releases by pipeline schedule
  * Add gitlab ci for calling pre-commit and ci-fairy

OBS-URL: https://build.opensuse.org/request/show/1113030
OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=442
This commit is contained in:
Takashi Iwai 2023-09-22 14:38:02 +00:00 committed by Git OBS Bridge
parent 6ca2b761af
commit bc5ef928de
23 changed files with 229 additions and 59 deletions

12
.gitattributes vendored
View File

@ -23,6 +23,18 @@
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-b0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-b0-jf-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-c0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-Qu-c0-jf-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-QuZ-a0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-QuZ-a0-jf-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-cc-a0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-so-a0-gf-a0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-so-a0-gf4-a0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-so-a0-hr-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-so-a0-jf-b0-71.ucode filter=lfs diff=lfs merge=lfs -text
iwlwifi-ty-a0-gf-a0-71.ucode filter=lfs diff=lfs merge=lfs -text
ql2600_fw.bin filter=lfs diff=lfs merge=lfs -text
ql2700_fw.bin filter=lfs diff=lfs merge=lfs -text
ql8300_fw.bin filter=lfs diff=lfs merge=lfs -text

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git</param>
<param name="changesrevision">49f9e3479fb564ab96ebbfef327743b0ec2a7620</param></service></servicedata>
<param name="changesrevision">f48da6da55078e732fb870cee4e72762e774c603</param></service></servicedata>

View File

@ -3523,6 +3523,7 @@ r8152: usb:v17EFp721Ed*dc*dsc*dp*icFFisc*ip*in*
r8152: usb:v17EFpA387d*dc*dsc*dp*ic*isc*ip*in*
r8152: usb:v17EFpA387d*dc*dsc*dp*ic02isc06ip00in*
r8152: usb:v17EFpA387d*dc*dsc*dp*icFFisc*ip*in*
r8152: usb:v2001pB301d*dc*dsc*dp*ic*isc*ip*in*
r8152: usb:v2357p0601d*dc*dsc*dp*ic*isc*ip*in*
r8152: usb:v2357p0601d*dc*dsc*dp*ic02isc06ip00in*
r8152: usb:v2357p0601d*dc*dsc*dp*icFFisc*ip*in*

View File

@ -1,30 +0,0 @@
diff --git a/WHENCE b/WHENCE
index 390a5689408e..852e88f55341 100644
--- a/WHENCE
+++ b/WHENCE
@@ -3912,20 +3912,15 @@ License: Redistributable. See LICENSE.amd-sev for details
Driver: microcode_amd - AMD CPU Microcode Update Driver for Linux
-File: amd-ucode/microcode_amd.bin
-Raw: amd-ucode/microcode_amd.bin
+RawFile: amd-ucode/microcode_amd.bin
Version: 2013-07-10
-File: amd-ucode/microcode_amd_fam15h.bin
-Raw: amd-ucode/microcode_amd_fam15h.bin
+RawFile: amd-ucode/microcode_amd_fam15h.bin
Version: 2018-05-24
-File: amd-ucode/microcode_amd_fam16h.bin
-Raw: amd-ucode/microcode_amd_fam16h.bin
+RawFile: amd-ucode/microcode_amd_fam16h.bin
Version: 2014-10-28
-File: amd-ucode/microcode_amd_fam17h.bin
-Raw: amd-ucode/microcode_amd_fam17h.bin
+RawFile: amd-ucode/microcode_amd_fam17h.bin
Version: 2023-07-19
-File: amd-ucode/microcode_amd_fam19h.bin
-Raw: amd-ucode/microcode_amd_fam19h.bin
+RawFile: amd-ucode/microcode_amd_fam19h.bin
Version: 2023-08-08
File: amd-ucode/README

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7ddabe9cc308de0f618ff208313e7180fdf7178d3ba70814664d6fc2f9c9324
size 1364312

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:696fff84535d276f1645a4510f06bbc1469a5d73b2ca9513b77d2602311a937e
size 1285192

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3522b528a52dafe68ffdcc9dc07593267a1a956d689c9e23d93110e3fc6599ce
size 1364328

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3cce1c557372d8177f6a3363604a59c205c52285448c2e624974d02eb0b75bdd
size 1285208

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11fd8d891a6bea770dc9a2c1c7cc728745cfd470b8c0e5a57f0c5d50312a1743
size 1364308

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:995bf8c424472a86940014792b7c1c85b27f666742539ae36b3959bb53d445ce
size 1285188

47
iwlwifi-WHENCE-fix.patch Normal file
View File

@ -0,0 +1,47 @@
diff --git a/WHENCE b/WHENCE
index cf805e28f5a7..16a9f1d78d57 100644
--- a/WHENCE
+++ b/WHENCE
@@ -908,6 +908,42 @@ Version: 66.f1c864e0.0
File: iwlwifi-ty-a0-gf-a0-66.ucode
Version: 66.f1c864e0.0
+File: iwlwifi-cc-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-b0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-b0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-c0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-Qu-c0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-QuZ-a0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-QuZ-a0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-ty-a0-gf-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-gf4-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-gf-a0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-hr-b0-71.ucode
+Version: 71.058653f6.0
+
+File: iwlwifi-so-a0-jf-b0-71.ucode
+Version: 71.058653f6.0
+
File: iwlwifi-cc-a0-72.ucode
Version: 72.daa05125.0

3
iwlwifi-cc-a0-71.ucode Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1561efa63710678be1392b0a572b9b5d021b529e71463346a7a05129294ddfa6
size 1322288

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5d7cc6a6c7748e570e0094032045122d7a5a76f6fde2e7b2f1ad1048575896a
size 1550124

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b5b1f8c1d22ae4df4f44e5e81c5ed5a45591526c07f9e2a1b13ec7c8ee2d16dc
size 1566352

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8f5feac1b1db256da2c6c0739ec6ea7bdbe8e78ed19944b4c9a39b7fc61a5aa
size 1456960

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:169de0f9f49d5dbcc59d7d1432890b7f153c3864d8d72ff5f47549f281b6b41e
size 1400056

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4a0c77a84f9bb279c5b4e83a8949073f4a93f248fcfff90ff2147ac658eba95
size 1494024

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39956b7c9b6316211f68d70e45933ef26cea132f7f3214f4636abda1425565d9
size 288932500

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a860ce20bc4c98983627ab6c4458973e6dfb25eea7601bcb7dc28bc299df2667
size 306435080

View File

@ -1,3 +1,48 @@
-------------------------------------------------------------------
Fri Sep 22 12:53:05 UTC 2023 - tiwai@suse.com
- Update to version 20230918 (commit f48da6da5507):
* Run merge request pipelines for pre-commit.
* linux-firmware: amd-ucode: Add note on fam19h warnings
* i915: update MTL HuC to version 8.5.4
* amdgpu: update DMCUB to 0.0.183.0 for various AMDGPU ASICs
-------------------------------------------------------------------
Thu Sep 14 12:44:20 UTC 2023 - tiwai@suse.com
- Update to version 20230907 (git commit c801b3b807d2):
* Turn off textwidth check
* linux-firmware: add link to sc8280xp audioreach firmware
* qcom: sm8250: add RB5 sensors DSP firmware
* qcom: Update vpu-1.0 firmware
* qcom: sm8250: update DSP firmware
* qcom: add firmware for the onboard WiFi on qcm2290 / qrb4210
* qcom: add venus firmware files for v6.0
* qcom: add firmware for QRB4210 platforms
* qcom: add firmware for QCM2290 platforms
* qcom: add GPU firmware for QCM2290 / QRB2210
* ath10k/WCN3990: move wlanmdsp to qcom/sdm845
* WHENCE: Don't compress qcom json files
* WHENCE: amd-ucode: Use new RawFile keyword
* check_whence: Recognize RawFile keyword
* Only run ci-fairy on merge requests
* Capture artifacts from `make dist` to save at release time.
* Add new toplevel 'make dist' target.
* Create symlinks for all firmware that is duplicate using rdfind
* QCA: Update Bluetooth WCN685x 2.1 firmware to 2.1.0-00605
* Add shellcheck pre-commit target
* Fix carl9170fw shell scripts for shellcheck errors
* Add a rule for automatic tagging releases by pipeline schedule
* Add gitlab ci for calling pre-commit and ci-fairy
* Add Dockerfile used to build CI image
* Rewrite README in markdown
* Wire up pre-commit to `make check`
* Add pre-commit hooks and codespell template
* check_whence: reformat using python black
- Drop obsoleted amd-ucode-rawfile.patch
- Fix make-files.sh to handle RawFile tag correctly
- Update aliases from 6.6-rc1
-------------------------------------------------------------------
Tue Aug 29 15:09:31 UTC 2023 - tiwai@suse.com
@ -280,6 +325,13 @@ Mon Apr 17 08:13:49 UTC 2023 - tiwai@suse.com
* amdgpu: Add GC 11.0.4 firmware
* rtw88: 8822c: Update normal firmware to v9.9.15
-------------------------------------------------------------------
Fri Mar 24 16:08:17 UTC 2023 - Takashi Iwai <tiwai@suse.com>
- Revive the old iwlwifi-*-71 ucode for compatibility with
SLE15-SP4 kernel (bsc#1209681):
WHENCE updated by iwlwifi-WHENCE-fix.patch
-------------------------------------------------------------------
Fri Mar 24 08:22:16 UTC 2023 - tiwai@suse.com

View File

@ -21,11 +21,11 @@
%define _firmwaredir /lib/firmware
%endif
%define __ksyms_path ^%{_firmwaredir}
%define version_unconverted 20230829
%define version_unconverted 20230918
# Force bzip2 instead of lzma compression (bsc#1176981)
%define _binary_payload w9.bzdio
Name: kernel-firmware
Version: 20230829
Version: 20230918
Release: 0
Summary: Linux kernel firmware files
License: GPL-2.0-only AND SUSE-Firmware AND GPL-2.0-or-later AND MIT
@ -39,6 +39,19 @@ Source8: ql2600_fw.bin
Source9: ql2700_fw.bin
Source10: ql8300_fw.bin
Source99: kernel-firmware-rpmlintrc
# for compatibility with SLE15-SP4 kernel (bsc#1209681)
Source200: iwlwifi-cc-a0-71.ucode
Source201: iwlwifi-Qu-b0-hr-b0-71.ucode
Source202: iwlwifi-Qu-b0-jf-b0-71.ucode
Source203: iwlwifi-Qu-c0-hr-b0-71.ucode
Source204: iwlwifi-Qu-c0-jf-b0-71.ucode
Source205: iwlwifi-QuZ-a0-hr-b0-71.ucode
Source206: iwlwifi-QuZ-a0-jf-b0-71.ucode
Source207: iwlwifi-so-a0-gf4-a0-71.ucode
Source208: iwlwifi-so-a0-gf-a0-71.ucode
Source209: iwlwifi-so-a0-hr-b0-71.ucode
Source210: iwlwifi-so-a0-jf-b0-71.ucode
Source211: iwlwifi-ty-a0-gf-a0-71.ucode
# install / build infrastructure
Source1001: make-files.sh
Source1002: list-license.sh
@ -59,7 +72,8 @@ Source1100: qcom-post
Source1101: uncompressed-post
# workarounds
Patch1: copy-file-ignore-README.patch
Patch2: amd-ucode-rawfile.patch
# for compatibility with SLE15-SP4 kernel (bsc#1209681)
Patch200: iwlwifi-WHENCE-fix.patch
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): %{_bindir}/mkdir
@ -5849,6 +5863,7 @@ Supplements: modalias(usb:v2001p3C21d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2001p3C22d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2001p3C23d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2001p3C25d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2001pB301d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2019p1201d*dc*dsc*dp*ic*isc*ip*in*)
Supplements: modalias(usb:v2019p1201d*dc*dsc*dp*icFFiscFFipFFin*)
Supplements: modalias(usb:v2019p4901d*dc*dsc*dp*ic*isc*ip*in*)
@ -6389,11 +6404,27 @@ various USB WiFi / Ethernet drivers.
%prep
%setup -q -n kernel-firmware-%{version}
%patch1 -p1
%patch2 -p1
# additional firmwares
cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
%if 0%{?suse_version} < 1599
# revive old iwlwifi firmware for compatibility (bsc#1209681)
%patch200 -p1
cp %{SOURCE200} .
cp %{SOURCE201} .
cp %{SOURCE202} .
cp %{SOURCE203} .
cp %{SOURCE204} .
cp %{SOURCE205} .
cp %{SOURCE206} .
cp %{SOURCE207} .
cp %{SOURCE208} .
cp %{SOURCE209} .
cp %{SOURCE210} .
cp %{SOURCE211} .
%endif
%build
# nothing to do
@ -6766,7 +6797,7 @@ fi
%if "%{flavor}" == "uncompressed"
%files
%doc WHENCE README
%doc WHENCE README.md
%license GPL-2 GPL-3 LICEN[CS]E.*
%{_firmwaredir}
%exclude %{_firmwaredir}/amd-ucode
@ -6775,7 +6806,7 @@ fi
%else
%files all
%doc WHENCE README
%doc WHENCE README.md
%files -n ucode-amd
%doc amd-ucode/README

View File

@ -39,6 +39,19 @@ Source8: ql2600_fw.bin
Source9: ql2700_fw.bin
Source10: ql8300_fw.bin
Source99: kernel-firmware-rpmlintrc
# for compatibility with SLE15-SP4 kernel (bsc#1209681)
Source200: iwlwifi-cc-a0-71.ucode
Source201: iwlwifi-Qu-b0-hr-b0-71.ucode
Source202: iwlwifi-Qu-b0-jf-b0-71.ucode
Source203: iwlwifi-Qu-c0-hr-b0-71.ucode
Source204: iwlwifi-Qu-c0-jf-b0-71.ucode
Source205: iwlwifi-QuZ-a0-hr-b0-71.ucode
Source206: iwlwifi-QuZ-a0-jf-b0-71.ucode
Source207: iwlwifi-so-a0-gf4-a0-71.ucode
Source208: iwlwifi-so-a0-gf-a0-71.ucode
Source209: iwlwifi-so-a0-hr-b0-71.ucode
Source210: iwlwifi-so-a0-jf-b0-71.ucode
Source211: iwlwifi-ty-a0-gf-a0-71.ucode
# install / build infrastructure
Source1001: make-files.sh
Source1002: list-license.sh
@ -59,7 +72,8 @@ Source1100: qcom-post
Source1101: uncompressed-post
# workarounds
Patch1: copy-file-ignore-README.patch
Patch2: amd-ucode-rawfile.patch
# for compatibility with SLE15-SP4 kernel (bsc#1209681)
Patch200: iwlwifi-WHENCE-fix.patch
BuildRequires: fdupes
BuildRequires: suse-module-tools
Requires(post): %{_bindir}/mkdir
@ -123,11 +137,27 @@ all files that have been provided by kernel-firmware package.
%prep
%setup -q -n kernel-firmware-%{version}
%patch1 -p1
%patch2 -p1
# additional firmwares
cat %{SOURCE1} >> WHENCE
cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} .
%if 0%{?suse_version} < 1599
# revive old iwlwifi firmware for compatibility (bsc#1209681)
%patch200 -p1
cp %{SOURCE200} .
cp %{SOURCE201} .
cp %{SOURCE202} .
cp %{SOURCE203} .
cp %{SOURCE204} .
cp %{SOURCE205} .
cp %{SOURCE206} .
cp %{SOURCE207} .
cp %{SOURCE208} .
cp %{SOURCE209} .
cp %{SOURCE210} .
cp %{SOURCE211} .
%endif
%build
# nothing to do
@ -153,7 +183,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%if "%{flavor}" == "uncompressed"
%files
%doc WHENCE README
%doc WHENCE README.md
%license GPL-2 GPL-3 LICEN[CS]E.*
%{_firmwaredir}
%exclude %{_firmwaredir}/amd-ucode
@ -161,7 +191,7 @@ sh %{_sourcedir}/list-license.sh < %{_sourcedir}/licenses.list
%else
%files all
%doc WHENCE README
%doc WHENCE README.md
%files -n ucode-amd
%doc amd-ucode/README

View File

@ -41,17 +41,10 @@ make_dirs () {
fi
}
copy_link () {
add_file () {
local f="$1"
local lf="$2"
local src="${f%/*}"
if [ "$src" = "$f" ]; then
src="$lf"
else
src="$src/$lf"
fi
make_dirs "$f"
if [ -d "$dest/$src" ]; then
if [ -f "$dest/$f" ]; then
echo "\"$fwdir/$f\"" >> files-$topic
else
echo "\"$fwdir/$f$cext\"" >> files-$topic
@ -89,13 +82,12 @@ while read l; do
echo "ERROR: no topic found for $l"
exit 1
fi
f=$(echo "$l" | sed -e's/^File: *//' -e's/"//g' -e's/\\//g')
f=$(echo "$l" | sed -e's/^File: *//' -e's/^RawFile: *//' -e's/"//g' -e's/\\//g')
case "$f" in
*/README)
*/README*)
continue;;
esac
make_dirs "$f"
echo "\"$fwdir/$f$cext\"" >> files-$topic
add_file "$f"
;;
Link:*)
test "$topic" = "SKIP" && continue
@ -104,8 +96,7 @@ while read l; do
exit 1
fi
f=$(echo "$l" | sed -e's/^Link: *//' -e's/ *->.*$//' -es'/\\//g')
d=$(echo "$l" | sed -e's/^.*-> *//' -e's/\\//g')
copy_link "$f" "$d"
add_file "$f"
;;
esac
done