Commit 8a9c06b4 authored by Lingbo Kong's avatar Lingbo Kong Committed by Jeff Johnson
Browse files

wifi: ath12k: report station mode transmit rate 



Currently, the transmit rate of "iw dev xxx station dump" command
always show an invalid value.

To address this issue, ath12k parse the info of transmit complete
report from firmware and indicate the transmit rate to mac80211.

This patch affects the station mode of WCN7850 and QCN9274.

After that, "iw dev xxx station dump" show the correct transmit rate.
Such as:

Station 00:03:7f:12:03:03 (on wlo1)
        inactive time:  872 ms
        rx bytes:       219111
        rx packets:     1133
        tx bytes:       53767
        tx packets:     462
        tx retries:     51
        tx failed:      0
        beacon loss:    0
        beacon rx:      403
        rx drop misc:   74
        signal:         -95 dBm
        beacon signal avg:      -18 dBm
        tx bitrate:     1441.1 MBit/s 80MHz EHT-MCS 13 EHT-NSS 2 EHT-GI 0

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00214-QCAHKSWPL_SILICONZ-1

Signed-off-by: default avatarLingbo Kong <quic_lingbok@quicinc.com>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219715
Link: https://patch.msgid.link/20250115063537.35797-2-quic_lingbok@quicinc.com


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 28a9972e

drivers/net/wireless/ath/ath12k/core.h

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ enum wme_ac { 
#define ATH12K_HT_MCS_MAX	7

#define ATH12K_VHT_MCS_MAX	9

#define ATH12K_HE_MCS_MAX	11

#define ATH12K_EHT_MCS_MAX	15



enum ath12k_crypt_mode {

	/* Only use hardware crypto engine */
@@ -501,6 +502,7 @@ struct ath12k_link_sta { 
	struct ath12k_rx_peer_stats *rx_stats;

	struct ath12k_wbm_tx_stats *wbm_tx_stats;

	u32 bw_prev;

	u32 peer_nss;



	/* For now the assoc link will be considered primary */

	bool is_assoc_link;

drivers/net/wireless/ath/ath12k/dp_rx.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause-Clear */

/*

 * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 */

#ifndef ATH12K_DP_RX_H

#define ATH12K_DP_RX_H
@@ -79,6 +79,9 @@ static inline u32 ath12k_he_gi_to_nl80211_he_gi(u8 sgi) 
	case RX_MSDU_START_SGI_3_2_US:

		ret = NL80211_RATE_INFO_HE_GI_3_2;

		break;

	default:

		ret = NL80211_RATE_INFO_HE_GI_0_8;

		break;

	}



	return ret;

drivers/net/wireless/ath/ath12k/dp_tx.c

+135 −4
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include "dp_tx.h"

#include "debug.h"

#include "hw.h"

#include "peer.h"

#include "mac.h"



static enum hal_tcl_encap_type

ath12k_dp_tx_get_encap_type(struct ath12k_link_vif *arvif, struct sk_buff *skb)
@@ -581,6 +583,124 @@ ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab, 
	}

}



static void ath12k_dp_tx_update_txcompl(struct ath12k *ar, struct hal_tx_status *ts)

{

	struct ath12k_base *ab = ar->ab;

	struct ath12k_peer *peer;

	struct ieee80211_sta *sta;

	struct ath12k_sta *ahsta;

	struct ath12k_link_sta *arsta;

	struct rate_info txrate = {0};

	u16 rate, ru_tones;

	u8 rate_idx = 0;

	int ret;



	spin_lock_bh(&ab->base_lock);

	peer = ath12k_peer_find_by_id(ab, ts->peer_id);

	if (!peer || !peer->sta) {

		ath12k_dbg(ab, ATH12K_DBG_DP_TX,

			   "failed to find the peer by id %u\n", ts->peer_id);

		spin_unlock_bh(&ab->base_lock);

		return;

	}

	sta = peer->sta;

	ahsta = ath12k_sta_to_ahsta(sta);

	arsta = &ahsta->deflink;



	/* This is to prefer choose the real NSS value arsta->last_txrate.nss,

	 * if it is invalid, then choose the NSS value while assoc.

	 */

	if (arsta->last_txrate.nss)

		txrate.nss = arsta->last_txrate.nss;

	else

		txrate.nss = arsta->peer_nss;

	spin_unlock_bh(&ab->base_lock);



	switch (ts->pkt_type) {

	case HAL_TX_RATE_STATS_PKT_TYPE_11A:

	case HAL_TX_RATE_STATS_PKT_TYPE_11B:

		ret = ath12k_mac_hw_ratecode_to_legacy_rate(ts->mcs,

							    ts->pkt_type,

							    &rate_idx,

							    &rate);

		if (ret < 0) {

			ath12k_warn(ab, "Invalid tx legacy rate %d\n", ret);

			return;

		}



		txrate.legacy = rate;

		break;

	case HAL_TX_RATE_STATS_PKT_TYPE_11N:

		if (ts->mcs > ATH12K_HT_MCS_MAX) {

			ath12k_warn(ab, "Invalid HT mcs index %d\n", ts->mcs);

			return;

		}



		if (txrate.nss != 0)

			txrate.mcs = ts->mcs + 8 * (txrate.nss - 1);



		txrate.flags = RATE_INFO_FLAGS_MCS;



		if (ts->sgi)

			txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;

		break;

	case HAL_TX_RATE_STATS_PKT_TYPE_11AC:

		if (ts->mcs > ATH12K_VHT_MCS_MAX) {

			ath12k_warn(ab, "Invalid VHT mcs index %d\n", ts->mcs);

			return;

		}



		txrate.mcs = ts->mcs;

		txrate.flags = RATE_INFO_FLAGS_VHT_MCS;



		if (ts->sgi)

			txrate.flags |= RATE_INFO_FLAGS_SHORT_GI;

		break;

	case HAL_TX_RATE_STATS_PKT_TYPE_11AX:

		if (ts->mcs > ATH12K_HE_MCS_MAX) {

			ath12k_warn(ab, "Invalid HE mcs index %d\n", ts->mcs);

			return;

		}



		txrate.mcs = ts->mcs;

		txrate.flags = RATE_INFO_FLAGS_HE_MCS;

		txrate.he_gi = ath12k_he_gi_to_nl80211_he_gi(ts->sgi);

		break;

	case HAL_TX_RATE_STATS_PKT_TYPE_11BE:

		if (ts->mcs > ATH12K_EHT_MCS_MAX) {

			ath12k_warn(ab, "Invalid EHT mcs index %d\n", ts->mcs);

			return;

		}



		txrate.mcs = ts->mcs;

		txrate.flags = RATE_INFO_FLAGS_EHT_MCS;

		txrate.eht_gi = ath12k_mac_eht_gi_to_nl80211_eht_gi(ts->sgi);

		break;

	default:

		ath12k_warn(ab, "Invalid tx pkt type: %d\n", ts->pkt_type);

		return;

	}



	txrate.bw = ath12k_mac_bw_to_mac80211_bw(ts->bw);



	if (ts->ofdma && ts->pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) {

		txrate.bw = RATE_INFO_BW_HE_RU;

		ru_tones = ath12k_mac_he_convert_tones_to_ru_tones(ts->tones);

		txrate.he_ru_alloc =

			ath12k_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones);

	}



	if (ts->ofdma && ts->pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11BE) {

		txrate.bw = RATE_INFO_BW_EHT_RU;

		txrate.eht_ru_alloc =

			ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(ts->tones);

	}



	spin_lock_bh(&ab->base_lock);

	arsta->txrate = txrate;

	spin_unlock_bh(&ab->base_lock);

}



