1 files changed, 76 insertions, 27 deletions

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index f42bac204ef8..4fc885617de1 100644
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: ISC
 /*
  * Copyright (c) 2005-2011 Atheros Communications Inc.
  * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
  * Copyright (c) 2018, The Linux Foundation. All rights reserved.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include "core.h"
@@ -265,7 +254,7 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)
         struct ath10k_htt *htt = &ar->htt;
         int ret;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return 0;
 
         spin_lock_bh(&htt->rx_ring.lock);
@@ -282,7 +271,7 @@ int ath10k_htt_rx_ring_refill(struct ath10k *ar)
 
 void ath10k_htt_rx_free(struct ath10k_htt *htt)
 {
-        if (htt->ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (htt->ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return;
 
         del_timer_sync(&htt->rx_ring.refill_retry_timer);
@@ -760,7 +749,7 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt)
         size_t size;
         struct timer_list *timer = &htt->rx_ring.refill_retry_timer;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 return 0;
 
         htt->rx_confused = false;
@@ -1905,7 +1894,7 @@ static void ath10k_htt_rx_h_enqueue(struct ath10k *ar,
 }
 
 static int ath10k_unchain_msdu(struct sk_buff_head *amsdu,
-                               unsigned long int *unchain_cnt)
+                               unsigned long *unchain_cnt)
 {
         struct sk_buff *skb, *first;
         int space;
@@ -1954,8 +1943,8 @@ static int ath10k_unchain_msdu(struct sk_buff_head *amsdu,
 
 static void ath10k_htt_rx_h_unchain(struct ath10k *ar,
                                     struct sk_buff_head *amsdu,
-                                    unsigned long int *drop_cnt,
-                                    unsigned long int *unchain_cnt)
+                                    unsigned long *drop_cnt,
+                                    unsigned long *unchain_cnt)
 {
         struct sk_buff *first;
         struct htt_rx_desc *rxd;
@@ -2005,7 +1994,7 @@ static bool ath10k_htt_rx_amsdu_allowed(struct ath10k *ar,
 static void ath10k_htt_rx_h_filter(struct ath10k *ar,
                                    struct sk_buff_head *amsdu,
                                    struct ieee80211_rx_status *rx_status,
-                                   unsigned long int *drop_cnt)
+                                   unsigned long *drop_cnt)
 {
         if (skb_queue_empty(amsdu))
                 return;
@@ -2025,10 +2014,10 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
         struct ieee80211_rx_status *rx_status = &htt->rx_status;
         struct sk_buff_head amsdu;
         int ret;
-        unsigned long int drop_cnt = 0;
-        unsigned long int unchain_cnt = 0;
-        unsigned long int drop_cnt_filter = 0;
-        unsigned long int msdus_to_queue, num_msdus;
+        unsigned long drop_cnt = 0;
+        unsigned long unchain_cnt = 0;
+        unsigned long drop_cnt_filter = 0;
+        unsigned long msdus_to_queue, num_msdus;
         enum ath10k_pkt_rx_err err = ATH10K_PKT_RX_ERR_MAX;
         u8 first_hdr[RX_HTT_HDR_STATUS_LEN];
 
@@ -2220,8 +2209,12 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
         int status = MS(resp->data_tx_completion.flags, HTT_DATA_TX_STATUS);
         __le16 msdu_id, *msdus;
         bool rssi_enabled = false;
-        u8 msdu_count = 0;
+        u8 msdu_count = 0, num_airtime_records, tid;
         int i;
+        struct htt_data_tx_compl_ppdu_dur *ppdu_info;
+        struct ath10k_peer *peer;
+        u16 ppdu_info_offset = 0, peer_id;
+        u32 tx_duration;
 
         switch (status) {
         case HTT_DATA_TX_STATUS_NO_ACK:
@@ -2245,12 +2238,12 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
                    resp->data_tx_completion.num_msdus);
 
         msdu_count = resp->data_tx_completion.num_msdus;
+        msdus = resp->data_tx_completion.msdus;
 
         if (resp->data_tx_completion.flags2 & HTT_TX_CMPL_FLAG_DATA_RSSI)
                 rssi_enabled = true;
 
         for (i = 0; i < msdu_count; i++) {
-                msdus = resp->data_tx_completion.msdus;
                 msdu_id = msdus[i];
                 tx_done.msdu_id = __le16_to_cpu(msdu_id);
 
@@ -2282,6 +2275,50 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,
                         ath10k_txrx_tx_unref(htt, &tx_done);
                 }
         }
+
+        if (!(resp->data_tx_completion.flags2 & HTT_TX_CMPL_FLAG_PPDU_DURATION_PRESENT))
+                return;
+
+        ppdu_info_offset = (msdu_count & 0x01) ? msdu_count + 1 : msdu_count;
+
+        if (rssi_enabled)
+                ppdu_info_offset += ppdu_info_offset;
+
+        if (resp->data_tx_completion.flags2 &
+            (HTT_TX_CMPL_FLAG_PPID_PRESENT | HTT_TX_CMPL_FLAG_PA_PRESENT))
+                ppdu_info_offset += 2;
+
+        ppdu_info = (struct htt_data_tx_compl_ppdu_dur *)&msdus[ppdu_info_offset];
+        num_airtime_records = FIELD_GET(HTT_TX_COMPL_PPDU_DUR_INFO0_NUM_ENTRIES_MASK,
+                                        __le32_to_cpu(ppdu_info->info0));
+
+        for (i = 0; i < num_airtime_records; i++) {
+                struct htt_data_tx_ppdu_dur *ppdu_dur;
+                u32 info0;
+
+                ppdu_dur = &ppdu_info->ppdu_dur[i];
+                info0 = __le32_to_cpu(ppdu_dur->info0);
+
+                peer_id = FIELD_GET(HTT_TX_PPDU_DUR_INFO0_PEER_ID_MASK,
+                                    info0);
+                rcu_read_lock();
+                spin_lock_bh(&ar->data_lock);
+
+                peer = ath10k_peer_find_by_id(ar, peer_id);
+                if (!peer) {
+                        spin_unlock_bh(&ar->data_lock);
+                        rcu_read_unlock();
+                        continue;
+                }
+
+                tid = FIELD_GET(HTT_TX_PPDU_DUR_INFO0_TID_MASK, info0);
+                tx_duration = __le32_to_cpu(ppdu_dur->tx_duration);
+
+                ieee80211_sta_register_airtime(peer->sta, tid, tx_duration, 0);
+
+                spin_unlock_bh(&ar->data_lock);
+                rcu_read_unlock();
+        }
 }
 
 static void ath10k_htt_rx_addba(struct ath10k *ar, struct htt_resp *resp)
@@ -2596,6 +2633,7 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
         u8 tid;
         int ret;
         int i;
+        bool may_tx;
 
         ath10k_dbg(ar, ATH10K_DBG_HTT, "htt rx tx fetch ind\n");
 
@@ -2668,8 +2706,13 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
                 num_msdus = 0;
                 num_bytes = 0;
 
+                ieee80211_txq_schedule_start(hw, txq->ac);
+                may_tx = ieee80211_txq_may_transmit(hw, txq);
                 while (num_msdus < max_num_msdus &&
                        num_bytes < max_num_bytes) {
+                        if (!may_tx)
+                                break;
+
                         ret = ath10k_mac_tx_push_txq(hw, txq);
                         if (ret < 0)
                                 break;
@@ -2677,6 +2720,8 @@ static void ath10k_htt_rx_tx_fetch_ind(struct ath10k *ar, struct sk_buff *skb)
                         num_msdus++;
                         num_bytes += ret;
                 }
+                ieee80211_return_txq(hw, txq);
+                ieee80211_txq_schedule_end(hw, txq->ac);
 
                 record->num_msdus = cpu_to_le16(num_msdus);
                 record->num_bytes = cpu_to_le32(num_bytes);
@@ -2975,6 +3020,8 @@ ath10k_accumulate_per_peer_tx_stats(struct ath10k *ar,
                 STATS_OP_FMT(RETRY).rate_table[0][idx] += pstats->retry_bytes;
                 STATS_OP_FMT(RETRY).rate_table[1][idx] += pstats->retry_pkts;
         }
+
+        tx_stats->tx_duration += pstats->duration;
 }
 
 static void
@@ -3070,6 +3117,7 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar,
 
         arsta->txrate.nss = txrate.nss;
         arsta->txrate.bw = ath10k_bw_to_mac80211_bw(txrate.bw);
+        arsta->last_tx_bitrate = cfg80211_calculate_bitrate(&arsta->txrate);
         if (sgi)
                 arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;
 
@@ -3141,6 +3189,7 @@ static void ath10k_htt_fetch_peer_stats(struct ath10k *ar,
                 p_tx_stats->succ_pkts = __le16_to_cpu(tx_stats->succ_pkts);
                 p_tx_stats->retry_pkts = __le16_to_cpu(tx_stats->retry_pkts);
                 p_tx_stats->failed_pkts = __le16_to_cpu(tx_stats->failed_pkts);
+                p_tx_stats->duration = __le16_to_cpu(tx_stats->tx_duration);
 
                 ath10k_update_per_peer_tx_stats(ar, sta, p_tx_stats);
         }
@@ -3234,7 +3283,7 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                 break;
         }
         case HTT_T2H_MSG_TYPE_RX_IND:
-                if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+                if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                         return ath10k_htt_rx_proc_rx_ind_hl(htt,
                                                             &resp->rx_ind_hl,
                                                             skb);
@@ -3530,7 +3579,7 @@ void ath10k_htt_set_rx_ops(struct ath10k_htt *htt)
 {
         struct ath10k *ar = htt->ar;
 
-        if (ar->dev_type == ATH10K_DEV_TYPE_HL)
+        if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)
                 htt->rx_ops = &htt_rx_ops_hl;
         else if (ar->hw_params.target_64bit)
                 htt->rx_ops = &htt_rx_ops_64;