Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad82d8a5 authored by Eyal Shapira's avatar Eyal Shapira Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: rs: update Tx statistics when using fixed rate 



The Tx statistics weren't updated when using fixed rate for
debugging. Fix this as Tx statistics are useful in this use case.

Signed-off-by: default avatarEyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 35af15d1

drivers/net/wireless/iwlwifi/mvm/rs.c

+63 −7
Original line number Diff line number Diff line
@@ -1065,6 +1065,37 @@ static inline bool rs_rate_column_match(struct rs_rate *a, 
		&& ant_match;

}



static inline enum rs_column rs_get_column_from_rate(struct rs_rate *rate)

{

	if (is_legacy(rate)) {

		if (rate->ant == ANT_A)

			return RS_COLUMN_LEGACY_ANT_A;



		if (rate->ant == ANT_B)

			return RS_COLUMN_LEGACY_ANT_B;



		goto err;

	}



	if (is_siso(rate)) {

		if (rate->ant == ANT_A || rate->stbc || rate->bfer)

			return rate->sgi ? RS_COLUMN_SISO_ANT_A_SGI :

				RS_COLUMN_SISO_ANT_A;



		if (rate->ant == ANT_B)

			return rate->sgi ? RS_COLUMN_SISO_ANT_B_SGI :

				RS_COLUMN_SISO_ANT_B;



		goto err;

	}



	if (is_mimo(rate))

		return rate->sgi ? RS_COLUMN_MIMO2_SGI : RS_COLUMN_MIMO2;



err:

	return RS_COLUMN_INVALID;

}



static u8 rs_get_tid(struct ieee80211_hdr *hdr)

{

	u8 tid = IWL_MAX_TID_COUNT;
@@ -1106,17 +1137,43 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
		return;

	}



	/* This packet was aggregated but doesn't carry status info */

	if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&

	    !(info->flags & IEEE80211_TX_STAT_AMPDU))

		return;



	rs_rate_from_ucode_rate(tx_resp_hwrate, info->band, &tx_resp_rate);



#ifdef CONFIG_MAC80211_DEBUGFS

	/* Disable last tx check if we are debugging with fixed rate */

	/* Disable last tx check if we are debugging with fixed rate but

	 * update tx stats */

	if (lq_sta->pers.dbg_fixed_rate) {

		IWL_DEBUG_RATE(mvm, "Fixed rate. avoid rate scaling\n");

		int index = tx_resp_rate.index;

		enum rs_column column;

		int attempts, success;



		column = rs_get_column_from_rate(&tx_resp_rate);

		if (WARN_ONCE(column == RS_COLUMN_INVALID,

			      "Can't map rate 0x%x to column",

			      tx_resp_hwrate))

			return;



		if (info->flags & IEEE80211_TX_STAT_AMPDU) {

			attempts = info->status.ampdu_len;

			success = info->status.ampdu_ack_len;

		} else {

			attempts = info->status.rates[0].count;

			success = !!(info->flags & IEEE80211_TX_STAT_ACK);

		}



		lq_sta->pers.tx_stats[column][index].total += attempts;

		lq_sta->pers.tx_stats[column][index].success += success;



		IWL_DEBUG_RATE(mvm, "Fixed rate 0x%x success %d attempts %d\n",

			       tx_resp_hwrate, success, attempts);

		return;

	}

#endif

	/* This packet was aggregated but doesn't carry status info */

	if ((info->flags & IEEE80211_TX_CTL_AMPDU) &&

	    !(info->flags & IEEE80211_TX_STAT_AMPDU))

		return;



	if (time_after(jiffies,

		       (unsigned long)(lq_sta->last_tx +
@@ -1142,7 +1199,6 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta, 
	table = &lq_sta->lq;

	lq_hwrate = le32_to_cpu(table->rs_table[0]);

	rs_rate_from_ucode_rate(lq_hwrate, info->band, &lq_rate);

	rs_rate_from_ucode_rate(tx_resp_hwrate, info->band, &tx_resp_rate);



	/* Here we actually compare this rate to the latest LQ command */

	if (!rs_rate_equal(&tx_resp_rate, &lq_rate, allow_ant_mismatch)) {