summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShengzhen Li <szli@marvell.com>2016-01-12 16:43:16 +0300
committerKalle Valo <kvalo@codeaurora.org>2016-01-29 12:18:22 +0300
commitdc896b15fe94345912ff13fa8eb581b5c6acccde (patch)
treec9cfeefc63deb64e137fff7a986fdad8620160a1
parent99074fc1e67b374b5c72406a23ac01fed806d634 (diff)
downloadlinux-dc896b15fe94345912ff13fa8eb581b5c6acccde.tar.xz
mwifiex: fix power state out of sync problem
It's been observed that driver's power state goes out of sync with firmware in some corner cases. When this happens, driver tries to download the data to firmware assuming it's awake which causes Tx data timeout. Main thread will process interrupt as soon as interrupt handler fills 'int_status' variable. This patch fixes the race issue by updating 'int_status' at the end of mwifiex_interrupt_status(). Signed-off-by: Shengzhen Li <szli@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/marvell/mwifiex/pcie.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 5e154649c6a2..918e04954afe 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2116,11 +2116,6 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter,
}
}
- spin_lock_irqsave(&adapter->int_lock, flags);
- adapter->int_status |= pcie_ireg;
- spin_unlock_irqrestore(&adapter->int_lock, flags);
- mwifiex_dbg(adapter, INTR, "ireg: 0x%08x\n", pcie_ireg);
-
if (!adapter->pps_uapsd_mode &&
adapter->ps_state == PS_STATE_SLEEP &&
mwifiex_pcie_ok_to_access_hw(adapter)) {
@@ -2132,6 +2127,11 @@ static void mwifiex_interrupt_status(struct mwifiex_adapter *adapter,
adapter->pm_wakeup_fw_try = false;
del_timer(&adapter->wakeup_timer);
}
+
+ spin_lock_irqsave(&adapter->int_lock, flags);
+ adapter->int_status |= pcie_ireg;
+ spin_unlock_irqrestore(&adapter->int_lock, flags);
+ mwifiex_dbg(adapter, INTR, "ireg: 0x%08x\n", pcie_ireg);
}
/*