static void ath12k_dp_tx_complete_msdu(struct ath12k *ar,

				       struct sk_buff *msdu,

				       struct hal_tx_status *ts)
@@ -659,6 +779,8 @@ static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, 
	 * Might end up reporting it out-of-band from HTT stats.

	 */



	ath12k_dp_tx_update_txcompl(ar, ts);



	ieee80211_tx_status_skb(ath12k_ar_to_hw(ar), msdu);



exit:
@@ -669,6 +791,8 @@ static void ath12k_dp_tx_status_parse(struct ath12k_base *ab, 
				      struct hal_wbm_completion_ring_tx *desc,

				      struct hal_tx_status *ts)

{

	u32 info0 = le32_to_cpu(desc->rate_stats.info0);



	ts->buf_rel_source =

		le32_get_bits(desc->info0, HAL_WBM_COMPL_TX_INFO0_REL_SRC_MODULE);

	if (ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW &&
@@ -683,10 +807,17 @@ static void ath12k_dp_tx_status_parse(struct ath12k_base *ab, 


	ts->ppdu_id = le32_get_bits(desc->info1,

				    HAL_WBM_COMPL_TX_INFO1_TQM_STATUS_NUMBER);

	if (le32_to_cpu(desc->rate_stats.info0) & HAL_TX_RATE_STATS_INFO0_VALID)

		ts->rate_stats = le32_to_cpu(desc->rate_stats.info0);

	else

		ts->rate_stats = 0;



	ts->peer_id = le32_get_bits(desc->info3, HAL_WBM_COMPL_TX_INFO3_PEER_ID);



	if (info0 & HAL_TX_RATE_STATS_INFO0_VALID) {

		ts->pkt_type = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_PKT_TYPE);

		ts->mcs = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_MCS);

		ts->sgi = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_SGI);

		ts->bw = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_BW);

		ts->tones = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_TONES_IN_RU);

		ts->ofdma = u32_get_bits(info0, HAL_TX_RATE_STATS_INFO0_OFDMA_TX);

	}

}



void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id)

drivers/net/wireless/ath/ath12k/hal_rx.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause-Clear */

/*

 * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 */



#ifndef ATH12K_HAL_RX_H
@@ -662,6 +662,9 @@ enum nl80211_he_ru_alloc ath12k_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones) 
	case RU_996:

		ret = NL80211_RATE_INFO_HE_RU_ALLOC_996;

		break;

	case RU_2X996:

		ret = NL80211_RATE_INFO_HE_RU_ALLOC_2x996;

		break;

	case RU_26:

		fallthrough;

	default:

drivers/net/wireless/ath/ath12k/hal_tx.h

+8 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause-Clear */

/*

 * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2022, 2024 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2021-2022, 2024-2025 Qualcomm Innovation Center, Inc.

 * All rights reserved.

 */



#ifndef ATH12K_HAL_TX_H
@@ -63,7 +64,12 @@ struct hal_tx_status { 
	u8 try_cnt;

	u8 tid;

	u16 peer_id;

	u32 rate_stats;

	enum hal_tx_rate_stats_pkt_type pkt_type;

	enum hal_tx_rate_stats_sgi sgi;

	enum ath12k_supported_bw bw;

	u8 mcs;

	u16 tones;

	u8 ofdma;

};



#define HAL_TX_PHY_DESC_INFO0_BF_TYPE		GENMASK(17, 16)