Updated to 6.0.16

2 files changed, 3 insertions, 46 deletions

diff --git a/0002-soundwire-intel-Initialize-clock-stop-timeout.patch b/0002-soundwire-intel-Initialize-clock-stop-timeout.patch
deleted file mode 100644
index ded86ff..0000000
--- a/0002-soundwire-intel-Initialize-clock-stop-timeout.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fe7004128c90077116d07de74ee43ad1270ce3e7 Mon Sep 17 00:00:00 2001
-From: Sjoerd Simons <sjoerd@collabora.com>
-Date: Sat, 8 Oct 2022 21:57:51 +0200
-Subject: [PATCH 2/6] soundwire: intel: Initialize clock stop timeout
-
-The bus->clk_stop_timeout member is only initialized to a non-zero value
-during the codec driver probe. This can lead to corner cases where this
-value remains pegged at zero when the bus suspends, which results in an
-endless loop in sdw_bus_wait_for_clk_prep_deprep().
-
-Corner cases include configurations with no codecs described in the
-firmware, or delays in probing codec drivers.
-
-Initializing the default timeout to the smallest non-zero value avoid this
-problem and allows for the existing logic to be preserved: the
-bus->clk_stop_timeout is set as the maximum required by all codecs
-connected on the bus.
-
-Signed-off-by: Sjoerd Simons <sjoerd@collabora.com>
-For: https://github.com/thesofproject/linux/issues/3777
----
- drivers/soundwire/intel.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c
-index af6c1a93372d..002bc26b525e 100644
---- a/drivers/soundwire/intel.c
-+++ b/drivers/soundwire/intel.c
-@@ -1307,6 +1307,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev,
- 	cdns->msg_count = 0;
- 
- 	bus->link_id = auxdev->id;
-+	bus->clk_stop_timeout = 1;
- 
- 	sdw_cdns_probe(cdns);
- 
--- 
-2.38.1
-
diff --git a/PKGBUILD b/PKGBUILD
index d616eab..bde6e3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _custom=0
 pkgbase=linux
 _supver=6
 _majver=0
-_minver=11
+_minver=16
 _gccpatchver='20221104'
 _gccpatchker='5.17+'
   if [ "$_minver" == "0" ]; then
@@ -43,7 +43,6 @@ source=(
   https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign}
   config         # the main kernel config file
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0002-soundwire-intel-Initialize-clock-stop-timeout.patch
   0003-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
   0004-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
   0005-drm-i915-improve-the-catch-all-evict-to-handle-lock-.patch
@@ -56,22 +55,20 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('2bae6131e64971e1e34ff395fa542971134c857bdb0b29069ab847c7c9a9c762'
+sha256sums=('842071bca611c1f080cbc39c7ab3a6b58d7951f4f41e553b3db4fbe3e0705ce4'
             'SKIP'
             'e490737c0007da7bf9275e4d5f0162b64bb27d31169c9a24c2258c56c76fa43f'
             '2f4d03a8bb21357f88d694b62fc3299944fa1738652dfe888ac0320d5d21f351'
-            '2fe671aab9f164a3841e75d837058f208ee781854e6c41e829ddde789bfdc4c2'
             '671c3852d1adf7095cf82fdecf197c65df4d3003c917b56cee2fc9845cd06883'
             '3d00e39c53c107c87925eaeade32fc7d78e916e588ab5d8e4dd84c33ae748a96'
             '753576c6bc05bab969c5824fdb8dd8e6e1131d4c7f805dbaf5c529aafd2a1b6b'
             '3a8f397b89bad95c46f42c0f80ede7536a4a45a28621e00ed486918a55f905ed'
             'e9e0d289170b7fb598b572d9c892ae8d1420952034aa415e8b3334f20a58edcc'
             '6ab863c8cfe6e0dd53a9d6455872fd4391508a8b97ab92e3f13558a6617b12a6')
-b2sums=('55d3fc789bd0775afc3415c3cdbdf0819f1cce599fa383a44fd62eb80734bc204ef9848b35ae7746b6fb74db58bff106639ed2ac971b12b60f0ade3fae96f404'
+b2sums=('9e7b042e1f8fefd5b84aa867a0dfc3d86da8e531fdbdf84aed81dfe987c01bf2b4d4df13fcad5ceca0fec206032268c5324ce1dfefc8611016e44c3ddb50584d'
         'SKIP'
         '02755ec326bde2703f0019d9fa214f6a7db52af43d47dde9ba87cd95bdc40fc4cc47f678a677640e4a472ec46790ba31ac36c37ded650740a1ef4f23b3f5e92b'
         '9d9dd78748f901b9be5876e1b34f4f13cae51384fbbfa653678924c6c8d90fdddf71b8c524aa2bc24548c6111adf160153753bd8a738866a2473459a338df6a0'
-        'e2b8f09db5299046f4b37caeef16bb26430432a63fa58c7055eaeec58c70e1e12cfe712b37e54325b6273c317294b654a3d9b16ce4b0862b9ae679d766d08245'
         'd7b384645d39201c43871e3c6067012b8bb2b30bcce3217dbfdd6cc9437e1cf1ab7dbbbcd333cc5b9e04a986a6d1aefa9659cab73fdd308878621104285138b8'
         'bc9d55712dbcb69a6220ffa98da46ac8ed78c2901e74aa65d4a5f35796a7cc17f2bd87d9d62924c18266f703bea67debf120d5ceff7a21963d1b35e022391252'
         'c819f6054da048c136d058e2925dcce4fab694917bd0608aee7f616a74c2464176b9c842764af49589bcbf298bb267528c7607f81137415cfccde2fa51b4beea'
@@ -97,7 +94,6 @@ prepare() {
   # Hotfixes
   echo "Applying hotfixes"
   patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  patch -p1 -i ../0002-soundwire-intel-Initialize-clock-stop-timeout.patch
   patch -p1 -i ../0003-drm-sched-add-DRM_SCHED_FENCE_DONT_PIPELINE-flag.patch
   patch -p1 -i ../0004-drm-amdgpu-use-DRM_SCHED_FENCE_DONT_PIPELINE-for-VM-.patch
   patch -p1 -i ../0005-drm-i915-improve-the-catch-all-evict-to-handle-lock-.patch