Update to 5.2.11-1

4 files changed, 10 insertions, 157 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd4d12e33195..4492157dfda5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-ck
-	pkgver = 5.2.10
+	pkgver = 5.2.11
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = x86_64
@@ -9,8 +9,8 @@ pkgbase = linux-ck
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.10.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.10.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.11.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.2.11.tar.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -19,11 +19,9 @@ pkgbase = linux-ck
 	source = http://ck.kolivas.org/patches/5.0/5.2/5.2-ck1/patch-5.2-ck1.xz
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 	source = 0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
-	source = 0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-	source = 0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	sha256sums = 6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49
+	sha256sums = 0c2a831f993dc8a8a8e1ca4186b467de72ff173c6f5855e2aab70f6f7fb033f9
 	sha256sums = SKIP
 	sha256sums = 42e2bc6a7d8439b3a6fe4084d1349077472e0a6831d8a39edda46824a5f0987b
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -33,8 +31,6 @@ pkgbase = linux-ck
 	sha256sums = f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36
 	sha256sums = 91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3
 	sha256sums = 63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9
-	sha256sums = fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020
-	sha256sums = 2186ca201a99edb94ce56840132544c47234636aada75b75aca6bfa780e04f57
 
 pkgname = linux-ck
 	pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.192
@@ -44,12 +40,12 @@ pkgname = linux-ck
 	depends = kmod
 	depends = mkinitcpio
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-ck=5.2.10
+	provides = linux-ck=5.2.11
 	backup = etc/mkinitcpio.d/linux-ck.preset
 
 pkgname = linux-ck-headers
 	pkgdesc = Header files and scripts for building modules for Linux-ck kernel
 	depends = linux-ck
-	provides = linux-ck-headers=5.2.10
-	provides = linux-headers=5.2.10
+	provides = linux-ck-headers=5.2.11
+	provides = linux-headers=5.2.11
 
