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

Commit fc697159 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Kalle Valo
Browse files

mwifiex: use generic name 'device dump' 



Currently we are dumping driver information also inside
firmware dump API. We will call it as device dump and
dump driver and firmware data separately.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarCathy Luo <cluo@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 9cc0dbf0

drivers/net/wireless/mwifiex/README

+3 −3
Original line number Original line Diff line number Diff line
@@ -230,9 +230,9 @@ getlog 




	cat getlog

	cat getlog





fw_dump

device_dump

	This command is used to dump firmware memory into files.

	This command is used to dump driver information and firmware memory

	Separate file will be created for each memory segment.

	segments.

	Usage:

	Usage:





	cat fw_dump

	cat fw_dump

drivers/net/wireless/mwifiex/cmdevt.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -993,8 +993,8 @@ mwifiex_cmd_timeout_func(unsigned long function_context) 
	if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING)

	if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING)

		mwifiex_init_fw_complete(adapter);

		mwifiex_init_fw_complete(adapter);





	if (adapter->if_ops.fw_dump)

	if (adapter->if_ops.device_dump)

		adapter->if_ops.fw_dump(adapter);

		adapter->if_ops.device_dump(adapter);





	if (adapter->if_ops.card_reset)

	if (adapter->if_ops.card_reset)

		adapter->if_ops.card_reset(adapter);

		adapter->if_ops.card_reset(adapter);

drivers/net/wireless/mwifiex/debugfs.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -152,24 +152,24 @@ mwifiex_info_read(struct file *file, char __user *ubuf, 
}

}





/*

/*

 * Proc firmware dump read handler.

 * Proc device dump read handler.

 *

 *

 * This function is called when the 'fw_dump' file is opened for

 * This function is called when the 'device_dump' file is opened for

 * reading.

 * reading.

 * This function dumps firmware memory in different files

 * This function dumps driver information and firmware memory segments

 * (ex. DTCM, ITCM, SQRAM etc.) based on the the segments for

 * (ex. DTCM, ITCM, SQRAM etc.) for

 * debugging.

 * debugging.

 */

 */

static ssize_t

static ssize_t

mwifiex_fw_dump_read(struct file *file, char __user *ubuf,

mwifiex_device_dump_read(struct file *file, char __user *ubuf,

			 size_t count, loff_t *ppos)

			 size_t count, loff_t *ppos)

{

{

	struct mwifiex_private *priv = file->private_data;

	struct mwifiex_private *priv = file->private_data;





	if (!priv->adapter->if_ops.fw_dump)

	if (!priv->adapter->if_ops.device_dump)

		return -EIO;

		return -EIO;





	priv->adapter->if_ops.fw_dump(priv->adapter);

	priv->adapter->if_ops.device_dump(priv->adapter);





	return 0;

	return 0;

}

}
@@ -885,7 +885,7 @@ static const struct file_operations mwifiex_dfs_##name##_fops = { \ 
MWIFIEX_DFS_FILE_READ_OPS(info);

MWIFIEX_DFS_FILE_READ_OPS(info);

MWIFIEX_DFS_FILE_READ_OPS(debug);

MWIFIEX_DFS_FILE_READ_OPS(debug);

MWIFIEX_DFS_FILE_READ_OPS(getlog);

MWIFIEX_DFS_FILE_READ_OPS(getlog);

MWIFIEX_DFS_FILE_READ_OPS(fw_dump);

MWIFIEX_DFS_FILE_READ_OPS(device_dump);

MWIFIEX_DFS_FILE_OPS(regrdwr);

MWIFIEX_DFS_FILE_OPS(regrdwr);

MWIFIEX_DFS_FILE_OPS(rdeeprom);

MWIFIEX_DFS_FILE_OPS(rdeeprom);

MWIFIEX_DFS_FILE_OPS(memrw);

MWIFIEX_DFS_FILE_OPS(memrw);
@@ -913,7 +913,7 @@ mwifiex_dev_debugfs_init(struct mwifiex_private *priv) 
	MWIFIEX_DFS_ADD_FILE(getlog);

	MWIFIEX_DFS_ADD_FILE(getlog);

	MWIFIEX_DFS_ADD_FILE(regrdwr);

	MWIFIEX_DFS_ADD_FILE(regrdwr);

	MWIFIEX_DFS_ADD_FILE(rdeeprom);

	MWIFIEX_DFS_ADD_FILE(rdeeprom);

	MWIFIEX_DFS_ADD_FILE(fw_dump);

	MWIFIEX_DFS_ADD_FILE(device_dump);

	MWIFIEX_DFS_ADD_FILE(memrw);

	MWIFIEX_DFS_ADD_FILE(memrw);

	MWIFIEX_DFS_ADD_FILE(hscfg);

	MWIFIEX_DFS_ADD_FILE(hscfg);

	MWIFIEX_DFS_ADD_FILE(histogram);

	MWIFIEX_DFS_ADD_FILE(histogram);

drivers/net/wireless/mwifiex/ethtool.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ mwifiex_get_dump_flag(struct net_device *dev, struct ethtool_dump *dump) 
	struct mwifiex_adapter *adapter = priv->adapter;

	struct mwifiex_adapter *adapter = priv->adapter;

	struct memory_type_mapping *entry;

	struct memory_type_mapping *entry;





	if (!adapter->if_ops.fw_dump)

	if (!adapter->if_ops.device_dump)

		return -ENOTSUPP;

		return -ENOTSUPP;





	dump->flag = adapter->curr_mem_idx;

	dump->flag = adapter->curr_mem_idx;
@@ -97,7 +97,7 @@ mwifiex_get_dump_data(struct net_device *dev, struct ethtool_dump *dump, 
	struct mwifiex_adapter *adapter = priv->adapter;

	struct mwifiex_adapter *adapter = priv->adapter;

	struct memory_type_mapping *entry;

	struct memory_type_mapping *entry;





	if (!adapter->if_ops.fw_dump)

	if (!adapter->if_ops.device_dump)

		return -ENOTSUPP;

		return -ENOTSUPP;





	if (adapter->curr_mem_idx == MWIFIEX_DRV_INFO_IDX) {

	if (adapter->curr_mem_idx == MWIFIEX_DRV_INFO_IDX) {
@@ -109,7 +109,7 @@ mwifiex_get_dump_data(struct net_device *dev, struct ethtool_dump *dump, 




	if (adapter->curr_mem_idx == MWIFIEX_FW_DUMP_IDX) {

	if (adapter->curr_mem_idx == MWIFIEX_FW_DUMP_IDX) {

		mwifiex_dbg(adapter, ERROR,

		mwifiex_dbg(adapter, ERROR,

			    "firmware dump in progress!!\n");

			    "device dump in progress!!\n");

		return -EBUSY;

		return -EBUSY;

	}

	}
@@ -132,7 +132,7 @@ static int mwifiex_set_dump(struct net_device *dev, struct ethtool_dump *val) 
	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_private *priv = mwifiex_netdev_get_priv(dev);

	struct mwifiex_adapter *adapter = priv->adapter;

	struct mwifiex_adapter *adapter = priv->adapter;





	if (!adapter->if_ops.fw_dump)

	if (!adapter->if_ops.device_dump)

		return -ENOTSUPP;

		return -ENOTSUPP;





	if (val->flag == MWIFIEX_DRV_INFO_IDX) {

	if (val->flag == MWIFIEX_DRV_INFO_IDX) {
@@ -142,13 +142,13 @@ static int mwifiex_set_dump(struct net_device *dev, struct ethtool_dump *val) 




	if (adapter->curr_mem_idx == MWIFIEX_FW_DUMP_IDX) {

	if (adapter->curr_mem_idx == MWIFIEX_FW_DUMP_IDX) {

		mwifiex_dbg(adapter, ERROR,

		mwifiex_dbg(adapter, ERROR,

			    "firmware dump in progress!!\n");

			    "device dump in progress!!\n");

		return -EBUSY;

		return -EBUSY;

	}

	}





	if (val->flag == MWIFIEX_FW_DUMP_IDX) {

	if (val->flag == MWIFIEX_FW_DUMP_IDX) {

		adapter->curr_mem_idx = val->flag;

		adapter->curr_mem_idx = val->flag;

		adapter->if_ops.fw_dump(adapter);

		adapter->if_ops.device_dump(adapter);

		return 0;

		return 0;

	}

	}

drivers/net/wireless/mwifiex/main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -873,7 +873,7 @@ mwifiex_tx_timeout(struct net_device *dev) 
	}

	}

}

}





void mwifiex_dump_drv_info(struct mwifiex_adapter *adapter)

void mwifiex_drv_info_dump(struct mwifiex_adapter *adapter)

{

{

	void *p;

	void *p;

	char drv_version[64];

	char drv_version[64];
@@ -980,7 +980,7 @@ void mwifiex_dump_drv_info(struct mwifiex_adapter *adapter) 
	adapter->drv_info_size = p - adapter->drv_info_dump;

	adapter->drv_info_size = p - adapter->drv_info_dump;

	mwifiex_dbg(adapter, MSG, "===mwifiex driverinfo dump end===\n");

	mwifiex_dbg(adapter, MSG, "===mwifiex driverinfo dump end===\n");

}

}

EXPORT_SYMBOL_GPL(mwifiex_dump_drv_info);

EXPORT_SYMBOL_GPL(mwifiex_drv_info_dump);





/*

/*

 * CFG802.11 network device handler for statistics retrieval.

 * CFG802.11 network device handler for statistics retrieval.