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

Commit 91a8bcde authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: support radio statistics as global survey 



Export the radio statistics from the statistics v10 API (if the
firmware also has the capability to fill these statistics) using
the global survey data facility.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 777c9b6b

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+2 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ enum iwl_ucode_tlv_api { 
 *	which also implies support for the scheduler configuration command

 * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching

 * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command

 * @IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS: support radio and beacon statistics

 */

enum iwl_ucode_tlv_capa {

	IWL_UCODE_TLV_CAPA_D0I3_SUPPORT			= BIT(0),
@@ -300,6 +301,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_DQA_SUPPORT			= BIT(12),

	IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH		= BIT(13),

	IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT		= BIT(18),

	IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS		= BIT(22),

};



/* The default calibrate table size if not specified by firmware file */

drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h

+8 −9
Original line number Diff line number Diff line
@@ -290,15 +290,7 @@ struct mvm_statistics_rx { 
 *

 * By default, uCode issues this notification after receiving a beacon

 * while associated.  To disable this behavior, set DISABLE_NOTIF flag in the

 * REPLY_STATISTICS_CMD 0x9c, above.

 *

 * Statistics counters continue to increment beacon after beacon, but are

 * cleared when changing channels or when driver issues REPLY_STATISTICS_CMD

 * 0x9c with CLEAR_STATS bit set (see above).

 *

 * uCode also issues this notification during scans.  uCode clears statistics

 * appropriately so that each notification contains statistics for only the

 * one channel that has just been scanned.

 * STATISTICS_CMD (0x9c), below.

 */



struct iwl_notif_statistics_v8 {
@@ -315,4 +307,11 @@ struct iwl_notif_statistics_v10 { 
	struct mvm_statistics_general_v8 general;

} __packed; /* STATISTICS_NTFY_API_S_VER_10 */



#define IWL_STATISTICS_FLG_CLEAR		0x1

#define IWL_STATISTICS_FLG_DISABLE_NOTIF	0x2



struct iwl_statistics_cmd {

	__le32 flags;

} __packed; /* STATISTICS_CMD_API_S_VER_1 */



#endif /* __fw_api_stats_h__ */

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ enum { 
	BEACON_NOTIFICATION = 0x90,

	BEACON_TEMPLATE_CMD = 0x91,

	TX_ANT_CONFIGURATION_CMD = 0x98,

	STATISTICS_CMD = 0x9c,

	STATISTICS_NOTIFICATION = 0x9d,

	EOSP_NOTIFICATION = 0x9e,

	REDUCE_TX_POWER_CMD = 0x9f,

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

+58 −0
Original line number Diff line number Diff line
@@ -1091,6 +1091,9 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) 


	mvm->vif_count = 0;

	mvm->rx_ba_sessions = 0;



	/* keep statistics ticking */

	iwl_mvm_accu_radio_stats(mvm);

}



int __iwl_mvm_mac_start(struct iwl_mvm *mvm)
@@ -1213,6 +1216,11 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm) 
{

	lockdep_assert_held(&mvm->mutex);



	/* firmware counters are obviously reset now, but we shouldn't

	 * partially track so also clear the fw_reset_accu counters.

	 */

	memset(&mvm->accu_radio_stats, 0, sizeof(mvm->accu_radio_stats));



	/*

	 * Disallow low power states when the FW is down by taking

	 * the UCODE_DOWN ref. in case of ongoing hw restart the
@@ -3581,6 +3589,55 @@ static void iwl_mvm_mac_flush(struct ieee80211_hw *hw, 
	}

}



static int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,

				  struct survey_info *survey)

{

	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);

	int ret;



	memset(survey, 0, sizeof(*survey));



	/* only support global statistics right now */

	if (idx != 0)

		return -ENOENT;



	if (!(mvm->fw->ucode_capa.capa[0] &

			IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS))

		return -ENOENT;



	mutex_lock(&mvm->mutex);



	if (mvm->ucode_loaded) {

		ret = iwl_mvm_request_statistics(mvm);

		if (ret)

			goto out;

	}



	survey->filled = SURVEY_INFO_TIME |

			 SURVEY_INFO_TIME_RX |

			 SURVEY_INFO_TIME_TX |

			 SURVEY_INFO_TIME_SCAN;

	survey->time = mvm->accu_radio_stats.on_time_rf +

		       mvm->radio_stats.on_time_rf;

	do_div(survey->time, USEC_PER_MSEC);



	survey->time_rx = mvm->accu_radio_stats.rx_time +

			  mvm->radio_stats.rx_time;

	do_div(survey->time_rx, USEC_PER_MSEC);



	survey->time_tx = mvm->accu_radio_stats.tx_time +

			  mvm->radio_stats.tx_time;

	do_div(survey->time_tx, USEC_PER_MSEC);



	survey->time_scan = mvm->accu_radio_stats.on_time_scan +

			    mvm->radio_stats.on_time_scan;

	do_div(survey->time_scan, USEC_PER_MSEC);



 out:

	mutex_unlock(&mvm->mutex);

	return ret;

}



const struct ieee80211_ops iwl_mvm_hw_ops = {

	.tx = iwl_mvm_mac_tx,

	.ampdu_action = iwl_mvm_mac_ampdu_action,
@@ -3647,4 +3704,5 @@ const struct ieee80211_ops iwl_mvm_hw_ops = { 
#endif

	.set_default_unicast_key = iwl_mvm_set_default_unicast_key,

#endif

	.get_survey = iwl_mvm_mac_get_survey,

};

drivers/net/wireless/iwlwifi/mvm/mvm.h

+11 −3
Original line number Diff line number Diff line
@@ -593,6 +593,13 @@ struct iwl_mvm { 


	struct mvm_statistics_rx rx_stats;



	struct {

		u64 rx_time;

		u64 tx_time;

		u64 on_time_rf;

		u64 on_time_scan;

	} radio_stats, accu_radio_stats;



	u8 queue_to_mac80211[IWL_MAX_HW_QUEUES];

	atomic_t mac80211_queue_stop_count[IEEE80211_MAX_QUEUES];
@@ -951,12 +958,13 @@ static inline void iwl_mvm_wait_for_async_handlers(struct iwl_mvm *mvm) 
}



/* Statistics */

int iwl_mvm_rx_reply_statistics(struct iwl_mvm *mvm,

				struct iwl_rx_cmd_buffer *rxb,

				struct iwl_device_cmd *cmd);

void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,

				  struct iwl_rx_packet *pkt);

int iwl_mvm_rx_statistics(struct iwl_mvm *mvm,

			  struct iwl_rx_cmd_buffer *rxb,

			  struct iwl_device_cmd *cmd);

int iwl_mvm_request_statistics(struct iwl_mvm *mvm);

void iwl_mvm_accu_radio_stats(struct iwl_mvm *mvm);



/* NVM */

int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic);