| Message ID | 1489445343-8719-1-git-send-email-ryanhsu@qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6be3b6cce1e225f189b68b4e84fc711d19b4277b |
| Delegated to: | Kalle Valo |
| Headers | show |
<ryanhsu@qca.qualcomm.com> writes: > From: Ryan Hsu <ryanhsu@qca.qualcomm.com> > > In the 'commit ebee76f7fa46 ("ath10k: allow setting coverage class")', > it inherits the design and the address offset from ath9k, but the address > is not applicable to QCA6174, which leads to a random crash while doing the > resume() operation, since the set_coverage_class.ops will be called from > ieee80211_reconfig() when resume() (if the wow is not configured). > > Fix the incorrect address offset here to avoid the random crash. > > Verified on QCA6174/hw3.0 with firmware WLAN.RM.4.4-00022-QCARMSWPZ-2. This also seems to fix a regression related to firmware restart. I was testing simulate_fw_crash on qca6174 with current ath.git master branch and noticed firmware crash recovery fails every time: [ 90.402204] ath10k_pci 0000:02:00.0: device is wedged, will not restart With this patch the recovery works every time I tested this. But I'm not 100% sure yet about this, need to test more. > Cc: stable@vger.kernel.org I'll add '# v4.10' because that should be first release which had ebee76f7fa46, no need to backport to older releases.
Ryan Hsu <ryanhsu@qca.qualcomm.com> wrote: > From: Ryan Hsu <ryanhsu@qca.qualcomm.com> > > In the 'commit ebee76f7fa46 ("ath10k: allow setting coverage class")', > it inherits the design and the address offset from ath9k, but the address > is not applicable to QCA6174, which leads to a random crash while doing the > resume() operation, since the set_coverage_class.ops will be called from > ieee80211_reconfig() when resume() (if the wow is not configured). > > Fix the incorrect address offset here to avoid the random crash. > > Verified on QCA6174/hw3.0 with firmware WLAN.RM.4.4-00022-QCARMSWPZ-2. > > Fixes: ebee76f7fa46 ("ath10k: allow setting coverage class") > Cc: stable@vger.kernel.org > Signed-off-by: Ryan Hsu <ryanhsu@qca.qualcomm.com> Patch applied to ath-current branch of ath.git, thanks. 6be3b6cce1e2 ath10k: fix incorrect wlan_mac_base in qca6174_regs
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c index 33fb268..d9f37ee 100644 --- a/drivers/net/wireless/ath/ath10k/hw.c +++ b/drivers/net/wireless/ath/ath10k/hw.c @@ -51,7 +51,7 @@ .rtc_soc_base_address = 0x00000800, .rtc_wmac_base_address = 0x00001000, .soc_core_base_address = 0x0003a000, - .wlan_mac_base_address = 0x00020000, + .wlan_mac_base_address = 0x00010000, .ce_wrapper_base_address = 0x00034000, .ce0_base_address = 0x00034400, .ce1_base_address = 0x00034800,