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

Commit 47411a06 authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: add multi-queue support 



This patch adds support for multiple TX queues inside mwifiex
driver. Four different queues according to WMM access categories
are defined for each virtual interface. When a packet is
received from netdev for transmission, tx pending count for
particular queue is incremented and if tx pending count has
reached upper water-mark, this queue is stopped instead of
stopping all queues. Similarly when a packet is successfully
transmitted from device, tx pending count is decremented per
queue and if pending count falls below lower water-mark, queue
operations are again resumed. This ensures that not all
tranmission is blocked if traffic with particular TOS value
suddenly increases.

Also wake all queues after association/IBSS_join/uAP_BSS_start
to enable traffic on all queues.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d31ab357

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

+4 −4
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
				       ra_list_flags);

		mwifiex_11n_form_amsdu_pkt(skb_aggr, skb_src, &pad);



		mwifiex_write_data_complete(adapter, skb_src, 0);

		mwifiex_write_data_complete(adapter, skb_src, 0, 0);



		spin_lock_irqsave(&priv->wmm.ra_list_spinlock, ra_list_flags);
@@ -256,7 +256,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
		if (!mwifiex_is_ralist_valid(priv, pra_list, ptrindex)) {

			spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,

					       ra_list_flags);

			mwifiex_write_data_complete(adapter, skb_aggr, -1);

			mwifiex_write_data_complete(adapter, skb_aggr, 1, -1);

			return -1;

		}

		if (GET_BSS_ROLE(priv) == MWIFIEX_BSS_ROLE_STA &&
@@ -282,13 +282,13 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
		dev_err(adapter->dev, "%s: host_to_card failed: %#x\n",

			__func__, ret);

		adapter->dbg.num_tx_host_to_card_failure++;

		mwifiex_write_data_complete(adapter, skb_aggr, ret);

		mwifiex_write_data_complete(adapter, skb_aggr, 1, ret);

		return 0;

	case -EINPROGRESS:

		adapter->data_sent = false;

		break;

	case 0:

		mwifiex_write_data_complete(adapter, skb_aggr, ret);

		mwifiex_write_data_complete(adapter, skb_aggr, 1, ret);

		break;

	default:

		break;

drivers/net/wireless/mwifiex/cfg80211.c

+3 −4
Original line number Diff line number Diff line
@@ -2080,8 +2080,8 @@ struct wireless_dev *mwifiex_add_virtual_intf(struct wiphy *wiphy, 
		return ERR_PTR(-EINVAL);

	}



	dev = alloc_netdev_mq(sizeof(struct mwifiex_private *), name,

			      ether_setup, 1);

	dev = alloc_netdev_mqs(sizeof(struct mwifiex_private *), name,

			       ether_setup, IEEE80211_NUM_ACS, 1);

	if (!dev) {

		wiphy_err(wiphy, "no memory available for netdevice\n");

		priv->bss_mode = NL80211_IFTYPE_UNSPECIFIED;
@@ -2143,8 +2143,7 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) 
	mwifiex_dev_debugfs_remove(priv);

#endif



	if (!netif_queue_stopped(priv->netdev))

		netif_stop_queue(priv->netdev);

	mwifiex_stop_net_dev_queue(priv->netdev, priv->adapter);



	if (netif_carrier_ok(priv->netdev))

		netif_carrier_off(priv->netdev);

drivers/net/wireless/mwifiex/debugfs.c

+8 −2
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ mwifiex_info_read(struct file *file, char __user *ubuf, 
		(struct mwifiex_private *) file->private_data;

	struct net_device *netdev = priv->netdev;

	struct netdev_hw_addr *ha;

	struct netdev_queue *txq;

	unsigned long page = get_zeroed_page(GFP_KERNEL);

	char *p = (char *) page, fmt[64];

	struct mwifiex_bss_info info;
@@ -229,8 +230,13 @@ mwifiex_info_read(struct file *file, char __user *ubuf, 
	p += sprintf(p, "num_rx_pkts_err = %lu\n", priv->stats.rx_errors);

	p += sprintf(p, "carrier %s\n", ((netif_carrier_ok(priv->netdev))

					 ? "on" : "off"));

	p += sprintf(p, "tx queue %s\n", ((netif_queue_stopped(priv->netdev))

					  ? "stopped" : "started"));

	p += sprintf(p, "tx queue");

	for (i = 0; i < netdev->num_tx_queues; i++) {

		txq = netdev_get_tx_queue(netdev, i);

		p += sprintf(p, " %d:%s", i, netif_tx_queue_stopped(txq) ?

			     "stopped" : "started");

	}

	p += sprintf(p, "\n");



	ret = simple_read_from_buffer(ubuf, count, ppos, (char *) page,

				      (unsigned long) p - page);

drivers/net/wireless/mwifiex/init.c

+18 −2
Original line number Diff line number Diff line
@@ -388,9 +388,17 @@ void mwifiex_wake_up_net_dev_queue(struct net_device *netdev, 
					struct mwifiex_adapter *adapter)

{

	unsigned long dev_queue_flags;

	unsigned int i;



	spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);

	netif_tx_wake_all_queues(netdev);



	for (i = 0; i < netdev->num_tx_queues; i++) {

		struct netdev_queue *txq = netdev_get_tx_queue(netdev, i);



		if (netif_tx_queue_stopped(txq))

			netif_tx_wake_queue(txq);

	}



	spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);

}
@@ -401,9 +409,17 @@ void mwifiex_stop_net_dev_queue(struct net_device *netdev, 
					struct mwifiex_adapter *adapter)

{

	unsigned long dev_queue_flags;

	unsigned int i;



	spin_lock_irqsave(&adapter->queue_lock, dev_queue_flags);

	netif_tx_stop_all_queues(netdev);



	for (i = 0; i < netdev->num_tx_queues; i++) {

		struct netdev_queue *txq = netdev_get_tx_queue(netdev, i);



		if (!netif_tx_queue_stopped(txq))

			netif_tx_stop_queue(txq);

	}



	spin_unlock_irqrestore(&adapter->queue_lock, dev_queue_flags);

}

drivers/net/wireless/mwifiex/join.c

+2 −4
Original line number Diff line number Diff line
@@ -721,8 +721,7 @@ int mwifiex_ret_802_11_associate(struct mwifiex_private *priv, 


	if (!netif_carrier_ok(priv->netdev))

		netif_carrier_on(priv->netdev);

	if (netif_queue_stopped(priv->netdev))

		netif_wake_queue(priv->netdev);

	mwifiex_wake_up_net_dev_queue(priv->netdev, adapter);



	if (priv->sec_info.wpa_enabled || priv->sec_info.wpa2_enabled)

		priv->scan_block = true;
@@ -1238,8 +1237,7 @@ int mwifiex_ret_802_11_ad_hoc(struct mwifiex_private *priv, 


	if (!netif_carrier_ok(priv->netdev))

		netif_carrier_on(priv->netdev);

	if (netif_queue_stopped(priv->netdev))

		netif_wake_queue(priv->netdev);

	mwifiex_wake_up_net_dev_queue(priv->netdev, adapter);



	mwifiex_save_curr_bcn(priv);