ath10k: Fix the race condition in firmware dump work queue

Commit Message

Maharaja Kennadyrajan March 26, 2020, 8:57 a.m. UTC

There is a race condition, when the user writes 'hw-restart' and
'hard' in the simulate_fw_crash debugfs file without any delay.
In the above scenario, the firmware dump work queue(scheduled by
'hard') should be handled gracefully, while the target is in the
'hw-restart'.

Tested HW: QCA9984
Tested FW: 10.4-3.9.0.2-00044

Co-developed-by: Govindaraj Saminathan <[e-mail]>
Signed-off-by: Govindaraj Saminathan <[e-mail]>
Signed-off-by: Maharaja Kennadyrajan <[e-mail]>
---
 drivers/net/wireless/ath/ath10k/pci.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kalle Valo April 6, 2020, 4:15 p.m. UTC | #1

Maharaja Kennadyrajan <[e-mail]> wrote:

> There is a race condition, when the user writes 'hw-restart' and
> 'hard' in the simulate_fw_crash debugfs file without any delay.
> In the above scenario, the firmware dump work queue(scheduled by
> 'hard') should be handled gracefully, while the target is in the
> 'hw-restart'.
> 
> Tested HW: QCA9984
> Tested FW: 10.4-3.9.0.2-00044
> 
> Co-developed-by: Govindaraj Saminathan <[e-mail]>
> Signed-off-by: Govindaraj Saminathan <[e-mail]>
> Signed-off-by: Maharaja Kennadyrajan <[e-mail]>
> Signed-off-by: Kalle Valo <[e-mail]>

Patch applied to ath-next branch of ath.git, thanks.

3d1c60460fb2 ath10k: Fix the race condition in firmware dump work queue

Patch

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index ded7a22..cd1c5d6 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2074,6 +2074,7 @@  static void ath10k_pci_hif_stop(struct ath10k *ar)
 	ath10k_pci_irq_sync(ar);
 	napi_synchronize(&ar->napi);
 	napi_disable(&ar->napi);
+	cancel_work_sync(&ar_pci->dump_work);
 
 	/* Most likely the device has HTT Rx ring configured. The only way to
 	 * prevent the device from accessing (and possible corrupting) host