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

Commit 490953ac authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: move firmware restart debugfs hook to op_mode 



This allows to test fw restart flow. The hook in transport
layer doesn't really make the fw assert. Moving this hook
to the op_mode allows to use the fw API to actually send a
host command that will make the fw assert.

Change the restart_fw module parameter to be a boolean on
the way.

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

drivers/net/wireless/iwlwifi/dvm/debugfs.c

+24 −0
Original line number Original line Diff line number Diff line
@@ -2324,6 +2324,28 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file, 
	return count;

	return count;

}

}





static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,

					  const char __user *user_buf,

					  size_t count, loff_t *ppos)

{

	struct iwl_priv *priv = file->private_data;

	bool restart_fw = iwlwifi_mod_params.restart_fw;

	int ret;



	iwlwifi_mod_params.restart_fw = true;



	mutex_lock(&priv->mutex);



	/* take the return value to make compiler happy - it will fail anyway */

	ret = iwl_dvm_send_cmd_pdu(priv, REPLY_ERROR, CMD_SYNC, 0, NULL);



	mutex_unlock(&priv->mutex);



	iwlwifi_mod_params.restart_fw = restart_fw;



	return count;

}



DEBUGFS_READ_FILE_OPS(ucode_rx_stats);

DEBUGFS_READ_FILE_OPS(ucode_rx_stats);

DEBUGFS_READ_FILE_OPS(ucode_tx_stats);

DEBUGFS_READ_FILE_OPS(ucode_tx_stats);

DEBUGFS_READ_FILE_OPS(ucode_general_stats);

DEBUGFS_READ_FILE_OPS(ucode_general_stats);
@@ -2343,6 +2365,7 @@ DEBUGFS_READ_FILE_OPS(bt_traffic); 
DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);

DEBUGFS_READ_WRITE_FILE_OPS(protection_mode);

DEBUGFS_READ_FILE_OPS(reply_tx_error);

DEBUGFS_READ_FILE_OPS(reply_tx_error);

DEBUGFS_WRITE_FILE_OPS(echo_test);

DEBUGFS_WRITE_FILE_OPS(echo_test);

DEBUGFS_WRITE_FILE_OPS(fw_restart);

#ifdef CONFIG_IWLWIFI_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

DEBUGFS_READ_WRITE_FILE_OPS(log_event);

DEBUGFS_READ_WRITE_FILE_OPS(log_event);

#endif

#endif
@@ -2400,6 +2423,7 @@ int iwl_dbgfs_register(struct iwl_priv *priv, struct dentry *dbgfs_dir) 
	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(rxon_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(rxon_filter_flags, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(echo_test, dir_debug, S_IWUSR);

	DEBUGFS_ADD_FILE(fw_restart, dir_debug, S_IWUSR);

#ifdef CONFIG_IWLWIFI_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);

	DEBUGFS_ADD_FILE(log_event, dir_debug, S_IWUSR | S_IRUSR);

#endif

#endif

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -1102,7 +1102,7 @@ void iwl_drv_stop(struct iwl_drv *drv) 




/* shared module parameters */

/* shared module parameters */

struct iwl_mod_params iwlwifi_mod_params = {

struct iwl_mod_params iwlwifi_mod_params = {

	.restart_fw = 1,

	.restart_fw = true,

	.plcp_check = true,

	.plcp_check = true,

	.bt_coex_active = true,

	.bt_coex_active = true,

	.power_level = IWL_POWER_INDEX_1,

	.power_level = IWL_POWER_INDEX_1,
@@ -1207,8 +1207,8 @@ MODULE_PARM_DESC(11n_disable, 
module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,

module_param_named(amsdu_size_8K, iwlwifi_mod_params.amsdu_size_8K,

		   int, S_IRUGO);

		   int, S_IRUGO);

MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)");

MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size (default 0)");

module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, int, S_IRUGO);

module_param_named(fw_restart, iwlwifi_mod_params.restart_fw, bool, S_IRUGO);

MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");

MODULE_PARM_DESC(fw_restart, "restart firmware in case of error (default true)");





module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling,

module_param_named(antenna_coupling, iwlwifi_mod_params.ant_coupling,

		   int, S_IRUGO);

		   int, S_IRUGO);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,7 @@ struct iwl_mod_params { 
	int sw_crypto;

	int sw_crypto;

	unsigned int disable_11n;

	unsigned int disable_11n;

	int amsdu_size_8K;

	int amsdu_size_8K;

	int restart_fw;

	bool restart_fw;

	bool plcp_check;

	bool plcp_check;

	int  wd_disable;

	int  wd_disable;

	bool bt_coex_active;

	bool bt_coex_active;

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

+24 −0
Original line number Original line Diff line number Diff line
@@ -398,6 +398,28 @@ static ssize_t iwl_dbgfs_bt_notif_read(struct file *file, char __user *user_buf, 
}

}

#undef BT_MBOX_PRINT

#undef BT_MBOX_PRINT





static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,

					  const char __user *user_buf,

					  size_t count, loff_t *ppos)

