summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch78
-rw-r--r--PKGBUILD12
-rw-r--r--config4
4 files changed, 16 insertions, 96 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05676981ff28..cfef5dd84b43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rt
- pkgver = 5.4.19.11
+ pkgver = 5.4.22.13
pkgrel = 1
url = https://wiki.linuxfoundation.org/realtime/start
arch = x86_64
@@ -15,16 +15,15 @@ pkgbase = linux-rt
makedepends = python-sphinx_rtd_theme
makedepends = xmlto
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.19.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.19.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.19-rt11.patch.xz
- source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.19-rt11.patch.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.22.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.22.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.22-rt13.patch.xz
+ source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/older/patch-5.4.22-rt13.patch.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
source = 0003-mfd-intel-lpss-Use-devm_ioremap_uc-for-MMIO.patch
source = 0004-PCI-pciehp-Prevent-deadlock-on-disconnect.patch
- source = 0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
source = 0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
source = 0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
source = 0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -37,16 +36,15 @@ pkgbase = linux-rt
validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73
validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14
- sha256sums = 9584b971153e46a4a07573ca8f0ed78d7ca17b1eee25ff52f8b844b5d1fb77b8
+ sha256sums = 661bcb8d7e390dcc28e53795485e648f2bdc9b697b731459cc2bcc9ceb4a7d1a
sha256sums = SKIP
- sha256sums = 8fd8726f213ce70a9d4b9cb10f6c51aaf1470bf33bc76579631c75b0a1d319d4
+ sha256sums = f5d353e405aefad1e174104631e24f34ece03cf64f02b41f6a6e7a10811fe5f5
sha256sums = SKIP
- sha256sums = c601f45d4903622c8d7a71d8e5dd827de3e37747907f7d61c7effbe6f70d034d
+ sha256sums = 7586abc5e898afccc3103143d94dc610a7f1a3a28284dbdfff712eed5963c86c
sha256sums = ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85
sha256sums = cce19157ce22b33b33cd6ba917d1994ad7b2456cb0bbae004ed9276d6af2f2fa
sha256sums = 4b8dc61f03a6b72eec64de86c2ccf8e98dab44f72f7daad0cec2723b3d06331c
sha256sums = 6055025e53d87087774f7497088bf1a2ba43404c6629fd8601302496c226896d
- sha256sums = f48c9a8a286901ce12eefe11fbd830fdede08afac8911ab887f7d89c687421f0
sha256sums = 194b893c18118be08c5d42762f5f1926953fc7a5903f06f1d39f893542d377a9
sha256sums = 2234444ae52bf3810e13bdb4c0ab6d808eb9fe6cb003c2b78be04a987ef12388
sha256sums = 5a1584d26c7d046fa0398b56980f628b4194dff95d0916e9527dbea7299e7765
diff --git a/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch b/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
deleted file mode 100644
index de9c756f9046..000000000000
--- a/0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 766611dcde15685197f756d86f4ada389a98375e 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 05/15] 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
-that function checks the GPE status and dispatches its handler if
-need be and the SCI action handler is not going to run anyway at
-that point.
-
-Moreover, it is better to drain all of the pending ACPI events
-before restoring the working-state configuration of GPEs in
-acpi_s2idle_restore(), because those events are likely to be related
-to system wakeup, in which case they will not be relevant going
-forward.
-
-Rework the code to take these observations into account.
-
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
- drivers/acpi/sleep.c | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 2af937a8b1c5..6747a279621b 100644
---- a/drivers/acpi/sleep.c
-+++ b/drivers/acpi/sleep.c
-@@ -977,6 +977,16 @@ static int acpi_s2idle_prepare_late(void)
- return 0;
- }
-
-+static void acpi_s2idle_sync(void)
-+{
-+ /*
-+ * The EC driver uses the system workqueue and an additional special
-+ * one, so those need to be flushed too.
-+ */
-+ acpi_ec_flush_work();
-+ acpi_os_wait_events_complete(); /* synchronize Notify handling */
-+}
-+
- static void acpi_s2idle_wake(void)
- {
- /*
-@@ -1001,13 +1011,8 @@ static void acpi_s2idle_wake(void)
- * should be missed by canceling the wakeup here.
- */
- pm_system_cancel_wakeup();
-- /*
-- * The EC driver uses the system workqueue and an additional
-- * special one, so those need to be flushed too.
-- */
-- acpi_os_wait_events_complete(); /* synchronize EC GPE processing */
-- acpi_ec_flush_work();
-- acpi_os_wait_events_complete(); /* synchronize Notify handling */
-+
-+ acpi_s2idle_sync();
-
- rearm_wake_irq(acpi_sci_irq);
- }
-@@ -1024,6 +1029,13 @@ static void acpi_s2idle_restore_early(void)
-
- static void acpi_s2idle_restore(void)
- {
-+ /*
-+ * Drain pending events before restoring the working-state configuration
-+ * of GPEs.
-+ */
-+ acpi_os_wait_events_complete(); /* synchronize GPE processing */
-+ acpi_s2idle_sync();
-+
- s2idle_wakeup = false;
-
- acpi_enable_all_runtime_gpes();
---
-2.25.0
-
diff --git a/PKGBUILD b/PKGBUILD
index ecd55b0893b1..9c3f52c6bbd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: David Runge <dvzrv@archlinux.org>
pkgbase=linux-rt
-_pkgver=5.4.19
-_rtpatchver=11
+_pkgver=5.4.22
+_rtpatchver=13
pkgver="${_pkgver}.${_rtpatchver}"
pkgrel=1
arch=('x86_64')
@@ -23,7 +23,6 @@ source=(
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-Prevent-deadlock-on-disconnect.patch
- 0005-ACPI-PM-s2idle-Rework-ACPI-events-synchronization.patch
0006-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
0007-drm-i915-save-AUD_FREQ_CNTRL-state-at-audio-domain-s.patch
0008-drm-i915-Fix-audio-power-up-sequence-for-gen10-displ.patch
@@ -39,16 +38,15 @@ validpgpkeys=(
'5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt
'E644E2F1D45FA0B2EAA02F33109F098506FF0B14' # Thomas Gleixner
)
-sha256sums=('9584b971153e46a4a07573ca8f0ed78d7ca17b1eee25ff52f8b844b5d1fb77b8'
+sha256sums=('661bcb8d7e390dcc28e53795485e648f2bdc9b697b731459cc2bcc9ceb4a7d1a'
'SKIP'
- '8fd8726f213ce70a9d4b9cb10f6c51aaf1470bf33bc76579631c75b0a1d319d4'
+ 'f5d353e405aefad1e174104631e24f34ece03cf64f02b41f6a6e7a10811fe5f5'
'SKIP'
- 'c601f45d4903622c8d7a71d8e5dd827de3e37747907f7d61c7effbe6f70d034d'
+ '7586abc5e898afccc3103143d94dc610a7f1a3a28284dbdfff712eed5963c86c'
'ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85'
'cce19157ce22b33b33cd6ba917d1994ad7b2456cb0bbae004ed9276d6af2f2fa'
'4b8dc61f03a6b72eec64de86c2ccf8e98dab44f72f7daad0cec2723b3d06331c'
'6055025e53d87087774f7497088bf1a2ba43404c6629fd8601302496c226896d'
- 'f48c9a8a286901ce12eefe11fbd830fdede08afac8911ab887f7d89c687421f0'
'194b893c18118be08c5d42762f5f1926953fc7a5903f06f1d39f893542d377a9'
'2234444ae52bf3810e13bdb4c0ab6d808eb9fe6cb003c2b78be04a987ef12388'
'5a1584d26c7d046fa0398b56980f628b4194dff95d0916e9527dbea7299e7765'
diff --git a/config b/config
index cae67a6a156e..8366a83c8ffc 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.19 Kernel Configuration
+# Linux/x86 5.4.22 Kernel Configuration
#
#
@@ -238,6 +238,7 @@ CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
CONFIG_KALLSYMS_BASE_RELATIVE=y
+# CONFIG_BPF_SYSCALL is not set
# CONFIG_USERFAULTFD is not set
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_RSEQ=y
@@ -1896,6 +1897,7 @@ CONFIG_AF_RXRPC_IPV6=y
# CONFIG_AF_RXRPC_INJECT_LOSS is not set
CONFIG_AF_RXRPC_DEBUG=y
CONFIG_RXKAD=y
+# CONFIG_AF_KCM is not set
CONFIG_STREAM_PARSER=y
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y