From: Kalle Valo <kvalo@qca.qualcomm.com>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH v2 5/8] ath10k: fix NULL deref upon early FW crash
Date: Wed, 16 Oct 2013 16:46:05 +0300 [thread overview]
Message-ID: <20131016134605.25095.65863.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20131016134503.25095.8044.stgit@localhost6.localdomain6>
From: Michal Kazior <michal.kazior@tieto.com>
If firmware crashes during FW probing it would try
to perform FW recovery which uses mac80211
workqueue before registering to mac80211.
Using internal workqueue solves the problem.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath10k/core.c | 3 ++-
drivers/net/wireless/ath/ath10k/pci.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 1129994..2a360ca 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -664,7 +664,8 @@ static void ath10k_core_restart(struct work_struct *work)
ieee80211_restart_hw(ar->hw);
break;
case ATH10K_STATE_OFF:
- /* this can happen if driver is being unloaded */
+ /* this can happen if driver is being unloaded
+ * or if the crash happens during FW probing */
ath10k_warn("cannot restart a device that hasn't been started\n");
break;
case ATH10K_STATE_RESTARTING:
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index f8d59c7..d09f8a2 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -777,7 +777,7 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar)
reg_dump_values[i + 2],
reg_dump_values[i + 3]);
- ieee80211_queue_work(ar->hw, &ar->restart_work);
+ queue_work(ar->workqueue, &ar->restart_work);
}
static void ath10k_pci_hif_send_complete_check(struct ath10k *ar, u8 pipe,
next prev parent reply other threads:[~2013-10-16 13:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-16 13:45 [PATCH v2 0/8] ath10k: fixes 2013-10-15 Kalle Valo
2013-10-16 13:45 ` [PATCH v2 1/8] ath10k: prevent starting monitor without a vdev Kalle Valo
2013-10-16 13:45 ` [PATCH v2 2/8] ath10k: add sanity checks for monitor management Kalle Valo
2013-10-16 13:45 ` [PATCH v2 3/8] ath10k: fix endianess in prints Kalle Valo
2013-10-16 13:45 ` [PATCH v2 4/8] ath10k: fix NSS reporting in RX Kalle Valo
2013-10-16 13:46 ` Kalle Valo [this message]
2013-10-16 13:46 ` [PATCH v2 6/8] ath10k: implement ath10k_pci_soc_read/write32() Kalle Valo
2013-10-16 15:38 ` Michal Kazior
2013-10-16 15:55 ` Kalle Valo
2013-10-16 13:46 ` [PATCH v2 7/8] ath10k: fix device initialization routine Kalle Valo
2013-10-16 15:44 ` Michal Kazior
2013-10-16 15:57 ` Kalle Valo
2013-10-16 16:01 ` Michal Kazior
2013-10-17 5:33 ` Kalle Valo
2013-10-16 13:46 ` [PATCH v2 8/8] ath10k: fix FW crashes on heavy TX on 10.1.389 AP FW Kalle Valo
2013-10-21 14:15 ` [PATCH v2 0/8] ath10k: fixes 2013-10-15 Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131016134605.25095.65863.stgit@localhost6.localdomain6 \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox