Update to 5.10.4-4

Refresh ARCH patches and adjust .config at build time to clean up BPF options.
See: https://bbs.archlinux.org/viewtopic.php?id=262019

9 files changed, 64 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ef8407e6127..6569dfda50a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-ck
 	pkgver = 5.10.4
-	pkgrel = 3
+	pkgrel = 4
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
 	license = GPL2
@@ -23,6 +23,7 @@ pkgbase = linux-ck
 	source = 0004-drm-amd-display-Add-get_dig_frontend-implementation-.patch
 	source = 0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
 	source = 0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+	source = 0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	b2sums = 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec
@@ -30,12 +31,13 @@ pkgbase = linux-ck
 	b2sums = cb3a58e4eef8395b75887d94a84bba25f05fbec8f576a791623057a190a1d51b412a19ecf1b600ac3f9f6c46968eb0e130d571743e61afc231a97146ee4b52d0
 	b2sums = 7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127
 	b2sums = 067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a
-	b2sums = 079e6f80f72716b8b70bea6f4fa3813c7d2285e8486cb1e779a04351b8138b6d3415ecd7c69a32abcca05bf4cd8694bca3799a37e51b7e2814e88b7661775a08
-	b2sums = f4842ff80ddc86c07496a20cbb39a7bc9725bcdd3b0c6d0f92f3a708a4441d36b5655413830e3a950e263d14e9d44f71d877b3c7ad8625179bf8bb46ef71fc6b
-	b2sums = 823fa132b87921d1eeb49f26eb3ba07e96c422261992c3eb3640d453d82d058bd5b62d47117582667b6c6f514b43b47c686e8da0e3d35b3b4ad700f2950657ee
-	b2sums = 097a23f29aca109935c4d39b8ef1731839229890004c0c649df509a6d05b17dc0e5cc4d44a4394ba822efec642e6d17205cf5372408fdc50db1eb82a2a5dfcfe
-	b2sums = ae453b4712cb26865aee79fae34efa48b223faa49244f3fb1ca1b5e896ae39db2662516593cb755dee47469c6e9649cd9d5e340751141dad9d33031d653bc2d1
-	b2sums = 81b8d7581757b07e60f4f42bc5d916ccaa773ab7e82bccb9ba2f4ac3ec3d6d6aba60ce41f9308e256b00be12ad9871eea0e93a7349446ac199c04dc6fbab6592
+	b2sums = 7d2ef86a15ead6c946051c117a8ed97056e92a25a274455c5cc62ec65ff92bda7a50032b32c8019180f233a54e778becc45751741ae4d87db8f56ef520ca1e83
+	b2sums = 8ea9d2b7809728c3de05768fea5d8838fe20de8aaaed9106f26c0e8fc051921668d0c31345f200d06005403dec565690f828dbbcd38504079fe6fccbf742be61
+	b2sums = d361b313a3dcd761833b8e2e40201df5e5b93c472e8a06f4684feb24d6e174405e6e4328dc0c449b9b0263e87224b3e1f4a52c873b666a93055979c9d2e2bf59
+	b2sums = a0eb84f3be3ce81c8faebfcef5cf41aa21fb3c49a20c5d6a50396b7aa50a6a88f5509a13541d2db3be3fc422e59dc102d18ad9934471629c627fd96bfa79a091
+	b2sums = 2853fa5257b96b11bcbf60ed68df09938ebb15f81c1bb6aa763c721c4e55f440fd27f9a6b49e8f9a1788948928299810f9e8ea43f0759b06cae3dd140902f93e
+	b2sums = 46a30c86206717fe6804d8e88693b90382b07fdad91d8fd7220e398e41f87a4b5cb5be70285241a3fc81c62ced6021f1710ce0426f3161285c254db9e5484d86
+	b2sums = eec26b472efda62e27d26c2033158e970a5eadb30d38fc4de59c36fafe53efc1e220b7d57189abcd5a2697d242df8475cf2eebfd1ad6373804b5456dbcc14098
 
 pkgname = linux-ck
 	pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
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 cf6bb231ce03..5c8add1c1e44 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 3a8bc83f97cb4ef7ad72a742382f373357d4d95b 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 1/7] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
  CLONE_NEWUSER
 
 Our default behavior continues to match the vanilla kernel.
