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

Commit e35000ea authored by Zhaoyang Liu's avatar Zhaoyang Liu Committed by Kalle Valo
Browse files

mwifiex: preprocess packets from TX queue 



During profiling, we discovered that driver remains idle for time
when pakcet is downloaded to FW but no TX_DONE has been received
i.e. while data_sent is true.

This patch adds enhancement to TX routine where we preprocess
packets from TX queue, make them ready for TX and add them to
separate TX queue.

Signed-off-by: default avatarZhaoyang Liu <liuzy@marvell.com>
Signed-off-by: default avatarMarc Yang <yangyang@marvell.com>
Signed-off-by: default avatarChin-ran Lo <crlo@marvell.com>
Reviewed-by: default avatarCathy Luo <cluo@marvell.com>
Reviewed-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Reviewed-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 690e792c

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

+11 −5
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
	struct mwifiex_adapter *adapter = priv->adapter;

	struct sk_buff *skb_aggr, *skb_src;

	struct mwifiex_txinfo *tx_info_aggr, *tx_info_src;

	int pad = 0, ret;

	int pad = 0, aggr_num = 0, ret;

	struct mwifiex_tx_param tx_param;

	struct txpd *ptx_pd = NULL;

	struct timeval tv;
@@ -184,7 +184,8 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
	}



	tx_info_src = MWIFIEX_SKB_TXCB(skb_src);

	skb_aggr = dev_alloc_skb(adapter->tx_buf_size);

	skb_aggr = mwifiex_alloc_dma_align_buf(adapter->tx_buf_size,

					       GFP_ATOMIC | GFP_DMA);

	if (!skb_aggr) {

		dev_err(adapter->dev, "%s: alloc skb_aggr\n", __func__);

		spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,
@@ -200,6 +201,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 


	if (tx_info_src->flags & MWIFIEX_BUF_FLAG_TDLS_PKT)

		tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_TDLS_PKT;

	tx_info_aggr->flags |= MWIFIEX_BUF_FLAG_AGGR_PKT;

	skb_aggr->priority = skb_src->priority;



	do_gettimeofday(&tv);
@@ -211,11 +213,9 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
			break;



		skb_src = skb_dequeue(&pra_list->skb_head);



		pra_list->total_pkt_count--;



		atomic_dec(&priv->wmm.tx_pkts_queued);



		aggr_num++;

		spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock,

				       ra_list_flags);

		mwifiex_11n_form_amsdu_pkt(skb_aggr, skb_src, &pad);
