Commit 1f7b6172 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: move isr_statistics to transport layer 



It is accessed by the transport layer only, hence the move.
The debugfs handlers that accessed it moved to the transport layer too.
The rx_handlers part of it stayed in the upper layer and a special debugfs
has been added for it

Also add missing includes to iwl-commands.h.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e4ef84d9

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

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ 
#ifndef __iwl_commands_h__

#define __iwl_commands_h__



#include <linux/etherdevice.h>

#include <linux/ieee80211.h>



struct iwl_priv;



/* uCode version contains 4 values: Major/Minor/API/Serial */

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

+0 −5
Original line number Diff line number Diff line
@@ -1121,11 +1121,6 @@ int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear) 
					&statistics_cmd);

}



void iwl_clear_isr_stats(struct iwl_priv *priv)

{

	memset(&priv->isr_stats, 0, sizeof(priv->isr_stats));

}



int iwl_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,

			   const struct ieee80211_tx_queue_params *params)

{

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

+0 −2
Original line number Diff line number Diff line
@@ -387,8 +387,6 @@ static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv, 
}

#endif



void iwl_clear_isr_stats(struct iwl_priv *priv);



/*****************************************************

*  GEOS

******************************************************/

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

+10 −44
Original line number Diff line number Diff line
@@ -556,11 +556,12 @@ static ssize_t iwl_dbgfs_status_read(struct file *file, 
	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);

}



static ssize_t iwl_dbgfs_interrupt_read(struct file *file,

static ssize_t iwl_dbgfs_rx_handlers_read(struct file *file,

					char __user *user_buf,

					size_t count, loff_t *ppos) {



	struct iwl_priv *priv = file->private_data;



	int pos = 0;

	int cnt = 0;

	char *buf;
@@ -573,61 +574,25 @@ static ssize_t iwl_dbgfs_interrupt_read(struct file *file, 
		return -ENOMEM;

	}



	pos += scnprintf(buf + pos, bufsz - pos,

			"Interrupt Statistics Report:\n");



	pos += scnprintf(buf + pos, bufsz - pos, "HW Error:\t\t\t %u\n",

		priv->isr_stats.hw);

	pos += scnprintf(buf + pos, bufsz - pos, "SW Error:\t\t\t %u\n",

		priv->isr_stats.sw);

	if (priv->isr_stats.sw || priv->isr_stats.hw) {

		pos += scnprintf(buf + pos, bufsz - pos,

			"\tLast Restarting Code:  0x%X\n",

			priv->isr_stats.err_code);

	}

#ifdef CONFIG_IWLWIFI_DEBUG

	pos += scnprintf(buf + pos, bufsz - pos, "Frame transmitted:\t\t %u\n",

		priv->isr_stats.sch);

	pos += scnprintf(buf + pos, bufsz - pos, "Alive interrupt:\t\t %u\n",

		priv->isr_stats.alive);

#endif

	pos += scnprintf(buf + pos, bufsz - pos,

		"HW RF KILL switch toggled:\t %u\n",

		priv->isr_stats.rfkill);



	pos += scnprintf(buf + pos, bufsz - pos, "CT KILL:\t\t\t %u\n",

		priv->isr_stats.ctkill);



	pos += scnprintf(buf + pos, bufsz - pos, "Wakeup Interrupt:\t\t %u\n",

		priv->isr_stats.wakeup);



	pos += scnprintf(buf + pos, bufsz - pos,

		"Rx command responses:\t\t %u\n",

		priv->isr_stats.rx);

	for (cnt = 0; cnt < REPLY_MAX; cnt++) {

		if (priv->isr_stats.rx_handlers[cnt] > 0)

		if (priv->rx_handlers_stats[cnt] > 0)

			pos += scnprintf(buf + pos, bufsz - pos,

				"\tRx handler[%36s]:\t\t %u\n",

				get_cmd_string(cnt),

				priv->isr_stats.rx_handlers[cnt]);

				priv->rx_handlers_stats[cnt]);

	}



	pos += scnprintf(buf + pos, bufsz - pos, "Tx/FH interrupt:\t\t %u\n",

		priv->isr_stats.tx);



	pos += scnprintf(buf + pos, bufsz - pos, "Unexpected INTA:\t\t %u\n",

		priv->isr_stats.unhandled);



	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

	kfree(buf);

	return ret;

}



static ssize_t iwl_dbgfs_interrupt_write(struct file *file,

static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,

					 const char __user *user_buf,

					 size_t count, loff_t *ppos)

{

	struct iwl_priv *priv = file->private_data;



	char buf[8];

	int buf_size;

	u32 reset_flag;
@@ -639,7 +604,8 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file, 
	if (sscanf(buf, "%x", &reset_flag) != 1)

		return -EFAULT;

	if (reset_flag == 0)

		iwl_clear_isr_stats(priv);

		memset(&priv->rx_handlers_stats[0], 0,

			sizeof(priv->rx_handlers_stats));



	return count;

}
@@ -834,7 +800,7 @@ DEBUGFS_READ_FILE_OPS(nvm); 
DEBUGFS_READ_FILE_OPS(stations);

DEBUGFS_READ_FILE_OPS(channels);

DEBUGFS_READ_FILE_OPS(status);

DEBUGFS_READ_WRITE_FILE_OPS(interrupt);

DEBUGFS_READ_WRITE_FILE_OPS(rx_handlers);

DEBUGFS_READ_FILE_OPS(qos);

DEBUGFS_READ_FILE_OPS(thermal_throttling);

DEBUGFS_READ_WRITE_FILE_OPS(disable_ht40);
@@ -2471,7 +2437,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, const char *name) 
	DEBUGFS_ADD_FILE(stations, dir_data, S_IRUSR);

	DEBUGFS_ADD_FILE(channels, dir_data, S_IRUSR);

	DEBUGFS_ADD_FILE(status, dir_data, S_IRUSR);

	DEBUGFS_ADD_FILE(interrupt, dir_data, S_IWUSR | S_IRUSR);

	DEBUGFS_ADD_FILE(rx_handlers, dir_data, S_IWUSR | S_IRUSR);

	DEBUGFS_ADD_FILE(qos, 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);

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

+3 −20
Original line number Diff line number Diff line
@@ -810,22 +810,6 @@ enum iwl_pa_type { 
	IWL_PA_INTERNAL = 1,

};



/* interrupt statistics */

struct isr_statistics {

	u32 hw;

	u32 sw;

	u32 err_code;

	u32 sch;

	u32 alive;

	u32 rfkill;

	u32 ctkill;

	u32 wakeup;

	u32 rx;

	u32 rx_handlers[REPLY_MAX];

	u32 tx;

	u32 unhandled;

};



/* reply_tx_statistics (for _agn devices) */

struct reply_tx_error_statistics {

	u32 pp_delay;
@@ -1155,6 +1139,9 @@ struct iwl_priv { 
	/* jiffies when last recovery from statistics was performed */

	unsigned long rx_statistics_jiffies;



	/*counters */

	u32 rx_handlers_stats[REPLY_MAX];



	/* force reset */

	struct iwl_force_reset force_reset[IWL_MAX_FORCE_RESET];
@@ -1258,10 +1245,6 @@ struct iwl_priv { 
	struct traffic_stats tx_stats;

	struct traffic_stats rx_stats;



	/* counts interrupts */

	/* TODO: move to the transport layer */

	struct isr_statistics isr_stats;



	struct iwl_power_mgr power_data;

	struct iwl_tt_mgmt thermal_throttle;

CRA Git | Maintained and supported by SUSTech CRA and CCSE