Linux v5.3-rc3-282-g33920f1ec5bf
This commit is contained in:
parent
3166f3d037
commit
c37e89654f
2
gitrev
2
gitrev
@ -1 +1 @@
|
||||
1e78030e5e5b2d8b0cad7136caf9cfab986a6bff
|
||||
33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9
|
||||
|
@ -1,53 +0,0 @@
|
||||
From 3658c2832e3919b68fdba173f3d30079030542c6 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] 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 6a3b11dd2edf..f9df5e3eeee7 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
||||
@@ -467,7 +467,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.21.0
|
||||
|
@ -71,7 +71,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%global rcrev 3
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
%define gitrev 1
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 5.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -580,10 +580,6 @@ Patch507: 0001-Drop-that-for-now.patch
|
||||
# Submitted upstream at https://lkml.org/lkml/2019/4/23/89
|
||||
Patch508: KEYS-Make-use-of-platform-keyring-for-module-signature.patch
|
||||
|
||||
# rhbz 1716334
|
||||
# https://patchwork.kernel.org/patch/11029027/
|
||||
Patch509: iwlwifi-mvm-disable-TX-AMSDU-on-older-NICs.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
@ -1822,6 +1818,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Aug 07 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-0.rc3.git1.1
|
||||
- Linux v5.3-rc3-282-g33920f1ec5bf
|
||||
|
||||
* Wed Aug 07 2019 Laura Abbott <labbott@redhat.com>
|
||||
- Reenable debugging options.
|
||||
|
||||
|
1
sources
1
sources
@ -1,2 +1,3 @@
|
||||
SHA512 (linux-5.2.tar.xz) = 5a28f8a34c4e0470617f5638b7112e6252109b78f23b1eed484a228530970c7ef5c130d6e5a09cf25ea2f6a0329602dcc1ec66ce893182e15b27d99bd228789c
|
||||
SHA512 (patch-5.3-rc3.xz) = 559c8e32ac1da56950279e6515c4520013de8ffd017957811be3e5951a3b9fcdcec5ef8eedfe325ce21c3d5997b1b7d6e65d26363ac444cc479fb6b279749067
|
||||
SHA512 (patch-5.3-rc3-git1.xz) = e5b701faad482b2bfd76884b321b963747bbd54471450da36cea171e4098ab247c96248c68336c33b42f354e647981c4ec6b2e7f9d69228d3bceaec31132403d
|
||||
|
Loading…
Reference in New Issue
Block a user