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

Commit ec750f10 authored by Xinming Hu's avatar Xinming Hu Committed by Kalle Valo
Browse files

mwifiex: cleanup in PCIe flr code path 



adapter and card variables don't get freed during PCIe function level
reset. "adapter->ext_scan" variable need not be re-initialized.
fw_name and tx_buf_size initialization is moved to pcie specific code
so that mwifiex_reinit_sw() can be used by SDIO.

Signed-off-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8750ab62

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

+0 −9
Original line number Diff line number Diff line
@@ -1425,9 +1425,6 @@ EXPORT_SYMBOL_GPL(mwifiex_shutdown_sw); 
int

mwifiex_reinit_sw(struct mwifiex_adapter *adapter)

{

	char fw_name[32];

	struct pcie_service_card *card = adapter->card;



	mwifiex_init_lock_list(adapter);

	if (adapter->if_ops.up_dev)

		adapter->if_ops.up_dev(adapter);
@@ -1468,18 +1465,12 @@ mwifiex_reinit_sw(struct mwifiex_adapter *adapter) 
	 * mwifiex_register_dev()

	 */

	mwifiex_dbg(adapter, INFO, "%s, mwifiex_init_hw_fw()...\n", __func__);

	strcpy(fw_name, adapter->fw_name);

	strcpy(adapter->fw_name, PCIE8997_DEFAULT_WIFIFW_NAME);



	adapter->tx_buf_size = card->pcie.tx_buf_size;

	adapter->ext_scan = card->pcie.can_ext_scan;

	if (mwifiex_init_hw_fw(adapter, false)) {

		strcpy(adapter->fw_name, fw_name);

		mwifiex_dbg(adapter, ERROR,

			    "%s: firmware init failed\n", __func__);

		goto err_init_fw;

	}

	strcpy(adapter->fw_name, fw_name);

	mwifiex_dbg(adapter, INFO, "%s, successful\n", __func__);



	complete_all(adapter->fw_done);

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

+11 −1
Original line number Diff line number Diff line
@@ -3082,6 +3082,17 @@ static void mwifiex_pcie_up_dev(struct mwifiex_adapter *adapter) 
	struct pci_dev *pdev = card->dev;

	const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;



	/* Bluetooth is not on pcie interface. Download Wifi only firmware

	 * during pcie FLR, so that bluetooth part of firmware which is

	 * already running doesn't get affected.

	 */

	strcpy(adapter->fw_name, PCIE8997_DEFAULT_WIFIFW_NAME);



	/* tx_buf_size might be changed to 3584 by firmware during

	 * data transfer, we should reset it to default size.

	 */

	adapter->tx_buf_size = card->pcie.tx_buf_size;



	card->cmdrsp_buf = NULL;

	ret = mwifiex_pcie_create_txbd_ring(adapter);

	if (ret) {
@@ -3143,7 +3154,6 @@ static void mwifiex_pcie_down_dev(struct mwifiex_adapter *adapter) 
		mwifiex_dbg(adapter, ERROR, "Failed to write driver not-ready signature\n");



	adapter->seq_num = 0;

	adapter->tx_buf_size = MWIFIEX_TX_DATA_BUF_SIZE_4K;



	if (reg->sleep_cookie)

		mwifiex_pcie_delete_sleep_cookie_buf(adapter);