{

	struct iwl_mvm *mvm = file->private_data;

	bool restart_fw = iwlwifi_mod_params.restart_fw;

	int ret;



	iwlwifi_mod_params.restart_fw = true;



	mutex_lock(&mvm->mutex);



	/* take the return value to make compiler happy - it will fail anyway */

	ret = iwl_mvm_send_cmd_pdu(mvm, REPLY_ERROR, CMD_SYNC, 0, NULL);



	mutex_unlock(&mvm->mutex);



	iwlwifi_mod_params.restart_fw = restart_fw;



	return count;

}



#define MVM_DEBUGFS_READ_FILE_OPS(name)					\

#define MVM_DEBUGFS_READ_FILE_OPS(name)					\

static const struct file_operations iwl_dbgfs_##name##_ops = {	\

static const struct file_operations iwl_dbgfs_##name##_ops = {	\

	.read = iwl_dbgfs_##name##_read,				\

	.read = iwl_dbgfs_##name##_read,				\
@@ -440,6 +462,7 @@ MVM_DEBUGFS_READ_FILE_OPS(stations); 
MVM_DEBUGFS_READ_FILE_OPS(bt_notif);

MVM_DEBUGFS_READ_FILE_OPS(bt_notif);

MVM_DEBUGFS_WRITE_FILE_OPS(power_down_allow);

MVM_DEBUGFS_WRITE_FILE_OPS(power_down_allow);

MVM_DEBUGFS_WRITE_FILE_OPS(power_down_d3_allow);

MVM_DEBUGFS_WRITE_FILE_OPS(power_down_d3_allow);

MVM_DEBUGFS_WRITE_FILE_OPS(fw_restart);





int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)

int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir)

{

{
@@ -454,6 +477,7 @@ int iwl_mvm_dbgfs_register(struct iwl_mvm *mvm, struct dentry *dbgfs_dir) 
	MVM_DEBUGFS_ADD_FILE(bt_notif, dbgfs_dir, S_IRUSR);

	MVM_DEBUGFS_ADD_FILE(bt_notif, dbgfs_dir, S_IRUSR);

	MVM_DEBUGFS_ADD_FILE(power_down_allow, mvm->debugfs_dir, S_IWUSR);

	MVM_DEBUGFS_ADD_FILE(power_down_allow, mvm->debugfs_dir, S_IWUSR);

	MVM_DEBUGFS_ADD_FILE(power_down_d3_allow, mvm->debugfs_dir, S_IWUSR);

	MVM_DEBUGFS_ADD_FILE(power_down_d3_allow, mvm->debugfs_dir, S_IWUSR);

	MVM_DEBUGFS_ADD_FILE(fw_restart, mvm->debugfs_dir, S_IWUSR);





	/*

	/*

	 * Create a symlink with mac80211. It will be removed when mac80211

	 * Create a symlink with mac80211. It will be removed when mac80211

drivers/net/wireless/iwlwifi/pcie/trans.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -1370,28 +1370,11 @@ static ssize_t iwl_dbgfs_fh_reg_read(struct file *file, 
	return ret;

	return ret;

}

}





static ssize_t iwl_dbgfs_fw_restart_write(struct file *file,

					  const char __user *user_buf,

					  size_t count, loff_t *ppos)

{

	struct iwl_trans *trans = file->private_data;



	if (!trans->op_mode)

		return -EAGAIN;



	local_bh_disable();

	iwl_op_mode_nic_error(trans->op_mode);

	local_bh_enable();



	return count;

}



DEBUGFS_READ_WRITE_FILE_OPS(interrupt);

DEBUGFS_READ_WRITE_FILE_OPS(interrupt);

DEBUGFS_READ_FILE_OPS(fh_reg);

DEBUGFS_READ_FILE_OPS(fh_reg);

DEBUGFS_READ_FILE_OPS(rx_queue);

DEBUGFS_READ_FILE_OPS(rx_queue);

DEBUGFS_READ_FILE_OPS(tx_queue);

DEBUGFS_READ_FILE_OPS(tx_queue);

DEBUGFS_WRITE_FILE_OPS(csr);

DEBUGFS_WRITE_FILE_OPS(csr);

DEBUGFS_WRITE_FILE_OPS(fw_restart);





/*

/*

 * Create the debugfs files and directories

 * Create the debugfs files and directories
@@ -1405,7 +1388,6 @@ static int iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans, 
	DEBUGFS_ADD_FILE(interrupt, dir, S_IWUSR | S_IRUSR);

	DEBUGFS_ADD_FILE(interrupt, dir, S_IWUSR | S_IRUSR);

	DEBUGFS_ADD_FILE(csr, dir, S_IWUSR);

	DEBUGFS_ADD_FILE(csr, dir, S_IWUSR);

	DEBUGFS_ADD_FILE(fh_reg, dir, S_IRUSR);

	DEBUGFS_ADD_FILE(fh_reg, dir, S_IRUSR);

	DEBUGFS_ADD_FILE(fw_restart, dir, S_IWUSR);

	return 0;

	return 0;





err:

err: