summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-01-03 11:08:24 -0500
committergraysky2020-01-03 11:08:24 -0500
commit7478a62c68c07c04b80d59171fa421701c01db87 (patch)
tree33ecd6eb3befe8f1c82e454954773aaca3815548
parent6350ed57c7daa464a71a9f8a0d4199ac0e5d8b52 (diff)
downloadaur-7478a62c68c07c04b80d59171fa421701c01db87.tar.gz
Update to 5.4.8rc1-1
-rw-r--r--.SRCINFO68
-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-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch (renamed from 0010-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch)4
-rw-r--r--0007-x86-MCE-AMD-Do-not-use-rdmsr_safe_on_cpu-in-smca_con.patch73
-rw-r--r--0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch (renamed from 0019-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch)4
-rw-r--r--0008-x86-MCE-AMD-Allow-Reserved-types-to-be-overwritten-i.patch96
-rw-r--r--0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch (renamed from 0013-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch)4
-rw-r--r--0009-x86-mce-Fix-possibly-incorrect-severity-calculation-.patch47
-rw-r--r--0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch (renamed from 0014-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch)4
-rw-r--r--0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch (renamed from 0015-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch)4
-rw-r--r--0011-iwlwifi-pcie-move-power-gating-workaround-earlier-in.patch120
-rw-r--r--0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch (renamed from 0016-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch)4
-rw-r--r--0012-x86-intel-Disable-HPET-on-Intel-Coffee-Lake-H-platfo.patch41
-rw-r--r--0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch129
-rw-r--r--0017-ASoC-SOF-enable-sync_write-in-hdac_bus.patch39
-rw-r--r--0018-xhci-pci-Allow-host-runtime-PM-as-default-also-for-I.patch48
-rw-r--r--PKGBUILD60
-rw-r--r--config6
23 files changed, 208 insertions, 567 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ce49e11f49e..0bb8fc4936e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.4.7rc1
+ pkgver = 5.4.8rc1
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.7-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.7-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.6.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.6.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.8-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.4.8-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.7.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.7.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
@@ -20,45 +20,33 @@ pkgbase = linux-rc
source = 0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
source = 0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
source = 0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
- source = 0007-x86-MCE-AMD-Do-not-use-rdmsr_safe_on_cpu-in-smca_con.patch
- source = 0008-x86-MCE-AMD-Allow-Reserved-types-to-be-overwritten-i.patch
- source = 0009-x86-mce-Fix-possibly-incorrect-severity-calculation-.patch
- source = 0010-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
- source = 0011-iwlwifi-pcie-move-power-gating-workaround-earlier-in.patch
- source = 0012-x86-intel-Disable-HPET-on-Intel-Coffee-Lake-H-platfo.patch
- source = 0013-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
- source = 0014-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
- source = 0015-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
- source = 0016-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
- source = 0017-ASoC-SOF-enable-sync_write-in-hdac_bus.patch
- source = 0018-xhci-pci-Allow-host-runtime-PM-as-default-also-for-I.patch
- source = 0019-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ source = 0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
+ source = 0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ source = 0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+ source = 0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+ source = 0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+ source = 0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+ source = 0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 6478624107f98d5f097e22107cb718c943adfbf8b9e8a676d3f597b4afefabb7
+ sha256sums = 31f6a581a52667a932f3c271ac4f8cd03d616a87dd84238da69bc77837bb28a8
sha256sums = SKIP
- sha256sums = fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8
+ sha256sums = abc9b21d9146d95853dac35f4c4489a0199aff53ee6eee4b0563d1b37079fcc9
sha256sums = SKIP
- sha256sums = b7f23bbc09b6c571b76f851f0389386a6f3a64f3d7b1b8509c8550228b0f4537
- sha256sums = c404647c64cb7b2ab6aae5333cffe072725fe1a3e3f863646656591af7b55078
- sha256sums = fe6d125c1101b8ec6e01783598b7a9a34130447b28239d47ee6cafd76f9806ae
- sha256sums = e021b7d4cfb26e851b5b55250fd4e635b66237a8863c962ede4f51022f9927cc
- sha256sums = 5ccbf49c1f588f344b120750d63bf42be5b8cda4946ebe256d5d69df3fce96ac
- sha256sums = 514088ce473a7160e1a906aaf44adac4389de48ba8bfaffb28ef2efaff5b2a41
- sha256sums = 5fcddf32bc5017afcf20c52430febf08c4f4de2a13aa838298eb8ff982fbda77
- sha256sums = 2ffc236ad41c40ec5d622ff2c8d6ae3a22e545dbeb3a0cc0f63a70d2438bb507
- sha256sums = 90bb284a19e9dd8aab105a80632170e58d818200965f51cb98ee4849d9cd2594
- sha256sums = d573611616cb24b6c240c57321b3de6c2e51c49a3f8df52ef63009aeea5eb60e
- sha256sums = 04c6d2408452b907b12a6ee149cc023998545199cd3e9793b555682ad99aae35
- sha256sums = c974abd5df781b303a6cfaa1685a5b1556b4104441804d14963e8a2893fcc548
- sha256sums = 6556d1dfa848566774fb1014c451809fb6dfab39336b27197d1b3a23d427d1ca
- sha256sums = 6b7f016aa55b9ba7ce7425b9a2f0c8b3bd8d4a4bbf703db9701c0974dc24162c
- sha256sums = 02f8992b6b6c467f561dd9aa309fc00695276d11227a2fc6816860c896bd206d
- sha256sums = 227668904e0d363c43e756dd08aec15accc5ebbc045b9d7b2068f27801009b63
- sha256sums = 97ab714be54e5516dcd4df051c8f7b551b87a0ca85c0e6b1f50f4eb1226d95d1
- sha256sums = 09749254d63826dd3ddf6451882adc91deb1a79561593a7c399a41b623310c19
- sha256sums = c81691927b5c7e36f492d5d922051fb2b26dd1b24033c3a483f40045621e3960
- sha256sums = 2bde1e65dec65394c26cfe5f0ba0256d807047f7720cd3ce9367667d885fc7bd
+ sha256sums = eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31
+ sha256sums = b9072c0d202c2e59d78f7453c4ed73618d9000f14aa8da7b270253c0c8ba2882
+ sha256sums = 0cb3b5ed908456c0c577ca9ae5b2fa64c5e215e1cbe7a072054fe486c9d1c7f9
+ sha256sums = 24e03b0cc17cb158eb715b4e1f6901e988a870ad7690ce3e0e21ee55d9125fd1
+ sha256sums = e2951b7ae55e3f3ecb2511716d75f7b0e05c3c21612c0d5a03c4e24fea473255
+ sha256sums = ae093645bc5165583f3dce37de171a291fbe8435f0b8a6652f3e0a40f7ba903a
+ sha256sums = 256955383fb94e5c044ffad6e449899be72a6f819053a3c2eb8c8094cff966ef
+ sha256sums = d88b4acf8a5bf3b8c404df06eac767b503925eade11515d1844c75a344abdc72
+ sha256sums = 43746bd6e905504734c95a6a6bd95993081341b80bf0ceed07f6e0f90aa61dbd
+ sha256sums = 1604f19befeb24731c8a028111fa2a68fb7990691b83559c2efb321f3a56fa40
+ sha256sums = 22ab8d1f3d5d8b8e02a54836c56bc38fb84ca4710283b179a2c0495742a3d1c2
+ sha256sums = 11dd9cbbc296aa699d7d1c39ee4b60881440df534191d5860add3ed1e07db481
+ sha256sums = 8c8fdb623e2c5779226efe36c81c134d024ac12733cdd800a348983d03b5c0e5
+ sha256sums = b18c8996fdd72abc1ebca41e455ba2e12c01c92514d3c3f98c310e4acddbd119
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 79fe302a047..9f4f46191ef 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 ad4dbce36dd2083de69815f613342257535f6274 Mon Sep 17 00:00:00 2001
+From 85ada8712a2fb1111be063cea0f7d0152ea6d912 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/20] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 01/14] 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 71b5414bd3b..f9610edd078 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 5925138606a245d43d8a6db47b754cea6f6049ae Mon Sep 17 00:00:00 2001
+From 7c8e145e8d365b0d2824a1d0d5174afa54088aca 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/20] lib: devres: add a helper function for ioremap_uc
+Subject: [PATCH 02/14] 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 e83308b7c2f..5aaa5278089 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 3cec19068653e77d311382d7467728f5d424d4a3 Mon Sep 17 00:00:00 2001
+From 940e7e842005b5edc56b99ad5034cf15aed145b8 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/20] mfd: intel-lpss: Use devm_ioremap_uc for MMIO
+Subject: [PATCH 03/14] 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 d26660b4b8f..034e9d82aab 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 271c8fe698d3ba5b3b135ffacfd1dc0c87243e32 Mon Sep 17 00:00:00 2001
+From 707e3df20d2792a0a020168d54ba9fed22633df3 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/20] PCI: pciehp: Do not disable interrupt twice on suspend
+Subject: [PATCH 04/14] 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 73637c093ba..5bcceb008e0 100644
--- a/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
+++ b/0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
@@ -1,7 +1,7 @@
-From 8d032e7fc1d1d37974785ccdb994524d60201ca3 Mon Sep 17 00:00:00 2001
+From 27e6694a92270bac0bdca37e71446f3e0ddf317b 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/20] PCI: pciehp: Prevent deadlock on disconnect
+Subject: [PATCH 05/14] 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 e2b20e3f926..7a5d3cd26b1 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 9888be9033e8e79a055df2ae8d388baf5970f83b Mon Sep 17 00:00:00 2001
+From 42d275c017d9d80a54435a25af3d382c93a1e101 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/20] ACPI: PM: s2idle: Rework ACPI events synchronization
+Subject: [PATCH 06/14] 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/0010-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch b/0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
index e644463b01e..b89d77737ea 100644
--- a/0010-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
+++ b/0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
@@ -1,7 +1,7 @@
-From 5cedf4aa8f59ed7c8fa1cf129731fbe86205cbea Mon Sep 17 00:00:00 2001
+From 775933c04b65436da05ddc6c597fe1bce291e2ac Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 2 Dec 2019 17:09:20 -0500
-Subject: [PATCH 10/20] Revert "iwlwifi: assign directly to iwl_trans->cfg in
+Subject: [PATCH 07/14] Revert "iwlwifi: assign directly to iwl_trans->cfg in
QuZ detection"
This reverts commit 968dcfb4905245dc64d65312c0d17692fa087b99.
diff --git a/0007-x86-MCE-AMD-Do-not-use-rdmsr_safe_on_cpu-in-smca_con.patch b/0007-x86-MCE-AMD-Do-not-use-rdmsr_safe_on_cpu-in-smca_con.patch
deleted file mode 100644
index 36644e88054..00000000000
--- a/0007-x86-MCE-AMD-Do-not-use-rdmsr_safe_on_cpu-in-smca_con.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 1a95a3417bdadb0528e16745802688c393aa0afd Mon Sep 17 00:00:00 2001
-From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Date: Thu, 31 Oct 2019 16:04:48 +0300
-Subject: [PATCH 07/20] x86/MCE/AMD: Do not use rdmsr_safe_on_cpu() in
- smca_configure()
-
-... because interrupts are disabled that early and sending IPIs can
-deadlock:
-
- BUG: sleeping function called from invalid context at kernel/sched/completion.c:99
- in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 0, name: swapper/1
- no locks held by swapper/1/0.
- irq event stamp: 0
- hardirqs last enabled at (0): [<0000000000000000>] 0x0
- hardirqs last disabled at (0): [<ffffffff8106dda9>] copy_process+0x8b9/0x1ca0
- softirqs last enabled at (0): [<ffffffff8106dda9>] copy_process+0x8b9/0x1ca0
- softirqs last disabled at (0): [<0000000000000000>] 0x0
- Preemption disabled at:
- [<ffffffff8104703b>] start_secondary+0x3b/0x190
- CPU: 1 PID: 0 Comm: swapper/1 Not tainted 5.5.0-rc2+ #1
- Hardware name: GIGABYTE MZ01-CE1-00/MZ01-CE1-00, BIOS F02 08/29/2018
- Call Trace:
- dump_stack
- ___might_sleep.cold.92
- wait_for_completion
- ? generic_exec_single
- rdmsr_safe_on_cpu
- ? wrmsr_on_cpus
- mce_amd_feature_init
- mcheck_cpu_init
- identify_cpu
- identify_secondary_cpu
- smp_store_cpu_info
- start_secondary
- secondary_startup_64
-
-The function smca_configure() is called only on the current CPU anyway,
-therefore replace rdmsr_safe_on_cpu() with atomic rdmsr_safe() and avoid
-the IPI.
-
- [ bp: Update commit message. ]
-
-Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Reviewed-by: Yazen Ghannam <yazen.ghannam@amd.com>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: linux-edac <linux-edac@vger.kernel.org>
-Cc: <stable@vger.kernel.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Tony Luck <tony.luck@intel.com>
-Cc: x86-ml <x86@kernel.org>
-Link: https://lkml.kernel.org/r/157252708836.3876.4604398213417262402.stgit@buzz
----
- arch/x86/kernel/cpu/mce/amd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
-index 6ea7fdc82f3c..c7ab0d38af79 100644
---- a/arch/x86/kernel/cpu/mce/amd.c
-+++ b/arch/x86/kernel/cpu/mce/amd.c
-@@ -269,7 +269,7 @@ static void smca_configure(unsigned int bank, unsigned int cpu)
- if (smca_banks[bank].hwid)
- return;
-
-- if (rdmsr_safe_on_cpu(cpu, MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) {
-+ if (rdmsr_safe(MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) {
- pr_warn("Failed to read MCA_IPID for bank %d\n", bank);
- return;
- }
---
-2.24.1
-
diff --git a/0019-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch b/0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
index 9d15e69e305..943c473fe0e 100644
--- a/0019-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+++ b/0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
@@ -1,7 +1,7 @@
-From fd1d146698d09aaac6709ae4fde90d80dbd153cd Mon Sep 17 00:00:00 2001
+From 66174559a7eecb2f1bcc9be74555e19513b1343f 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 19/20] iwlwifi: pcie: restore support for Killer Qu C0 NICs
+Subject: [PATCH 08/14] 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-MCE-AMD-Allow-Reserved-types-to-be-overwritten-i.patch b/0008-x86-MCE-AMD-Allow-Reserved-types-to-be-overwritten-i.patch
deleted file mode 100644
index 67d5d92c709..00000000000
--- a/0008-x86-MCE-AMD-Allow-Reserved-types-to-be-overwritten-i.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 14e0c3a2f956421e0731a1b5e474b3428c8bda24 Mon Sep 17 00:00:00 2001
-From: Yazen Ghannam <yazen.ghannam@amd.com>
-Date: Thu, 21 Nov 2019 08:15:08 -0600
-Subject: [PATCH 08/20] x86/MCE/AMD: Allow Reserved types to be overwritten in
- smca_banks[]
-
-Each logical CPU in Scalable MCA systems controls a unique set of MCA
-banks in the system. These banks are not shared between CPUs. The bank
-types and ordering will be the same across CPUs on currently available
-systems.
-
-However, some CPUs may see a bank as Reserved/Read-as-Zero (RAZ) while
-other CPUs do not. In this case, the bank seen as Reserved on one CPU is
-assumed to be the same type as the bank seen as a known type on another
-CPU.
-
-In general, this occurs when the hardware represented by the MCA bank
-is disabled, e.g. disabled memory controllers on certain models, etc.
-The MCA bank is disabled in the hardware, so there is no possibility of
-getting an MCA/MCE from it even if it is assumed to have a known type.
-
-For example:
-
-Full system:
- Bank | Type seen on CPU0 | Type seen on CPU1
- ------------------------------------------------
- 0 | LS | LS
- 1 | UMC | UMC
- 2 | CS | CS
-
-System with hardware disabled:
- Bank | Type seen on CPU0 | Type seen on CPU1
- ------------------------------------------------
- 0 | LS | LS
- 1 | UMC | RAZ
- 2 | CS | CS
-
-For this reason, there is a single, global struct smca_banks[] that is
-initialized at boot time. This array is initialized on each CPU as it
-comes online. However, the array will not be updated if an entry already
-exists.
-
-This works as expected when the first CPU (usually CPU0) has all
-possible MCA banks enabled. But if the first CPU has a subset, then it
-will save a "Reserved" type in smca_banks[]. Successive CPUs will then
-not be able to update smca_banks[] even if they encounter a known bank
-type.
-
-This may result in unexpected behavior. Depending on the system
-configuration, a user may observe issues enumerating the MCA
-thresholding sysfs interface. The issues may be as trivial as sysfs
-entries not being available, or as severe as system hangs.
-
-For example:
-
- Bank | Type seen on CPU0 | Type seen on CPU1
- ------------------------------------------------
- 0 | LS | LS
- 1 | RAZ | UMC
- 2 | CS | CS
-
-Extend the smca_banks[] entry check to return if the entry is a
-non-reserved type. Otherwise, continue so that CPUs that encounter a
-known bank type can update smca_banks[].
-
-Fixes: 68627a697c19 ("x86/mce/AMD, EDAC/mce_amd: Enumerate Reserved SMCA bank type")
-Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: Ingo Molnar <mingo@kernel.org>
-Cc: linux-edac <linux-edac@vger.kernel.org>
-Cc: <stable@vger.kernel.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Tony Luck <tony.luck@intel.com>
-Cc: x86-ml <x86@kernel.org>
-Link: https://lkml.kernel.org/r/20191121141508.141273-1-Yazen.Ghannam@amd.com
----
- arch/x86/kernel/cpu/mce/amd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/kernel/cpu/mce/amd.c b/arch/x86/kernel/cpu/mce/amd.c
-index c7ab0d38af79..259f3f4e2e5f 100644
---- a/arch/x86/kernel/cpu/mce/amd.c
-+++ b/arch/x86/kernel/cpu/mce/amd.c
-@@ -266,7 +266,7 @@ static void smca_configure(unsigned int bank, unsigned int cpu)
- smca_set_misc_banks_map(bank, cpu);
-
- /* Return early if this bank was already initialized. */
-- if (smca_banks[bank].hwid)
-+ if (smca_banks[bank].hwid && smca_banks[bank].hwid->hwid_mcatype != 0)
- return;
-
- if (rdmsr_safe(MSR_AMD64_SMCA_MCx_IPID(bank), &low, &high)) {
---
-2.24.1
-
diff --git a/0013-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch b/0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
index 83fd9a45cbf..1f8fb91b9b9 100644
--- a/0013-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+++ b/0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
@@ -1,7 +1,7 @@
-From de022ec5134c060ee735424ed3d0f9a663b73c53 Mon Sep 17 00:00:00 2001
+From ff857f80548ecae9ab2d80304ccf909b8fd427fc 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 13/20] x86/intel: Disable HPET on Intel Ice Lake platforms
+Subject: [PATCH 09/14] 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-x86-mce-Fix-possibly-incorrect-severity-calculation-.patch b/0009-x86-mce-Fix-possibly-incorrect-severity-calculation-.patch
deleted file mode 100644
index fb753c4443e..00000000000
--- a/0009-x86-mce-Fix-possibly-incorrect-severity-calculation-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 583bb4015fc2279dc8e482dacb9ba30bcb738be1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20H=2E=20Sch=C3=B6nherr?= <jschoenh@amazon.de>
-Date: Tue, 10 Dec 2019 01:07:30 +0100
-Subject: [PATCH 09/20] x86/mce: Fix possibly incorrect severity calculation on
- AMD
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The function mce_severity_amd_smca() requires m->bank to be initialized
-for correct operation. Fix the one case, where mce_severity() is called
-without doing so.
-
-Fixes: 6bda529ec42e ("x86/mce: Grade uncorrected errors for SMCA-enabled systems")
-Fixes: d28af26faa0b ("x86/MCE: Initialize mce.bank in the case of a fatal error in mce_no_way_out()")
-Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de>
-Signed-off-by: Borislav Petkov <bp@suse.de>
-Reviewed-by: Tony Luck <tony.luck@intel.com>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: Ingo Molnar <mingo@kernel.org>
-Cc: linux-edac <linux-edac@vger.kernel.org>
-Cc: <stable@vger.kernel.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: x86-ml <x86@kernel.org>
-Cc: Yazen Ghannam <Yazen.Ghannam@amd.com>
-Link: https://lkml.kernel.org/r/20191210000733.17979-4-jschoenh@amazon.de
----
- arch/x86/kernel/cpu/mce/core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
-index 743370ee4983..aecb15ba66cd 100644
---- a/arch/x86/kernel/cpu/mce/core.c
-+++ b/arch/x86/kernel/cpu/mce/core.c
-@@ -814,8 +814,8 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp,
- if (quirk_no_way_out)
- quirk_no_way_out(i, m, regs);
-
-+ m->bank = i;
- if (mce_severity(m, mca_cfg.tolerant, &tmp, true) >= MCE_PANIC_SEVERITY) {
-- m->bank = i;
- mce_read_aux(m, i);
- *msg = tmp;
- return 1;
---
-2.24.1
-
diff --git a/0014-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch b/0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
index a4956cd71d3..85082265e76 100644
--- a/0014-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+++ b/0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
@@ -1,7 +1,7 @@
-From c0da4d4ee458208d5427d0a284173bd39a95d040 Mon Sep 17 00:00:00 2001
+From 92b61cdfe2ecd4ae5923ae254efcd726ad0585e4 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 14/20] drm/i915: save AUD_FREQ_CNTRL state at audio domain
+Subject: [PATCH 10/14] drm/i915: save AUD_FREQ_CNTRL state at audio domain
suspend
When audio power domain is suspended, the display driver must
diff --git a/0015-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch b/0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
index f4cacb1da68..8fb4ff48207 100644
--- a/0015-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+++ b/0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -1,7 +1,7 @@
-From 6e149a5538676e885561f1dfc18bbb4dd104c1f6 Mon Sep 17 00:00:00 2001
+From 9f4f84aba5a78a06cf29651f7b3b74d9780d72db 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 15/20] drm/i915: Fix audio power up sequence for gen10+
+Subject: [PATCH 11/14] 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-iwlwifi-pcie-move-power-gating-workaround-earlier-in.patch b/0011-iwlwifi-pcie-move-power-gating-workaround-earlier-in.patch
deleted file mode 100644
index 04a7ea6e2dd..00000000000
--- a/0011-iwlwifi-pcie-move-power-gating-workaround-earlier-in.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 9894b27702c2e6090213f84db3e3d47f191253cd Mon Sep 17 00:00:00 2001
-From: Luca Coelho <luciano.coelho@intel.com>
-Date: Thu, 5 Dec 2019 09:03:54 +0200
-Subject: [PATCH 11/20] iwlwifi: pcie: move power gating workaround earlier in
- the flow
-
-We need to reset the NIC after setting the bits to enable power
-gating and that cannot be done too late in the flow otherwise it
-cleans other registers and things that were already configured,
-causing initialization to fail.
-
-In order to fix this, move the function to the common code in trans.c
-so it can be called directly from there at an earlier point, just
-after the reset we already do during initialization.
-
-Fixes: 9a47cb988338 ("iwlwifi: pcie: add workaround for power gating in integrated 22000")
-Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=205719
-Cc: stable@ver.kernel.org # 5.4+
-Reported-by: Anders Kaseorg <andersk@mit.edu>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
----
- .../wireless/intel/iwlwifi/pcie/trans-gen2.c | 25 ----------------
- .../net/wireless/intel/iwlwifi/pcie/trans.c | 30 +++++++++++++++++++
- 2 files changed, 30 insertions(+), 25 deletions(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
-index ca3bb4d65b00..df8455f14e4d 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
-@@ -57,24 +57,6 @@
- #include "internal.h"
- #include "fw/dbg.h"
-
--static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)
--{
-- iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,
-- HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);
-- udelay(20);
-- iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,
-- HPM_HIPM_GEN_CFG_CR_PG_EN |
-- HPM_HIPM_GEN_CFG_CR_SLP_EN);
-- udelay(20);
-- iwl_clear_bits_prph(trans, HPM_HIPM_GEN_CFG,
-- HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);
--
-- iwl_trans_sw_reset(trans);
-- iwl_clear_bit(trans, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
--
-- return 0;
--}
--
- /*
- * Start up NIC's basic functionality after it has been reset
- * (e.g. after platform boot, or shutdown via iwl_pcie_apm_stop())
-@@ -110,13 +92,6 @@ int iwl_pcie_gen2_apm_init(struct iwl_trans *trans)
-
- iwl_pcie_apm_config(trans);
-
-- if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_22000 &&
-- trans->cfg->integrated) {
-- ret = iwl_pcie_gen2_force_power_gating(trans);
-- if (ret)
-- return ret;
-- }
--
- ret = iwl_finish_nic_init(trans, trans->trans_cfg);
- if (ret)
- return ret;
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-index 6961f00ff812..d3db38c3095b 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -1783,6 +1783,29 @@ static int iwl_trans_pcie_clear_persistence_bit(struct iwl_trans *trans)
- return 0;
- }
-
-+static int iwl_pcie_gen2_force_power_gating(struct iwl_trans *trans)
-+{
-+ int ret;
-+
-+ ret = iwl_finish_nic_init(trans, trans->trans_cfg);
-+ if (ret < 0)
-+ return ret;
-+
-+ iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,
-+ HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);
-+ udelay(20);
-+ iwl_set_bits_prph(trans, HPM_HIPM_GEN_CFG,
-+ HPM_HIPM_GEN_CFG_CR_PG_EN |
-+ HPM_HIPM_GEN_CFG_CR_SLP_EN);
-+ udelay(20);
-+ iwl_clear_bits_prph(trans, HPM_HIPM_GEN_CFG,
-+ HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE);
-+
-+ iwl_trans_pcie_sw_reset(trans);
-+
-+ return 0;
-+}
-+
- static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)
- {
- struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-@@ -1802,6 +1825,13 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)
-
- iwl_trans_pcie_sw_reset(trans);
-
-+ if (trans->trans_cfg->device_family == IWL_DEVICE_FAMILY_22000 &&
-+ trans->cfg->integrated) {
-+ err = iwl_pcie_gen2_force_power_gating(trans);
-+ if (err)
-+ return err;
-+ }
-+
- err = iwl_pcie_apm_init(trans);
- if (err)
- return err;
---
-2.24.1
-
diff --git a/0016-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch b/0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
index 7542373b742..2cf758dc769 100644
--- a/0016-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+++ b/0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
@@ -1,7 +1,7 @@
-From 975d5a884b3c80155808c2ac39e6bb6d51450dea Mon Sep 17 00:00:00 2001
+From b7fccafc81799d2546da531b7da3336dfefb4070 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 16/20] drm/i915: extend audio CDCLK>=2*BCLK constraint to more
+Subject: [PATCH 12/14] 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-x86-intel-Disable-HPET-on-Intel-Coffee-Lake-H-platfo.patch b/0012-x86-intel-Disable-HPET-on-Intel-Coffee-Lake-H-platfo.patch
deleted file mode 100644
index ca7fa04fb7f..00000000000
--- a/0012-x86-intel-Disable-HPET-on-Intel-Coffee-Lake-H-platfo.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d112ebe17985ec073ae6edd0d46fa7a18fbe50cd Mon Sep 17 00:00:00 2001
-From: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Date: Fri, 29 Nov 2019 14:23:02 +0800
-Subject: [PATCH 12/20] x86/intel: Disable HPET on Intel Coffee Lake H
- platforms
-
-Coffee Lake H SoC has similar behavior as Coffee Lake, skewed HPET timer
-once the SoCs entered PC10.
-
-So let's disable HPET on CFL-H platforms.
-
-Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: bp@alien8.de
-Cc: feng.tang@intel.com
-Cc: harry.pan@intel.com
-Cc: hpa@zytor.com
-Link: https://lkml.kernel.org/r/20191129062303.18982-1-kai.heng.feng@canonical.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
----
- arch/x86/kernel/early-quirks.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
-index 4cba91ec8049..606711f5ebf8 100644
---- a/arch/x86/kernel/early-quirks.c
-+++ b/arch/x86/kernel/early-quirks.c
-@@ -710,6 +710,8 @@ static struct chipset early_qrk[] __initdata = {
- */
- { PCI_VENDOR_ID_INTEL, 0x0f00,
- PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
-+ { PCI_VENDOR_ID_INTEL, 0x3e20,
-+ PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
- { PCI_VENDOR_ID_INTEL, 0x3ec4,
- PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, 0, force_disable_hpet},
- { PCI_VENDOR_ID_BROADCOM, 0x4331,
---
-2.24.1
-
diff --git a/0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch b/0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
new file mode 100644
index 00000000000..fc0cc2c98ca
--- /dev/null
+++ b/0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
@@ -0,0 +1,129 @@
+From 8c19c0f7eacb125b9a097d080a385d527f8ff836 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 13/14] 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
+before submitting to stay ahead of the RING_HEAD.
+
+Normally this is prevented by keeping a couple of spare NOPs in the
+request->wa_tail so that on resubmission we can advance the tail. This
+relies on the request only being resubmitted once, which is the normal
+condition as it is seen once for ELSP[1] and then later in ELSP[0]. On
+preemption, the requests are unwound and the tail reset back to the
+normal end point (as we know the request is incomplete and therefore its
+RING_HEAD is even earlier).
+
+However, if this w/a should fail we would try and resubmit the request
+with the RING_TAIL already set to the location of this request's wa_tail
+potentially causing a GPU hang. We can spot when we do try and
+incorrectly resubmit without advancing the RING_TAIL and spare any
+embarrassment by forcing the context restore.
+
+In the case of preempt-to-busy, we leave the requests running on the HW
+while we unwind. As the ring is still live, we cannot rewind our
+rq->tail without forcing a reload so leave it set to rq->wa_tail and
+only force a reload if we resubmit after a lite-restore. (Normally, the
+forced reload will be a part of the preemption event.)
+
+Fixes: 22b7a426bbe1 ("drm/i915/execlists: Preempt-to-busy")
+Closes: https://gitlab.freedesktop.org/drm/intel/issues/673
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
+Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+Cc: stable@vger.kernel.org
+Link: https://patchwork.freedesktop.org/patch/msgid/20191209023215.3519970-1-chris@chris-wilson.co.uk
+(cherry picked from commit 82c69bf58650e644c61aa2bf5100b63a1070fd2f)
+---
+ drivers/gpu/drm/i915/gt/intel_lrc.c | 42 ++++++++++++++---------------
+ 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
+--- 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)
+ return desc;
+ }
+
+-static void unwind_wa_tail(struct i915_request *rq)
+-{
+- rq->tail = intel_ring_wrap(rq->ring, rq->wa_tail - WA_TAIL_BYTES);
+- assert_ring_tail_valid(rq->ring, rq->tail);
+-}
+-
+ static struct i915_request *
+ __unwind_incomplete_requests(struct intel_engine_cs *engine)
+ {
+@@ -495,7 +489,6 @@ __unwind_incomplete_requests(struct intel_engine_cs *engine)
+ continue; /* XXX */
+
+ __i915_request_unsubmit(rq);
+- unwind_wa_tail(rq);
+
+ /*
+ * Push the request back into the queue for later resubmission.
+@@ -649,13 +642,29 @@ execlists_schedule_out(struct i915_request *rq)
+ i915_request_put(rq);
+ }
+
+-static u64 execlists_update_context(const struct i915_request *rq)
++static u64 execlists_update_context(struct i915_request *rq)
+ {
+ struct intel_context *ce = rq->hw_context;
+- u64 desc;
++ u64 desc = ce->lrc_desc;
++ u32 tail;
+
+- ce->lrc_reg_state[CTX_RING_TAIL + 1] =
+- intel_ring_set_tail(rq->ring, rq->tail);
++ /*
++ * WaIdleLiteRestore:bdw,skl
++ *
++ * We should never submit the context with the same RING_TAIL twice
++ * just in case we submit an empty ring, which confuses the HW.
++ *
++ * We append a couple of NOOPs (gen8_emit_wa_tail) after the end of
++ * the normal request to be able to always advance the RING_TAIL on
++ * subsequent resubmissions (for lite restore). Should that fail us,
++ * and we try and submit the same tail again, force the context
++ * reload.
++ */
++ tail = intel_ring_set_tail(rq->ring, rq->tail);
++ if (unlikely(ce->lrc_reg_state[CTX_RING_TAIL + 1] == tail))
++ desc |= CTX_DESC_FORCE_RESTORE;
++ ce->lrc_reg_state[CTX_RING_TAIL + 1] = tail;
++ rq->tail = rq->wa_tail;
+
+ /*
+ * 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)
+ */
+ mb();
+
+- desc = ce->lrc_desc;
+ ce->lrc_desc &= ~CTX_DESC_FORCE_RESTORE;
+
+ return desc;
+@@ -1149,16 +1157,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine)
+ if (!list_is_last(&last->sched.link,
+ &engine->active.requests))
+ return;
+-
+- /*
+- * WaIdleLiteRestore:bdw,skl
+- * Apply the wa NOOPs to prevent
+- * ring:HEAD == rq:TAIL as we resubmit the
+- * request. See gen8_emit_fini_breadcrumb() for
+- * where we prepare the padding after the
+- * end of the request.
+- */
+- last->tail = last->wa_tail;
+ }
+ }
+
+--
+2.24.1
+
diff --git a/0017-ASoC-SOF-enable-sync_write-in-hdac_bus.patch b/0017-ASoC-SOF-enable-sync_write-in-hdac_bus.patch
deleted file mode 100644
index 828883f136b..00000000000
--- a/0017-ASoC-SOF-enable-sync_write-in-hdac_bus.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7699523eeae2b47440faa96cbed32c5e23db0e75 Mon Sep 17 00:00:00 2001
-From: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Date: Tue, 8 Oct 2019 11:44:35 -0500
-Subject: [PATCH 17/20] ASoC: SOF: enable sync_write in hdac_bus
-
-Align SOF HDA implementation with snd-hda-intel driver and enable
-sync_write flag for all supported Intel platforms in SOF. When set,
-a sync is issued after each verb write.
-
-Sync after write has helped to overcome intermittent delays in
-system resume flow on Intel Coffee Lake systems, and most recently
-probe errors related to the HDMI codec on Ice Lake systems.
-
-Matches the snd-hda-intel driver change done in commit 2756d9143aa5
-("ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips").
-
-Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
-Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
-Link: https://lore.kernel.org/r/20191008164443.1358-2-pierre-louis.bossart@linux.intel.com
-Signed-off-by: Mark Brown <broonie@kernel.org>
----
- sound/soc/sof/intel/hda.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
-index 06e84679087b..5a5163eef2ef 100644
---- a/sound/soc/sof/intel/hda.c
-+++ b/sound/soc/sof/intel/hda.c
-@@ -268,6 +268,7 @@ static int hda_init(struct snd_sof_dev *sdev)
-
- bus->use_posbuf = 1;
- bus->bdl_pos_adj = 0;
-+ bus->sync_write = 1;
-
- mutex_init(&hbus->prepare_mutex);
- hbus->pci = pci;
---
-2.24.1
-
diff --git a/0018-xhci-pci-Allow-host-runtime-PM-as-default-also-for-I.patch b/0018-xhci-pci-Allow-host-runtime-PM-as-default-also-for-I.patch
deleted file mode 100644
index 9fe021788f9..00000000000
--- a/0018-xhci-pci-Allow-host-runtime-PM-as-default-also-for-I.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 74641e1ede93144485509cb7c2c682602107ec6b Mon Sep 17 00:00:00 2001
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Fri, 15 Nov 2019 18:50:03 +0200
-Subject: [PATCH 18/20] xhci-pci: Allow host runtime PM as default also for
- Intel Ice Lake xHCI
-
-Intel Ice Lake has two xHCI controllers one on PCH and the other as part
-of the CPU itself. The latter is also part of the so called Type C
-Subsystem (TCSS) sharing ACPI power resources with the PCIe root ports
-and the Thunderbolt controllers. In order to put the whole TCSS block
-into D3cold the xHCI needs to be runtime suspended as well when idle.
-
-For this reason allow runtime PM as default for Ice Lake TCSS xHCI
-controller.
-
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
-Link: https://lore.kernel.org/r/1573836603-10871-5-git-send-email-mathias.nyman@linux.intel.com
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/usb/host/xhci-pci.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 1904ef56f61c..2907fe4d78dd 100644
---- a/drivers/usb/host/xhci-pci.c
-+++ b/drivers/usb/host/xhci-pci.c
-@@ -48,6 +48,7 @@
- #define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI 0x15e9
- #define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI 0x15ec
- #define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI 0x15f0
-+#define PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI 0x8a13
-
- #define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9
- #define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba
-@@ -212,7 +213,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
- pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI ||
- pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI ||
- pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI ||
-- pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI))
-+ pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI ||
-+ pdev->device == PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI))
- xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
-
- if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
---
-2.24.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 4f5e55a6a34..f9b0232cedf 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=6
+_minor=7
### on initial release comment this out and set to =1
_minorc=$((_minor+1))
#_minorc=1
@@ -36,48 +36,36 @@ source=(
0004-PCI-pciehp-Do-not-disable-interrupt-twice-on-suspend.patch
0005-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
0006-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
- 0007-x86-MCE-AMD-Do-not-use-rdmsr_safe_on_cpu-in-smca_con.patch
- 0008-x86-MCE-AMD-Allow-Reserved-types-to-be-overwritten-i.patch
- 0009-x86-mce-Fix-possibly-incorrect-severity-calculation-.patch
- 0010-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
- 0011-iwlwifi-pcie-move-power-gating-workaround-earlier-in.patch
- 0012-x86-intel-Disable-HPET-on-Intel-Coffee-Lake-H-platfo.patch
- 0013-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
- 0014-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
- 0015-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
- 0016-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
- 0017-ASoC-SOF-enable-sync_write-in-hdac_bus.patch
- 0018-xhci-pci-Allow-host-runtime-PM-as-default-also-for-I.patch
- 0019-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ 0007-Revert-iwlwifi-assign-directly-to-iwl_trans-cfg-in-Q.patch
+ 0008-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
+ 0009-x86-intel-Disable-HPET-on-Intel-Ice-Lake-platforms.patch
+ 0010-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
+ 0011-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
+ 0012-drm-i915-extend-audio-CDCLK-2-BCLK-constraint-to-mor.patch
+ 0013-drm-i915-gt-Detect-if-we-miss-WaIdleLiteRestore.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('6478624107f98d5f097e22107cb718c943adfbf8b9e8a676d3f597b4afefabb7'
+sha256sums=('31f6a581a52667a932f3c271ac4f8cd03d616a87dd84238da69bc77837bb28a8'
'SKIP'
- 'fda561bcdea397ddd59656319c53871002938b19b554f30efed90affa30989c8'
+ 'abc9b21d9146d95853dac35f4c4489a0199aff53ee6eee4b0563d1b37079fcc9'
'SKIP'
- 'b7f23bbc09b6c571b76f851f0389386a6f3a64f3d7b1b8509c8550228b0f4537'
- 'c404647c64cb7b2ab6aae5333cffe072725fe1a3e3f863646656591af7b55078'
- 'fe6d125c1101b8ec6e01783598b7a9a34130447b28239d47ee6cafd76f9806ae'
- 'e021b7d4cfb26e851b5b55250fd4e635b66237a8863c962ede4f51022f9927cc'
- '5ccbf49c1f588f344b120750d63bf42be5b8cda4946ebe256d5d69df3fce96ac'
- '514088ce473a7160e1a906aaf44adac4389de48ba8bfaffb28ef2efaff5b2a41'
- '5fcddf32bc5017afcf20c52430febf08c4f4de2a13aa838298eb8ff982fbda77'
- '2ffc236ad41c40ec5d622ff2c8d6ae3a22e545dbeb3a0cc0f63a70d2438bb507'
- '90bb284a19e9dd8aab105a80632170e58d818200965f51cb98ee4849d9cd2594'
- 'd573611616cb24b6c240c57321b3de6c2e51c49a3f8df52ef63009aeea5eb60e'
- '04c6d2408452b907b12a6ee149cc023998545199cd3e9793b555682ad99aae35'
- 'c974abd5df781b303a6cfaa1685a5b1556b4104441804d14963e8a2893fcc548'
- '6556d1dfa848566774fb1014c451809fb6dfab39336b27197d1b3a23d427d1ca'
- '6b7f016aa55b9ba7ce7425b9a2f0c8b3bd8d4a4bbf703db9701c0974dc24162c'
- '02f8992b6b6c467f561dd9aa309fc00695276d11227a2fc6816860c896bd206d'
- '227668904e0d363c43e756dd08aec15accc5ebbc045b9d7b2068f27801009b63'
- '97ab714be54e5516dcd4df051c8f7b551b87a0ca85c0e6b1f50f4eb1226d95d1'
- '09749254d63826dd3ddf6451882adc91deb1a79561593a7c399a41b623310c19'
- 'c81691927b5c7e36f492d5d922051fb2b26dd1b24033c3a483f40045621e3960'
- '2bde1e65dec65394c26cfe5f0ba0256d807047f7720cd3ce9367667d885fc7bd')
+ 'eeb60c19586bf5855eeaeac8323b0012107bfa74f9efa0c8e129d979d38f1f31'
+ 'b9072c0d202c2e59d78f7453c4ed73618d9000f14aa8da7b270253c0c8ba2882'
+ '0cb3b5ed908456c0c577ca9ae5b2fa64c5e215e1cbe7a072054fe486c9d1c7f9'
+ '24e03b0cc17cb158eb715b4e1f6901e988a870ad7690ce3e0e21ee55d9125fd1'
+ 'e2951b7ae55e3f3ecb2511716d75f7b0e05c3c21612c0d5a03c4e24fea473255'
+ 'ae093645bc5165583f3dce37de171a291fbe8435f0b8a6652f3e0a40f7ba903a'
+ '256955383fb94e5c044ffad6e449899be72a6f819053a3c2eb8c8094cff966ef'
+ 'd88b4acf8a5bf3b8c404df06eac767b503925eade11515d1844c75a344abdc72'
+ '43746bd6e905504734c95a6a6bd95993081341b80bf0ceed07f6e0f90aa61dbd'
+ '1604f19befeb24731c8a028111fa2a68fb7990691b83559c2efb321f3a56fa40'
+ '22ab8d1f3d5d8b8e02a54836c56bc38fb84ca4710283b179a2c0495742a3d1c2'
+ '11dd9cbbc296aa699d7d1c39ee4b60881440df534191d5860add3ed1e07db481'
+ '8c8fdb623e2c5779226efe36c81c134d024ac12733cdd800a348983d03b5c0e5'
+ 'b18c8996fdd72abc1ebca41e455ba2e12c01c92514d3c3f98c310e4acddbd119')
_kernelname=${pkgbase#linux}
diff --git a/config b/config
index e674971dea6..d5946e50ccd 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1-arch1 Kernel Configuration
+# Linux/x86 5.4.7-arch1 Kernel Configuration
#
#
@@ -6759,7 +6759,7 @@ CONFIG_SND_YMFPCI=m
#
CONFIG_SND_HDA=m
CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y
@@ -8711,7 +8711,7 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=m
CONFIG_RPMSG_VIRTIO=m
# end of Rpmsg drivers
-CONFIG_SOUNDWIRE=y
+CONFIG_SOUNDWIRE=m
#
# SoundWire Devices