|
 |
deb259 |
From 0f89f208e7a2437b5d7ff440db091c94d2ce3ac2 Mon Sep 17 00:00:00 2001
|
|
|
deb259 |
From: Eugene Syromiatnikov <esyr@redhat.com>
|
|
|
deb259 |
Date: Thu, 11 Jul 2019 18:39:53 +0200
|
|
|
deb259 |
Subject: [PATCH] Revert "mac80211: update HE IEs to D3.3"
|
|
|
deb259 |
|
|
|
deb259 |
This reverts commit 77ff2c6b49843b01adef1f80abb091753e4c9c65.
|
|
|
deb259 |
---
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 26 +---------
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 58 ++++++++++++++--------
|
|
|
deb259 |
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 42 ----------------
|
|
|
deb259 |
include/linux/ieee80211.h | 22 +++-----
|
|
|
deb259 |
4 files changed, 46 insertions(+), 102 deletions(-)
|
|
|
deb259 |
|
|
|
deb259 |
Index: src/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h
|
|
|
deb259 |
===================================================================
|
|
|
deb259 |
--- src.orig/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h 2019-06-27 14:54:04.121678482 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/fw/api/mac.h 2019-07-11 18:41:11.521146562 +0200
|
|
|
deb259 |
@@ -7,7 +7,7 @@
|
|
|
deb259 |
*
|
|
|
deb259 |
* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
|
|
|
deb259 |
* Copyright(c) 2017 Intel Deutschland GmbH
|
|
|
deb259 |
- * Copyright(c) 2018 - 2019 Intel Corporation
|
|
|
deb259 |
+ * Copyright(c) 2018 Intel Corporation
|
|
|
deb259 |
*
|
|
|
deb259 |
* This program is free software; you can redistribute it and/or modify
|
|
|
deb259 |
* it under the terms of version 2 of the GNU General Public License as
|
|
|
deb259 |
@@ -29,7 +29,7 @@
|
|
|
deb259 |
*
|
|
|
deb259 |
* Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
|
|
|
deb259 |
* Copyright(c) 2017 Intel Deutschland GmbH
|
|
|
deb259 |
- * Copyright(c) 2018 - 2019 Intel Corporation
|
|
|
deb259 |
+ * Copyright(c) 2018 Intel Corporation
|
|
|
deb259 |
* All rights reserved.
|
|
|
deb259 |
*
|
|
|
deb259 |
* Redistribution and use in source and binary forms, with or without
|
|
|
deb259 |
@@ -433,28 +433,6 @@
|
|
|
deb259 |
__le16 mu_time;
|
|
|
deb259 |
} __packed; /* AC_QOS_DOT11AX_API_S */
|
|
|
deb259 |
|
|
|
deb259 |
-/**
|
|
|
deb259 |
- * enum iwl_he_pkt_ext_constellations - PPE constellation indices
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_BPSK: BPSK
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_QPSK: QPSK
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_16QAM: 16-QAM
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_64QAM: 64-QAM
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_256QAM: 256-QAM
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_1024QAM: 1024-QAM
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_RESERVED: reserved value
|
|
|
deb259 |
- * @IWL_HE_PKT_EXT_NONE: not defined
|
|
|
deb259 |
- */
|
|
|
deb259 |
-enum iwl_he_pkt_ext_constellations {
|
|
|
deb259 |
- IWL_HE_PKT_EXT_BPSK = 0,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_QPSK,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_16QAM,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_64QAM,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_256QAM,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_1024QAM,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_RESERVED,
|
|
|
deb259 |
- IWL_HE_PKT_EXT_NONE,
|
|
|
deb259 |
-};
|
|
|
deb259 |
-
|
|
|
deb259 |
#define MAX_HE_SUPP_NSS 2
|
|
|
deb259 |
#define MAX_HE_CHANNEL_BW_INDX 4
|
|
|
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-07-11 18:41:04.030243005 +0200
|
|
|
deb259 |
+++ src/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2019-07-11 18:41:11.522146549 +0200
|
|
|
deb259 |
@@ -497,6 +497,7 @@
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_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 |
@@ -507,9 +508,7 @@
|
|
|
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_CAP5_HE_DYNAMIC_SM_PS |
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX,
|
|
|
deb259 |
+ IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,
|
|
|
deb259 |
.phy_cap_info[0] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
|
|
|
deb259 |
@@ -517,13 +516,18 @@
|
|
|
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_LDPC_CODING_IN_PAYLOAD |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,
|
|
|
deb259 |
.phy_cap_info[2] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,
|
|
|
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 |
.phy_cap_info[3] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,
|
|
|
deb259 |
.phy_cap_info[4] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
|
|
|
deb259 |
@@ -531,8 +535,16 @@
|
|
|
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_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,
|
|
|
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 |
@@ -543,12 +555,11 @@
|
|
|
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_RU_2x996,
|
|
|
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_CAP9_NOMIMAL_PKT_PADDING_RESERVED,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,
|
|
|
deb259 |
},
|
|
|
deb259 |
/*
|
|
|
deb259 |
* Set default Tx/Rx HE MCS NSS Support field.
|
|
|
deb259 |
@@ -582,26 +593,28 @@
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP1_MULTI_TID_AGG_RX_QOS_8,
|
|
|
deb259 |
.mac_cap_info[2] =
|
|
|
deb259 |
IEEE80211_HE_MAC_CAP2_BSR |
|
|
|
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 |
- .mac_cap_info[5] =
|
|
|
deb259 |
- IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,
|
|
|
deb259 |
.phy_cap_info[0] =
|
|
|
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_LDPC_CODING_IN_PAYLOAD,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP1_MIDAMBLE_RX_TX_MAX_NSTS,
|
|
|
deb259 |
.phy_cap_info[2] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US,
|
|
|
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 |
.phy_cap_info[3] =
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_NO_DCM |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_BPSK |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP3_DCM_MAX_TX_NSS_1 |
|
|
|
deb259 |
- IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_NO_DCM |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_RX_BPSK |
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP3_DCM_MAX_RX_NSS_1,
|
|
|
deb259 |
.phy_cap_info[4] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
|
|
|
deb259 |
@@ -609,8 +622,12 @@
|
|
|
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_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2 |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP5_NG16_SU_FEEDBACK |
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP5_NG16_MU_FEEDBACK,
|
|
|
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_PPE_THRESHOLD_PRESENT,
|
|
|
deb259 |
.phy_cap_info[7] =
|
|
|
deb259 |
IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |
|
|
|
deb259 |
@@ -620,11 +637,10 @@
|
|
|
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_RU_2x996,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP8_DCM_MAX_BW_160_OR_80P80_MHZ,
|
|
|
deb259 |
.phy_cap_info[9] =
|
|
|
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_CAP9_NOMIMAL_PKT_PADDING_RESERVED,
|
|
|
deb259 |
+ IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB,
|
|
|
deb259 |
},
|
|
|
deb259 |
/*
|
|
|
deb259 |
* Set default Tx/Rx HE MCS NSS Support field.
|