mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-20 10:51:27 +00:00
3affbc1cad
This series is based on * 2020-07-10 ipq6018-ilq-11-0_qca_oem-034672b0676c37b1f4519e5720e18e95fe6236ef Add support for * qsdk kernel/v4.4 * qsdk ethernet subsystem * v5.7 ath11k backport + QualComm staging patches (wlan_ap_1.0) * ath11k-firmware * hostapd/iw/... Feature support * full boot, system detection * sysupgrade to nand * HE support via latest hostapd * driver support for usb, crypto, hwmon, cpufreq, ... Missing * NSS/HW flow offloading - FW blob is not redistributable Using the qsdk v4.4 is an intermediate solution while the vanilla is being tested. Vanilla kernel is almost on feature par. Work has already started to upstream the ethernet and switch drivers. Once complete the target will be fully upstream. Signed-off-by: John Crispin <john@phrozen.org>
63 lines
2.5 KiB
Diff
63 lines
2.5 KiB
Diff
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -1208,6 +1208,7 @@ static void ath11k_peer_assoc_h_he(struc
|
|
enum nl80211_band band;
|
|
const u16 *he_mcs_mask;
|
|
u8 max_nss, he_mcs;
|
|
+ u8 ampdu_factor;
|
|
__le16 he_tx_mcs = 0, v = 0;
|
|
int i;
|
|
|
|
@@ -1235,6 +1236,30 @@ static void ath11k_peer_assoc_h_he(struc
|
|
/* the top most byte is used to indicate BSS color info */
|
|
arg->peer_he_ops &= 0xffffff;
|
|
|
|
+ /* As per section 26.6.1 11ax Draft4.0, if the Max AMPDU Exponent Extension
|
|
+ * in HE cap is zero, use the arg->peer_max_mpdu as calculated while parsing
|
|
+ * VHT caps(if VHT caps is present) or HT caps (if VHT caps is not present).
|
|
+ *
|
|
+ * For non-zero value of Max AMPDU Extponent Extension in HE MAC caps,
|
|
+ * if a HE STA sends VHT cap and HE cap IE in assoc request then, use
|
|
+ * MAX_AMPDU_LEN_FACTOR as 20 to calculate max_ampdu length.
|
|
+ * If a HE STA that does not send VHT cap, but HE and HT cap in assoc
|
|
+ * request, then use MAX_AMPDU_LEN_FACTOR as 16 to calculate max_ampdu
|
|
+ * length.
|
|
+ */
|
|
+ ampdu_factor = (he_cap->he_cap_elem.mac_cap_info[3] &
|
|
+ IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK) >>
|
|
+ IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_SHIFT;
|
|
+
|
|
+ if (ampdu_factor) {
|
|
+ if (sta->vht_cap.vht_supported)
|
|
+ arg->peer_max_mpdu = (1 << (IEEE80211_HE_VHT_MAX_AMPDU_FACTOR +
|
|
+ ampdu_factor)) - 1;
|
|
+ else if (sta->ht_cap.ht_supported)
|
|
+ arg->peer_max_mpdu = (1 << (IEEE80211_HE_HT_MAX_AMPDU_FACTOR +
|
|
+ ampdu_factor)) - 1;
|
|
+ }
|
|
+
|
|
if (he_cap->he_cap_elem.phy_cap_info[6] &
|
|
IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) {
|
|
int bit = 7;
|
|
--- a/include/linux/ieee80211.h
|
|
+++ b/include/linux/ieee80211.h
|
|
@@ -1805,6 +1805,8 @@ int ieee80211_get_vht_max_nss(struct iee
|
|
#define IEEE80211_HE_MAC_CAP3_FLEX_TWT_SCHED 0x40
|
|
#define IEEE80211_HE_MAC_CAP3_RX_CTRL_FRAME_TO_MULTIBSS 0x80
|
|
|
|
+#define IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_SHIFT 3
|
|
+
|
|
#define IEEE80211_HE_MAC_CAP4_BSRP_BQRP_A_MPDU_AGG 0x01
|
|
#define IEEE80211_HE_MAC_CAP4_QTP 0x02
|
|
#define IEEE80211_HE_MAC_CAP4_BQR 0x04
|
|
@@ -1826,6 +1828,9 @@ int ieee80211_get_vht_max_nss(struct iee
|
|
#define IEEE80211_HE_MAC_CAP5_PUNCTURED_SOUNDING 0x40
|
|
#define IEEE80211_HE_MAC_CAP5_HT_VHT_TRIG_FRAME_RX 0x80
|
|
|
|
+#define IEEE80211_HE_VHT_MAX_AMPDU_FACTOR 20
|
|
+#define IEEE80211_HE_HT_MAX_AMPDU_FACTOR 16
|
|
+
|
|
/* 802.11ax HE PHY capabilities */
|
|
#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G 0x02
|
|
#define IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G 0x04
|