Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-28 15:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mwifiex: more_task flag for main_process

Browse Source 
This patch handles a corner case where TX packet would remain in
driver queue till next packet comes in.
Here is sequence:
1. TX packet is queued via hard_start_xmit and main_work is queued
2. SDIO interrupt comes in which directly call mwifiex_main_process.
This starts executing main superloop.
3. Now work from step1 is scheduled but at first check itself it sees
mwifiex_processing is set and exits.
4. Now if superloop from step2 has passed TX processing part of superloop
this packet would remain in queue until next packet/command/SDIO interrupt
arrives and queues main_work.

This patch fixes this corner case by defining more_task flag which is set when
mwifiex_processing is found to be true. At end of superloop we again check if
more_task flag is set and if set, execute superloop again.

Signed-off-by: Shengzhen Li <szli@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Shengzhen Li 2015-02-11 23:12:24 +05:30 committed by Kalle Valo
parent 8a1959beca
commit 04c7b363c9
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/mwifiex/main.c
View File

@ -190,14 +190,16 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
/* Check if already processing */ /* Check if already processing */
if (adapter->mwifiex_processing) { if (adapter->mwifiex_processing) {
adapter->more_task_flag = true;
spin_unlock_irqrestore(&adapter->main_proc_lock, flags); spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
goto exit_main_proc; goto exit_main_proc;
} else { } else {
adapter->mwifiex_processing = true; adapter->mwifiex_processing = true;
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
} }
process_start: process_start:
do { do {
adapter->more_task_flag = false;
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
if ((adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) || if ((adapter->hw_status == MWIFIEX_HW_STATUS_CLOSING) ||
(adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY)) (adapter->hw_status == MWIFIEX_HW_STATUS_NOT_READY))
break; break;
@ -238,6 +240,7 @@ process_start:
adapter->pm_wakeup_fw_try = true; adapter->pm_wakeup_fw_try = true;
mod_timer(&adapter->wakeup_timer, jiffies + (HZ*3)); mod_timer(&adapter->wakeup_timer, jiffies + (HZ*3));
adapter->if_ops.wakeup(adapter); adapter->if_ops.wakeup(adapter);
spin_lock_irqsave(&adapter->main_proc_lock, flags);
continue; continue;
} }
@ -295,8 +298,10 @@ process_start:
if ((adapter->ps_state == PS_STATE_SLEEP) || if ((adapter->ps_state == PS_STATE_SLEEP) ||
(adapter->ps_state == PS_STATE_PRE_SLEEP) || (adapter->ps_state == PS_STATE_PRE_SLEEP) ||
(adapter->ps_state == PS_STATE_SLEEP_CFM) || (adapter->ps_state == PS_STATE_SLEEP_CFM) ||
adapter->tx_lock_flag) adapter->tx_lock_flag){
spin_lock_irqsave(&adapter->main_proc_lock, flags);
continue; continue;
}
if (!adapter->cmd_sent && !adapter->curr_cmd) { if (!adapter->cmd_sent && !adapter->curr_cmd) {
if (mwifiex_exec_next_cmd(adapter) == -1) { if (mwifiex_exec_next_cmd(adapter) == -1) {
@ -330,15 +335,12 @@ process_start:
} }
break; break;
} }
spin_lock_irqsave(&adapter->main_proc_lock, flags);
} while (true); } while (true);
spin_lock_irqsave(&adapter->main_proc_lock, flags); spin_lock_irqsave(&adapter->main_proc_lock, flags);
if (!adapter->delay_main_work && if (adapter->more_task_flag)
(adapter->int_status || IS_CARD_RX_RCVD(adapter))) {
spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
goto process_start; goto process_start;
}
adapter->mwifiex_processing = false; adapter->mwifiex_processing = false;
spin_unlock_irqrestore(&adapter->main_proc_lock, flags); spin_unlock_irqrestore(&adapter->main_proc_lock, flags);

1
drivers/net/wireless/mwifiex/main.h
View File

@ -774,6 +774,7 @@ struct mwifiex_adapter {
/* spin lock for main process */ /* spin lock for main process */
spinlock_t main_proc_lock; spinlock_t main_proc_lock;
u32 mwifiex_processing; u32 mwifiex_processing;
u8 more_task_flag;
u16 tx_buf_size; u16 tx_buf_size;
u16 curr_tx_buf_size; u16 curr_tx_buf_size;
u32 ioport; u32 ioport;