@@ -251,6 +251,12 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv, 
		ptx_pd = (struct txpd *)skb_aggr->data;



	skb_push(skb_aggr, headroom);

	tx_info_aggr->aggr_num = aggr_num * 2;

	if (adapter->data_sent || adapter->tx_lock_flag) {

		atomic_add(aggr_num * 2, &adapter->tx_queued);

		skb_queue_tail(&adapter->tx_data_q, skb_aggr);

		return 0;

	}



	if (adapter->iface_type == MWIFIEX_USB) {

		adapter->data_sent = true;

drivers/net/wireless/mwifiex/decl.h

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#define MWIFIEX_BUF_FLAG_TDLS_PKT	   BIT(2)

#define MWIFIEX_BUF_FLAG_EAPOL_TX_STATUS   BIT(3)

#define MWIFIEX_BUF_FLAG_ACTION_TX_STATUS  BIT(4)

#define MWIFIEX_BUF_FLAG_AGGR_PKT          BIT(5)



#define MWIFIEX_BRIDGED_PKTS_THR_HIGH      1024

#define MWIFIEX_BRIDGED_PKTS_THR_LOW        128
@@ -179,6 +180,7 @@ struct mwifiex_txinfo { 
	u8 flags;

	u8 bss_num;

	u8 bss_type;

	u8 aggr_num;

	u32 pkt_len;

	u8 ack_frame_id;

	u64 cookie;

drivers/net/wireless/mwifiex/init.c

+5 −0
Original line number Diff line number Diff line
@@ -481,6 +481,7 @@ int mwifiex_init_lock_list(struct mwifiex_adapter *adapter) 
	spin_lock_init(&adapter->rx_proc_lock);



	skb_queue_head_init(&adapter->rx_data_q);

	skb_queue_head_init(&adapter->tx_data_q);



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

		INIT_LIST_HEAD(&adapter->bss_prio_tbl[i].bss_prio_head);
@@ -688,6 +689,10 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) 
		}

	}



	atomic_set(&adapter->tx_queued, 0);

	while ((skb = skb_dequeue(&adapter->tx_data_q)))

		mwifiex_write_data_complete(adapter, skb, 0, 0);



	spin_lock_irqsave(&adapter->rx_proc_lock, flags);



	while ((skb = skb_dequeue(&adapter->rx_data_q))) {

drivers/net/wireless/mwifiex/main.c

+19 −2
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter) 
		    (adapter->pm_wakeup_card_req &&

		     !adapter->pm_wakeup_fw_try) &&

		    (is_command_pending(adapter) ||

		     !skb_queue_empty(&adapter->tx_data_q) ||

		     !mwifiex_wmm_lists_empty(adapter))) {

			adapter->pm_wakeup_fw_try = true;

			mod_timer(&adapter->wakeup_timer, jiffies + (HZ*3));
@@ -286,7 +287,8 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter) 


			if ((!adapter->scan_chan_gap_enabled &&

			     adapter->scan_processing) || adapter->data_sent ||

			    mwifiex_wmm_lists_empty(adapter)) {

			    (mwifiex_wmm_lists_empty(adapter) &&

			     skb_queue_empty(&adapter->tx_data_q))) {

				if (adapter->cmd_sent || adapter->curr_cmd ||

				    (!is_command_pending(adapter)))

					break;
@@ -336,6 +338,20 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter) 
			}

		}



		if ((adapter->scan_chan_gap_enabled ||

		     !adapter->scan_processing) &&

		    !adapter->data_sent &&

		    !skb_queue_empty(&adapter->tx_data_q)) {

			mwifiex_process_tx_queue(adapter);

			if (adapter->hs_activated) {

				adapter->is_hs_configured = false;

				mwifiex_hs_activated_event

					(mwifiex_get_priv

					(adapter, MWIFIEX_BSS_ROLE_ANY),

					false);

			}

		}



		if ((adapter->scan_chan_gap_enabled ||

		     !adapter->scan_processing) &&

		    !adapter->data_sent && !mwifiex_wmm_lists_empty(adapter)) {
@@ -351,7 +367,8 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter) 


		if (adapter->delay_null_pkt && !adapter->cmd_sent &&

		    !adapter->curr_cmd && !is_command_pending(adapter) &&

		    mwifiex_wmm_lists_empty(adapter)) {

		    (mwifiex_wmm_lists_empty(adapter) &&

		     skb_queue_empty(&adapter->tx_data_q))) {

			if (!mwifiex_send_null_packet

			    (mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_STA),

			     MWIFIEX_TxPD_POWER_MGMT_NULL_PACKET |

drivers/net/wireless/mwifiex/main.h

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ enum { 


#define MWIFIEX_MAX_AP				64



#define MWIFIEX_MAX_PKTS_TXQ			16



#define MWIFIEX_DEFAULT_WATCHDOG_TIMEOUT	(5 * HZ)



#define MWIFIEX_TIMER_10S			10000
@@ -819,6 +821,8 @@ struct mwifiex_adapter { 
	spinlock_t scan_pending_q_lock;

	/* spin lock for RX processing routine */

	spinlock_t rx_proc_lock;

	struct sk_buff_head tx_data_q;

	atomic_t tx_queued;

	u32 scan_processing;

	u16 region_code;

	struct mwifiex_802_11d_domain_reg domain_reg;
@@ -905,6 +909,8 @@ struct mwifiex_adapter { 
	bool auto_tdls;

};



void mwifiex_process_tx_queue(struct mwifiex_adapter *adapter);



int mwifiex_init_lock_list(struct mwifiex_adapter *adapter);



void mwifiex_set_trans_start(struct net_device *dev);