diff --git a/0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch b/0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
index acbe9ae76852..5d60cc098ffc 100644
--- a/0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+++ b/0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
@@ -1,7 +1,7 @@
 From 0438f3011663ce01a981bb8b3af0e84e73551ecf Mon Sep 17 00:00:00 2001
 From: Edward Vear <edwardvear@gmail.com>
 Date: Tue, 27 Oct 2020 00:02:03 -0700
-Subject: [PATCH 2/7] Bluetooth: Fix attempting to set RPA timeout when
+Subject: [PATCH 2/8] Bluetooth: Fix attempting to set RPA timeout when
  unsupported
 
 During controller initialization, an LE Set RPA Timeout command is sent
diff --git a/0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch b/0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
index 90b10c396a08..f49bf27f2adf 100644
--- a/0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
+++ b/0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
@@ -1,7 +1,7 @@
 From e5e77ad2223f662e1615266d8ef39a8db7e65a70 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
 Date: Thu, 19 Nov 2020 09:22:32 +0100
-Subject: [PATCH 3/7] HID: quirks: Add Apple Magic Trackpad 2 to
+Subject: [PATCH 3/8] HID: quirks: Add Apple Magic Trackpad 2 to
  hid_have_special_driver list
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
diff --git a/0004-drm-amd-display-Add-get_dig_frontend-implementation-.patch b/0004-drm-amd-display-Add-get_dig_frontend-implementation-.patch
index c0d231b13341..9c3323a9688a 100644
--- a/0004-drm-amd-display-Add-get_dig_frontend-implementation-.patch
+++ b/0004-drm-amd-display-Add-get_dig_frontend-implementation-.patch
@@ -1,7 +1,7 @@
 From 88fbde26128dedf0097aa45b8c923973a4e5f843 Mon Sep 17 00:00:00 2001
 From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
 Date: Tue, 15 Dec 2020 10:33:34 -0500
-Subject: [PATCH 4/7] drm/amd/display: Add get_dig_frontend implementation for
+Subject: [PATCH 4/8] drm/amd/display: Add get_dig_frontend implementation for
  DCEx
 
 Some old ASICs might not implement/require get_dig_frontend helper; in
diff --git a/0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch b/0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
index 801bcc8d0c27..c4bdae791036 100644
--- a/0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
+++ b/0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
@@ -1,7 +1,7 @@
 From 0128c7314a4d856461caacfdd528a7bffa03d41e Mon Sep 17 00:00:00 2001
 From: Josef Bacik <josef@toxicpanda.com>
 Date: Wed, 23 Dec 2020 14:41:00 -0500
-Subject: [PATCH 5/7] btrfs: Fix 500-2000% performance regression w/ 5.10
+Subject: [PATCH 5/8] btrfs: Fix 500-2000% performance regression w/ 5.10
 
 Josef's tentative fix from
 https://lore.kernel.org/linux-btrfs/0382080a1836a12c2d625f8a5bf899828eba204b.1608752315.git.josef@toxicpanda.com/
diff --git a/0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch b/0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
index 7d2f61e7c308..37532e1696d3 100644
--- a/0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+++ b/0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
@@ -1,7 +1,7 @@
 From 61e5f6548784e507eb0662a71976a673436e6e3a Mon Sep 17 00:00:00 2001
 From: Eric Dumazet <edumazet@google.com>
 Date: Mon, 21 Dec 2020 20:14:02 +0100
