diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-debugfs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1074 | 
1 files changed, 1002 insertions, 72 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 8842411f1cf..0e6a04b739a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c @@ -2,7 +2,7 @@   *   * GPL LICENSE SUMMARY   * - * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved. + * Copyright(c) 2008 - 2011 Intel Corporation. All rights reserved.   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of version 2 of the GNU General Public License as @@ -39,6 +39,7 @@  #include "iwl-debug.h"  #include "iwl-core.h"  #include "iwl-io.h" +#include "iwl-agn.h"  /* create and remove of files */  #define DEBUGFS_ADD_FILE(name, parent, mode) do {			\ @@ -226,10 +227,10 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,  	/* default is to dump the entire data segment */  	if (!priv->dbgfs_sram_offset && !priv->dbgfs_sram_len) {  		priv->dbgfs_sram_offset = 0x800000; -		if (priv->ucode_type == UCODE_INIT) -			priv->dbgfs_sram_len = priv->ucode_init_data.len; +		if (priv->ucode_type == UCODE_SUBTYPE_INIT) +			priv->dbgfs_sram_len = priv->ucode_init.data.len;  		else -			priv->dbgfs_sram_len = priv->ucode_data.len; +			priv->dbgfs_sram_len = priv->ucode_rt.data.len;  	}  	len = priv->dbgfs_sram_len; @@ -437,8 +438,7 @@ static ssize_t iwl_dbgfs_log_event_read(struct file *file,  	int pos = 0;  	ssize_t ret = -ENOMEM; -	ret = pos = priv->cfg->ops->lib->dump_nic_event_log( -					priv, true, &buf, true); +	ret = pos = iwl_dump_nic_event_log(priv, true, &buf, true);  	if (buf) {  		ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);  		kfree(buf); @@ -462,8 +462,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,  	if (sscanf(buf, "%d", &event_log_flag) != 1)  		return -EFAULT;  	if (event_log_flag == 1) -		priv->cfg->ops->lib->dump_nic_event_log(priv, true, -							NULL, false); +		iwl_dump_nic_event_log(priv, true, NULL, false);  	return count;  } @@ -1039,13 +1038,463 @@ static ssize_t iwl_dbgfs_rx_queue_read(struct file *file,  	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);  } +static const char *fmt_value = "  %-30s %10u\n"; +static const char *fmt_hex   = "  %-30s       0x%02X\n"; +static const char *fmt_table = "  %-30s %10u  %10u  %10u  %10u\n"; +static const char *fmt_header = +	"%-32s    current  cumulative       delta         max\n"; + +static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz) +{ +	int p = 0; +	u32 flag; + +	flag = le32_to_cpu(priv->statistics.flag); + +	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n", flag); +	if (flag & UCODE_STATISTICS_CLEAR_MSK) +		p += scnprintf(buf + p, bufsz - p, +		"\tStatistics have been cleared\n"); +	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n", +		(flag & UCODE_STATISTICS_FREQUENCY_MSK) +		? "2.4 GHz" : "5.2 GHz"); +	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n", +		(flag & UCODE_STATISTICS_NARROW_BAND_MSK) +		 ? "enabled" : "disabled"); + +	return p; +} +  static ssize_t iwl_dbgfs_ucode_rx_stats_read(struct file *file,  					char __user *user_buf,  					size_t count, loff_t *ppos)  {  	struct iwl_priv *priv = file->private_data; -	return priv->cfg->ops->lib->debugfs_ops.rx_stats_read(file, -			user_buf, count, ppos); +	int pos = 0; +	char *buf; +	int bufsz = sizeof(struct statistics_rx_phy) * 40 + +		    sizeof(struct statistics_rx_non_phy) * 40 + +		    sizeof(struct statistics_rx_ht_phy) * 40 + 400; +	ssize_t ret; +	struct statistics_rx_phy *ofdm, *accum_ofdm, *delta_ofdm, *max_ofdm; +	struct statistics_rx_phy *cck, *accum_cck, *delta_cck, *max_cck; +	struct statistics_rx_non_phy *general, *accum_general; +	struct statistics_rx_non_phy *delta_general, *max_general; +	struct statistics_rx_ht_phy *ht, *accum_ht, *delta_ht, *max_ht; + +	if (!iwl_is_alive(priv)) +		return -EAGAIN; + +	buf = kzalloc(bufsz, GFP_KERNEL); +	if (!buf) { +		IWL_ERR(priv, "Can not allocate Buffer\n"); +		return -ENOMEM; +	} + +	/* +	 * the statistic information display here is based on +	 * the last statistics notification from uCode +	 * might not reflect the current uCode activity +	 */ +	ofdm = &priv->statistics.rx_ofdm; +	cck = &priv->statistics.rx_cck; +	general = &priv->statistics.rx_non_phy; +	ht = &priv->statistics.rx_ofdm_ht; +	accum_ofdm = &priv->accum_stats.rx_ofdm; +	accum_cck = &priv->accum_stats.rx_cck; +	accum_general = &priv->accum_stats.rx_non_phy; +	accum_ht = &priv->accum_stats.rx_ofdm_ht; +	delta_ofdm = &priv->delta_stats.rx_ofdm; +	delta_cck = &priv->delta_stats.rx_cck; +	delta_general = &priv->delta_stats.rx_non_phy; +	delta_ht = &priv->delta_stats.rx_ofdm_ht; +	max_ofdm = &priv->max_delta_stats.rx_ofdm; +	max_cck = &priv->max_delta_stats.rx_cck; +	max_general = &priv->max_delta_stats.rx_non_phy; +	max_ht = &priv->max_delta_stats.rx_ofdm_ht; + +	pos += iwl_statistics_flag(priv, buf, bufsz); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_header, "Statistics_Rx - OFDM:"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "ina_cnt:", +			 le32_to_cpu(ofdm->ina_cnt), +			 accum_ofdm->ina_cnt, +			 delta_ofdm->ina_cnt, max_ofdm->ina_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "fina_cnt:", +			 le32_to_cpu(ofdm->fina_cnt), accum_ofdm->fina_cnt, +			 delta_ofdm->fina_cnt, max_ofdm->fina_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "plcp_err:", +			 le32_to_cpu(ofdm->plcp_err), accum_ofdm->plcp_err, +			 delta_ofdm->plcp_err, max_ofdm->plcp_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "crc32_err:", +			 le32_to_cpu(ofdm->crc32_err), accum_ofdm->crc32_err, +			 delta_ofdm->crc32_err, max_ofdm->crc32_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "overrun_err:", +			 le32_to_cpu(ofdm->overrun_err), +			 accum_ofdm->overrun_err, delta_ofdm->overrun_err, +			 max_ofdm->overrun_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "early_overrun_err:", +			 le32_to_cpu(ofdm->early_overrun_err), +			 accum_ofdm->early_overrun_err, +			 delta_ofdm->early_overrun_err, +			 max_ofdm->early_overrun_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "crc32_good:", +			 le32_to_cpu(ofdm->crc32_good), +			 accum_ofdm->crc32_good, delta_ofdm->crc32_good, +			 max_ofdm->crc32_good); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "false_alarm_cnt:", +			 le32_to_cpu(ofdm->false_alarm_cnt), +			 accum_ofdm->false_alarm_cnt, +			 delta_ofdm->false_alarm_cnt, +			 max_ofdm->false_alarm_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "fina_sync_err_cnt:", +			 le32_to_cpu(ofdm->fina_sync_err_cnt), +			 accum_ofdm->fina_sync_err_cnt, +			 delta_ofdm->fina_sync_err_cnt, +			 max_ofdm->fina_sync_err_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sfd_timeout:", +			 le32_to_cpu(ofdm->sfd_timeout), +			 accum_ofdm->sfd_timeout, delta_ofdm->sfd_timeout, +			 max_ofdm->sfd_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "fina_timeout:", +			 le32_to_cpu(ofdm->fina_timeout), +			 accum_ofdm->fina_timeout, delta_ofdm->fina_timeout, +			 max_ofdm->fina_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "unresponded_rts:", +			 le32_to_cpu(ofdm->unresponded_rts), +			 accum_ofdm->unresponded_rts, +			 delta_ofdm->unresponded_rts, +			 max_ofdm->unresponded_rts); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "rxe_frame_lmt_ovrun:", +			 le32_to_cpu(ofdm->rxe_frame_limit_overrun), +			 accum_ofdm->rxe_frame_limit_overrun, +			 delta_ofdm->rxe_frame_limit_overrun, +			 max_ofdm->rxe_frame_limit_overrun); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sent_ack_cnt:", +			 le32_to_cpu(ofdm->sent_ack_cnt), +			 accum_ofdm->sent_ack_cnt, delta_ofdm->sent_ack_cnt, +			 max_ofdm->sent_ack_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sent_cts_cnt:", +			 le32_to_cpu(ofdm->sent_cts_cnt), +			 accum_ofdm->sent_cts_cnt, delta_ofdm->sent_cts_cnt, +			 max_ofdm->sent_cts_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sent_ba_rsp_cnt:", +			 le32_to_cpu(ofdm->sent_ba_rsp_cnt), +			 accum_ofdm->sent_ba_rsp_cnt, +			 delta_ofdm->sent_ba_rsp_cnt, +			 max_ofdm->sent_ba_rsp_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "dsp_self_kill:", +			 le32_to_cpu(ofdm->dsp_self_kill), +			 accum_ofdm->dsp_self_kill, +			 delta_ofdm->dsp_self_kill, +			 max_ofdm->dsp_self_kill); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "mh_format_err:", +			 le32_to_cpu(ofdm->mh_format_err), +			 accum_ofdm->mh_format_err, +			 delta_ofdm->mh_format_err, +			 max_ofdm->mh_format_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "re_acq_main_rssi_sum:", +			 le32_to_cpu(ofdm->re_acq_main_rssi_sum), +			 accum_ofdm->re_acq_main_rssi_sum, +			 delta_ofdm->re_acq_main_rssi_sum, +			 max_ofdm->re_acq_main_rssi_sum); + +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_header, "Statistics_Rx - CCK:"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "ina_cnt:", +			 le32_to_cpu(cck->ina_cnt), accum_cck->ina_cnt, +			 delta_cck->ina_cnt, max_cck->ina_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "fina_cnt:", +			 le32_to_cpu(cck->fina_cnt), accum_cck->fina_cnt, +			 delta_cck->fina_cnt, max_cck->fina_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "plcp_err:", +			 le32_to_cpu(cck->plcp_err), accum_cck->plcp_err, +			 delta_cck->plcp_err, max_cck->plcp_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "crc32_err:", +			 le32_to_cpu(cck->crc32_err), accum_cck->crc32_err, +			 delta_cck->crc32_err, max_cck->crc32_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "overrun_err:", +			 le32_to_cpu(cck->overrun_err), +			 accum_cck->overrun_err, delta_cck->overrun_err, +			 max_cck->overrun_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "early_overrun_err:", +			 le32_to_cpu(cck->early_overrun_err), +			 accum_cck->early_overrun_err, +			 delta_cck->early_overrun_err, +			 max_cck->early_overrun_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "crc32_good:", +			 le32_to_cpu(cck->crc32_good), accum_cck->crc32_good, +			 delta_cck->crc32_good, max_cck->crc32_good); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "false_alarm_cnt:", +			 le32_to_cpu(cck->false_alarm_cnt), +			 accum_cck->false_alarm_cnt, +			 delta_cck->false_alarm_cnt, max_cck->false_alarm_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "fina_sync_err_cnt:", +			 le32_to_cpu(cck->fina_sync_err_cnt), +			 accum_cck->fina_sync_err_cnt, +			 delta_cck->fina_sync_err_cnt, +			 max_cck->fina_sync_err_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sfd_timeout:", +			 le32_to_cpu(cck->sfd_timeout), +			 accum_cck->sfd_timeout, delta_cck->sfd_timeout, +			 max_cck->sfd_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "fina_timeout:", +			 le32_to_cpu(cck->fina_timeout), +			 accum_cck->fina_timeout, delta_cck->fina_timeout, +			 max_cck->fina_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "unresponded_rts:", +			 le32_to_cpu(cck->unresponded_rts), +			 accum_cck->unresponded_rts, delta_cck->unresponded_rts, +			 max_cck->unresponded_rts); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "rxe_frame_lmt_ovrun:", +			 le32_to_cpu(cck->rxe_frame_limit_overrun), +			 accum_cck->rxe_frame_limit_overrun, +			 delta_cck->rxe_frame_limit_overrun, +			 max_cck->rxe_frame_limit_overrun); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sent_ack_cnt:", +			 le32_to_cpu(cck->sent_ack_cnt), +			 accum_cck->sent_ack_cnt, delta_cck->sent_ack_cnt, +			 max_cck->sent_ack_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sent_cts_cnt:", +			 le32_to_cpu(cck->sent_cts_cnt), +			 accum_cck->sent_cts_cnt, delta_cck->sent_cts_cnt, +			 max_cck->sent_cts_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sent_ba_rsp_cnt:", +			 le32_to_cpu(cck->sent_ba_rsp_cnt), +			 accum_cck->sent_ba_rsp_cnt, +			 delta_cck->sent_ba_rsp_cnt, +			 max_cck->sent_ba_rsp_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "dsp_self_kill:", +			 le32_to_cpu(cck->dsp_self_kill), +			 accum_cck->dsp_self_kill, delta_cck->dsp_self_kill, +			 max_cck->dsp_self_kill); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "mh_format_err:", +			 le32_to_cpu(cck->mh_format_err), +			 accum_cck->mh_format_err, delta_cck->mh_format_err, +			 max_cck->mh_format_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "re_acq_main_rssi_sum:", +			 le32_to_cpu(cck->re_acq_main_rssi_sum), +			 accum_cck->re_acq_main_rssi_sum, +			 delta_cck->re_acq_main_rssi_sum, +			 max_cck->re_acq_main_rssi_sum); + +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_header, "Statistics_Rx - GENERAL:"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "bogus_cts:", +			 le32_to_cpu(general->bogus_cts), +			 accum_general->bogus_cts, delta_general->bogus_cts, +			 max_general->bogus_cts); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "bogus_ack:", +			 le32_to_cpu(general->bogus_ack), +			 accum_general->bogus_ack, delta_general->bogus_ack, +			 max_general->bogus_ack); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "non_bssid_frames:", +			 le32_to_cpu(general->non_bssid_frames), +			 accum_general->non_bssid_frames, +			 delta_general->non_bssid_frames, +			 max_general->non_bssid_frames); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "filtered_frames:", +			 le32_to_cpu(general->filtered_frames), +			 accum_general->filtered_frames, +			 delta_general->filtered_frames, +			 max_general->filtered_frames); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "non_channel_beacons:", +			 le32_to_cpu(general->non_channel_beacons), +			 accum_general->non_channel_beacons, +			 delta_general->non_channel_beacons, +			 max_general->non_channel_beacons); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "channel_beacons:", +			 le32_to_cpu(general->channel_beacons), +			 accum_general->channel_beacons, +			 delta_general->channel_beacons, +			 max_general->channel_beacons); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "num_missed_bcon:", +			 le32_to_cpu(general->num_missed_bcon), +			 accum_general->num_missed_bcon, +			 delta_general->num_missed_bcon, +			 max_general->num_missed_bcon); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "adc_rx_saturation_time:", +			 le32_to_cpu(general->adc_rx_saturation_time), +			 accum_general->adc_rx_saturation_time, +			 delta_general->adc_rx_saturation_time, +			 max_general->adc_rx_saturation_time); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "ina_detect_search_tm:", +			 le32_to_cpu(general->ina_detection_search_time), +			 accum_general->ina_detection_search_time, +			 delta_general->ina_detection_search_time, +			 max_general->ina_detection_search_time); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_silence_rssi_a:", +			 le32_to_cpu(general->beacon_silence_rssi_a), +			 accum_general->beacon_silence_rssi_a, +			 delta_general->beacon_silence_rssi_a, +			 max_general->beacon_silence_rssi_a); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_silence_rssi_b:", +			 le32_to_cpu(general->beacon_silence_rssi_b), +			 accum_general->beacon_silence_rssi_b, +			 delta_general->beacon_silence_rssi_b, +			 max_general->beacon_silence_rssi_b); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_silence_rssi_c:", +			 le32_to_cpu(general->beacon_silence_rssi_c), +			 accum_general->beacon_silence_rssi_c, +			 delta_general->beacon_silence_rssi_c, +			 max_general->beacon_silence_rssi_c); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "interference_data_flag:", +			 le32_to_cpu(general->interference_data_flag), +			 accum_general->interference_data_flag, +			 delta_general->interference_data_flag, +			 max_general->interference_data_flag); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "channel_load:", +			 le32_to_cpu(general->channel_load), +			 accum_general->channel_load, +			 delta_general->channel_load, +			 max_general->channel_load); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "dsp_false_alarms:", +			 le32_to_cpu(general->dsp_false_alarms), +			 accum_general->dsp_false_alarms, +			 delta_general->dsp_false_alarms, +			 max_general->dsp_false_alarms); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_rssi_a:", +			 le32_to_cpu(general->beacon_rssi_a), +			 accum_general->beacon_rssi_a, +			 delta_general->beacon_rssi_a, +			 max_general->beacon_rssi_a); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_rssi_b:", +			 le32_to_cpu(general->beacon_rssi_b), +			 accum_general->beacon_rssi_b, +			 delta_general->beacon_rssi_b, +			 max_general->beacon_rssi_b); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_rssi_c:", +			 le32_to_cpu(general->beacon_rssi_c), +			 accum_general->beacon_rssi_c, +			 delta_general->beacon_rssi_c, +			 max_general->beacon_rssi_c); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_energy_a:", +			 le32_to_cpu(general->beacon_energy_a), +			 accum_general->beacon_energy_a, +			 delta_general->beacon_energy_a, +			 max_general->beacon_energy_a); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_energy_b:", +			 le32_to_cpu(general->beacon_energy_b), +			 accum_general->beacon_energy_b, +			 delta_general->beacon_energy_b, +			 max_general->beacon_energy_b); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "beacon_energy_c:", +			 le32_to_cpu(general->beacon_energy_c), +			 accum_general->beacon_energy_c, +			 delta_general->beacon_energy_c, +			 max_general->beacon_energy_c); + +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_header, "Statistics_Rx - OFDM_HT:"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "plcp_err:", +			 le32_to_cpu(ht->plcp_err), accum_ht->plcp_err, +			 delta_ht->plcp_err, max_ht->plcp_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "overrun_err:", +			 le32_to_cpu(ht->overrun_err), accum_ht->overrun_err, +			 delta_ht->overrun_err, max_ht->overrun_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "early_overrun_err:", +			 le32_to_cpu(ht->early_overrun_err), +			 accum_ht->early_overrun_err, +			 delta_ht->early_overrun_err, +			 max_ht->early_overrun_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "crc32_good:", +			 le32_to_cpu(ht->crc32_good), accum_ht->crc32_good, +			 delta_ht->crc32_good, max_ht->crc32_good); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "crc32_err:", +			 le32_to_cpu(ht->crc32_err), accum_ht->crc32_err, +			 delta_ht->crc32_err, max_ht->crc32_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "mh_format_err:", +			 le32_to_cpu(ht->mh_format_err), +			 accum_ht->mh_format_err, +			 delta_ht->mh_format_err, max_ht->mh_format_err); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg_crc32_good:", +			 le32_to_cpu(ht->agg_crc32_good), +			 accum_ht->agg_crc32_good, +			 delta_ht->agg_crc32_good, max_ht->agg_crc32_good); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg_mpdu_cnt:", +			 le32_to_cpu(ht->agg_mpdu_cnt), +			 accum_ht->agg_mpdu_cnt, +			 delta_ht->agg_mpdu_cnt, max_ht->agg_mpdu_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg_cnt:", +			 le32_to_cpu(ht->agg_cnt), accum_ht->agg_cnt, +			 delta_ht->agg_cnt, max_ht->agg_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "unsupport_mcs:", +			 le32_to_cpu(ht->unsupport_mcs), +			 accum_ht->unsupport_mcs, +			 delta_ht->unsupport_mcs, max_ht->unsupport_mcs); + +	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); +	kfree(buf); +	return ret;  }  static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file, @@ -1053,8 +1502,190 @@ static ssize_t iwl_dbgfs_ucode_tx_stats_read(struct file *file,  					size_t count, loff_t *ppos)  {  	struct iwl_priv *priv = file->private_data; -	return priv->cfg->ops->lib->debugfs_ops.tx_stats_read(file, -			user_buf, count, ppos); +	int pos = 0; +	char *buf; +	int bufsz = (sizeof(struct statistics_tx) * 48) + 250; +	ssize_t ret; +	struct statistics_tx *tx, *accum_tx, *delta_tx, *max_tx; + +	if (!iwl_is_alive(priv)) +		return -EAGAIN; + +	buf = kzalloc(bufsz, GFP_KERNEL); +	if (!buf) { +		IWL_ERR(priv, "Can not allocate Buffer\n"); +		return -ENOMEM; +	} + +	/* the statistic information display here is based on +	 * the last statistics notification from uCode +	 * might not reflect the current uCode activity +	 */ +	tx = &priv->statistics.tx; +	accum_tx = &priv->accum_stats.tx; +	delta_tx = &priv->delta_stats.tx; +	max_tx = &priv->max_delta_stats.tx; + +	pos += iwl_statistics_flag(priv, buf, bufsz); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_header, "Statistics_Tx:"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "preamble:", +			 le32_to_cpu(tx->preamble_cnt), +			 accum_tx->preamble_cnt, +			 delta_tx->preamble_cnt, max_tx->preamble_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "rx_detected_cnt:", +			 le32_to_cpu(tx->rx_detected_cnt), +			 accum_tx->rx_detected_cnt, +			 delta_tx->rx_detected_cnt, max_tx->rx_detected_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "bt_prio_defer_cnt:", +			 le32_to_cpu(tx->bt_prio_defer_cnt), +			 accum_tx->bt_prio_defer_cnt, +			 delta_tx->bt_prio_defer_cnt, +			 max_tx->bt_prio_defer_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "bt_prio_kill_cnt:", +			 le32_to_cpu(tx->bt_prio_kill_cnt), +			 accum_tx->bt_prio_kill_cnt, +			 delta_tx->bt_prio_kill_cnt, +			 max_tx->bt_prio_kill_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "few_bytes_cnt:", +			 le32_to_cpu(tx->few_bytes_cnt), +			 accum_tx->few_bytes_cnt, +			 delta_tx->few_bytes_cnt, max_tx->few_bytes_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "cts_timeout:", +			 le32_to_cpu(tx->cts_timeout), accum_tx->cts_timeout, +			 delta_tx->cts_timeout, max_tx->cts_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "ack_timeout:", +			 le32_to_cpu(tx->ack_timeout), +			 accum_tx->ack_timeout, +			 delta_tx->ack_timeout, max_tx->ack_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "expected_ack_cnt:", +			 le32_to_cpu(tx->expected_ack_cnt), +			 accum_tx->expected_ack_cnt, +			 delta_tx->expected_ack_cnt, +			 max_tx->expected_ack_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "actual_ack_cnt:", +			 le32_to_cpu(tx->actual_ack_cnt), +			 accum_tx->actual_ack_cnt, +			 delta_tx->actual_ack_cnt, +			 max_tx->actual_ack_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "dump_msdu_cnt:", +			 le32_to_cpu(tx->dump_msdu_cnt), +			 accum_tx->dump_msdu_cnt, +			 delta_tx->dump_msdu_cnt, +			 max_tx->dump_msdu_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "abort_nxt_frame_mismatch:", +			 le32_to_cpu(tx->burst_abort_next_frame_mismatch_cnt), +			 accum_tx->burst_abort_next_frame_mismatch_cnt, +			 delta_tx->burst_abort_next_frame_mismatch_cnt, +			 max_tx->burst_abort_next_frame_mismatch_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "abort_missing_nxt_frame:", +			 le32_to_cpu(tx->burst_abort_missing_next_frame_cnt), +			 accum_tx->burst_abort_missing_next_frame_cnt, +			 delta_tx->burst_abort_missing_next_frame_cnt, +			 max_tx->burst_abort_missing_next_frame_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "cts_timeout_collision:", +			 le32_to_cpu(tx->cts_timeout_collision), +			 accum_tx->cts_timeout_collision, +			 delta_tx->cts_timeout_collision, +			 max_tx->cts_timeout_collision); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "ack_ba_timeout_collision:", +			 le32_to_cpu(tx->ack_or_ba_timeout_collision), +			 accum_tx->ack_or_ba_timeout_collision, +			 delta_tx->ack_or_ba_timeout_collision, +			 max_tx->ack_or_ba_timeout_collision); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg ba_timeout:", +			 le32_to_cpu(tx->agg.ba_timeout), +			 accum_tx->agg.ba_timeout, +			 delta_tx->agg.ba_timeout, +			 max_tx->agg.ba_timeout); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg ba_resched_frames:", +			 le32_to_cpu(tx->agg.ba_reschedule_frames), +			 accum_tx->agg.ba_reschedule_frames, +			 delta_tx->agg.ba_reschedule_frames, +			 max_tx->agg.ba_reschedule_frames); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg scd_query_agg_frame:", +			 le32_to_cpu(tx->agg.scd_query_agg_frame_cnt), +			 accum_tx->agg.scd_query_agg_frame_cnt, +			 delta_tx->agg.scd_query_agg_frame_cnt, +			 max_tx->agg.scd_query_agg_frame_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg scd_query_no_agg:", +			 le32_to_cpu(tx->agg.scd_query_no_agg), +			 accum_tx->agg.scd_query_no_agg, +			 delta_tx->agg.scd_query_no_agg, +			 max_tx->agg.scd_query_no_agg); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg scd_query_agg:", +			 le32_to_cpu(tx->agg.scd_query_agg), +			 accum_tx->agg.scd_query_agg, +			 delta_tx->agg.scd_query_agg, +			 max_tx->agg.scd_query_agg); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg scd_query_mismatch:", +			 le32_to_cpu(tx->agg.scd_query_mismatch), +			 accum_tx->agg.scd_query_mismatch, +			 delta_tx->agg.scd_query_mismatch, +			 max_tx->agg.scd_query_mismatch); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg frame_not_ready:", +			 le32_to_cpu(tx->agg.frame_not_ready), +			 accum_tx->agg.frame_not_ready, +			 delta_tx->agg.frame_not_ready, +			 max_tx->agg.frame_not_ready); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg underrun:", +			 le32_to_cpu(tx->agg.underrun), +			 accum_tx->agg.underrun, +			 delta_tx->agg.underrun, max_tx->agg.underrun); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg bt_prio_kill:", +			 le32_to_cpu(tx->agg.bt_prio_kill), +			 accum_tx->agg.bt_prio_kill, +			 delta_tx->agg.bt_prio_kill, +			 max_tx->agg.bt_prio_kill); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "agg rx_ba_rsp_cnt:", +			 le32_to_cpu(tx->agg.rx_ba_rsp_cnt), +			 accum_tx->agg.rx_ba_rsp_cnt, +			 delta_tx->agg.rx_ba_rsp_cnt, +			 max_tx->agg.rx_ba_rsp_cnt); + +	if (tx->tx_power.ant_a || tx->tx_power.ant_b || tx->tx_power.ant_c) { +		pos += scnprintf(buf + pos, bufsz - pos, +			"tx power: (1/2 dB step)\n"); +		if ((priv->cfg->valid_tx_ant & ANT_A) && tx->tx_power.ant_a) +			pos += scnprintf(buf + pos, bufsz - pos, +					fmt_hex, "antenna A:", +					tx->tx_power.ant_a); +		if ((priv->cfg->valid_tx_ant & ANT_B) && tx->tx_power.ant_b) +			pos += scnprintf(buf + pos, bufsz - pos, +					fmt_hex, "antenna B:", +					tx->tx_power.ant_b); +		if ((priv->cfg->valid_tx_ant & ANT_C) && tx->tx_power.ant_c) +			pos += scnprintf(buf + pos, bufsz - pos, +					fmt_hex, "antenna C:", +					tx->tx_power.ant_c); +	} +	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); +	kfree(buf); +	return ret;  }  static ssize_t iwl_dbgfs_ucode_general_stats_read(struct file *file, @@ -1062,8 +1693,347 @@ static ssize_t iwl_dbgfs_ucode_general_stats_read(struct file *file,  					size_t count, loff_t *ppos)  {  	struct iwl_priv *priv = file->private_data; -	return priv->cfg->ops->lib->debugfs_ops.general_stats_read(file, -			user_buf, count, ppos); +	int pos = 0; +	char *buf; +	int bufsz = sizeof(struct statistics_general) * 10 + 300; +	ssize_t ret; +	struct statistics_general_common *general, *accum_general; +	struct statistics_general_common *delta_general, *max_general; +	struct statistics_dbg *dbg, *accum_dbg, *delta_dbg, *max_dbg; +	struct statistics_div *div, *accum_div, *delta_div, *max_div; + +	if (!iwl_is_alive(priv)) +		return -EAGAIN; + +	buf = kzalloc(bufsz, GFP_KERNEL); +	if (!buf) { +		IWL_ERR(priv, "Can not allocate Buffer\n"); +		return -ENOMEM; +	} + +	/* the statistic information display here is based on +	 * the last statistics notification from uCode +	 * might not reflect the current uCode activity +	 */ +	general = &priv->statistics.common; +	dbg = &priv->statistics.common.dbg; +	div = &priv->statistics.common.div; +	accum_general = &priv->accum_stats.common; +	accum_dbg = &priv->accum_stats.common.dbg; +	accum_div = &priv->accum_stats.common.div; +	delta_general = &priv->delta_stats.common; +	max_general = &priv->max_delta_stats.common; +	delta_dbg = &priv->delta_stats.common.dbg; +	max_dbg = &priv->max_delta_stats.common.dbg; +	delta_div = &priv->delta_stats.common.div; +	max_div = &priv->max_delta_stats.common.div; + +	pos += iwl_statistics_flag(priv, buf, bufsz); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_header, "Statistics_General:"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_value, "temperature:", +			 le32_to_cpu(general->temperature)); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_value, "temperature_m:", +			 le32_to_cpu(general->temperature_m)); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_value, "ttl_timestamp:", +			 le32_to_cpu(general->ttl_timestamp)); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "burst_check:", +			 le32_to_cpu(dbg->burst_check), +			 accum_dbg->burst_check, +			 delta_dbg->burst_check, max_dbg->burst_check); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "burst_count:", +			 le32_to_cpu(dbg->burst_count), +			 accum_dbg->burst_count, +			 delta_dbg->burst_count, max_dbg->burst_count); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "wait_for_silence_timeout_count:", +			 le32_to_cpu(dbg->wait_for_silence_timeout_cnt), +			 accum_dbg->wait_for_silence_timeout_cnt, +			 delta_dbg->wait_for_silence_timeout_cnt, +			 max_dbg->wait_for_silence_timeout_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "sleep_time:", +			 le32_to_cpu(general->sleep_time), +			 accum_general->sleep_time, +			 delta_general->sleep_time, max_general->sleep_time); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "slots_out:", +			 le32_to_cpu(general->slots_out), +			 accum_general->slots_out, +			 delta_general->slots_out, max_general->slots_out); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "slots_idle:", +			 le32_to_cpu(general->slots_idle), +			 accum_general->slots_idle, +			 delta_general->slots_idle, max_general->slots_idle); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "tx_on_a:", +			 le32_to_cpu(div->tx_on_a), accum_div->tx_on_a, +			 delta_div->tx_on_a, max_div->tx_on_a); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "tx_on_b:", +			 le32_to_cpu(div->tx_on_b), accum_div->tx_on_b, +			 delta_div->tx_on_b, max_div->tx_on_b); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "exec_time:", +			 le32_to_cpu(div->exec_time), accum_div->exec_time, +			 delta_div->exec_time, max_div->exec_time); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "probe_time:", +			 le32_to_cpu(div->probe_time), accum_div->probe_time, +			 delta_div->probe_time, max_div->probe_time); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "rx_enable_counter:", +			 le32_to_cpu(general->rx_enable_counter), +			 accum_general->rx_enable_counter, +			 delta_general->rx_enable_counter, +			 max_general->rx_enable_counter); +	pos += scnprintf(buf + pos, bufsz - pos, +			 fmt_table, "num_of_sos_states:", +			 le32_to_cpu(general->num_of_sos_states), +			 accum_general->num_of_sos_states, +			 delta_general->num_of_sos_states, +			 max_general->num_of_sos_states); +	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); +	kfree(buf); +	return ret; +} + +static ssize_t iwl_dbgfs_ucode_bt_stats_read(struct file *file, +					char __user *user_buf, +					size_t count, loff_t *ppos) +{ +	struct iwl_priv *priv = (struct iwl_priv *)file->private_data; +	int pos = 0; +	char *buf; +	int bufsz = (sizeof(struct statistics_bt_activity) * 24) + 200; +	ssize_t ret; +	struct statistics_bt_activity *bt, *accum_bt; + +	if (!iwl_is_alive(priv)) +		return -EAGAIN; + +	if (!priv->bt_enable_flag) +		return -EINVAL; + +	/* make request to uCode to retrieve statistics information */ +	mutex_lock(&priv->mutex); +	ret = iwl_send_statistics_request(priv, CMD_SYNC, false); +	mutex_unlock(&priv->mutex); + +	if (ret) { +		IWL_ERR(priv, +			"Error sending statistics request: %zd\n", ret); +		return -EAGAIN; +	} +	buf = kzalloc(bufsz, GFP_KERNEL); +	if (!buf) { +		IWL_ERR(priv, "Can not allocate Buffer\n"); +		return -ENOMEM; +	} + +	/* +	 * the statistic information display here is based on +	 * the last statistics notification from uCode +	 * might not reflect the current uCode activity +	 */ +	bt = &priv->statistics.bt_activity; +	accum_bt = &priv->accum_stats.bt_activity; + +	pos += iwl_statistics_flag(priv, buf, bufsz); +	pos += scnprintf(buf + pos, bufsz - pos, "Statistics_BT:\n"); +	pos += scnprintf(buf + pos, bufsz - pos, +			"\t\t\tcurrent\t\t\taccumulative\n"); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "hi_priority_tx_req_cnt:\t\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->hi_priority_tx_req_cnt), +			 accum_bt->hi_priority_tx_req_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "hi_priority_tx_denied_cnt:\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->hi_priority_tx_denied_cnt), +			 accum_bt->hi_priority_tx_denied_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "lo_priority_tx_req_cnt:\t\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->lo_priority_tx_req_cnt), +			 accum_bt->lo_priority_tx_req_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "lo_priority_tx_denied_cnt:\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->lo_priority_tx_denied_cnt), +			 accum_bt->lo_priority_tx_denied_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "hi_priority_rx_req_cnt:\t\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->hi_priority_rx_req_cnt), +			 accum_bt->hi_priority_rx_req_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "hi_priority_rx_denied_cnt:\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->hi_priority_rx_denied_cnt), +			 accum_bt->hi_priority_rx_denied_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "lo_priority_rx_req_cnt:\t\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->lo_priority_rx_req_cnt), +			 accum_bt->lo_priority_rx_req_cnt); +	pos += scnprintf(buf + pos, bufsz - pos, +			 "lo_priority_rx_denied_cnt:\t%u\t\t\t%u\n", +			 le32_to_cpu(bt->lo_priority_rx_denied_cnt), +			 accum_bt->lo_priority_rx_denied_cnt); + +	pos += scnprintf(buf + pos, bufsz - pos, +			 "(rx)num_bt_kills:\t\t%u\t\t\t%u\n", +			 le32_to_cpu(priv->statistics.num_bt_kills), +			 priv->statistics.accum_num_bt_kills); + +	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); +	kfree(buf); +	return ret; +} + +static ssize_t iwl_dbgfs_reply_tx_error_read(struct file *file, +					char __user *user_buf, +					size_t count, loff_t *ppos) +{ +	struct iwl_priv *priv = (struct iwl_priv *)file->private_data; +	int pos = 0; +	char *buf; +	int bufsz = (sizeof(struct reply_tx_error_statistics) * 24) + +		(sizeof(struct reply_agg_tx_error_statistics) * 24) + 200; +	ssize_t ret; + +	if (!iwl_is_alive(priv)) +		return -EAGAIN; + +	buf = kzalloc(bufsz, GFP_KERNEL); +	if (!buf) { +		IWL_ERR(priv, "Can not allocate Buffer\n"); +		return -ENOMEM; +	} + +	pos += scnprintf(buf + pos, bufsz - pos, "Statistics_TX_Error:\n"); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_POSTPONE_DELAY), +			 priv->_agn.reply_tx_stats.pp_delay); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_POSTPONE_FEW_BYTES), +			 priv->_agn.reply_tx_stats.pp_few_bytes); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_POSTPONE_BT_PRIO), +			 priv->_agn.reply_tx_stats.pp_bt_prio); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_POSTPONE_QUIET_PERIOD), +			 priv->_agn.reply_tx_stats.pp_quiet_period); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_POSTPONE_CALC_TTAK), +			 priv->_agn.reply_tx_stats.pp_calc_ttak); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_tx_fail_reason( +				TX_STATUS_FAIL_INTERNAL_CROSSED_RETRY), +			 priv->_agn.reply_tx_stats.int_crossed_retry); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_SHORT_LIMIT), +			 priv->_agn.reply_tx_stats.short_limit); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_LONG_LIMIT), +			 priv->_agn.reply_tx_stats.long_limit); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_FIFO_UNDERRUN), +			 priv->_agn.reply_tx_stats.fifo_underrun); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_DRAIN_FLOW), +			 priv->_agn.reply_tx_stats.drain_flow); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_RFKILL_FLUSH), +			 priv->_agn.reply_tx_stats.rfkill_flush); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_LIFE_EXPIRE), +			 priv->_agn.reply_tx_stats.life_expire); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_DEST_PS), +			 priv->_agn.reply_tx_stats.dest_ps); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_HOST_ABORTED), +			 priv->_agn.reply_tx_stats.host_abort); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_BT_RETRY), +			 priv->_agn.reply_tx_stats.pp_delay); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_STA_INVALID), +			 priv->_agn.reply_tx_stats.sta_invalid); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_FRAG_DROPPED), +			 priv->_agn.reply_tx_stats.frag_drop); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_TID_DISABLE), +			 priv->_agn.reply_tx_stats.tid_disable); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_FIFO_FLUSHED), +			 priv->_agn.reply_tx_stats.fifo_flush); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_tx_fail_reason( +				TX_STATUS_FAIL_INSUFFICIENT_CF_POLL), +			 priv->_agn.reply_tx_stats.insuff_cf_poll); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_tx_fail_reason(TX_STATUS_FAIL_PASSIVE_NO_RX), +			 priv->_agn.reply_tx_stats.fail_hw_drop); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_tx_fail_reason( +				TX_STATUS_FAIL_NO_BEACON_ON_RADAR), +			 priv->_agn.reply_tx_stats.sta_color_mismatch); +	pos += scnprintf(buf + pos, bufsz - pos, "UNKNOWN:\t\t\t%u\n", +			 priv->_agn.reply_tx_stats.unknown); + +	pos += scnprintf(buf + pos, bufsz - pos, +			 "\nStatistics_Agg_TX_Error:\n"); + +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_UNDERRUN_MSK), +			 priv->_agn.reply_agg_tx_stats.underrun); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_BT_PRIO_MSK), +			 priv->_agn.reply_agg_tx_stats.bt_prio); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_FEW_BYTES_MSK), +			 priv->_agn.reply_agg_tx_stats.few_bytes); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_ABORT_MSK), +			 priv->_agn.reply_agg_tx_stats.abort); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_agg_tx_fail_reason( +				AGG_TX_STATE_LAST_SENT_TTL_MSK), +			 priv->_agn.reply_agg_tx_stats.last_sent_ttl); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_agg_tx_fail_reason( +				AGG_TX_STATE_LAST_SENT_TRY_CNT_MSK), +			 priv->_agn.reply_agg_tx_stats.last_sent_try); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_agg_tx_fail_reason( +				AGG_TX_STATE_LAST_SENT_BT_KILL_MSK), +			 priv->_agn.reply_agg_tx_stats.last_sent_bt_kill); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_SCD_QUERY_MSK), +			 priv->_agn.reply_agg_tx_stats.scd_query); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t%u\n", +			 iwl_get_agg_tx_fail_reason( +				AGG_TX_STATE_TEST_BAD_CRC32_MSK), +			 priv->_agn.reply_agg_tx_stats.bad_crc32); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_RESPONSE_MSK), +			 priv->_agn.reply_agg_tx_stats.response); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_DUMP_TX_MSK), +			 priv->_agn.reply_agg_tx_stats.dump_tx); +	pos += scnprintf(buf + pos, bufsz - pos, "%s:\t\t\t%u\n", +			 iwl_get_agg_tx_fail_reason(AGG_TX_STATE_DELAY_TX_MSK), +			 priv->_agn.reply_agg_tx_stats.delay_tx); +	pos += scnprintf(buf + pos, bufsz - pos, "UNKNOWN:\t\t\t%u\n", +			 priv->_agn.reply_agg_tx_stats.unknown); + +	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); +	kfree(buf); +	return ret;  }  static ssize_t iwl_dbgfs_sensitivity_read(struct file *file, @@ -1268,8 +2238,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,  	if (sscanf(buf, "%d", &csr) != 1)  		return -EFAULT; -	if (priv->cfg->ops->lib->dump_csr) -		priv->cfg->ops->lib->dump_csr(priv); +	iwl_dump_csr(priv);  	return count;  } @@ -1359,13 +2328,11 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file,  	int pos = 0;  	ssize_t ret = -EFAULT; -	if (priv->cfg->ops->lib->dump_fh) { -		ret = pos = priv->cfg->ops->lib->dump_fh(priv, &buf, true); -		if (buf) { -			ret = simple_read_from_buffer(user_buf, -						      count, ppos, buf, pos); -			kfree(buf); -		} +	ret = pos = iwl_dump_fh(priv, &buf, true); +	if (buf) { +		ret = simple_read_from_buffer(user_buf, +					      count, ppos, buf, pos); +		kfree(buf);  	}  	return ret; @@ -1531,16 +2498,6 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,  	return count;  } -static ssize_t iwl_dbgfs_ucode_bt_stats_read(struct file *file, -					char __user *user_buf, -					size_t count, loff_t *ppos) -{ -	struct iwl_priv *priv = (struct iwl_priv *)file->private_data; - -	return priv->cfg->ops->lib->debugfs_ops.bt_stats_read(file, -			user_buf, count, ppos); -} -  static ssize_t iwl_dbgfs_wd_timeout_write(struct file *file,  					const char __user *user_buf,  					size_t count, loff_t *ppos) { @@ -1572,12 +2529,10 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,  	int pos = 0;  	char buf[200];  	const size_t bufsz = sizeof(buf); -	ssize_t ret;  	if (!priv->bt_enable_flag) {  		pos += scnprintf(buf + pos, bufsz - pos, "BT coex disabled\n"); -		ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); -		return ret; +		return simple_read_from_buffer(user_buf, count, ppos, buf, pos);  	}  	pos += scnprintf(buf + pos, bufsz - pos, "BT enable flag: 0x%x\n",  		priv->bt_enable_flag); @@ -1608,8 +2563,7 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file,  		break;  	} -	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos); -	return ret; +	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);  }  static ssize_t iwl_dbgfs_protection_mode_read(struct file *file, @@ -1658,18 +2612,6 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,  	return count;  } -static ssize_t iwl_dbgfs_reply_tx_error_read(struct file *file, -					char __user *user_buf, -					size_t count, loff_t *ppos) -{ -	struct iwl_priv *priv = file->private_data; - -	if (priv->cfg->ops->lib->debugfs_ops.reply_tx_error) -		return priv->cfg->ops->lib->debugfs_ops.reply_tx_error( -			file, user_buf, count, ppos); -	else -		return -ENODATA; -}  DEBUGFS_READ_FILE_OPS(rx_statistics);  DEBUGFS_READ_FILE_OPS(tx_statistics);  DEBUGFS_READ_WRITE_FILE_OPS(traffic_log); @@ -1731,11 +2673,8 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)  	DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);  	DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);  	DEBUGFS_ADD_FILE(qos, dir_data, S_IRUSR); -	if (!priv->cfg->base_params->broken_powersave) { -		DEBUGFS_ADD_FILE(sleep_level_override, dir_data, -				 S_IWUSR | S_IRUSR); -		DEBUGFS_ADD_FILE(current_sleep_command, dir_data, S_IRUSR); -	} +	DEBUGFS_ADD_FILE(sleep_level_override, dir_data, S_IWUSR | S_IRUSR); +	DEBUGFS_ADD_FILE(current_sleep_command, dir_data, S_IRUSR);  	DEBUGFS_ADD_FILE(thermal_throttling, dir_data, S_IRUSR);  	DEBUGFS_ADD_FILE(disable_ht40, dir_data, S_IWUSR | S_IRUSR);  	DEBUGFS_ADD_FILE(rx_statistics, dir_debug, S_IRUSR); @@ -1758,29 +2697,20 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name)  		DEBUGFS_ADD_FILE(txfifo_flush, dir_debug, S_IWUSR);  	DEBUGFS_ADD_FILE(protection_mode, dir_debug, S_IWUSR | S_IRUSR); -	if (priv->cfg->base_params->sensitivity_calib_by_driver) -		DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR); -	if (priv->cfg->base_params->chain_noise_calib_by_driver) -		DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR); -	if (priv->cfg->base_params->ucode_tracing) -		DEBUGFS_ADD_FILE(ucode_tracing, dir_debug, S_IWUSR | S_IRUSR); -	if (iwl_bt_statistics(priv)) -		DEBUGFS_ADD_FILE(ucode_bt_stats, dir_debug, S_IRUSR); +	DEBUGFS_ADD_FILE(sensitivity, dir_debug, S_IRUSR); +	DEBUGFS_ADD_FILE(chain_noise, dir_debug, S_IRUSR); +	DEBUGFS_ADD_FILE(ucode_tracing, dir_debug, S_IWUSR | S_IRUSR); +	DEBUGFS_ADD_FILE(ucode_bt_stats, dir_debug, S_IRUSR);  	DEBUGFS_ADD_FILE(reply_tx_error, dir_debug, S_IRUSR);  	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);  	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);  	DEBUGFS_ADD_FILE(wd_timeout, dir_debug, S_IWUSR);  	if (iwl_advanced_bt_coexist(priv))  		DEBUGFS_ADD_FILE(bt_traffic, dir_debug, S_IRUSR); -	if (priv->cfg->base_params->sensitivity_calib_by_driver) -		DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf, -				 &priv->disable_sens_cal); -	if (priv->cfg->base_params->chain_noise_calib_by_driver) -		DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf, -				 &priv->disable_chain_noise_cal); -	if (priv->cfg->base_params->tx_power_by_driver) -		DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, -				&priv->disable_tx_power_cal); +	DEBUGFS_ADD_BOOL(disable_sensitivity, dir_rf, +			 &priv->disable_sens_cal); +	DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf, +			 &priv->disable_chain_noise_cal);  	return 0;  err:  |