openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mwifiex: move pcie_work and related variables inside card 

Currently pcie_work and related variables are global. It may create
problem while supporting multiple devices simultaneously. Let's move
it inside card structure so that separate instance will be created/
cancelled in init/teardown threads of each connected devices.

Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Ganapathi Bhat 2016-11-16 18:39:09 +05:30 committed by Kalle Valo
parent 41efaf5824
commit 3860e5e395
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/marvell/mwifiex/pcie.c
View File

@ -52,7 +52,6 @@ static int mwifiex_pcie_probe_of(struct device *dev)
} }
static void mwifiex_pcie_work(struct work_struct *work); static void mwifiex_pcie_work(struct work_struct *work);
static DECLARE_WORK(pcie_work, mwifiex_pcie_work);
static int static int
mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb, mwifiex_map_pci_memory(struct mwifiex_adapter *adapter, struct sk_buff *skb,
@ -222,6 +221,7 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev,
card->pcie.mem_type_mapping_tbl = data->mem_type_mapping_tbl; card->pcie.mem_type_mapping_tbl = data->mem_type_mapping_tbl;
card->pcie.num_mem_types = data->num_mem_types; card->pcie.num_mem_types = data->num_mem_types;
card->pcie.can_ext_scan = data->can_ext_scan; card->pcie.can_ext_scan = data->can_ext_scan;
INIT_WORK(&card->work, mwifiex_pcie_work);
} }
/* device tree node parsing and platform specific configuration*/ /* device tree node parsing and platform specific configuration*/
@ -257,7 +257,7 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
if (!adapter || !adapter->priv_num) if (!adapter || !adapter->priv_num)
return; return;
cancel_work_sync(&pcie_work); cancel_work_sync(&card->work);
if (user_rmmod && !adapter->mfg_mode) { if (user_rmmod && !adapter->mfg_mode) {
mwifiex_deauthenticate_all(adapter); mwifiex_deauthenticate_all(adapter);
@ -2728,25 +2728,27 @@ static void mwifiex_pcie_device_dump_work(struct mwifiex_adapter *adapter)
mwifiex_upload_device_dump(adapter, drv_info, drv_info_size); mwifiex_upload_device_dump(adapter, drv_info, drv_info_size);
} }
static unsigned long iface_work_flags;
static struct mwifiex_adapter *save_adapter;
static void mwifiex_pcie_work(struct work_struct *work) static void mwifiex_pcie_work(struct work_struct *work)
{ {
struct pcie_service_card *card =
container_of(work, struct pcie_service_card, work);
if (test_and_clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, if (test_and_clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP,
&iface_work_flags)) &card->work_flags))
mwifiex_pcie_device_dump_work(save_adapter); mwifiex_pcie_device_dump_work(card->adapter);
} }
/* This function dumps FW information */ /* This function dumps FW information */
static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter) static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter)
{ {
save_adapter = adapter; struct pcie_service_card *card = adapter->card;
if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags))
if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags))
return; return;
set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags); set_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);
schedule_work(&pcie_work); schedule_work(&card->work);
} }
/* /*
@ -3212,7 +3214,6 @@ static void mwifiex_pcie_cleanup_module(void)
/* Set the flag as user is removing this module. */ /* Set the flag as user is removing this module. */
user_rmmod = 1; user_rmmod = 1;
cancel_work_sync(&pcie_work);
pci_unregister_driver(&mwifiex_pcie); pci_unregister_driver(&mwifiex_pcie);
} }

2
drivers/net/wireless/marvell/mwifiex/pcie.h
View File

@ -386,6 +386,8 @@ struct pcie_service_card {
#endif #endif
struct mwifiex_msix_context msix_ctx[MWIFIEX_NUM_MSIX_VECTORS]; struct mwifiex_msix_context msix_ctx[MWIFIEX_NUM_MSIX_VECTORS];
struct mwifiex_msix_context share_irq_ctx; struct mwifiex_msix_context share_irq_ctx;
struct work_struct work;
unsigned long work_flags;
}; };
static inline int static inline int