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

Commit 4daffe35 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: add support for Marvell USB8797 chipset 



This patch supports Avastar 88W8797 chipset with USB interface.

The corresponding firmware image file is located at:
"mrvl/usb8797_uapsta.bin"

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarFrank Huang <frankh@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent aee286c2

drivers/net/wireless/mwifiex/11n_aggr.c

+21 −15
Original line number Diff line number Diff line
@@ -233,6 +233,11 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 


	skb_push(skb_aggr, headroom);



	if (adapter->iface_type == MWIFIEX_USB) {

		adapter->data_sent = true;

		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_USB_EP_DATA,

						   skb_aggr, NULL);

	} else {

		/*

		 * Padding per MSDU will affect the length of next

		 * packet and hence the exact length of next packet
@@ -248,6 +253,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 


		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA,

						   skb_aggr, &tx_param);

	}

	switch (ret) {

	case -EBUSY:

		spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);

drivers/net/wireless/mwifiex/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -30,3 +30,14 @@ config MWIFIEX_PCIE 


	  If you choose to build it as a module, it will be called

	  mwifiex_pcie.



config MWIFIEX_USB

	tristate "Marvell WiFi-Ex Driver for USB8797"

	depends on MWIFIEX && USB

	select FW_LOADER

	---help---

	  This adds support for wireless adapters based on Marvell

	  Avastar 88W8797 chipset with USB interface.



	  If you choose to build it as a module, it will be called

	  mwifiex_usb.

drivers/net/wireless/mwifiex/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -42,3 +42,6 @@ obj-$(CONFIG_MWIFIEX_SDIO) += mwifiex_sdio.o 


mwifiex_pcie-y += pcie.o

obj-$(CONFIG_MWIFIEX_PCIE) += mwifiex_pcie.o



mwifiex_usb-y += usb.o

obj-$(CONFIG_MWIFIEX_USB) += mwifiex_usb.o

drivers/net/wireless/mwifiex/cmdevt.c

+52 −11
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv, 
	uint16_t cmd_size;

	struct timeval tstamp;

	unsigned long flags;

	__le32 tmp;



	if (!adapter || !cmd_node)

		return -1;
@@ -178,15 +179,28 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv, 
		le16_to_cpu(*(__le16 *) ((u8 *) host_cmd + S_DS_GEN)), cmd_size,

		le16_to_cpu(host_cmd->seq_num));



	if (adapter->iface_type == MWIFIEX_USB) {

		tmp = cpu_to_le32(MWIFIEX_USB_TYPE_CMD);

		skb_push(cmd_node->cmd_skb, MWIFIEX_TYPE_LEN);

		memcpy(cmd_node->cmd_skb->data, &tmp, MWIFIEX_TYPE_LEN);

		adapter->cmd_sent = true;

		ret = adapter->if_ops.host_to_card(adapter,

						   MWIFIEX_USB_EP_CMD_EVENT,

						   cmd_node->cmd_skb, NULL);

		skb_pull(cmd_node->cmd_skb, MWIFIEX_TYPE_LEN);

		if (ret == -EBUSY)

			cmd_node->cmd_skb = NULL;

	} else {

		skb_push(cmd_node->cmd_skb, INTF_HEADER_LEN);



		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,

						   cmd_node->cmd_skb, NULL);



		skb_pull(cmd_node->cmd_skb, INTF_HEADER_LEN);

	}



	if (ret == -1) {

		dev_err(adapter->dev, "DNLD_CMD: host to card failed\n");

		if (adapter->iface_type == MWIFIEX_USB)

			adapter->cmd_sent = false;

		if (cmd_node->wait_q_enabled)

			adapter->cmd_wait_q.status = -1;

		mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
@@ -232,6 +246,9 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter) 
	struct mwifiex_opt_sleep_confirm *sleep_cfm_buf =

				(struct mwifiex_opt_sleep_confirm *)

						adapter->sleep_cfm->data;

	struct sk_buff *sleep_cfm_tmp;

	__le32 tmp;



	priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);



	sleep_cfm_buf->seq_num =
@@ -240,10 +257,28 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter) 
					 priv->bss_type)));

	adapter->seq_num++;



	if (adapter->iface_type == MWIFIEX_USB) {

		sleep_cfm_tmp =

			dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm)

				      + MWIFIEX_TYPE_LEN);

		skb_put(sleep_cfm_tmp, sizeof(struct mwifiex_opt_sleep_confirm)

			+ MWIFIEX_TYPE_LEN);

		tmp = cpu_to_le32(MWIFIEX_USB_TYPE_CMD);

		memcpy(sleep_cfm_tmp->data, &tmp, MWIFIEX_TYPE_LEN);

		memcpy(sleep_cfm_tmp->data + MWIFIEX_TYPE_LEN,

		       adapter->sleep_cfm->data,

		       sizeof(struct mwifiex_opt_sleep_confirm));

		ret = adapter->if_ops.host_to_card(adapter,

						   MWIFIEX_USB_EP_CMD_EVENT,

						   sleep_cfm_tmp, NULL);

		if (ret != -EBUSY)

			dev_kfree_skb_any(sleep_cfm_tmp);

	} else {

		skb_push(adapter->sleep_cfm, INTF_HEADER_LEN);

		ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_CMD,

						   adapter->sleep_cfm, NULL);

		skb_pull(adapter->sleep_cfm, INTF_HEADER_LEN);

	}



	if (ret == -1) {

		dev_err(adapter->dev, "SLEEP_CFM: failed\n");
@@ -343,6 +378,11 @@ int mwifiex_free_cmd_buffer(struct mwifiex_adapter *adapter) 
		}

		if (!cmd_array[i].resp_skb)

			continue;



		if (adapter->iface_type == MWIFIEX_USB)

			adapter->if_ops.cmdrsp_complete(adapter,

							cmd_array[i].resp_skb);

		else

			dev_kfree_skb_any(cmd_array[i].resp_skb);

	}

	/* Release struct cmd_ctrl_node */
@@ -1083,6 +1123,7 @@ mwifiex_process_hs_config(struct mwifiex_adapter *adapter) 
						    MWIFIEX_BSS_ROLE_ANY),

				   false);

}

EXPORT_SYMBOL_GPL(mwifiex_process_hs_config);



/*

 * This function handles the command response of a sleep confirm command.

drivers/net/wireless/mwifiex/decl.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define MWIFIEX_RATE_BITMAP_MCS127 159



#define MWIFIEX_RX_DATA_BUF_SIZE     (4 * 1024)

#define MWIFIEX_RX_CMD_BUF_SIZE	     (2 * 1024)



#define MWIFIEX_RTS_MIN_VALUE              (0)

#define MWIFIEX_RTS_MAX_VALUE              (2347)