From f800c8d4670b970e38fdc3b4f6d47b5efd8c355d8910a703507538f539873a74 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 15 Nov 2017 15:57:00 +0000 Subject: [PATCH 1/2] Accepting request 542059 from home:tiwai:branches:Kernel:HEAD - Update Intel WiFi firmwares: the files are still not included in linux-firmware.git, hence applied individually. For security updates (CVE-2017-13080 CVE-2017-13081 bsc#1066295) For new chipset models (FATE#322675) OBS-URL: https://build.opensuse.org/request/show/542059 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=177 --- .gitattributes | 11 +++++ WHENCE-iwlwifi-update.patch | 79 +++++++++++++++++++++++++++++++ iwlwifi-3160-17.ucode | 3 ++ iwlwifi-3168-29.ucode | 3 ++ iwlwifi-7260-17.ucode | 3 ++ iwlwifi-7265-17.ucode | 3 ++ iwlwifi-7265D-29.ucode | 3 ++ iwlwifi-8000C-31.ucode | 3 ++ iwlwifi-8000C-34.ucode | 3 ++ iwlwifi-8265-31.ucode | 3 ++ iwlwifi-8265-34.ucode | 3 ++ iwlwifi-9000-pu-b0-jf-b0-33.ucode | 3 ++ iwlwifi-9260-th-b0-jf-b0-33.ucode | 3 ++ kernel-firmware.changes | 9 ++++ kernel-firmware.spec | 25 ++++++++++ 15 files changed, 157 insertions(+) create mode 100644 WHENCE-iwlwifi-update.patch create mode 100644 iwlwifi-3160-17.ucode create mode 100644 iwlwifi-3168-29.ucode create mode 100644 iwlwifi-7260-17.ucode create mode 100644 iwlwifi-7265-17.ucode create mode 100644 iwlwifi-7265D-29.ucode create mode 100644 iwlwifi-8000C-31.ucode create mode 100644 iwlwifi-8000C-34.ucode create mode 100644 iwlwifi-8265-31.ucode create mode 100644 iwlwifi-8265-34.ucode create mode 100644 iwlwifi-9000-pu-b0-jf-b0-33.ucode create mode 100644 iwlwifi-9260-th-b0-jf-b0-33.ucode diff --git a/.gitattributes b/.gitattributes index ad4a8fc..6d5fa65 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,6 +23,17 @@ *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns ast_dp501_fw.bin filter=lfs diff=lfs merge=lfs -text +iwlwifi-3160-17.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-3168-29.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-7260-17.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-7265-17.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-7265D-29.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-8000C-31.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-8000C-34.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-8265-31.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-8265-34.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-9000-pu-b0-jf-b0-33.ucode filter=lfs diff=lfs merge=lfs -text +iwlwifi-9260-th-b0-jf-b0-33.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-update.patch b/WHENCE-iwlwifi-update.patch new file mode 100644 index 0000000..b3eb1df --- /dev/null +++ b/WHENCE-iwlwifi-update.patch @@ -0,0 +1,79 @@ +diff --git a/WHENCE b/WHENCE +index b2dc6a10abb2..61104ef37017 100644 +--- a/WHENCE ++++ b/WHENCE +@@ -861,7 +861,7 @@ File: iwlwifi-7260-16.ucode + Version 16.242414.0 + + File: iwlwifi-7260-17.ucode +-Version 17.459231.0 ++Version 17.608620.0 + + File: iwlwifi-3160-7.ucode + Version: 22.1.7.0 +@@ -885,7 +885,7 @@ File: iwlwifi-3160-16.ucode + Version 16.242414.0 + + File: iwlwifi-3160-17.ucode +-Version 17.459231.0 ++Version 17.608620.0 + + File: iwlwifi-7265-8.ucode + Version: 22.24.8.0 +@@ -906,7 +906,7 @@ File: iwlwifi-7265-16.ucode + Version 16.242414.0 + + File: iwlwifi-7265-17.ucode +-Version 17.459231.0 ++Version 17.608620.0 + + File: iwlwifi-7265D-10.ucode + Version: 23.15.10.0 +@@ -933,7 +933,7 @@ File: iwlwifi-7265D-27.ucode + Version 27.541033.0 + + File: iwlwifi-7265D-29.ucode +-Version 29.541020.0 ++Version 29.610311.0 + + File: iwlwifi-3168-21.ucode + Version 21.302800.0 +@@ -945,7 +945,7 @@ File: iwlwifi-3168-27.ucode + Version 27.541033.0 + + File: iwlwifi-3168-29.ucode +-Version 29.541020.0 ++Version 29.610311.0 + + File: iwlwifi-8000C-13.ucode + Version: 25.30.13.0 +@@ -963,7 +963,10 @@ File: iwlwifi-8000C-27.ucode + Version 27.541033.0 + + File: iwlwifi-8000C-31.ucode +-Version 31.532993.0 ++Version 31.560484.0 ++ ++File: iwlwifi-8000C-34.ucode ++Version 34.610288.0 + + File: iwlwifi-8265-21.ucode + Version 21.302800.0 +@@ -975,7 +978,16 @@ File: iwlwifi-8265-27.ucode + Version 27.541033.0 + + File: iwlwifi-8265-31.ucode +-Version 31.532993.0 ++Version 31.560484.0 ++ ++File iwlwifi-8265-34.ucode ++Version 34.610288.0 ++ ++File: iwlwifi-9260-th-b0-jf-b0-33.ucode ++Version: 33.610294.0 ++ ++File: iwlwifi-9000-pu-b0-jf-b0-33.ucode ++Version: 33.610294.0 + + Licence: Redistributable. See LICENCE.iwlwifi_firmware for details + diff --git a/iwlwifi-3160-17.ucode b/iwlwifi-3160-17.ucode new file mode 100644 index 0000000..3bc9831 --- /dev/null +++ b/iwlwifi-3160-17.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d35052682c2495d778825351d11c7a14920a272fc590c1bfa732b93d29d62009 +size 918268 diff --git a/iwlwifi-3168-29.ucode b/iwlwifi-3168-29.ucode new file mode 100644 index 0000000..299b20d --- /dev/null +++ b/iwlwifi-3168-29.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b778c9ac40acbabbea87a3982264ffb04c01a47792f2166a021fef007943766 +size 1036372 diff --git a/iwlwifi-7260-17.ucode b/iwlwifi-7260-17.ucode new file mode 100644 index 0000000..cc9e026 --- /dev/null +++ b/iwlwifi-7260-17.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63fd9cda458444299beaa8172ee43e3d6a4cd35703897f81a21a9cf9fcda72e6 +size 1049340 diff --git a/iwlwifi-7265-17.ucode b/iwlwifi-7265-17.ucode new file mode 100644 index 0000000..77e63bf --- /dev/null +++ b/iwlwifi-7265-17.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbe6686088b688ebfb5d1a994a2faa4d02baa1ce1f0464f8a6c55a07d8416352 +size 1180412 diff --git a/iwlwifi-7265D-29.ucode b/iwlwifi-7265D-29.ucode new file mode 100644 index 0000000..391d023 --- /dev/null +++ b/iwlwifi-7265D-29.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0aa80b4b399337eac19224805e4093f3126549027985f6a0c9c797bd2bd96cc +size 1036528 diff --git a/iwlwifi-8000C-31.ucode b/iwlwifi-8000C-31.ucode new file mode 100644 index 0000000..79328ab --- /dev/null +++ b/iwlwifi-8000C-31.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85ad4200c3933a492431049d71ed31b8f95525a42544441c846bf4988431e5a7 +size 2310116 diff --git a/iwlwifi-8000C-34.ucode b/iwlwifi-8000C-34.ucode new file mode 100644 index 0000000..af09822 --- /dev/null +++ b/iwlwifi-8000C-34.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5476ec3e48825739c4d19a0a690ee72f05717bca797214065037f2077c0249ce +size 2448976 diff --git a/iwlwifi-8265-31.ucode b/iwlwifi-8265-31.ucode new file mode 100644 index 0000000..70c755b --- /dev/null +++ b/iwlwifi-8265-31.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f8c0f2b2c42d61b8284a2a3d3b2b5e0a50a1be8c8adb50ae49b80620136dbff +size 2307104 diff --git a/iwlwifi-8265-34.ucode b/iwlwifi-8265-34.ucode new file mode 100644 index 0000000..f233f8c --- /dev/null +++ b/iwlwifi-8265-34.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85566f9473b0774209b8351c2daeea8d5c20116f880082b64af819ca54e3b9f7 +size 2440780 diff --git a/iwlwifi-9000-pu-b0-jf-b0-33.ucode b/iwlwifi-9000-pu-b0-jf-b0-33.ucode new file mode 100644 index 0000000..50bca2f --- /dev/null +++ b/iwlwifi-9000-pu-b0-jf-b0-33.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a201addc042738dc5e74109ff828d2382cf0507a55dfffe25f34178026ca9ee7 +size 2632620 diff --git a/iwlwifi-9260-th-b0-jf-b0-33.ucode b/iwlwifi-9260-th-b0-jf-b0-33.ucode new file mode 100644 index 0000000..10d9366 --- /dev/null +++ b/iwlwifi-9260-th-b0-jf-b0-33.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a0056107c5f3d08c8006002edc183f710c4dd0be2067f03abe8addc96cdf3bb +size 2637216 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 3494c9f..3071941 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Nov 15 14:30:48 CET 2017 - tiwai@suse.de + +- Update Intel WiFi firmwares: + the files are still not included in linux-firmware.git, hence + applied individually. + For security updates (CVE-2017-13080 CVE-2017-13081 bsc#1066295) + For new chipset models (FATE#322675) + ------------------------------------------------------------------- Tue Oct 10 11:41:57 UTC 2017 - msuchanek@suse.com diff --git a/kernel-firmware.spec b/kernel-firmware.spec index e4dcd4b..d4b0441 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -38,6 +38,19 @@ Source8: ql2600_fw.bin Source9: ql2700_fw.bin Source10: ql8300_fw.bin Source99: %{name}-rpmlintrc +# Intel WiFi updates that still not landed to linux-firmware.git +Source100: iwlwifi-3160-17.ucode +Source101: iwlwifi-3168-29.ucode +Source102: iwlwifi-7260-17.ucode +Source103: iwlwifi-7265-17.ucode +Source104: iwlwifi-7265D-29.ucode +Source105: iwlwifi-8000C-31.ucode +Source106: iwlwifi-8000C-34.ucode +Source107: iwlwifi-8265-31.ucode +Source108: iwlwifi-8265-34.ucode +Source109: iwlwifi-9000-pu-b0-jf-b0-33.ucode +Source110: iwlwifi-9260-th-b0-jf-b0-33.ucode +Patch100: WHENCE-iwlwifi-update.patch BuildRequires: fdupes BuildRequires: suse-module-tools Requires(post): coreutils @@ -92,6 +105,18 @@ This package contains the microcode files used by AMD CPUs. %prep %setup -q cp %{SOURCE2} %{SOURCE8} %{SOURCE9} %{SOURCE10} . +cp %{SOURCE100} . +cp %{SOURCE101} . +cp %{SOURCE102} . +cp %{SOURCE103} . +cp %{SOURCE104} . +cp %{SOURCE105} . +cp %{SOURCE106} . +cp %{SOURCE107} . +cp %{SOURCE108} . +cp %{SOURCE109} . +cp %{SOURCE110} . +%patch100 -p1 %build # nothing to do From 65e81edf77c451ad17324fc08acb519e394227b71247e5910da86eec8f01ca48 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 15 Nov 2017 17:11:19 +0000 Subject: [PATCH 2/2] Accepting request 542088 from home:tiwai:branches:Kernel:HEAD * For security updates (CVE-2017-13080 CVE-2017-13081 bsc#1066295) * For new chipset models (FATE#322675) iwlwifi-3160-17.ucode iwlwifi-3168-29.ucode iwlwifi-7260-17.ucode iwlwifi-7265-17.ucode iwlwifi-7265D-29.ucode iwlwifi-8000C-31.ucode iwlwifi-8000C-34.ucode iwlwifi-8265-31.ucode iwlwifi-8265-34.ucode iwlwifi-9000-pu-b0-jf-b0-33.ucode iwlwifi-9260-th-b0-jf-b0-33.ucode WHENCE-iwlwifi-update.patch OBS-URL: https://build.opensuse.org/request/show/542088 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=178 --- kernel-firmware.changes | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 3071941..7191dca 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -4,8 +4,20 @@ Wed Nov 15 14:30:48 CET 2017 - tiwai@suse.de - Update Intel WiFi firmwares: the files are still not included in linux-firmware.git, hence applied individually. - For security updates (CVE-2017-13080 CVE-2017-13081 bsc#1066295) - For new chipset models (FATE#322675) + * For security updates (CVE-2017-13080 CVE-2017-13081 bsc#1066295) + * For new chipset models (FATE#322675) + iwlwifi-3160-17.ucode + iwlwifi-3168-29.ucode + iwlwifi-7260-17.ucode + iwlwifi-7265-17.ucode + iwlwifi-7265D-29.ucode + iwlwifi-8000C-31.ucode + iwlwifi-8000C-34.ucode + iwlwifi-8265-31.ucode + iwlwifi-8265-34.ucode + iwlwifi-9000-pu-b0-jf-b0-33.ucode + iwlwifi-9260-th-b0-jf-b0-33.ucode + WHENCE-iwlwifi-update.patch ------------------------------------------------------------------- Tue Oct 10 11:41:57 UTC 2017 - msuchanek@suse.com