Update to 6.5.2-1

8 files changed, 73 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04ecf5fd2bae..7bd7dd0fed90 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 6.5.1
+	pkgver = 6.5.2
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = linux-ck
 	makedepends = tar
 	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.1.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.1.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.2.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.5.2.tar.sign
 	source = config
 	source = more-uarches-20221217.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20221217.tar.gz
 	source = ck-hrtimer-6ef0e9ff5db0ed380f98cc8c7436ca9c44ea32c9.tar.gz::https://github.com/graysky2/linux-patches/archive/6ef0e9ff5db0ed380f98cc8c7436ca9c44ea32c9.tar.gz
@@ -24,19 +24,19 @@ pkgbase = linux-ck
 	source = 0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
 	source = 0003-tpm-Enable-hwrng-only-for-Pluton-on-AMD-CPUs.patch
 	source = 0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch
-	source = 0005-Revert-ASoC-Intel-soc-acpi-add-tables-for-Dell-SKU-0.patch
+	source = 0005-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 23765dd44425462cd92adbee52670608fd7f3fd183a83b25ba7a7b4883d0451b
+	sha256sums = 2027e14057d568ad3ddc100dadf4c8853a49b031270478a61d88f6011572650f
 	sha256sums = SKIP
 	sha256sums = b36c2945633d49b5f85600b58989a58f5ac61e31ca2c02f2046ce15b1462ea4b
 	sha256sums = f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0
 	sha256sums = a86a59d089ddd4f31565ff6a27ba74f4697ffa0ab0f57dc839e1da6ab83d77a4
-	sha256sums = 227cc673c7978c5d353cc19ffc9725d684b91de779adc6eef1e59cbc7fdce8bb
-	sha256sums = 5c5a5e75113a4d8cfcd2e5628f6c86efbd412313cfb3a2c9220da5a70045639a
-	sha256sums = 9279683f5517af465e98244bc35cfb734e26ff9c9d6e466432963dd71eb28042
-	sha256sums = 3521e575ea05c2f2a9bd77c4affbb7a76ab5b84aac6a5abf3d9d30660baecfa7
-	sha256sums = 44e1ebe817f1708b49b7473e640cd814bc5bdb983d71758893c5c9003034183c
+	sha256sums = 806801da9c5c251a9087a562bb1c203324c484cab60080f62452212e3e02eb77
+	sha256sums = 8c0d18bf189b0dcbe319a850bfa21dba8baab091251ec01ef52019478bc3a82a
+	sha256sums = 92292c9743f496c064c33046bad21670732762e6261227b8ceecb8be874723b8
+	sha256sums = cd70f794589c5481ec542d508fd23ca35fe42df5bfdbe3454a8443fae191e5eb
+	sha256sums = f9f00f18529c7f15cc476dbe0344636a3e76537476fffe9c37fea16a157e17ce
 
 pkgname = linux-ck
 	pkgdesc = The Linux kernel and modules with ck's hrtimer patches
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 fc350588cf25..396884e58166 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,4 +1,4 @@
-From 8659d263820b50c42036dd38fff16e0f6852575d Mon Sep 17 00:00:00 2001
+From e1fcd2107a9f8d938e51f5315cbc43c5e8a8c0b4 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/6] ZEN: Add sysctl and CONFIG to disallow unprivileged
diff --git a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
index 8f54e46a09a6..9e0206d174b6 100644
--- a/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
+++ b/0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
@@ -1,4 +1,4 @@
-From f0d16bed34435cef3908134d6af13aee7793cfdc Mon Sep 17 00:00:00 2001
+From ece3d148f997af3c3673903e61861af5201e4ae8 Mon Sep 17 00:00:00 2001
 From: Javier Martinez Canillas <javierm@redhat.com>
 Date: Thu, 19 May 2022 14:40:07 +0200
 Subject: [PATCH 2/6] drivers/firmware: skip simpledrm if nvidia-drm.modeset=1
diff --git a/0003-tpm-Enable-hwrng-only-for-Pluton-on-AMD-CPUs.patch b/0003-tpm-Enable-hwrng-only-for-Pluton-on-AMD-CPUs.patch
index 82b420aa9063..f0f4778116ae 100644
--- a/0003-tpm-Enable-hwrng-only-for-Pluton-on-AMD-CPUs.patch
+++ b/0003-tpm-Enable-hwrng-only-for-Pluton-on-AMD-CPUs.patch
@@ -1,4 +1,4 @@
-From 4b4714cfb7e76ce749c8cea583f0571c53214b30 Mon Sep 17 00:00:00 2001
+From 0408e39a978a498fc692f2e579d80afe4ed5c97e Mon Sep 17 00:00:00 2001
 From: Jarkko Sakkinen <jarkko@kernel.org>
 Date: Wed, 23 Aug 2023 02:15:10 +0300
 Subject: [PATCH 3/6] tpm: Enable hwrng only for Pluton on AMD CPUs
