Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mwifiex: use generic name 'device dump'

Browse Source 
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: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Amitkumar Karwar 2015-05-26 06:34:31 -07:00 committed by Kalle Valo
parent 9cc0dbf043
commit fc697159ad
8 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/mwifiex/README
View File

@ -230,9 +230,9 @@ getlog
cat getlog
fw_dump
This command is used to dump firmware memory into files.
Separate file will be created for each memory segment.
device_dump
This command is used to dump driver information and firmware memory
segments.
Usage:
cat fw_dump

4
drivers/net/wireless/mwifiex/cmdevt.c
View File

@ -993,8 +993,8 @@ mwifiex_cmd_timeout_func(unsigned long function_context)
if (adapter->hw_status == MWIFIEX_HW_STATUS_INITIALIZING)
mwifiex_init_fw_complete(adapter);
if (adapter->if_ops.fw_dump)
adapter->if_ops.fw_dump(adapter);
if (adapter->if_ops.device_dump)
adapter->if_ops.device_dump(adapter);
if (adapter->if_ops.card_reset)
adapter->if_ops.card_reset(adapter);

18
drivers/net/wireless/mwifiex/debugfs.c
View File

@ -152,24 +152,24 @@ free_and_exit:
}
/*
* 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.
* This function dumps firmware memory in different files
* (ex. DTCM, ITCM, SQRAM etc.) based on the the segments for
* This function dumps driver information and firmware memory segments
* (ex. DTCM, ITCM, SQRAM etc.) for
* debugging.
*/
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)
{
struct mwifiex_private *priv = file->private_data;
if (!priv->adapter->if_ops.fw_dump)
if (!priv->adapter->if_ops.device_dump)
return -EIO;
priv->adapter->if_ops.fw_dump(priv->adapter);
priv->adapter->if_ops.device_dump(priv->adapter);
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(debug);
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(rdeeprom);
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(regrdwr);
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(hscfg);
MWIFIEX_DFS_ADD_FILE(histogram);

12
drivers/net/wireless/mwifiex/ethtool.c
View File

@ -71,7 +71,7 @@ mwifiex_get_dump_flag(struct net_device *dev, struct ethtool_dump *dump)
struct mwifiex_adapter *adapter = priv->adapter;
struct memory_type_mapping *entry;
if (!adapter->if_ops.fw_dump)
if (!adapter->if_ops.device_dump)
return -ENOTSUPP;
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 memory_type_mapping *entry;
if (!adapter->if_ops.fw_dump)
if (!adapter->if_ops.device_dump)
return -ENOTSUPP;
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) {
mwifiex_dbg(adapter, ERROR,
"firmware dump in progress!!\n");
"device dump in progress!!\n");
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_adapter *adapter = priv->adapter;
if (!adapter->if_ops.fw_dump)
if (!adapter->if_ops.device_dump)
return -ENOTSUPP;
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) {
mwifiex_dbg(adapter, ERROR,
"firmware dump in progress!!\n");
"device dump in progress!!\n");
return -EBUSY;
}
if (val->flag == MWIFIEX_FW_DUMP_IDX) {
adapter->curr_mem_idx = val->flag;
adapter->if_ops.fw_dump(adapter);
adapter->if_ops.device_dump(adapter);
return 0;
}

4
drivers/net/wireless/mwifiex/main.c
View File

@ -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;
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;
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.

6
drivers/net/wireless/mwifiex/main.h
View File

