Updated to 5.2.11

3 files changed, 3 insertions, 146 deletions

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 d811047..0000000
--- a/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
+++ /dev/null
@@ -1,52 +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: 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)) {
--- 
-cgit v1.2.1-1-g437b
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 b82ce17..0000000
--- a/0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
+++ /dev/null
@@ -1,85 +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: 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;
- }
- 
--- 
-cgit v1.2.1-1-g437b
diff --git a/PKGBUILD b/PKGBUILD
index dbcc357..b3c8209 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@
 
 pkgbase=linux-libre
 _majver=5.2
-_minver=10
+_minver=11
   if [ "$_minver" == "0" ]; then
     pkgver=${_majver}
   else
@@ -38,8 +38,6 @@ source=(
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign}
         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
         graysky_bdver2-hotfix.patch
         kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
         ath9k-regdom-hack.patch
@@ -51,17 +49,15 @@ source=(
        )
 sha512sums=('3359b0a10ac04243399a1b0aa84f6c09e3c1914880be19a7e931189da92900ca77e467e7ab5c296a03d2ff0ab3238ec75b13fd41bd2796049b63e71f6896900e'
             'SKIP'
-            '502d896690509648d836cd448422a8b0d4ea7f57b7faf20c42749716f47c3f1f8e56fd7a0041203aa20509966389f02410cd2563b5bc89ea6b1f5b12facec17b'
+            'b57174666109d8a711d4efb496ec5e4b0362cbd91cba0210c24e39ee963b2dbdab3abbe2f2549ceafec8eef331cd3304d901d0e8cd79b9ba10856f21fb3c3863'
             'SKIP'
             '81a57ab537da498800475d1b30d2d067e06325486e7f19aab713c4bab211a7caaf63b85e1c761646eb945c40b6a0b917eeb2be9e58c8a6d9f730e5b25bb982b8'
             '32a95975fd933c2fe25a54b2fd7d6533d7adcc3c7a607159b4625020907af3d632c5b5f457b8c359669dbd19e77bf14348731a5385e10fc94471ad2a1b9a4ceb'
-            '45b1928c068ef5304bce127920d504aa0bcf7175b3b29187545a1f0eaaa910e7bd3530ffe12e091da4c5d994c4ac48b4eb5672f72e36fc5719e5a32691c65f72'
-            'b39892416a18526230457b50dd0141610d9de3ebf87ab37739367ab70bd9d3240fff2d75955816126ec441f3e0a4718d94ae88e4c7aefacc840f172a6ed02b5e'
             '1d5d8f6c0afff47deac8ab5f5bd8c0f1633c968bcd1f8022719bd0e3ec8c31b89658f15faaa1decbfb61d88af14fa8eec5886dc21c65e1975362dfd8f3939858'
             '44b44ef4a7a89c3d57548b41e2152dc5e977a582a8b77dfe7595dd94696890144fa0967cb0fbc4426fff32b616064f3143cf25302cf7af93207b74cb4ac914b6'
             '905beb3f47cccb161e1ee74f8d5ba324b7c2f72e86246d941dfb18c85ace9d32df1966b52d2be2e3ff1ebea74af3b868422aec5a3eebc29858ee9e7207dea226'
             'd6bec327f4f2c69f2fc2780d90cd5d057bc5e32b39e54a13fccb1f5a880a148fa322e54c372e38d3f453d06fd9ab54d653265f355bd61e08a416058bd4224167'
-            'aec33ac326ff1b64ccd82fb0bf0298aec4ff38c9db618d0ff3a3f6a539a96d72578fff64b6ebb870991dd49eec6dbda7804f781e0cf2126a7c35db0fd6703b79'
+            '3981741dd4fce3233a9decf6b1dbb863c17bcaf3d0a6ee2ed5d5467fc5056e6228afcd1fee02b0141b1d511f1cd6d7e90dece7b24e9b4cc9910ad9a0ab4285f6'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf')
@@ -84,8 +80,6 @@ prepare() {
   msg2 "Applying hotfixes"
   patch -p1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
   patch -p1 -i ../0002-ZEN-Add-CONFIG-for-unprivileged_userns_clone.patch
-  patch -p1 -i ../0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
-  patch -p1 -i ../0004-drm-amdgpu-pin-the-csb-buffer-on-hw-init-for-gfx-v8.patch
 
 
   # graysky gcc hotfixes