diff --git a/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch b/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
deleted file mode 100644
index 59d743deccaa..000000000000
--- a/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From f6f6b798c7330d7851fee4bbe835c3954886fc3f Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Wed, 3 Jul 2019 11:10:49 +0300
-Subject: [PATCH 3/4] iwlwifi: mvm: disable TX-AMSDU on older NICs
-
-On older NICs, we occasionally see issues with A-MSDU support,
-where the commands in the FIFO get confused and then we see an
-assert EDC because the next command in the FIFO isn't TX.
-
-We've tried to isolate this issue and understand where it comes
-from, but haven't found any errors in building the A-MSDU in
-software.
-
-At least for now, disable A-MSDU support on older hardware so
-that users can use it again without fearing the assert.
-
-This fixes https://bugzilla.kernel.org/show_bug.cgi?id=203315.
-
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Acked-by: Kalle Valo <kvalo@codeaurora.org>
----
- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-index fdbabca0280e..3a076e5e319f 100644
---- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
-@@ -468,7 +468,19 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
- 	ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW);
- 	ieee80211_hw_set(hw, BUFF_MMPDU_TXQ);
- 	ieee80211_hw_set(hw, STA_MMPDU_TXQ);
--	ieee80211_hw_set(hw, TX_AMSDU);
-+	/*
-+	 * On older devices, enabling TX A-MSDU occasionally leads to
-+	 * something getting messed up, the command read from the FIFO
-+	 * gets out of sync and isn't a TX command, so that we have an
-+	 * assert EDC.
-+	 *
-+	 * It's not clear where the bug is, but since we didn't used to
-+	 * support A-MSDU until moving the mac80211 iTXQs, just leave it
-+	 * for older devices. We also don't see this issue on any newer
-+	 * devices.
-+	 */
-+	if (mvm->cfg->device_family >= IWL_DEVICE_FAMILY_9000)
-+		ieee80211_hw_set(hw, TX_AMSDU);
- 	ieee80211_hw_set(hw, TX_FRAG_LIST);
- 
- 	if (iwl_mvm_has_tlc_offload(mvm)) {
--- 
-2.22.0
-
diff --git a/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch b/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
deleted file mode 100644
index 57d6f44a0572..000000000000
--- a/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From dd672eb4f207fcb2b26bafa0d61f118c3c11a479 Mon Sep 17 00:00:00 2001
-From: Likun Gao <Likun.Gao@amd.com>
-Date: Fri, 2 Aug 2019 15:18:57 +0800
-Subject: [PATCH 4/5] drm/amdgpu: pin the csb buffer on hw init for gfx v8
-
-Without this pin, the csb buffer will be filled with inconsistent
-data after S3 resume. And that will causes gfx hang on gfxoff
-exit since this csb will be executed then.
-
-Signed-off-by: Likun Gao <Likun.Gao@amd.com>
-Tested-by: Paul Gover <pmw.gover@yahoo.co.uk>
-Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
-Reviewed-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 +++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-index 02955e6e9dd9..c21ef99cc590 100644
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
-@@ -1317,6 +1317,39 @@ static int gfx_v8_0_rlc_init(struct amdgpu_device *adev)
- 	return 0;
- }
- 
-+static int gfx_v8_0_csb_vram_pin(struct amdgpu_device *adev)
-+{
-+	int r;
-+
-+	r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, false);
-+	if (unlikely(r != 0))
-+		return r;
-+
-+	r = amdgpu_bo_pin(adev->gfx.rlc.clear_state_obj,
-+			AMDGPU_GEM_DOMAIN_VRAM);
-+	if (!r)
-+		adev->gfx.rlc.clear_state_gpu_addr =
-+			amdgpu_bo_gpu_offset(adev->gfx.rlc.clear_state_obj);
-+
-+	amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
-+
-+	return r;
-+}
-+
-+static void gfx_v8_0_csb_vram_unpin(struct amdgpu_device *adev)
-+{
-+	int r;
-+
-+	if (!adev->gfx.rlc.clear_state_obj)
-+		return;
-+
-+	r = amdgpu_bo_reserve(adev->gfx.rlc.clear_state_obj, true);
-+	if (likely(r == 0)) {
-+		amdgpu_bo_unpin(adev->gfx.rlc.clear_state_obj);
-+		amdgpu_bo_unreserve(adev->gfx.rlc.clear_state_obj);
-+	}
-+}
-+
- static void gfx_v8_0_mec_fini(struct amdgpu_device *adev)
- {
- 	amdgpu_bo_free_kernel(&adev->gfx.mec.hpd_eop_obj, NULL, NULL);
-@@ -4777,6 +4810,10 @@ static int gfx_v8_0_hw_init(void *handle)
- 	gfx_v8_0_init_golden_registers(adev);
- 	gfx_v8_0_constants_init(adev);
- 
-+	r = gfx_v8_0_csb_vram_pin(adev);
-+	if (r)
-+		return r;
-+
- 	r = adev->gfx.rlc.funcs->resume(adev);
- 	if (r)
- 		return r;
-@@ -4893,6 +4930,9 @@ static int gfx_v8_0_hw_fini(void *handle)
- 	else
- 		pr_err("rlc is busy, skip halt rlc\n");
- 	amdgpu_gfx_rlc_exit_safe_mode(adev);
-+
-+	gfx_v8_0_csb_vram_unpin(adev);
-+
- 	return 0;
- }
- 
--- 
-2.23.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 44bfb1fd81f2..2d79eff0a41e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -63,7 +63,7 @@ _localmodcfg=
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-ck
-_srcver=5.2.10-arch1
+_srcver=5.2.11-arch1
 pkgver=${_srcver%-*}
 pkgrel=1
 _ckpatchversion=1
@@ -84,14 +84,12 @@ source=(
   "http://ck.kolivas.org/patches/5.0/5.2/5.2-ck${_ckpatchversion}/$_ckpatch.xz"
   0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
   0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
-  0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-  0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49'
+sha256sums=('0c2a831f993dc8a8a8e1ca4186b467de72ff173c6f5855e2aab70f6f7fb033f9'
             'SKIP'
             '42e2bc6a7d8439b3a6fe4084d1349077472e0a6831d8a39edda46824a5f0987b'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -100,9 +98,7 @@ sha256sums=('6096c4387c2a296de9136080942d11ae3f1bd28129b6952f7133c570e43bfc49'
             '8c11086809864b5cef7d079f930bd40da8d0869c091965fa62e95de9a0fe13b5'
             'f1abc13a8d859fbf6350040e45d7f04ad551a6d39f113ba96fbbd820118c0e36'
             '91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3'
-            '63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9'
-            'fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020'
-            '2186ca201a99edb94ce56840132544c47234636aada75b75aca6bfa780e04f57')
+            '63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9')
 
 _kernelname=${pkgbase#linux}
 : ${_kernelname:=-ARCH}