ath11k: add HE support
PATCH 1/1 ath11k: add HE support
Add basic HE support to the driver. Things still missing are
* fixed HE mcs/nss rates
* reading the caps from the FW
* 80P80 support
* verify if the mac_caps are correct
* he_operations is not yet propagated to the FW yet
For HE to work the following hostapd patches need to be used --> http://lists.infradead.org/pipermail/hostap/2019-April/039962.html
--- drivers/net/wireless/ath/ath11k/core.h | 3 + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 24 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +- drivers/net/wireless/ath/ath11k/mac.c | 405 ++++++++++++++++++++++---- drivers/net/wireless/ath/ath11k/wmi.c | 1 + drivers/net/wireless/ath/ath11k/wmi.h | 5 +- 6 files changed, 382 insertions(+), 59 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +3 -0
@@ -251,6 +251,7 @@ struct ath11k_peer {struct dp_rx_tid rx_tid[IEEE80211_NUM_TIDS +1 ]; }; +#define ATH11K_HE_MCS_NUM 12#define ATH11K_VHT_MCS_NUM 10#define ATH11K_BW_NUM 4#define ATH11K_NSS_NUM 4
@@ -304,6 +305,7 @@ struct ath11k_htt_data_stats {u64 legacy[ATH11K_COUNTER_TYPE_MAX ][ATH11K_LEGACY_NUM ];u64 ht[ATH11K_COUNTER_TYPE_MAX ][ATH11K_HT_MCS_NUM ];u64 vht[ATH11K_COUNTER_TYPE_MAX ][ATH11K_VHT_MCS_NUM ]; +u64 he[ATH11K_COUNTER_TYPE_MAX ][ATH11K_HE_MCS_NUM ];u64 bw[ATH11K_COUNTER_TYPE_MAX ][ATH11K_BW_NUM ];u64 nss[ATH11K_COUNTER_TYPE_MAX ][ATH11K_NSS_NUM ];u64 gi[ATH11K_COUNTER_TYPE_MAX ][ATH11K_GI_NUM ];
@@ -520,6 +522,7 @@ struct ath11k_pdev_cap {u32 ampdu_density;u32 vht_cap;u32 vht_mcs; +u32 he_mcs;u32 tx_chain_mask;u32 rx_chain_mask;u32 tx_chain_mask_shift;
drivers/net/wireless/ath/ath11k/debugfs_sta.c +22 -2
@@ -45,7 +45,14 @@ ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,#define STATS_OP_FMT (name) tx_stats->stats[ATH11K_STATS_TYPE_##name] -if (txrate->flags &RATE_INFO_FLAGS_VHT_MCS ) { +if (txrate->flags &RATE_INFO_FLAGS_HE_MCS ) { +STATS_OP_FMT (SUCC ).he[0 ][mcs] += peer_stats->succ_bytes; +STATS_OP_FMT (SUCC ).he[1 ][mcs] += peer_stats->succ_pkts; +STATS_OP_FMT (FAIL ).he[0 ][mcs] += peer_stats->failed_bytes; +STATS_OP_FMT (FAIL ).he[1 ][mcs] += peer_stats->failed_pkts; +STATS_OP_FMT (RETRY ).he[0 ][mcs] += peer_stats->retry_bytes; +STATS_OP_FMT (RETRY ).he[1 ][mcs] += peer_stats->retry_pkts; + }else if (txrate->flags &RATE_INFO_FLAGS_VHT_MCS ) {STATS_OP_FMT (SUCC ).vht[0 ][mcs] += peer_stats->succ_bytes;STATS_OP_FMT (SUCC ).vht[1 ][mcs] += peer_stats->succ_pkts;STATS_OP_FMT (FAIL ).vht[0 ][mcs] += peer_stats->failed_bytes;
@@ -73,7 +80,12 @@ ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,if (peer_stats->is_ampdu) { tx_stats->ba_fails += peer_stats->ba_fails; -if (txrate->flags &RATE_INFO_FLAGS_MCS ) { +if (txrate->flags &RATE_INFO_FLAGS_HE_MCS ) { +STATS_OP_FMT (AMPDU ).he[0 ][mcs] += + peer_stats->succ_bytes + peer_stats->retry_bytes; +STATS_OP_FMT (AMPDU ).he[1 ][mcs] += + peer_stats->succ_pkts + peer_stats->retry_pkts; + }else if (txrate->flags &RATE_INFO_FLAGS_MCS ) {STATS_OP_FMT (AMPDU ).ht[0 ][mcs] += peer_stats->succ_bytes + peer_stats->retry_bytes; STATS_OP_FMT(AMPDU).ht[1][mcs] +=
@@ -230,6 +242,14 @@ static ssize_t ath11k_dbg_sta_dump_tx_stats(struct file *file, str_name[k], str[j]); len +=scnprintf (buf + len, size - len, +" HE MCS %s\n" , + str[j]); +for (i =0 ; i <ATH11K_HE_MCS_NUM ; i++) + len +=scnprintf (buf + len, size - len, +" %llu " , + stats->he[j][i]); + len +=scnprintf (buf + len, size - len,"\n" ); + len +=scnprintf (buf + len, size - len," VHT MCS %s\n" , str[j]);for (i =0 ; i <ATH11K_VHT_MCS_NUM ; i++)
drivers/net/wireless/ath/ath11k/dp_rx.c +2 -1
@@ -1739,7 +1739,7 @@ static void ath11k_dp_rx_deliver_msdu(struct ath11k *ar, struct napi_struct *nap status =IEEE80211_SKB_RXCB (msdu); ath11k_dbg(ar->ab, ATH11K_DBG_DATA, - "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n", + "rx skb %pK len %u peer %pM %s %s sn %u %s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n", msdu, msdu->len, ieee80211_get_SA(hdr),
@@ -1750,6 +1750,7 @@ static void ath11k_dp_rx_deliver_msdu(struct ath11k *ar, struct napi_struct *nap (status->encoding ==RX_ENC_LEGACY ) ?"legacy" :"" , (status->encoding ==RX_ENC_HT ) ?"ht" :"" , (status->encoding ==RX_ENC_VHT ) ?"vht" :"" , + (status->encoding ==RX_ENC_HE ) ?"he" :"" , (status->bw ==RATE_INFO_BW_40 ) ?"40" :"" , (status->bw ==RATE_INFO_BW_80 ) ?"80" :"" , (status->bw == RATE_INFO_BW_160) ? "160" : "",
drivers/net/wireless/ath/ath11k/mac.c +350 -55
490 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/wmi.c +1 -0
@@ -325,6 +325,7 @@ static int ath11k_pull_mac_phy_cap_service_ready_ext( }else if (mac_phy_caps->supported_bands &WMI_HOST_WLAN_5G_CAP ) { pdev_cap->vht_cap = mac_phy_caps->vht_cap_info_5g; pdev_cap->vht_mcs = mac_phy_caps->vht_supp_mcs_5g; + pdev_cap->he_mcs = mac_phy_caps->he_supp_mcs_5g; pdev_cap->tx_chain_mask = mac_phy_caps->tx_chain_mask_5g; pdev_cap->rx_chain_mask = mac_phy_caps->rx_chain_mask_5g; }else {
drivers/net/wireless/ath/ath11k/wmi.h +4 -1
@@ -3858,7 +3858,10 @@ struct wmi_vdev_install_key_arg {#define WMI_MAX_SUPPORTED_RATES 128#define WMI_HOST_MAX_HECAP_PHY_SIZE 3 -#define WMI_HOST_MAX_HE_RATE_SET 1 +#define WMI_HOST_MAX_HE_RATE_SET 3 +#define WMI_HECAP_TXRX_MCS_NSS_IDX_80 0 +#define WMI_HECAP_TXRX_MCS_NSS_IDX_160 1 +#define WMI_HECAP_TXRX_MCS_NSS_IDX_80_80 2struct wmi_rate_set_arg {u32 num_rates;
Signature · 7 lines
2.11.0 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
drivers/net/wireless/ath/ath11k/mac.c static void ath11k_peer_assoc_h_he(struct ath11k *ar, · line 1408
Quoted 4 lines · John Crispin
drivers/net/wireless/ath/ath11k/mac.c +4
-0+if (he_cap->he_cap_elem.mac_cap_info[0 ] &IEEE80211_HE_MAC_CAP0_TWT_RES ) + arg->twt_responder = true; +if (he_cap->he_cap_elem.mac_cap_info[0 ] &IEEE80211_HE_MAC_CAP0_TWT_REQ ) + arg->twt_responder = true;
Hi,
just noticed this copy/paste bug while rebasing the TWT support patch. V2 coming up.
John
_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k