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

Commit 3860e5e3 authored by Ganapathi Bhat's avatar Ganapathi Bhat Committed by Kalle Valo
Browse files

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: default avatarGanapathi Bhat <gbhat@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 41efaf58

drivers/net/wireless/marvell/mwifiex/pcie.c

+12 −11
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ static int mwifiex_pcie_probe_of(struct device *dev) 
}



static void mwifiex_pcie_work(struct work_struct *work);

static DECLARE_WORK(pcie_work, mwifiex_pcie_work);



static int

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.num_mem_types = data->num_mem_types;

		card->pcie.can_ext_scan = data->can_ext_scan;

		INIT_WORK(&card->work, mwifiex_pcie_work);

	}



	/* 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)

		return;



	cancel_work_sync(&pcie_work);

	cancel_work_sync(&card->work);



	if (user_rmmod && !adapter->mfg_mode) {

		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);

}



static unsigned long iface_work_flags;

static struct mwifiex_adapter *save_adapter;

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,

			       &iface_work_flags))

		mwifiex_pcie_device_dump_work(save_adapter);

			       &card->work_flags))

		mwifiex_pcie_device_dump_work(card->adapter);

}



/* This function dumps FW information */

static void mwifiex_pcie_device_dump(struct mwifiex_adapter *adapter)

{

	save_adapter = adapter;

	if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &iface_work_flags))

	struct pcie_service_card *card = adapter->card;



	if (test_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags))

		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. */

	user_rmmod = 1;



	cancel_work_sync(&pcie_work);

	pci_unregister_driver(&mwifiex_pcie);

}

drivers/net/wireless/marvell/mwifiex/pcie.h

+2 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ struct pcie_service_card { 
#endif

	struct mwifiex_msix_context msix_ctx[MWIFIEX_NUM_MSIX_VECTORS];

	struct mwifiex_msix_context share_irq_ctx;

	struct work_struct work;

	unsigned long work_flags;

};



static inline int