|
 |
deb259 |
From fa85f5e990b991cb794bc53be62f7947bfe7850a Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 5 Sep 2019 16:07:45 +0200
|
|
|
deb259 |
Subject: [PATCH 01/43] Revert "wireless: align to draft 11ax D3.0"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit add7453ad62f05c8f1a48675bb4dfed52e6ac878.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 51 ++++++----------------
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++
|
|
|
deb259 |
2 files changed, 17 insertions(+), 38 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2019-09-05 14:40:03.470473054 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2019-09-06 01:25:40.500355788 +0200
|
|
|
deb259 |
@@ -486,40 +486,30 @@
|
|
|
deb259 |
.has_he = true,
|
|
|
deb259 |
.he_cap_elem = {
|
|
|
deb259 |
.mac_cap_info[0] =
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP0_HTC_HE |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP0_TWT_REQ,
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP0_HTC_HE,
|
|
|
deb259 |
.mac_cap_info[1] =
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_16US |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_QOS_8,
|
|
|
deb259 |
.mac_cap_info[2] =
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP2_MU_CASCADING |
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP2_ACK_EN,
|
|
|
deb259 |
.mac_cap_info[3] =
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP3_OMI_CONTROL |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2,
|
|
|
deb259 |
- .mac_cap_info[4] =
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,
|
|
|
deb259 |
- .mac_cap_info[5] =
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B41 |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP3_GRP_ADDR_MULTI_STA_BA_DL_MU |
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP3_MAX_A_AMPDU_LEN_EXP_VHT_2,
|
|
|
deb259 |
+ .mac_cap_info[4] = IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU,
|
|
|
deb259 |
.phy_cap_info[0] =
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP0_DUAL_BAND |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G,
|
|
|
deb259 |
.phy_cap_info[1] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP1_PREAMBLE_PUNC_RX_MASK |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP1_DEVICE_CLASS_A |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS,
|
|
|
deb259 |
.phy_cap_info[2] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP2_STBC_TX_UNDER_80MHZ |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP2_UL_MU_PARTIAL_MU_MIMO,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ,
|
|
|
deb259 |
.phy_cap_info[3] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |
|
|
|
deb259 |
@@ -531,31 +521,18 @@
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_8,
|
|
|
deb259 |
.phy_cap_info[5] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,
|
|
|
deb259 |
.phy_cap_info[6] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,
|
|
|
deb259 |
.phy_cap_info[7] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP7_MAX_NC_1,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP7_MAX_NC_7,
|
|
|
deb259 |
.phy_cap_info[8] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP8_HE_ER_SU_PPDU_4XLTF_AND_08_US_GI |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP8_20MHZ_IN_40MHZ_HE_PPDU_IN_2G |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_160_OR_80P80_MHZ,
|
|
|
deb259 |
- .phy_cap_info[9] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU,
|
|
|
deb259 |
},
|
|
|
deb259 |
/*
|
|
|
deb259 |
* Set default Tx/Rx HE MCS NSS Support field. Indicate support
|
|
|
deb259 |
@@ -592,11 +569,9 @@
|
|
|
deb259 |
/* If not 2x2, we need to indicate 1x1 in the Midamble RX Max NSTS */
|
|
|
deb259 |
if ((tx_chains & rx_chains) != ANT_AB) {
|
|
|
deb259 |
iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[1] &=
|
|
|
deb259 |
- ~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS;
|
|
|
deb259 |
+ ~IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_MAX_NSTS;
|
|
|
deb259 |
iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[2] &=
|
|
|
deb259 |
- ~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_TX_MAX_NSTS;
|
|
|
deb259 |
- iwl_he_capa.he_cap.he_cap_elem.phy_cap_info[7] &=
|
|
|
deb259 |
- ~IEEE80211_HE_PHY_CAP7_MAX_NC_MASK;
|
|
|
deb259 |
+ ~IEEE80211_HE_PHY_CAP2_MIDAMBLE_RX_MAX_NSTS;
|
|
|
deb259 |
}
|
|
|
deb259 |
}
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-05 14:40:03.378474238 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c 2019-09-06 01:25:40.501355775 +0200
|
|
|
deb259 |
@@ -2090,6 +2090,10 @@
|
|
|
deb259 |
sta_ctxt_cmd.htc_flags |=
|
|
|
deb259 |
cpu_to_le32(IWL_HE_HTC_LINK_ADAP_BOTH);
|
|
|
deb259 |
}
|
|
|
deb259 |
+ if (sta->he_cap.he_cap_elem.mac_cap_info[2] &
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP2_UL_MU_RESP_SCHED)
|
|
|
deb259 |
+ sta_ctxt_cmd.htc_flags |=
|
|
|
deb259 |
+ cpu_to_le32(IWL_HE_HTC_UL_MU_RESP_SCHED);
|
|
|
deb259 |
if (sta->he_cap.he_cap_elem.mac_cap_info[2] & IEEE80211_HE_MAC_CAP2_BSR)
|
|
|
deb259 |
sta_ctxt_cmd.htc_flags |= cpu_to_le32(IWL_HE_HTC_BSR_SUPP);
|
|
|
deb259 |
if (sta->he_cap.he_cap_elem.mac_cap_info[3] &
|