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

Commit cc60c6e9 authored by Eyal Shapira's avatar Eyal Shapira Committed by Luca Coelho
Browse files

iwlwifi: mvm: rs: improve rate debug messages 



Pretty print the rate full details to ease debugging.

Signed-off-by: default avatarEyal Shapira <eyalx.shapira@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent ceef91c8

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

+51 −9
Original line number Diff line number Diff line
@@ -524,14 +524,56 @@ static const char *rs_pretty_lq_type(enum iwl_table_type type) 
	return lq_types[type];

}



static char *rs_pretty_rate(const struct rs_rate *rate)

{

	static char buf[40];

	static const char * const legacy_rates[] = {

		[IWL_RATE_1M_INDEX] = "1M",

		[IWL_RATE_2M_INDEX] = "2M",

		[IWL_RATE_5M_INDEX] = "5.5M",

		[IWL_RATE_11M_INDEX] = "11M",

		[IWL_RATE_6M_INDEX] = "6M",

		[IWL_RATE_9M_INDEX] = "9M",

		[IWL_RATE_12M_INDEX] = "12M",

		[IWL_RATE_18M_INDEX] = "18M",

		[IWL_RATE_24M_INDEX] = "24M",

		[IWL_RATE_36M_INDEX] = "36M",

		[IWL_RATE_48M_INDEX] = "48M",

		[IWL_RATE_54M_INDEX] = "54M",

	};

	static const char *const ht_vht_rates[] = {

		[IWL_RATE_MCS_0_INDEX] = "MCS0",

		[IWL_RATE_MCS_1_INDEX] = "MCS1",

		[IWL_RATE_MCS_2_INDEX] = "MCS2",

		[IWL_RATE_MCS_3_INDEX] = "MCS3",

		[IWL_RATE_MCS_4_INDEX] = "MCS4",

		[IWL_RATE_MCS_5_INDEX] = "MCS5",

		[IWL_RATE_MCS_6_INDEX] = "MCS6",

		[IWL_RATE_MCS_7_INDEX] = "MCS7",

		[IWL_RATE_MCS_8_INDEX] = "MCS8",

		[IWL_RATE_MCS_9_INDEX] = "MCS9",

	};

	const char *rate_str;



	if (is_type_legacy(rate->type))

		rate_str = legacy_rates[rate->index];

	else if (is_type_ht(rate->type) || is_type_vht(rate->type))

		rate_str = ht_vht_rates[rate->index];

	else

		rate_str = "BAD_RATE";



	sprintf(buf, "(%s|%s|%s)", rs_pretty_lq_type(rate->type),

		rs_pretty_ant(rate->ant), rate_str);

	return buf;

}



static inline void rs_dump_rate(struct iwl_mvm *mvm, const struct rs_rate *rate,

				const char *prefix)

{

	IWL_DEBUG_RATE(mvm,

		       "%s: (%s: %d) ANT: %s BW: %d SGI: %d LDPC: %d STBC: %d\n",

		       prefix, rs_pretty_lq_type(rate->type),

		       rate->index, rs_pretty_ant(rate->ant),

		       rate->bw, rate->sgi, rate->ldpc, rate->stbc);

		       "%s: %s BW: %d SGI: %d LDPC: %d STBC: %d\n",

		       prefix, rs_pretty_rate(rate), rate->bw,

		       rate->sgi, rate->ldpc, rate->stbc);

}



static void rs_rate_scale_clear_window(struct iwl_rate_scale_data *window)
@@ -2174,9 +2216,9 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm, 
	if ((fail_count < IWL_MVM_RS_RATE_MIN_FAILURE_TH) &&

	    (window->success_counter < IWL_MVM_RS_RATE_MIN_SUCCESS_TH)) {

		IWL_DEBUG_RATE(mvm,

			       "(%s: %d): Test Window: succ %d total %d\n",

			       rs_pretty_lq_type(rate->type),

			       index, window->success_counter, window->counter);

			       "%s: Test Window: succ %d total %d\n",

			       rs_pretty_rate(rate),

			       window->success_counter, window->counter);



		/* Can't calculate this yet; not enough history */

		window->average_tpt = IWL_INVALID_VALUE;
@@ -2253,8 +2295,8 @@ static void rs_rate_scale_perform(struct iwl_mvm *mvm, 
		high_tpt = tbl->win[high].average_tpt;



	IWL_DEBUG_RATE(mvm,

		       "(%s: %d): cur_tpt %d SR %d low %d high %d low_tpt %d high_tpt %d\n",

		       rs_pretty_lq_type(rate->type), index, current_tpt, sr,

		       "%s: cur_tpt %d SR %d low %d high %d low_tpt %d high_tpt %d\n",

		       rs_pretty_rate(rate), current_tpt, sr,

		       low, high, low_tpt, high_tpt);



	scale_action = rs_get_rate_action(mvm, tbl, sr, low, high,