summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-01-11 16:05:49 -0500
committergraysky2020-01-11 16:05:49 -0500
commit994418775553c62f8ebf033bc9278a10316fbcec (patch)
treed349f179dd27927b12f296d82433e0a8b49105f4
parentd6a04834d5f2d9e7016d70feb22c5a3e1ebe9db6 (diff)
downloadaur-994418775553c62f8ebf033bc9278a10316fbcec.tar.gz
Update to 5.4.11rc1-1
-rw-r--r--.SRCINFO44
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch4
-rw-r--r--0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch4
-rw-r--r--0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch4
-rw-r--r--0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch4
-rw-r--r--0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch4
-rw-r--r--0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch4
-rw-r--r--0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch4
-rw-r--r--0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch4
-rw-r--r--0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch4
-rw-r--r--0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch4
-rw-r--r--0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch4
-rw-r--r--0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch12
-rw-r--r--0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch4
-rw-r--r--0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch48
-rw-r--r--0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch174
-rw-r--r--PKGBUILD38
17 files changed, 297 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e0b925f9a46..54035f81ef1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.4.9rc1
+ pkgver = 5.4.11rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -9,10 +9,10 @@ pkgbase = linux-rc
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.9-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.9-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.8.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.8.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.11-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.11-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.10.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.10.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
source = 0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
@@ -27,26 +27,30 @@ pkgbase = linux-rc
source = 0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
source = 0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
source = 0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+ source = 0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+ source = 0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = fc0d4939d701fbc0b1a1ce74dc62bf1d28ab38d8f89f88bb96cecf42a6f059fe
+ sha256sums = 4b9b0c7bdbf8712d8f3b32799ab8991e69b58b2e293a7e44531bdeb16a0834b7
sha256sums = SKIP
- sha256sums = 42c414c902193f9e8a1b70c728ca440de02d85dc29102f52ef98cfbf20d29a52
+ sha256sums = f23c0218a5e3b363bb5a880972f507bb4dc4a290a787a7da08be07ea12042edd
sha256sums = SKIP
sha256sums = eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31
- sha256sums = bd426e5a539152577608ac57b3e9a8f6281f848847c66d244274b48d95df39aa
- sha256sums = e34286f1f2ee29a45b1a38385489581323eb6672064f4afa13eb8b39dbc79556
- sha256sums = afaf90393cfd4b5d65dfec040cd0b74b5e7cda52540d3883e69ce8ca0b42da12
- sha256sums = 0c1c5de463df11efdd4ed8ca0732187deb3e06d4e15524f0dbb066c578657665
- sha256sums = 26500e808df98e20e62079d18137b5f0636f8c2a32dc8164f6b6381c22c3f217
- sha256sums = 5f8a47d95bd54e8c315c70491b25e70b2af4dce11c0acf06ba0f7c45985b59d8
- sha256sums = 53e1b22f9c97b3e3cdfaa03a4b3f3882ad427c4d400315a51303223209a05788
- sha256sums = 2885647d502d9eedd4f3d94cc27d6c8ecb3bb03e4e51611be8d74034eeccf0bb
- sha256sums = 40210b6cbd64cf70b3af76ab84c9e7f55e64aeed5c1072d4fed4345604735a67
- sha256sums = 7f5f1806a6bf1b256416da8c4d0fcb45249769425a93beb6940cabc2112d95e2
- sha256sums = 6a6b71cc316aff58124f169d22f7712f15f503ff3187d30e3288aa2b0c20402c
- sha256sums = 2b8110e2f53588fde1097dde9545f5369983e654004597a41f58f8e13b0be3c0
- sha256sums = 236e5502b9955747306eeb1078b22cc778feb8a0e1bde8895bafcf5c0438e250
+ sha256sums = a3e9541bf0306d32af8acf121643d9953776d448f68ec09741c591d1e5bc6748
+ sha256sums = 8e9967f83cf22be43b516b394523b0976c6831e28cee5136542df3c946328917
+ sha256sums = 226251c17ced22414e4275ca69be6aec318904778f0c8c244050916e51064b14
+ sha256sums = 9809d55995895e7061bfca0db9f38a608548f21bb5d4a2260e7bbb6b5af2db4a
+ sha256sums = 82bc11366ca296e86dd745c911a841d7ac12d16a1a2185da245a96e5440b8fd7
+ sha256sums = 1ef45f1e7456437e4ec7c2ada46c607f492a87db8d1cf3f3b59870bc2deaa1e6
+ sha256sums = fcd117bc51f21baac26f7570f48b91ce994fd351fcb19cb6097166a4a7c181e6
+ sha256sums = 49bc5c988a6cc127f39ae998954482450d19b69da2ce9dfcce678d3fe7504136
+ sha256sums = f583d172c69c288f5d2e587c5926b0e732284c19e73671eef112ab1a0e26362a
+ sha256sums = 84baa16aa022e0dac2515edced6f214a08d385a385ffb04e358fbe9671235d41
+ sha256sums = a55cfce037523fdb6244fd6286a1d9be12c2eab3327a1c6e05ac42899f5868d1
+ sha256sums = 9c600a292efb59087d913fd8e7a5fff9c7abcfad864d294a266600f4491476c5
+ sha256sums = 126f8b83065e3f7a72589f33874481aa06bb1686ddc6997a8a05a27c7d6721ac
+ sha256sums = 9c95928be62369403bb6822a838dc9791a5a98ac489af81b5ab8f2fd09b0c696
+ sha256sums = 4a2bd4b02e8c4f81334d22a8bd27a03f8a3a1e8137699b809de15cd7edf0e4dd
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 89fdb397c31..e52c061f02d 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 524202522faf86d81efaa96dc984d1996ddda302 Mon Sep 17 00:00:00 2001
+From 98ab83a7426ef0ec20ff46947f2ee8d651980b1c Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 01/14] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 01/16] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
diff --git a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
index 2549538d426..07d679aac07 100644
--- a/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
+++ b/0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
@@ -1,7 +1,7 @@
-From 54dd8abeea02e5ea426a83f0a924d874a9c6e617 Mon Sep 17 00:00:00 2001
+From 34648b0396ec5dfdfc18627c9c21c03e7243dbe2 Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:28 -0600
-Subject: [PATCH 02/14] lib: devres: add a helper function for ioremap_uc
+Subject: [PATCH 02/16] lib: devres: add a helper function for ioremap_uc
Implement a resource managed strongly uncachable ioremap function.
diff --git a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
index 2b54fe9b359..4325122939c 100644
--- a/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
+++ b/0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
@@ -1,7 +1,7 @@
-From 044bbe9ec44257ffb87b96b291636f5a854c3d14 Mon Sep 17 00:00:00 2001
+From 4b74251368e136095a2096ea1bdf95d40ddbd7fb Mon Sep 17 00:00:00 2001
From: Tuowen Zhao <ztuowen@gmail.com>
Date: Wed, 16 Oct 2019 15:06:29 -0600
-Subject: [PATCH 03/14] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
+Subject: [PATCH 03/16] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
Some BIOS erroneously specifies write-combining BAR for intel-lpss-pci
in MTRR. This will cause the system to hang during boot. If possible,
diff --git a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch b/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
index 8e722bb9ca6..62fab3861fa 100644
--- a/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
+++ b/0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
@@ -1,7 +1,7 @@
-From 0407fd310903c18882a7e0463930a71a46b61027 Mon Sep 17 00:00:00 2001
+From 47e8e0d8dbfded3675de6abed233ef134d1578e5 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:21 +0300
-Subject: [PATCH 04/14] PCI: pciehp: Do not disable interrupt twice on suspend
+Subject: [PATCH 04/16] PCI: pciehp: Do not disable interrupt twice on suspend
We try to keep PCIe hotplug ports runtime suspended when entering system
suspend. Because the PCIe portdrv sets the DPM_FLAG_NEVER_SKIP flag, the PM
diff --git a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
index 4b700714ca1..5be035af275 100644
--- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,7 +1,7 @@
-From b9bebf4cde0cf46438b2a7ab1652172e8e16c33e Mon Sep 17 00:00:00 2001
+From 54f60fe91123c1d95ee104c971d546b49e9d67f0 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Tue, 29 Oct 2019 20:00:22 +0300
-Subject: [PATCH 05/14] PCI: pciehp: Prevent deadlock on disconnect
+Subject: [PATCH 05/16] PCI: pciehp: Prevent deadlock on disconnect
This addresses deadlocks in these common cases in hierarchies containing
two switches:
diff --git a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
index 81f0607eab7..494f0c1b254 100644
--- a/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+++ b/0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
@@ -1,7 +1,7 @@
-From f74b67cce5f0c5c37b0c5cb0020a818f0594a743 Mon Sep 17 00:00:00 2001
+From 1b16d109c72e27909a590c5b91c45e8b90fe819a Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Thu, 28 Nov 2019 23:50:40 +0100
-Subject: [PATCH 06/14] ACPI: PM: s2idle: Rework ACPI events synchronization
+Subject: [PATCH 06/16] ACPI: PM: s2idle: Rework ACPI events synchronization
Note that the EC GPE processing need not be synchronized in
acpi_s2idle_wake() after invoking acpi_ec_dispatch_gpe(), because
diff --git a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 5e06efc54b1..38f07765a61 100644
--- a/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0007-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,7 +1,7 @@
-From 265dae4f5dac25c15272befa5eefb9b10906435f Mon Sep 17 00:00:00 2001
+From 88bbdf2becea7d9a04561f5b58219eb50efdd008 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 24 Dec 2019 05:18:47 +0100
-Subject: [PATCH 07/14] iwlwifi: pcie: restore support for Killer Qu C0 NICs
+Subject: [PATCH 07/16] iwlwifi: pcie: restore support for Killer Qu C0 NICs
Commit 809805a820c6 refactored the cfg mangling. Unfortunately, in this
process the lines which picked the right cfg for Killer Qu C0 NICs after
diff --git a/0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch b/0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
index cc1e60bf1fb..882b1cd5630 100644
--- a/0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+++ b/0008-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
@@ -1,7 +1,7 @@
-From ddb94a8dbd9144d7b85f553cb4a85db2ba62374d Mon Sep 17 00:00:00 2001
+From 7e4ac4925c87e5418bbe11d8887d5a9d3cd0d6c0 Mon Sep 17 00:00:00 2001
From: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date: Fri, 29 Nov 2019 14:23:03 +0800
-Subject: [PATCH 08/14] x86/intel: Disable HPET on Intel Ice Lake platforms
+Subject: [PATCH 08/16] x86/intel: Disable HPET on Intel Ice Lake platforms
Like CFL and CFL-H, ICL SoC has skewed HPET timer once it hits PC10.
So let's disable HPET on ICL.
diff --git a/0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch b/0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
index 0923ce501cb..f643582ea03 100644
--- a/0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+++ b/0009-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
@@ -1,7 +1,7 @@
-From e0d783c7ee43a39dadeb96ac669c45f3a3192d96 Mon Sep 17 00:00:00 2001
+From fd29a8b6f1d2974791dd4b700bad5254f2ad28d9 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Fri, 20 Sep 2019 11:39:18 +0300
-Subject: [PATCH 09/14] drm/i915: save AUD_FREQ_CNTRL state at audio domain
+Subject: [PATCH 09/16] drm/i915: save AUD_FREQ_CNTRL state at audio domain
suspend
When audio power domain is suspended, the display driver must
diff --git a/0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch b/0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
index 4fbc417b5c6..934c7462a1f 100644
--- a/0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+++ b/0010-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -1,7 +1,7 @@
-From 3a8fe5edd1f716667d7f1ebd4f06bc808bf89a6d Mon Sep 17 00:00:00 2001
+From 763a3bbf9ded9e8e0225ba25ab48a65f8e380517 Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:30 +0300
-Subject: [PATCH 10/14] drm/i915: Fix audio power up sequence for gen10+
+Subject: [PATCH 10/16] drm/i915: Fix audio power up sequence for gen10+
display
On platfroms with gen10+ display, driver must set the enable bit of
diff --git a/0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
index 1b83a7df446..a520c55b5d0 100644
--- a/0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+++ b/0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -1,7 +1,7 @@
-From 66b90ad22d857944d9b8452f064ae48565a40063 Mon Sep 17 00:00:00 2001
+From 92d38b35c52c1ee17f215515ed181b44e5fb3d3a Mon Sep 17 00:00:00 2001
From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Date: Thu, 3 Oct 2019 11:55:31 +0300
-Subject: [PATCH 11/14] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
+Subject: [PATCH 11/16] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
platforms
The CDCLK>=2*BCLK constraint applies to all generations since gen10.
diff --git a/0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch b/0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
index 95572528eb8..4796a2d7b1f 100644
--- a/0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
+++ b/0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
@@ -1,7 +1,7 @@
-From e33c3b5720592db7cbaa544b8c05414a17d35afd Mon Sep 17 00:00:00 2001
+From 390d0a67cecd44bbc52231f0e9ea93ccdb742568 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 30 Dec 2019 11:15:30 +0000
-Subject: [PATCH 12/14] drm/i915/gt: Detect if we miss WaIdleLiteRestore
+Subject: [PATCH 12/16] drm/i915/gt: Detect if we miss WaIdleLiteRestore
In order to avoid confusing the HW, we must never submit an empty ring
during lite-restore, that is we should always advance the RING_TAIL
@@ -41,7 +41,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191209023215.3519970-1-chr
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
-index 06a506c29463..6600b2e08fe3 100644
+index d564bfcab6a3..49ce15553e7b 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -471,12 +471,6 @@ lrc_descriptor(struct intel_context *ce, struct intel_engine_cs *engine)
@@ -65,7 +65,7 @@ index 06a506c29463..6600b2e08fe3 100644
/*
* Push the request back into the queue for later resubmission.
-@@ -649,13 +642,29 @@ execlists_schedule_out(struct i915_request *rq)
+@@ -650,13 +643,29 @@ execlists_schedule_out(struct i915_request *rq)
i915_request_put(rq);
}
@@ -99,7 +99,7 @@ index 06a506c29463..6600b2e08fe3 100644
/*
* Make sure the context image is complete before we submit it to HW.
-@@ -674,7 +683,6 @@ static u64 execlists_update_context(const struct i915_request *rq)
+@@ -675,7 +684,6 @@ static u64 execlists_update_context(const struct i915_request *rq)
*/
mb();
@@ -107,7 +107,7 @@ index 06a506c29463..6600b2e08fe3 100644
ce->lrc_desc &= ~CTX_DESC_FORCE_RESTORE;
return desc;
-@@ -1149,16 +1157,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
+@@ -1150,16 +1158,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
if (!list_is_last(&last->sched.link,
&engine->active.requests))
return;
diff --git a/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch b/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
index a6ab4996148..11bfc01cf62 100644
--- a/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+++ b/0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
@@ -1,7 +1,7 @@
-From adb810e1819b859aec1f8eb4c5611bc6ebe82137 Mon Sep 17 00:00:00 2001
+From d50448859890faa92fa1ebb82ef914fb15957994 Mon Sep 17 00:00:00 2001
From: Boyan Ding <boyan.j.ding@gmail.com>
Date: Wed, 1 Jan 2020 11:44:49 -0800
-Subject: [PATCH 13/14] pinctrl: sunrisepoint: Add missing Interrupt Status
+Subject: [PATCH 13/16] pinctrl: sunrisepoint: Add missing Interrupt Status
register offset
Commit 179e5a6114cc ("pinctrl: intel: Remove default Interrupt Status
diff --git a/0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch b/0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
new file mode 100644
index 00000000000..17ec8a044ef
--- /dev/null
+++ b/0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
@@ -0,0 +1,48 @@
+From 78fe4d666ff244609c7d02bea07a22ce87e56326 Mon Sep 17 00:00:00 2001
+From: Mehmet Akif Tasova <makiftasova@gmail.com>
+Date: Mon, 30 Dec 2019 15:48:16 +0200
+Subject: [PATCH 14/16] Revert "iwlwifi: mvm: fix scan config command size"
+
+Since v5.4-rc1 was released, iwlwifi started throwing errors when scan
+commands were sent to the firmware with certain devices (depending on
+the OTP burned in the device, which contains the list of available
+channels). For instance:
+
+iwlwifi 0000:00:14.3: FW error in SYNC CMD SCAN_CFG_CMD
+
+This bug was reported in the ArchLinux bug tracker:
+https://bugs.archlinux.org/task/64703
+
+And also in a specific case in bugzilla, when the lar_disabled option
+was set: https://bugzilla.kernel.org/show_bug.cgi?id=205193
+
+Revert the commit that introduced this error, by using the number of
+channels from the OTP instead of the number of channels that is
+specified in the FW TLV that tells us how many channels it supports.
+
+This reverts commit 06eb547c4ae4382e70d556ba213d13c95ca1801b.
+
+Cc: stable@vger.kernel.org # v5.4+
+Signed-off-by: Mehmet Akif Tasova <makiftasova@gmail.com>
+[ Luca: reworded the commit message a bit. ]
+Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+index fcafa22ec6ce..8aa567d7912c 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+@@ -1220,7 +1220,7 @@ static int iwl_mvm_legacy_config_scan(struct iwl_mvm *mvm)
+ cmd_size = sizeof(struct iwl_scan_config_v2);
+ else
+ cmd_size = sizeof(struct iwl_scan_config_v1);
+- cmd_size += num_channels;
++ cmd_size += mvm->fw->ucode_capa.n_scan_channels;
+
+ cfg = kzalloc(cmd_size, GFP_KERNEL);
+ if (!cfg)
+--
+2.24.1
+
diff --git a/0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch b/0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
new file mode 100644
index 00000000000..5e814ce7ec1
--- /dev/null
+++ b/0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
@@ -0,0 +1,174 @@
+From 195bb1762da1aa1c1beffe402353afd619ea7338 Mon Sep 17 00:00:00 2001
+From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Date: Sat, 4 Jan 2020 23:29:22 -0800
+Subject: [PATCH 15/16] e1000e: Revert "e1000e: Make watchdog use delayed work"
+
+This reverts commit 59653e6497d16f7ac1d9db088f3959f57ee8c3db.
+
+This is due to this commit causing driver crashes and connections to
+reset unexpectedly.
+
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+---
+ drivers/net/ethernet/intel/e1000e/e1000.h | 5 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 54 ++++++++++------------
+ 2 files changed, 27 insertions(+), 32 deletions(-)
+
+diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
+index 6c51b1bad8c4..37a2314d3e6b 100644
+--- a/drivers/net/ethernet/intel/e1000e/e1000.h
++++ b/drivers/net/ethernet/intel/e1000e/e1000.h
+@@ -185,13 +185,12 @@ struct e1000_phy_regs {
+
+ /* board specific private data structure */
+ struct e1000_adapter {
++ struct timer_list watchdog_timer;
+ struct timer_list phy_info_timer;
+ struct timer_list blink_timer;
+
+ struct work_struct reset_task;
+- struct delayed_work watchdog_task;
+-
+- struct workqueue_struct *e1000_workqueue;
++ struct work_struct watchdog_task;
+
+ const struct e1000_info *ei;
+
+diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
+index d7d56e42a6aa..060daf66bf63 100644
+--- a/drivers/net/ethernet/intel/e1000e/netdev.c
++++ b/drivers/net/ethernet/intel/e1000e/netdev.c
+@@ -1780,8 +1780,7 @@ static irqreturn_t e1000_intr_msi(int __always_unused irq, void *data)
+ }
+ /* guard against interrupt when we're going down */
+ if (!test_bit(__E1000_DOWN, &adapter->state))
+- mod_delayed_work(adapter->e1000_workqueue,
+- &adapter->watchdog_task, HZ);
++ mod_timer(&adapter->watchdog_timer, jiffies + 1);
+ }
+
+ /* Reset on uncorrectable ECC error */
+@@ -1861,8 +1860,7 @@ static irqreturn_t e1000_intr(int __always_unused irq, void *data)
+ }
+ /* guard against interrupt when we're going down */
+ if (!test_bit(__E1000_DOWN, &adapter->state))
+- mod_delayed_work(adapter->e1000_workqueue,
+- &adapter->watchdog_task, HZ);
++ mod_timer(&adapter->watchdog_timer, jiffies + 1);
+ }
+
+ /* Reset on uncorrectable ECC error */
+@@ -1907,8 +1905,7 @@ static irqreturn_t e1000_msix_other(int __always_unused irq, void *data)
+ hw->mac.get_link_status = true;
+ /* guard against interrupt when we're going down */
+ if (!test_bit(__E1000_DOWN, &adapter->state))
+- mod_delayed_work(adapter->e1000_workqueue,
+- &adapter->watchdog_task, HZ);
++ mod_timer(&adapter->watchdog_timer, jiffies + 1);
+ }
+
+ if (!test_bit(__E1000_DOWN, &adapter->state))
+@@ -4281,6 +4278,7 @@ void e1000e_down(struct e1000_adapter *adapter, bool reset)
+
+ napi_synchronize(&adapter->napi);
+
++ del_timer_sync(&adapter->watchdog_timer);
+ del_timer_sync(&adapter->phy_info_timer);
+
+ spin_lock(&adapter->stats64_lock);
+@@ -5152,11 +5150,25 @@ static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
+ }
+ }
+
++/**
++ * e1000_watchdog - Timer Call-back
++ * @data: pointer to adapter cast into an unsigned long
++ **/
++static void e1000_watchdog(struct timer_list *t)
++{
++ struct e1000_adapter *adapter = from_timer(adapter, t, watchdog_timer);
++
++ /* Do the rest outside of interrupt context */
++ schedule_work(&adapter->watchdog_task);
++
++ /* TODO: make this use queue_delayed_work() */
++}
++
+ static void e1000_watchdog_task(struct work_struct *work)
+ {
+ struct e1000_adapter *adapter = container_of(work,
+ struct e1000_adapter,
+- watchdog_task.work);
++ watchdog_task);
+ struct net_device *netdev = adapter->netdev;
+ struct e1000_mac_info *mac = &adapter->hw.mac;
+ struct e1000_phy_info *phy = &adapter->hw.phy;
+@@ -5404,9 +5416,8 @@ static void e1000_watchdog_task(struct work_struct *work)
+
+ /* Reset the timer */
+ if (!test_bit(__E1000_DOWN, &adapter->state))
+- queue_delayed_work(adapter->e1000_workqueue,
+- &adapter->watchdog_task,
+- round_jiffies(2 * HZ));
++ mod_timer(&adapter->watchdog_timer,
++ round_jiffies(jiffies + 2 * HZ));
+ }
+
+ #define E1000_TX_FLAGS_CSUM 0x00000001
+@@ -7259,21 +7270,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ goto err_eeprom;
+ }
+
+- adapter->e1000_workqueue = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0,
+- e1000e_driver_name);
+-
+- if (!adapter->e1000_workqueue) {
+- err = -ENOMEM;
+- goto err_workqueue;
+- }
+-
+- INIT_DELAYED_WORK(&adapter->watchdog_task, e1000_watchdog_task);
+- queue_delayed_work(adapter->e1000_workqueue, &adapter->watchdog_task,
+- 0);
+-
++ timer_setup(&adapter->watchdog_timer, e1000_watchdog, 0);
+ timer_setup(&adapter->phy_info_timer, e1000_update_phy_info, 0);
+
+ INIT_WORK(&adapter->reset_task, e1000_reset_task);
++ INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
+ INIT_WORK(&adapter->downshift_task, e1000e_downshift_workaround);
+ INIT_WORK(&adapter->update_phy_task, e1000e_update_phy_task);
+ INIT_WORK(&adapter->print_hang_task, e1000_print_hw_hang);
+@@ -7367,9 +7368,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ return 0;
+
+ err_register:
+- flush_workqueue(adapter->e1000_workqueue);
+- destroy_workqueue(adapter->e1000_workqueue);
+-err_workqueue:
+ if (!(adapter->flags & FLAG_HAS_AMT))
+ e1000e_release_hw_control(adapter);
+ err_eeprom:
+@@ -7416,17 +7414,15 @@ static void e1000_remove(struct pci_dev *pdev)
+ */
+ if (!down)
+ set_bit(__E1000_DOWN, &adapter->state);
++ del_timer_sync(&adapter->watchdog_timer);
+ del_timer_sync(&adapter->phy_info_timer);
+
+ cancel_work_sync(&adapter->reset_task);
++ cancel_work_sync(&adapter->watchdog_task);
+ cancel_work_sync(&adapter->downshift_task);
+ cancel_work_sync(&adapter->update_phy_task);
+ cancel_work_sync(&adapter->print_hang_task);
+
+- cancel_delayed_work(&adapter->watchdog_task);
+- flush_workqueue(adapter->e1000_workqueue);
+- destroy_workqueue(adapter->e1000_workqueue);
+-
+ if (adapter->flags & FLAG_HAS_HW_TIMESTAMP) {
+ cancel_work_sync(&adapter->tx_hwtstamp_work);
+ if (adapter->tx_hwtstamp_skb) {
+--
+2.24.1
+
diff --git a/PKGBUILD b/PKGBUILD
index be75c71b758..46330a0d75b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.4
_major=5.4
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc.
-_minor=8
+_minor=10
### on initial release comment this out and set to =1
_minorc=$((_minor+1))
#_minorc=1
@@ -30,7 +30,7 @@ source=(
# "$_rcpatch.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/patch/?id=$_srcname.y&id2=v${_major}.${_minor}"
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
config # the main kernel config file
- 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
0002-lib-devres-add-a-helper-function-for-ioremap_uc.patch
0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
@@ -43,29 +43,33 @@ source=(
0011-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
0012-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
0013-pinctrl-sunrisepoint-Add-missing-Interrupt-Status-re.patch
+0014-Revert-iwlwifi-mvm-fix-scan-config-command-size.patch
+0015-e1000e-Revert-e1000e-Make-watchdog-use-delayed-work.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('fc0d4939d701fbc0b1a1ce74dc62bf1d28ab38d8f89f88bb96cecf42a6f059fe'
+sha256sums=('4b9b0c7bdbf8712d8f3b32799ab8991e69b58b2e293a7e44531bdeb16a0834b7'
'SKIP'
- '42c414c902193f9e8a1b70c728ca440de02d85dc29102f52ef98cfbf20d29a52'
+ 'f23c0218a5e3b363bb5a880972f507bb4dc4a290a787a7da08be07ea12042edd'
'SKIP'
'eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31'
- 'bd426e5a539152577608ac57b3e9a8f6281f848847c66d244274b48d95df39aa'
- 'e34286f1f2ee29a45b1a38385489581323eb6672064f4afa13eb8b39dbc79556'
- 'afaf90393cfd4b5d65dfec040cd0b74b5e7cda52540d3883e69ce8ca0b42da12'
- '0c1c5de463df11efdd4ed8ca0732187deb3e06d4e15524f0dbb066c578657665'
- '26500e808df98e20e62079d18137b5f0636f8c2a32dc8164f6b6381c22c3f217'
- '5f8a47d95bd54e8c315c70491b25e70b2af4dce11c0acf06ba0f7c45985b59d8'
- '53e1b22f9c97b3e3cdfaa03a4b3f3882ad427c4d400315a51303223209a05788'
- '2885647d502d9eedd4f3d94cc27d6c8ecb3bb03e4e51611be8d74034eeccf0bb'
- '40210b6cbd64cf70b3af76ab84c9e7f55e64aeed5c1072d4fed4345604735a67'
- '7f5f1806a6bf1b256416da8c4d0fcb45249769425a93beb6940cabc2112d95e2'
- '6a6b71cc316aff58124f169d22f7712f15f503ff3187d30e3288aa2b0c20402c'
- '2b8110e2f53588fde1097dde9545f5369983e654004597a41f58f8e13b0be3c0'
- '236e5502b9955747306eeb1078b22cc778feb8a0e1bde8895bafcf5c0438e250')
+ 'a3e9541bf0306d32af8acf121643d9953776d448f68ec09741c591d1e5bc6748'
+ '8e9967f83cf22be43b516b394523b0976c6831e28cee5136542df3c946328917'
+ '226251c17ced22414e4275ca69be6aec318904778f0c8c244050916e51064b14'
+ '9809d55995895e7061bfca0db9f38a608548f21bb5d4a2260e7bbb6b5af2db4a'
+ '82bc11366ca296e86dd745c911a841d7ac12d16a1a2185da245a96e5440b8fd7'
+ '1ef45f1e7456437e4ec7c2ada46c607f492a87db8d1cf3f3b59870bc2deaa1e6'
+ 'fcd117bc51f21baac26f7570f48b91ce994fd351fcb19cb6097166a4a7c181e6'
+ '49bc5c988a6cc127f39ae998954482450d19b69da2ce9dfcce678d3fe7504136'
+ 'f583d172c69c288f5d2e587c5926b0e732284c19e73671eef112ab1a0e26362a'
+ '84baa16aa022e0dac2515edced6f214a08d385a385ffb04e358fbe9671235d41'
+ 'a55cfce037523fdb6244fd6286a1d9be12c2eab3327a1c6e05ac42899f5868d1'
+ '9c600a292efb59087d913fd8e7a5fff9c7abcfad864d294a266600f4491476c5'
+ '126f8b83065e3f7a72589f33874481aa06bb1686ddc6997a8a05a27c7d6721ac'
+ '9c95928be62369403bb6822a838dc9791a5a98ac489af81b5ab8f2fd09b0c696'
+ '4a2bd4b02e8c4f81334d22a8bd27a03f8a3a1e8137699b809de15cd7edf0e4dd')
_kernelname=${pkgbase#linux}