@ -499,7 +499,7 @@ enum rdwr_status {
};
enum mwifiex_iface_work_flags {
MWIFIEX_IFACE_WORK_FW_DUMP,
MWIFIEX_IFACE_WORK_DEVICE_DUMP,
MWIFIEX_IFACE_WORK_CARD_RESET,
};
@ -789,8 +789,8 @@ struct mwifiex_if_ops {
int (*init_fw_port) (struct mwifiex_adapter *);
int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
void (*card_reset) (struct mwifiex_adapter *);
void (*fw_dump)(struct mwifiex_adapter *);
int (*reg_dump)(struct mwifiex_adapter *, char *);
void (*device_dump)(struct mwifiex_adapter *);
int (*clean_pcie_ring) (struct mwifiex_adapter *adapter);
void (*iface_work)(struct work_struct *work);
void (*submit_rem_rx_urbs)(struct mwifiex_adapter *adapter);
@ -1484,7 +1484,7 @@ void mwifiex_hist_data_add(struct mwifiex_private *priv,
u8 mwifiex_adjust_data_rate(struct mwifiex_private *priv,
u8 rx_rate, u8 ht_info);
void mwifiex_dump_drv_info(struct mwifiex_adapter *adapter);
void mwifiex_drv_info_dump(struct mwifiex_adapter *adapter);
void *mwifiex_alloc_dma_align_buf(int rx_len, gfp_t flags);
void mwifiex_queue_main_work(struct mwifiex_adapter *adapter);

22
drivers/net/wireless/mwifiex/pcie.c
View File

@ -2305,7 +2305,7 @@ mwifiex_pcie_rdwr_firmware(struct mwifiex_adapter *adapter, u8 doneflag)
}
/* This function dump firmware memory to file */
static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter)
{
struct pcie_service_card *card = adapter->card;
const struct mwifiex_pcie_card_reg *creg = card->pcie.reg;
@ -2316,8 +2316,6 @@ static void mwifiex_pcie_fw_dump_work(struct mwifiex_adapter *adapter)
int ret;
static char *env[] = { "DRIVER=mwifiex_pcie", "EVENT=fw_dump", NULL };
mwifiex_dump_drv_info(adapter);
if (!card->pcie.can_dump_fw)
return;
@ -2419,24 +2417,30 @@ done:
adapter->curr_mem_idx = 0;
}
static void mwifiex_pcie_device_dump_work(struct mwifiex_adapter *adapter)
{
mwifiex_drv_info_dump(adapter);
mwifiex_pcie_fw_dump(adapter);
}
static unsigned long iface_work_flags;
static struct mwifiex_adapter *save_adapter;
static void mwifiex_pcie_work(struct work_struct *work)
{
if (test_and_clear_bit(MWIFIEX_IFACE_WORK_FW_DUMP,
if (test_and_clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP,
&iface_work_flags))
mwifiex_pcie_fw_dump_work(save_adapter);
mwifiex_pcie_device_dump_work(save_adapter);
}
static DECLARE_WORK(pcie_work, mwifiex_pcie_work);
/* This function dumps FW information */
static void mwifiex_pcie_fw_dump(struct mwifiex_adapter *adapter)
static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter)
{
save_adapter = adapter;
if (test_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags))
if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags))
return;
set_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags);
set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags);
schedule_work(&pcie_work);
}
@ -2673,7 +2677,7 @@ static struct mwifiex_if_ops pcie_ops = {
.cleanup_mpa_buf = NULL,
.init_fw_port = mwifiex_pcie_init_fw_port,
.clean_pcie_ring = mwifiex_clean_pcie_ring_buf,
.fw_dump = mwifiex_pcie_fw_dump,
.device_dump = mwifiex_pcie_device_dump,
};
/*

22
drivers/net/wireless/mwifiex/sdio.c
View File

@ -2177,7 +2177,7 @@ rdwr_status mwifiex_sdio_rdwr_firmware(struct mwifiex_adapter *adapter,
}
/* This function dump firmware memory to file */
static void mwifiex_sdio_fw_dump_work(struct mwifiex_adapter *adapter)
static void mwifiex_sdio_fw_dump(struct mwifiex_adapter *adapter)
{
struct sdio_mmc_card *card = adapter->card;
int ret = 0;
@ -2187,8 +2187,6 @@ static void mwifiex_sdio_fw_dump_work(struct mwifiex_adapter *adapter)
u32 memory_size;
static char *env[] = { "DRIVER=mwifiex_sdio", "EVENT=fw_dump", NULL };
mwifiex_dump_drv_info(adapter);
if (!card->can_dump_fw)
return;
@ -2306,11 +2304,17 @@ done:
adapter->curr_mem_idx = 0;
}
static void mwifiex_sdio_device_dump_work(struct mwifiex_adapter *adapter)
{
mwifiex_drv_info_dump(adapter);
mwifiex_sdio_fw_dump(adapter);
}
static void mwifiex_sdio_work(struct work_struct *work)
{
if (test_and_clear_bit(MWIFIEX_IFACE_WORK_FW_DUMP,
if (test_and_clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP,
&iface_work_flags))
mwifiex_sdio_fw_dump_work(save_adapter);
mwifiex_sdio_device_dump_work(save_adapter);
if (test_and_clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET,
&iface_work_flags))
mwifiex_sdio_card_reset_work(save_adapter);
@ -2330,13 +2334,13 @@ static void mwifiex_sdio_card_reset(struct mwifiex_adapter *adapter)
}
/* This function dumps FW information */
static void mwifiex_sdio_fw_dump(struct mwifiex_adapter *adapter)
static void mwifiex_sdio_device_dump(struct mwifiex_adapter *adapter)
{
save_adapter = adapter;
if (test_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags))
if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags))
return;
set_bit(MWIFIEX_IFACE_WORK_FW_DUMP, &iface_work_flags);
set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags);
schedule_work(&sdio_work);
}
@ -2453,8 +2457,8 @@ static struct mwifiex_if_ops sdio_ops = {
.cmdrsp_complete = mwifiex_sdio_cmdrsp_complete,
.event_complete = mwifiex_sdio_event_complete,
.card_reset = mwifiex_sdio_card_reset,
.fw_dump = mwifiex_sdio_fw_dump,
.reg_dump = mwifiex_sdio_reg_dump,
.device_dump = mwifiex_sdio_device_dump,
.deaggr_pkt = mwifiex_deaggr_sdio_pkt,
};