Updated to 5.1.18

3 files changed, 61 insertions, 5 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
new file mode 100644
index 0000000..59d743d
--- /dev/null
+++ b/0003-iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
@@ -0,0 +1,53 @@
+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/PKGBUILD b/PKGBUILD
index c94db3b..bf5cef3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@
 
 pkgbase=linux-ck
 _majver=5.1
-_minver=17
+_minver=18
   if [ "$_minver" == "0" ]; then
     pkgver=${_majver}
   else
@@ -40,6 +40,7 @@ source=(
         https://www.kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.{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
         ck_remove-excess-extraversion.patch
         http://ck.kolivas.org/patches/5.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatch}.xz
         graysky_bdver2-hotfix.patch
@@ -51,17 +52,18 @@ source=(
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
        )
-sha256sums=('5935c37966a7883cea6a541684fd4076b8d8d11776d7e76996c62c832b96c43d'
+sha256sums=('6013e7dcf59d7c1b168d8edce3dbd61ce340ff289541f920dbd0958bef98f36a'
             'SKIP'
             '91fafa76bf9cb32159ac7f22191b3589278b91e65bc4505cf2fc6013b8037bf3'
             '63e4378e69e2f23ed87af32a4951477a6d82d4ac0de2295db46502c8120da9d9'
+            'fc96300831506965383ef30bc46b72735dc45bb97dea2ccb8b9450c005d2f020'
             'a2db6672b2d35f3006c7151e8fa90f5187dcdac9fcc46e88e78d45c7d8226d1f'
             'f8d18a34f6b17ec8e5f2a7354383ca627e0fd00b5578c1ee7d9808a34f33c724'
             '229e063a578db0a278108f37b24da20c2a2a18d825e98a67e426cb0f4b492e4a'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
             '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
-            'b8e2b93359639e424d6929dfae3185a23a613d719e993a14bbfe0cbdb4ff960c'
+            '4c6e86b9a5dbbc672419c556cbe1123f22cd5b0da756c5018dd45be2f303362b'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -85,6 +87,7 @@ 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
 
 
   # ck hotfixes
diff --git a/config.x86_64 b/config.x86_64
index a8e64d6..7f800eb 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.1.17 Kernel Configuration
+# Linux/x86 5.1.18 Kernel Configuration
 #
 
 #
@@ -3226,7 +3226,7 @@ CONFIG_LED_TRIGGER_PHY=y
 CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 CONFIG_AQUANTIA_PHY=m
-CONFIG_ASIX_PHY=m
+CONFIG_AX88796B_PHY=m
 CONFIG_AT803X_PHY=m
 CONFIG_BCM7XXX_PHY=m
 CONFIG_BCM87XX_PHY=m