diff --git a/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch b/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch
index 4be4c07875fd..6847084dff8c 100644
--- a/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch
+++ b/0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch
@@ -1,4 +1,4 @@
-From 555b718e90b662cb924b562227e4c4e3cd60cd76 Mon Sep 17 00:00:00 2001
+From 84d43edcf274c9786f6f719d5cb74a2c4a1449e1 Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
 Date: Thu, 24 Aug 2023 01:28:17 +0200
 Subject: [PATCH 4/6] sphinx: kfigure.py: Convert outdir to str before using
diff --git a/0005-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch b/0005-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
new file mode 100644
index 000000000000..eacd1c660918
--- /dev/null
+++ b/0005-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
@@ -0,0 +1,51 @@
+From 4df5bd76b68674cc51777ffff0835dea0effb89b Mon Sep 17 00:00:00 2001
+From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Date: Tue, 5 Sep 2023 11:16:16 -0400
+Subject: [PATCH 5/6] ASoC: Intel: soc-acpi: fix Dell SKU 0B34
+
+The rule for the SoundWire tables is that the platforms with more
+devices need to be added first. We broke that rule with the Dell SKU
+0B34, and caused the second amplifier for SKU 0AF3 to be ignored.
+
+The fix is simple, we need to move the single-amplifier entry after
+the two-amplifier one.
+
+Fixes: b62a1a839b48 ("ASoC: Intel: soc-acpi: add tables for Dell SKU 0B34")
+Closes: https://github.com/thesofproject/linux/issues/4559
+Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+---
+ sound/soc/intel/common/soc-acpi-intel-adl-match.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+index bcd66e0094b4..c4b57cca6b22 100644
+--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
++++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+@@ -648,18 +648,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
+ 		.drv_name = "sof_sdw",
+ 		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",
+ 	},
+-	{
+-		.link_mask = 0x3, /* rt1316 on link1 & rt714 on link0 */
+-		.links = adl_sdw_rt1316_link1_rt714_link0,
+-		.drv_name = "sof_sdw",
+-		.sof_tplg_filename = "sof-adl-rt1316-l1-mono-rt714-l0.tplg",
+-	},
+ 	{
+ 		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
+ 		.links = adl_sdw_rt1316_link12_rt714_link0,
+ 		.drv_name = "sof_sdw",
+ 		.sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg",
+ 	},
++	{
++		.link_mask = 0x3, /* rt1316 on link1 & rt714 on link0 */
++		.links = adl_sdw_rt1316_link1_rt714_link0,
++		.drv_name = "sof_sdw",
++		.sof_tplg_filename = "sof-adl-rt1316-l1-mono-rt714-l0.tplg",
++	},
+ 	{
+ 		.link_mask = 0x5, /* 2 active links required */
+ 		.links = adl_sdw_rt1316_link2_rt714_link0,
+-- 
+2.42.0
+
diff --git a/0005-Revert-ASoC-Intel-soc-acpi-add-tables-for-Dell-SKU-0.patch b/0005-Revert-ASoC-Intel-soc-acpi-add-tables-for-Dell-SKU-0.patch
deleted file mode 100644
index 1471b3cea28a..000000000000
--- a/0005-Revert-ASoC-Intel-soc-acpi-add-tables-for-Dell-SKU-0.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 82d8584b889db5166bf7ad7863e079d38c9c6e7a Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
-Date: Sat, 2 Sep 2023 15:28:31 +0200
-Subject: [PATCH 5/6] Revert "ASoC: Intel: soc-acpi: add tables for Dell SKU
- 0B34"
-
-This reverts commit b62a1a839b48f55046727089c3ba7a8ebbf97f0e.
-
-It broke stereo sound on the Dell XPS 13 Plus 9320 (SKU 0AF3),
-see https://github.com/thesofproject/linux/issues/4559.
-
-Considering that this apparently wasn't enough to get sound working on
-SKU 0B34 (https://github.com/thesofproject/linux/issues/4399) and that
-Dell officially supports Linux on 0AF3 but not 0B34, I think this is
-safe to revert.
-
-Fixes: https://github.com/thesofproject/linux/issues/4559
-Signed-off-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
----
- .../intel/common/soc-acpi-intel-adl-match.c   | 29 -------------------
- 1 file changed, 29 deletions(-)
-
-diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
-index bcd66e0094b4..83414bfa8d6c 100644
---- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
-+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
-@@ -133,15 +133,6 @@ static const struct snd_soc_acpi_adr_device rt1316_1_group2_adr[] = {
- 	}
- };
- 
--static const struct snd_soc_acpi_adr_device rt1316_1_single_adr[] = {
--	{
--		.adr = 0x000130025D131601ull,
--		.num_endpoints = 1,
--		.endpoints = &single_endpoint,
--		.name_prefix = "rt1316-1"
--	}
--};
--
- static const struct snd_soc_acpi_adr_device rt1316_2_single_adr[] = {
- 	{
- 		.adr = 0x000230025D131601ull,
-@@ -321,20 +312,6 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link12_rt714_link0[] =
- 	{}
- };
- 
--static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link1_rt714_link0[] = {
--	{
--		.mask = BIT(1),
--		.num_adr = ARRAY_SIZE(rt1316_1_single_adr),
--		.adr_d = rt1316_1_single_adr,
--	},
--	{
--		.mask = BIT(0),
--		.num_adr = ARRAY_SIZE(rt714_0_adr),
--		.adr_d = rt714_0_adr,
--	},
--	{}
--};
--
- static const struct snd_soc_acpi_link_adr adl_sdw_rt1316_link2_rt714_link3[] = {
- 	{
- 		.mask = BIT(2),
-@@ -648,12 +625,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
- 		.drv_name = "sof_sdw",
- 		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",
- 	},
--	{
--		.link_mask = 0x3, /* rt1316 on link1 & rt714 on link0 */
--		.links = adl_sdw_rt1316_link1_rt714_link0,
--		.drv_name = "sof_sdw",
--		.sof_tplg_filename = "sof-adl-rt1316-l1-mono-rt714-l0.tplg",
--	},
- 	{
- 		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
- 		.links = adl_sdw_rt1316_link12_rt714_link0,
--- 
-2.42.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 08b177bc7de7..78d0e419d0b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -71,7 +71,7 @@ _subarch=
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 pkgbase=linux-ck
-pkgver=6.5.1
+pkgver=6.5.2
 pkgrel=1
 arch=(x86_64)
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -106,22 +106,22 @@ source=(
   0002-drivers-firmware-skip-simpledrm-if-nvidia-drm.modese.patch
   0003-tpm-Enable-hwrng-only-for-Pluton-on-AMD-CPUs.patch
   0004-sphinx-kfigure.py-Convert-outdir-to-str-before-using.patch
-  0005-Revert-ASoC-Intel-soc-acpi-add-tables-for-Dell-SKU-0.patch
+  0005-ASoC-Intel-soc-acpi-fix-Dell-SKU-0B34.patch
 )
 validpgpkeys=(
   ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
   647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
 )
-sha256sums=('23765dd44425462cd92adbee52670608fd7f3fd183a83b25ba7a7b4883d0451b'
+sha256sums=('2027e14057d568ad3ddc100dadf4c8853a49b031270478a61d88f6011572650f'
             'SKIP'
             'b36c2945633d49b5f85600b58989a58f5ac61e31ca2c02f2046ce15b1462ea4b'
             'f1d586e111932890ad5e0df15d092fb9b3f87bae4ea17812aae9b0ec98fe2db0'
             'a86a59d089ddd4f31565ff6a27ba74f4697ffa0ab0f57dc839e1da6ab83d77a4'
-            '227cc673c7978c5d353cc19ffc9725d684b91de779adc6eef1e59cbc7fdce8bb'
-            '5c5a5e75113a4d8cfcd2e5628f6c86efbd412313cfb3a2c9220da5a70045639a'
-            '9279683f5517af465e98244bc35cfb734e26ff9c9d6e466432963dd71eb28042'
-            '3521e575ea05c2f2a9bd77c4affbb7a76ab5b84aac6a5abf3d9d30660baecfa7'
-            '44e1ebe817f1708b49b7473e640cd814bc5bdb983d71758893c5c9003034183c')
+            '806801da9c5c251a9087a562bb1c203324c484cab60080f62452212e3e02eb77'
+            '8c0d18bf189b0dcbe319a850bfa21dba8baab091251ec01ef52019478bc3a82a'
+            '92292c9743f496c064c33046bad21670732762e6261227b8ceecb8be874723b8'
+            'cd70f794589c5481ec542d508fd23ca35fe42df5bfdbe3454a8443fae191e5eb'
+            'f9f00f18529c7f15cc476dbe0344636a3e76537476fffe9c37fea16a157e17ce')
 _make() {
   test -s version
   make KERNELRELEASE="$(<version)" "$@"