From a9757890728e5b91d2b6c47d5beb9829335be92f3d5abbd9b63e2d68e5e6c599 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 18 Jul 2019 15:04:53 +0000 Subject: [PATCH 1/2] Accepting request 715390 from home:pluskalm:branches:Kernel:HEAD - Update to version 20190712: * linux-firmware: Update firmware file for Intel Bluetooth AX201 * linux-firmware: Update firmware file for Intel Bluetooth 22161 * linux-firmware: Update firmware file for Intel Bluetooth 9560 * linux-firmware: Update firmware file for Intel Bluetooth 9260 * amdgpu: update vega10 VCE firmware * amdgpu: update picasso vcn firmware * amdgpu: update raven vcn firmware * amdgpu: update tonga to latest 19.20 firmware * amdgpu: update vega12 to latest 19.20 firmware * amdgpu: partially revert 2579167548be33afb1fe2a9a5c141561ee5a8bbe * amdgpu: update vega10 to latest 19.20 firmware * amdgpu: update polaris12 to latest 19.20 firmware * amdgpu: update raven2 to latest 19.20 firmware * amdgpu: update raven to latest 19.20 firmware * amdgpu: update picasso to latest 19.20 firmware OBS-URL: https://build.opensuse.org/request/show/715390 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=263 --- _servicedata | 2 +- kernel-firmware-20190628.tar.xz | 3 --- kernel-firmware-20190712.tar.xz | 3 +++ kernel-firmware.changes | 20 ++++++++++++++++++++ kernel-firmware.spec | 4 ++-- 5 files changed, 26 insertions(+), 6 deletions(-) delete mode 100644 kernel-firmware-20190628.tar.xz create mode 100644 kernel-firmware-20190712.tar.xz diff --git a/_servicedata b/_servicedata index 457f3e8..a999e1f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git - 70e43940b05e8d6e0c5f15b5e2d67760f1581ece \ No newline at end of file + d52556e4592e64023157a83fb0f483661f23ac0e \ No newline at end of file diff --git a/kernel-firmware-20190628.tar.xz b/kernel-firmware-20190628.tar.xz deleted file mode 100644 index 4b06104..0000000 --- a/kernel-firmware-20190628.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:938651f5568f5eafe53b4eb6bbee0f8336a5d346c99a36d67304876b5c84da22 -size 84471308 diff --git a/kernel-firmware-20190712.tar.xz b/kernel-firmware-20190712.tar.xz new file mode 100644 index 0000000..0a3fc06 --- /dev/null +++ b/kernel-firmware-20190712.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d70522eeb21c81c76de32c15e97cce40e31d7cab410f5d1d02f629cd4b0680fa +size 84579064 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 8cd3228..86a1ff7 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Jul 15 06:56:58 UTC 2019 - Martin Pluskal + +- Update to version 20190712: + * linux-firmware: Update firmware file for Intel Bluetooth AX201 + * linux-firmware: Update firmware file for Intel Bluetooth 22161 + * linux-firmware: Update firmware file for Intel Bluetooth 9560 + * linux-firmware: Update firmware file for Intel Bluetooth 9260 + * amdgpu: update vega10 VCE firmware + * amdgpu: update picasso vcn firmware + * amdgpu: update raven vcn firmware + * amdgpu: update tonga to latest 19.20 firmware + * amdgpu: update vega12 to latest 19.20 firmware + * amdgpu: partially revert 2579167548be33afb1fe2a9a5c141561ee5a8bbe + * amdgpu: update vega10 to latest 19.20 firmware + * amdgpu: update polaris12 to latest 19.20 firmware + * amdgpu: update raven2 to latest 19.20 firmware + * amdgpu: update raven to latest 19.20 firmware + * amdgpu: update picasso to latest 19.20 firmware + ------------------------------------------------------------------- Tue Jul 9 10:08:17 UTC 2019 - Martin Pluskal diff --git a/kernel-firmware.spec b/kernel-firmware.spec index cb324b9..b87c746 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -17,9 +17,9 @@ %define __ksyms_path ^/lib/firmware -%define version_unconverted 20190628 +%define version_unconverted 20190712 Name: kernel-firmware -Version: 20190628 +Version: 20190712 Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware AND GPL-2.0-only AND GPL-2.0-or-later AND MIT From 908291b0e8b3fc7522bbb145ab5ba11ecc11c8aa02739d02a44cc7afa9c4f899 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 19 Jul 2019 15:56:52 +0000 Subject: [PATCH 2/2] Accepting request 717117 from home:tiwai:branches:Kernel:HEAD - Revert the iwlwifi 9000 and 9260 *-46.ucode firmware files that are broken on some machines to 20190618 state (bsc#1142128): WHENCE-iwlwifi-9xxx-46-revert.patch OBS-URL: https://build.opensuse.org/request/show/717117 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=264 --- .gitattributes | 2 ++ WHENCE-iwlwifi-9xxx-46-revert.patch | 20 ++++++++++++++++++++ iwlwifi-9000-pu-b0-jf-b0-46.ucode | 3 +++ iwlwifi-9260-th-b0-jf-b0-46.ucode | 3 +++ iwlwifi-sha1sum | 2 ++ kernel-firmware.changes | 7 +++++++ kernel-firmware.spec | 9 +++++++++ 7 files changed, 46 insertions(+) create mode 100644 WHENCE-iwlwifi-9xxx-46-revert.patch create mode 100644 iwlwifi-9000-pu-b0-jf-b0-46.ucode create mode 100644 iwlwifi-9260-th-b0-jf-b0-46.ucode create mode 100644 iwlwifi-sha1sum diff --git a/.gitattributes b/.gitattributes index ad4a8fc..7b29e59 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,6 +23,8 @@ *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text +iwlwifi-9000-pu-b0-jf-b0-46.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-9260-th-b0-jf-b0-46.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 diff --git a/WHENCE-iwlwifi-9xxx-46-revert.patch b/WHENCE-iwlwifi-9xxx-46-revert.patch new file mode 100644 index 0000000..9f8faca --- /dev/null +++ b/WHENCE-iwlwifi-9xxx-46-revert.patch @@ -0,0 +1,20 @@ +--- a/WHENCE ++++ b/WHENCE +@@ -1019,7 +1019,7 @@ File: iwlwifi-9000-pu-b0-jf-b0-43.ucode + Version: 43.95eb4e97.0 + + File: iwlwifi-9000-pu-b0-jf-b0-46.ucode +-Version: 46.a41adfe7.0 ++Version: 46.3cfab8da.0 + + File: iwlwifi-9260-th-b0-jf-b0-33.ucode + Version: 33.610294.0 +@@ -1037,7 +1037,7 @@ File: iwlwifi-9260-th-b0-jf-b0-43.ucode + Version: 43.95eb4e97.0 + + File: iwlwifi-9260-th-b0-jf-b0-46.ucode +-Version: 46.a41adfe7.0 ++Version: 46.3cfab8da.0 + + File: iwlwifi-cc-a0-46.ucode + Version: 46.3cfab8da.0 diff --git a/iwlwifi-9000-pu-b0-jf-b0-46.ucode b/iwlwifi-9000-pu-b0-jf-b0-46.ucode new file mode 100644 index 0000000..bc1728d --- /dev/null +++ b/iwlwifi-9000-pu-b0-jf-b0-46.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ec38e49524c7c1ad7afb3be77391ee17cc802008be671950ce2cde4624b732a +size 1448644 diff --git a/iwlwifi-9260-th-b0-jf-b0-46.ucode b/iwlwifi-9260-th-b0-jf-b0-46.ucode new file mode 100644 index 0000000..243b39d --- /dev/null +++ b/iwlwifi-9260-th-b0-jf-b0-46.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c7c941ac6878b012a6f354acbfca66a119584bcfa45b63cfc2b81d6178cc868 +size 1456088 diff --git a/iwlwifi-sha1sum b/iwlwifi-sha1sum new file mode 100644 index 0000000..30f5c56 --- /dev/null +++ b/iwlwifi-sha1sum @@ -0,0 +1,2 @@ +e279ecf91a923731ba0d49166478cc9f0a0990e8 iwlwifi-9000-pu-b0-jf-b0-46.ucode +2ea6ac8c9c03b7a896cff9b3cb569cb4da2099b8 iwlwifi-9260-th-b0-jf-b0-46.ucode diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 86a1ff7..f89031f 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 19 08:08:01 CEST 2019 - tiwai@suse.de + +- Revert the iwlwifi 9000 and 9260 *-46.ucode firmware files that + are broken on some machines to 20190618 state (bsc#1142128): + WHENCE-iwlwifi-9xxx-46-revert.patch + ------------------------------------------------------------------- Mon Jul 15 06:56:58 UTC 2019 - Martin Pluskal diff --git a/kernel-firmware.spec b/kernel-firmware.spec index b87c746..2bd2d6f 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -37,6 +37,11 @@ Source8: ql2600_fw.bin Source9: ql2700_fw.bin Source10: ql8300_fw.bin Source99: %{name}-rpmlintrc +# temporary revert for the broken iwlwifi firmware (bsc#1142128) +Source100: iwlwifi-9000-pu-b0-jf-b0-46.ucode +Source101: iwlwifi-9260-th-b0-jf-b0-46.ucode +Source102: iwlwifi-sha1sum +Patch100: WHENCE-iwlwifi-9xxx-46-revert.patch BuildRequires: fdupes BuildRequires: suse-module-tools Requires(post): coreutils @@ -92,7 +97,11 @@ This package contains the microcode files used by AMD CPUs. %prep %setup -q +%patch100 -p1 cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . +sha1sum --quiet -c %{SOURCE102} || exit 1 +cp %{SOURCE100} . +cp %{SOURCE101} . %build # nothing to do