-Subject: [PATCH 6/7] iwlwifi: Fix regression from UDP segmentation support
+Subject: [PATCH 6/8] iwlwifi: Fix regression from UDP segmentation support
 
 Eric's tentative fix from
 https://lore.kernel.org/linux-wireless/CANn89iJWG2n1s3j7EdpwkQQv-9dOY02V+FGYHAWguO4JiqWuJA@mail.gmail.com/
diff --git a/0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch b/0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
new file mode 100644
index 000000000000..e06f6ce72ea0
--- /dev/null
+++ b/0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
@@ -0,0 +1,26 @@
+From 00f09a6a8193b46c83ae1c8ff6623db011f90099 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Fri, 1 Jan 2021 06:20:32 +0100
+Subject: [PATCH 7/8] ALSA: hda/hdmi: fix locking in silent_stream_disable
+
+The code unlocked the wrong lock, leading to deadlocks.
+---
+ sound/pci/hda/patch_hdmi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
+index 2ddc27db8c01..d12b4799c3cb 100644
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -1736,7 +1736,7 @@ static void silent_stream_disable(struct hda_codec *codec,
+ 	per_pin->silent_stream = false;
+ 
+  unlock_out:
+-	mutex_unlock(&spec->pcm_lock);
++	mutex_unlock(&per_pin->lock);
+ }
+ 
+ /* update ELD and jack state via audio component */
+-- 
+2.30.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 6ea6cfdf1945..2e46efafb2ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -65,7 +65,7 @@ _localmodcfg=
 
 pkgbase=linux-ck
 pkgver=5.10.4
