ath10k: Add support to update tx rate to mac80211
Subsystems (2)
v4 cover ath10k: Add support to update tx rate to mac80211
Tx rate was updated to nl80211/user using sta_statistics callback. This rate can not be used for mac80211 mesh and ATF.
This patch adds support to update tx rate to mac80211
Anilkumar Kolli (2):
mac80211: implement ieee80211_tx_rate_update to update rate
ath10k: report tx rate using ieee80211_tx_rate_update()
drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/htt_rx.c | 66 ++++++++++++++++++++++++++++-- drivers/net/wireless/ath/ath10k/wmi.h | 1 + include/net/mac80211.h | 15 +++++++ net/mac80211/status.c | 22 ++++++++++ 5 files changed, 101 insertions(+), 4 deletions(-)
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
RFC v4 1/2 mac80211: implement ieee80211_tx_rate_update to update rate
Current mac80211 has provision to update tx status through ieee80211_tx_status() and ieee80211_tx_status_ext(). But drivers like ath10k updates the tx status from the skb except txrate, txrate will be updated from a different path, peer stats.
Using ieee80211_tx_status_ext() in two different paths
- (one for the stats, one for the tx rate) will duplicate the stats.
To avoid this stats duplication, ieee80211_tx_rate_update() is implemented.
---
V3:
- Added new API in mac80211 to update tx rate(Johannes)
V4:
- Removed non NULL check on pubsta and updated comments on
ieee80211_tx_rate_update()
include/net/mac80211.h | 15 +++++++++++++++ net/mac80211/status.c | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+)
include/net/mac80211.h +15 -0
@@ -4331,6 +4331,21 @@ void ieee80211_sta_set_expected_throughput(struct ieee80211_sta *pubsta, u32 thr);/** +* ieee80211_tx_rate_update - transmit rate update callback +* +* Drivers should call this functions with a non-NULL pubsta +* This function can be used in drivers that does not have provision +* in updating the tx rate in data path. +* +* @hw: the hardware the frame was transmitted by +* @pubsta: the station to update the tx rate for. +* @info: tx status information +*/ +void ieee80211_tx_rate_update (struct ieee80211_hw *hw, +struct ieee80211_sta *pubsta, +struct ieee80211_tx_info *info); + +/** * ieee80211_tx_status - transmit status callback * * Call this function for all transmitted frames after they have been
net/mac80211/status.c +22 -0
@@ -988,6 +988,28 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, }EXPORT_SYMBOL (ieee80211_tx_status_ext); +void ieee80211_tx_rate_update (struct ieee80211_hw *hw, +struct ieee80211_sta *pubsta, +struct ieee80211_tx_info *info) +{ +struct ieee80211_local *local =hw_to_local (hw); +struct ieee80211_supported_band *sband; +struct sta_info *sta; +struct ieee80211_tx_status status; + + sband = hw->wiphy->bands[info->band]; + + sta = container_of(pubsta, struct sta_info, sta); + status.skb =NULL ; + status.info = info; + status.sta = pubsta; + +rate_control_tx_status (local, sband, &status); +if (ieee80211_hw_check (&local->hw,HAS_RATE_CONTROL )) + sta->tx_stats.last_rate = info->status.rates[0 ]; +} +EXPORT_SYMBOL (ieee80211_tx_rate_update); +void ieee80211_report_low_ack (struct ieee80211_sta *pubsta,u32 num_packets) { struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
RFC v4 2/2 ath10k: report tx rate using ieee80211_tx_rate_update()
In reply to Anilkumar KolliMesh path metric needs tx rate information from ieee80211_tx_status() call but in ath10k there is no mechanism to report tx rate information via ieee80211_tx_status(), the tx rate is only accessible via sta_statiscs() op.
Per peer tx stats has tx rate info available, Tx rate is available to ath10k driver after every 4 PPDU sent in the air. For each PPDU, ath10k driver updates rate informattion to mac80211 using ieee80211_tx_rate_update().
Per peer txrate information is updated through per peer statistics and is available for QCA9888/QCA9984/QCA4019/QCA998X only
Tested on QCA9984 with firmware-5.bin_10.4-3.5.3-00053 Tested on QCA998X with firmware-5.bin_10.2.4-1.0-00036
---
V3:
- added new API to update tx rate alone.
- Tx rate is updated for each PPDUs sent
drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/htt_rx.c | 66 ++++++++++++++++++++++++++++-- drivers/net/wireless/ath/ath10k/wmi.h | 1 + 3 files changed, 64 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath10k/core.h +1 -0
@@ -493,6 +493,7 @@ struct ath10k_sta {u32 smps;u16 peer_id;struct rate_info txrate; +struct ieee80211_tx_info tx_info;struct work_struct update_wk;u64 rx_duration;
drivers/net/wireless/ath/ath10k/htt_rx.c +62 -4
94 lines not on this page · raw message
drivers/net/wireless/ath/ath10k/wmi.h +1 -0
@@ -4968,6 +4968,7 @@ enum wmi_rate_preamble { (((preamble) << 6) | ((nss) << 4) | (rate))#define ATH10K_HW_AMPDU (flags) ((flags) & 0x1)#define ATH10K_HW_BA_FAIL (flags) (((flags) >> 1) & 0x3) +#define ATH10K_FW_SKIPPED_RATE_CTRL (flags) (((flags) >> 6) & 0x1)#define ATH10K_VHT_MCS_NUM 10#define ATH10K_BW_NUM 4
Signature · 7 lines
1.7.9.5 _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Re: [RFC v4 2/2] ath10k: report tx rate using ieee80211_tx_rate_update()
drivers/net/wireless/ath/ath10k/htt_rx.c static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) · line 2759
Quoted 13 lines · Anilkumar Kolli
drivers/net/wireless/ath/ath10k/htt_rx.c +3
-1@@ -2753,8 +2753,11 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) struct ath10k_per_peer_tx_stats *peer_stats) {struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; -u8 rate =0 , rate_idx =0 , sgi; +struct ieee80211_chanctx_conf *conf =NULL ;struct rate_info txrate; +u8 rate =0 , sgi; +int rate_idx =0 ;
type mismatch. ath10k_accumulate_per_peer_tx_stats() take u8 rate_idx, but you're passing int.
Re: [RFC v4 2/2] ath10k: report tx rate using ieee80211_tx_rate_update()
Quoted 17 lines · Peter Oh
drivers/net/wireless/ath/ath10k/htt_rx.c static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) · line 2759
Quoted 13 lines · Anilkumar Kolli
drivers/net/wireless/ath/ath10k/htt_rx.c +3
-1@@ -2753,8 +2753,11 @@ static inline int ath10k_get_legacy_rate_idx(struct ath10k *ar, u8 rate) struct ath10k_per_peer_tx_stats *peer_stats) {struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; -u8 rate =0 , rate_idx =0 , sgi; +struct ieee80211_chanctx_conf *conf =NULL ;struct rate_info txrate; +u8 rate =0 , sgi; +int rate_idx =0 ;type mismatch.
ath10k_accumulate_per_peer_tx_stats()take u8rate_idx, but you're passing int.
It looks like you better change return type of ath10k_get_legacy_rate_idx() from int to u8 by using u8 i; instead of int i inside of ath10k_get_legacy_rate_idx() and keep using rate_idx as u8 here.
Peter