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

Commit ef8d5529 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: update reply_statistics_cmd with 'clear' parameter 



When issue REPLY_STATISTICS_CMD to uCode, two possible flag
can be set in the configuration flags

bit 0: Clear statistics
       0: Do not clear Statistics counters
       1: Clear to zero Statistics counters

Allow "clear" parameter to be set from the caller.

Add debugfs file to clear the statistics counters to help monitor and
debug the uCode behavior.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7d2ed110

drivers/net/wireless/iwlwifi/iwl-agn.c

+3 −3
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ static void iwl_bg_statistics_periodic(unsigned long data) 
	if (!iwl_is_ready_rf(priv))

		return;



	iwl_send_statistics_request(priv, CMD_ASYNC);

	iwl_send_statistics_request(priv, CMD_ASYNC, false);

}



static void iwl_rx_beacon_notif(struct iwl_priv *priv,
@@ -729,7 +729,7 @@ static void iwl_setup_rx_handlers(struct iwl_priv *priv) 
	 * statistics request from the host as well as for the periodic

	 * statistics notifications (after received beacons) from the uCode.

	 */

	priv->rx_handlers[REPLY_STATISTICS_CMD] = iwl_rx_statistics;

	priv->rx_handlers[REPLY_STATISTICS_CMD] = iwl_reply_statistics;

	priv->rx_handlers[STATISTICS_NOTIFICATION] = iwl_rx_statistics;



	iwl_setup_spectrum_handlers(priv);
@@ -2892,7 +2892,7 @@ static ssize_t show_statistics(struct device *d, 
		return -EAGAIN;



	mutex_lock(&priv->mutex);

	rc = iwl_send_statistics_request(priv, 0);

	rc = iwl_send_statistics_request(priv, CMD_SYNC, false);

	mutex_unlock(&priv->mutex);



	if (rc) {

drivers/net/wireless/iwlwifi/iwl-calib.c

+1 −1
Original line number Diff line number Diff line
@@ -900,7 +900,7 @@ void iwl_reset_run_time_calib(struct iwl_priv *priv) 


	/* Ask for statistics now, the uCode will send notification

	 * periodically after association */

	iwl_send_statistics_request(priv, CMD_ASYNC);

	iwl_send_statistics_request(priv, CMD_ASYNC, true);

}

EXPORT_SYMBOL(iwl_reset_run_time_calib);

drivers/net/wireless/iwlwifi/iwl-commands.h

+4 −0
Original line number Diff line number Diff line
@@ -3071,6 +3071,10 @@ struct statistics_general { 
	__le32 reserved3;

} __attribute__ ((packed));



#define UCODE_STATISTICS_CLEAR_MSK		(0x1 << 0)

#define UCODE_STATISTICS_FREQUENCY_MSK		(0x1 << 1)

#define UCODE_STATISTICS_NARROW_BAND_MSK	(0x1 << 2)



/*

 * REPLY_STATISTICS_CMD = 0x9c,

 * 3945 and 4965 identical.

drivers/net/wireless/iwlwifi/iwl-core.c

+13 −8
Original line number Diff line number Diff line
@@ -1990,16 +1990,21 @@ int iwl_send_bt_config(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_send_bt_config);



int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags)

int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)

{

	u32 stat_flags = 0;

	struct iwl_host_cmd cmd = {

		.id = REPLY_STATISTICS_CMD,

		.flags = flags,

		.len = sizeof(stat_flags),

		.data = (u8 *) &stat_flags,

	struct iwl_statistics_cmd statistics_cmd = {

		.configuration_flags =

			clear ? IWL_STATS_CONF_CLEAR_STATS : 0,

	};

	return iwl_send_cmd(priv, &cmd);



	if (flags & CMD_ASYNC)

		return iwl_send_cmd_pdu_async(priv, REPLY_STATISTICS_CMD,

					       sizeof(struct iwl_statistics_cmd),

					       &statistics_cmd, NULL);

	else

		return iwl_send_cmd_pdu(priv, REPLY_STATISTICS_CMD,

					sizeof(struct iwl_statistics_cmd),

					&statistics_cmd);

}

EXPORT_SYMBOL(iwl_send_statistics_request);

drivers/net/wireless/iwlwifi/iwl-core.h

+4 −1
Original line number Diff line number Diff line
@@ -425,6 +425,8 @@ void iwl_rx_missed_beacon_notif(struct iwl_priv *priv, 
			       struct iwl_rx_mem_buffer *rxb);

void iwl_rx_statistics(struct iwl_priv *priv,

			      struct iwl_rx_mem_buffer *rxb);

void iwl_reply_statistics(struct iwl_priv *priv,

			  struct iwl_rx_mem_buffer *rxb);

void iwl_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb);



/* TX helpers */
@@ -669,7 +671,8 @@ static inline int iwl_is_ready_rf(struct iwl_priv *priv) 


extern void iwl_rf_kill_ct_config(struct iwl_priv *priv);

extern int iwl_send_bt_config(struct iwl_priv *priv);

extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags);

extern int iwl_send_statistics_request(struct iwl_priv *priv,

				       u8 flags, bool clear);

extern int iwl_verify_ucode(struct iwl_priv *priv);

extern int iwl_send_lq_cmd(struct iwl_priv *priv,

		struct iwl_link_quality_cmd *lq, u8 flags);