summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath10k/pci.c
diff options
context:
space:
mode:
authorRajkumar Manoharan <rmanohar@qti.qualcomm.com>2015-12-16 16:52:19 +0200
committerKalle Valo <kvalo@qca.qualcomm.com>2015-12-31 15:23:13 +0200
commitaa538aca9fb4a197464f5926c7b5d7050e9144b1 (patch)
tree8f1ef79b936c3f23634394307479dd03a2106814 /drivers/net/wireless/ath/ath10k/pci.c
parent541c9a84cd85203244307d9ebb821102eed82789 (diff)
downloadlinux-0-day-aa538aca9fb4a197464f5926c7b5d7050e9144b1.tar.gz
linux-0-day-aa538aca9fb4a197464f5926c7b5d7050e9144b1.tar.xz
ath10k: wake up device before accessing registers
commit 1aaf8efba0ae ("ath10k: disable PCI PS for QCA988X and QCA99X0") partially reverts pci soc powersave support added by commit 77258d409ce4 ("ath10k: enable pci soc powersaving"). While reverting the change, pci wake up function is called after accessing pci registers instead of prior to access. The assumption is that chip is woken up before accessing its registers.Though this change does not fix any known issues, this might help to avoid unknown or low power platform specific issues. Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.c')
-rw-r--r--drivers/net/wireless/ath/ath10k/pci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 14fd73ec1c969..d77ba4c09e780 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -3071,9 +3071,6 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
goto err_sleep;
}
- ath10k_pci_ce_deinit(ar);
- ath10k_pci_irq_disable(ar);
-
if (ar_pci->pci_ps == 0) {
ret = ath10k_pci_force_wake(ar);
if (ret) {
@@ -3082,6 +3079,9 @@ static int ath10k_pci_probe(struct pci_dev *pdev,
}
}
+ ath10k_pci_ce_deinit(ar);
+ ath10k_pci_irq_disable(ar);
+
ret = ath10k_pci_init_irq(ar);
if (ret) {
ath10k_err(ar, "failed to init irqs: %d\n", ret);