-pkgrel=3
+pkgrel=4
 _ckpatchversion=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -87,6 +87,7 @@ source=(
   0004-drm-amd-display-Add-get_dig_frontend-implementation-.patch
   0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
   0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+  0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -97,12 +98,13 @@ b2sums=('57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378a
         'cb3a58e4eef8395b75887d94a84bba25f05fbec8f576a791623057a190a1d51b412a19ecf1b600ac3f9f6c46968eb0e130d571743e61afc231a97146ee4b52d0'
         '7f1eb5938472f57748216bd00e0c875feab99fc1c5cb89babfea467ee30ca5c8e9fc5a691efe2e602bef1ea79820c5383822d7cec354b48d23321ccda8ee8127'
         '067f3389124fdd937ca69e9e9568b1b3194791960a093e81037051eb6d25e80b40bf7f60c61373ac9e92bff9db760766009b1e6f9ee8429a883bb7fce2d60f8a'
-        '079e6f80f72716b8b70bea6f4fa3813c7d2285e8486cb1e779a04351b8138b6d3415ecd7c69a32abcca05bf4cd8694bca3799a37e51b7e2814e88b7661775a08'
-        'f4842ff80ddc86c07496a20cbb39a7bc9725bcdd3b0c6d0f92f3a708a4441d36b5655413830e3a950e263d14e9d44f71d877b3c7ad8625179bf8bb46ef71fc6b'
-        '823fa132b87921d1eeb49f26eb3ba07e96c422261992c3eb3640d453d82d058bd5b62d47117582667b6c6f514b43b47c686e8da0e3d35b3b4ad700f2950657ee'
-        '097a23f29aca109935c4d39b8ef1731839229890004c0c649df509a6d05b17dc0e5cc4d44a4394ba822efec642e6d17205cf5372408fdc50db1eb82a2a5dfcfe'
-        'ae453b4712cb26865aee79fae34efa48b223faa49244f3fb1ca1b5e896ae39db2662516593cb755dee47469c6e9649cd9d5e340751141dad9d33031d653bc2d1'
-        '81b8d7581757b07e60f4f42bc5d916ccaa773ab7e82bccb9ba2f4ac3ec3d6d6aba60ce41f9308e256b00be12ad9871eea0e93a7349446ac199c04dc6fbab6592')
+        '7d2ef86a15ead6c946051c117a8ed97056e92a25a274455c5cc62ec65ff92bda7a50032b32c8019180f233a54e778becc45751741ae4d87db8f56ef520ca1e83'
+        '8ea9d2b7809728c3de05768fea5d8838fe20de8aaaed9106f26c0e8fc051921668d0c31345f200d06005403dec565690f828dbbcd38504079fe6fccbf742be61'
+        'd361b313a3dcd761833b8e2e40201df5e5b93c472e8a06f4684feb24d6e174405e6e4328dc0c449b9b0263e87224b3e1f4a52c873b666a93055979c9d2e2bf59'
+        'a0eb84f3be3ce81c8faebfcef5cf41aa21fb3c49a20c5d6a50396b7aa50a6a88f5509a13541d2db3be3fc422e59dc102d18ad9934471629c627fd96bfa79a091'
+        '2853fa5257b96b11bcbf60ed68df09938ebb15f81c1bb6aa763c721c4e55f440fd27f9a6b49e8f9a1788948928299810f9e8ea43f0759b06cae3dd140902f93e'
+        '46a30c86206717fe6804d8e88693b90382b07fdad91d8fd7220e398e41f87a4b5cb5be70285241a3fc81c62ced6021f1710ce0426f3161285c254db9e5484d86'
+        'eec26b472efda62e27d26c2033158e970a5eadb30d38fc4de59c36fafe53efc1e220b7d57189abcd5a2697d242df8475cf2eebfd1ad6373804b5456dbcc14098')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
@@ -132,9 +134,21 @@ prepare() {
   # and can easily overwhelm a system with 32 GB of memory using a tmpfs build
   # partition ... this was introduced by FS#66260, see:
   # https://git.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/linux&id=663b08666b269eeeeaafbafaee07fd03389ac8d7
-  sed -i -e 's/CONFIG_DEBUG_INFO=y/# CONFIG_DEBUG_INFO is not set/' \
+  sed -i -e 's/CONFIG_CGROUP_BPF=y/# CONFIG_CGROUP_BPF is not set/' \
+      -i -e 's/CONFIG_BPF_LSM=y/# CONFIG_BPF_LSM is not set/' \
+      -i -e 's/CONFIG_USERMODE_DRIVER=y/# CONFIG_BPF_PRELOAD is not set/' \
+      -i -e '/CONFIG_BPF_PRELOAD=y/d' \
+      -i -e '/CONFIG_BPF_PRELOAD_UMD=m/d' \
+      -i -e '/CONFIG_BPF_STREAM_PARSER=y/g' \
+      -i -e 's/CONFIG_BPF_LIRC_MODE2=y/# CONFIG_BPF_LIRC_MODE2 is not set/' \
+      -i -e 's/CONFIG_DEBUG_INFO=y/# CONFIG_DEBUG_INFO is not set/' \
+      -i -e '/# CONFIG_DEBUG_INFO_REDUCED is not set/d' \
+      -i -e '/# CONFIG_DEBUG_INFO_COMPRESSED is not set/d' \
+      -i -e '/# CONFIG_DEBUG_INFO_SPLIT is not set/d' \
       -i -e '/CONFIG_DEBUG_INFO_DWARF4=y/d' \
-      -i -e '/CONFIG_DEBUG_INFO_BTF=y/d' ./.config
+      -i -e '/CONFIG_DEBUG_INFO_BTF=y/d' \
+      -i -e '/# CONFIG_GDB_SCRIPTS is not set/d' \
+      -i -e 's/CONFIG_BPF_KPROBE_OVERRIDE=y/# CONFIG_BPF_KPROBE_OVERRIDE is not set/' ./.config
 
   # https://bbs.archlinux.org/viewtopic.php?pid=1824594#p1824594
   sed -i -e 's/# CONFIG_PSI_DEFAULT_DISABLED is not set/CONFIG_PSI_DEFAULT_DISABLED=y/' ./.config