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

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

mwifiex: add manufacturing mode support 



By default normal mode is chosen when driver is loaded. This
patch adds a provision to choose manufacturing mode via module
parameters.

Below command loads driver in manufacturing mode
insmod mwifiex.ko mfg_mode=1.

Tested-by: default avatarchunfan chen <jeffc@marvell.com>
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 defb893f

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

+8 −0
Original line number Diff line number Diff line
@@ -595,6 +595,14 @@ int mwifiex_send_cmd(struct mwifiex_private *priv, u16 cmd_no, 
			return -1;

		}

	}

	/* We don't expect commands in manufacturing mode. They are cooked

	 * in application and ready to download buffer is passed to the driver

	 */

	if (adapter->mfg_mode && cmd_no) {

		dev_dbg(adapter->dev, "Ignoring commands in manufacturing mode\n");

		return -1;

	}





	/* Get a new command node */

	cmd_node = mwifiex_get_cmd_node(adapter);

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

+15 −7
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter) 
	memset(&adapter->arp_filter, 0, sizeof(adapter->arp_filter));

	adapter->arp_filter_size = 0;

	adapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX;

	adapter->mfg_mode = mfg_mode;

	adapter->key_api_major_ver = 0;

	adapter->key_api_minor_ver = 0;

	eth_broadcast_addr(adapter->perm_addr);
@@ -553,16 +554,23 @@ int mwifiex_init_fw(struct mwifiex_adapter *adapter) 
				return -1;

		}

	}



	if (adapter->mfg_mode) {

		adapter->hw_status = MWIFIEX_HW_STATUS_READY;

		ret = -EINPROGRESS;

	} else {

		for (i = 0; i < adapter->priv_num; i++) {

			if (adapter->priv[i]) {

			ret = mwifiex_sta_init_cmd(adapter->priv[i], first_sta,

						   true);

				ret = mwifiex_sta_init_cmd(adapter->priv[i],

							   first_sta, true);

				if (ret == -1)

					return -1;



				first_sta = false;

			}







		}

	}



	spin_lock_irqsave(&adapter->cmd_pending_q_lock, flags);

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

+22 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "11n.h"



#define VERSION	"1.0"

#define MFG_FIRMWARE	"mwifiex_mfg.bin"



static unsigned int debug_mask = MWIFIEX_DEFAULT_DEBUG_MASK;

module_param(debug_mask, uint, 0);
@@ -37,6 +38,10 @@ module_param(driver_mode, ushort, 0); 
MODULE_PARM_DESC(driver_mode,

		 "station=0x1(default), ap-sta=0x3, station-p2p=0x5, ap-sta-p2p=0x7");



bool mfg_mode;

module_param(mfg_mode, bool, 0);

MODULE_PARM_DESC(mfg_mode, "manufacturing mode enable:1, disable:0");



/*

 * This function registers the device and performs all the necessary

 * initializations.
@@ -561,10 +566,12 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context) 
		goto done;

	}

	/* Wait for mwifiex_init to complete */

	if (!adapter->mfg_mode) {

		wait_event_interruptible(adapter->init_wait_q,

					 adapter->init_wait_q_woken);

		if (adapter->hw_status != MWIFIEX_HW_STATUS_READY)

			goto err_init_fw;

	}



	priv = adapter->priv[MWIFIEX_BSS_ROLE_STA];

	if (mwifiex_register_cfg80211(adapter)) {
@@ -668,6 +675,17 @@ static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter) 
{

	int ret;



	/* Override default firmware with manufacturing one if

	 * manufacturing mode is enabled

	 */

	if (mfg_mode) {

		if (strlcpy(adapter->fw_name, MFG_FIRMWARE,

			    sizeof(adapter->fw_name)) >=

			    sizeof(adapter->fw_name)) {

			pr_err("%s: fw_name too long!\n", __func__);

			return -1;

		}

	}

	ret = request_firmware_nowait(THIS_MODULE, 1, adapter->fw_name,

				      adapter->dev, GFP_KERNEL, adapter,

				      mwifiex_fw_dpc);

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

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "sdio.h"



extern const char driver_version[];

extern bool mfg_mode;



struct mwifiex_adapter;

struct mwifiex_private;
@@ -990,6 +991,7 @@ struct mwifiex_adapter { 
	u32 drv_info_size;

	bool scan_chan_gap_enabled;

	struct sk_buff_head rx_data_q;

	bool mfg_mode;

	struct mwifiex_chan_stats *chan_stats;

	u32 num_in_chan_stats;

	int survey_idx;

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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) 
	if (!adapter || !adapter->priv_num)

		return;



	if (user_rmmod) {

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

#ifdef CONFIG_PM_SLEEP

		if (adapter->is_suspended)

			mwifiex_pcie_resume(&pdev->dev);