ath10k: add atomic protection for device recovery

[ Upstream commit 5dadbe4e3718fb2214199b6dc7af1077fe14bf32 ]

When it has more than one restart_work queued meanwhile, the 2nd
restart_work is very easy to break the 1st restart work and lead
recovery fail.

Add a flag to allow only one restart work running untill
device successfully recovered.

It already has flag ATH10K_FLAG_CRASH_FLUSH, but it can not use this
flag again, because it is clear in ath10k_core_start. The function
ieee80211_reconfig(called by ieee80211_restart_work) of mac80211 do
many things and drv_start(call to ath10k_core_start) is 1st thing,
when drv_start complete, it does not mean restart complete. So it
add new flag and clear it in ath10k_reconfig_complete, because it
is the last thing called from drv_reconfig_complete of function
ieee80211_reconfig, after it, the restart process finished.

Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00049

Signed-off-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/010101746bead6a0-d5e97c66-dedd-4b92-810e-c2e4840fafc9-000000@us-west-2.amazonses.com
Stable-dep-of: 1650d32b92b0 ("ath10k: snoc: fix unbalanced IRQ enable in crash recovery")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index d03a36c45f9f3910b0c198aed4b34ecd41da3230..8ce5fbfcee972650a2a2fab75e374abcf0c58369 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -2292,6 +2292,17 @@ static int ath10k_init_hw_params(struct ath10k *ar)
        return 0;
 }
 
+void ath10k_core_start_recovery(struct ath10k *ar)
+{
+       if (test_and_set_bit(ATH10K_FLAG_RESTARTING, &ar->dev_flags)) {
+               ath10k_warn(ar, "already restarting\n");
+               return;
+       }
+
+       queue_work(ar->workqueue, &ar->restart_work);
+}
+EXPORT_SYMBOL(ath10k_core_start_recovery);
+
 static void ath10k_core_restart(struct work_struct *work)
 {
        struct ath10k *ar = container_of(work, struct ath10k, restart_work);

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index b50ab9e229dc53db0c69605b766c18ec7c7e8dae..b471c0ccf006b9bc6c865f3b659700f2c46b717c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -857,6 +857,9 @@ enum ath10k_dev_flags {
 
        /* Per Station statistics service */
        ATH10K_FLAG_PEER_STATS,
+
+       /* Indicates that ath10k device is during recovery process and not complete */
+       ATH10K_FLAG_RESTARTING,
 };
 
 enum ath10k_cal_mode {
@@ -1312,6 +1315,7 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
                      const struct ath10k_fw_components *fw_components);
 int ath10k_wait_for_suspend(struct ath10k *ar, u32 suspend_opt);
 void ath10k_core_stop(struct ath10k *ar);
+void ath10k_core_start_recovery(struct ath10k *ar);
 int ath10k_core_register(struct ath10k *ar,
                         const struct ath10k_bus_params *bus_params);
 void ath10k_core_unregister(struct ath10k *ar);

diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index ab737177a86bf2c55c2e52ae886538e992fbfb05..64d48d8cce50c56bf372fe8106564381b7800a80 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -583,7 +583,7 @@ static ssize_t ath10k_write_simulate_fw_crash(struct file *file,
                ret = ath10k_debug_fw_assert(ar);
        } else if (!strcmp(buf, "hw-restart")) {
                ath10k_info(ar, "user requested hw restart\n");
-               queue_work(ar->workqueue, &ar->restart_work);
+               ath10k_core_start_recovery(ar);
                ret = 0;
        } else {
                ret = -EINVAL;
@@ -2005,7 +2005,7 @@ static ssize_t ath10k_write_btcoex(struct file *file,
                }
        } else {
                ath10k_info(ar, "restarting firmware due to btcoex change");
-               queue_work(ar->workqueue, &ar->restart_work);
+               ath10k_core_start_recovery(ar);
        }
 
        if (val)
@@ -2136,7 +2136,7 @@ static ssize_t ath10k_write_peer_stats(struct file *file,
 
        ath10k_info(ar, "restarting firmware due to Peer stats change");
 
-       queue_work(ar->workqueue, &ar->restart_work);
+       ath10k_core_start_recovery(ar);
        ret = count;
 
 exit:

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 323b6763cb0f598a40980889fd6869afa960a18e..5dd0239e9d51b501434f819e8406b5559d69c212 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -7969,6 +7969,7 @@ static void ath10k_reconfig_complete(struct ieee80211_hw *hw,
                ath10k_info(ar, "device successfully recovered\n");
                ar->state = ATH10K_STATE_ON;
                ieee80211_wake_queues(ar->hw);
+               clear_bit(ATH10K_FLAG_RESTARTING, &ar->dev_flags);
        }
 
        mutex_unlock(&ar->conf_mutex);

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 2c8f04b415c711cb1a7136bf4f5d2413b9e44e81..83ef0517f099150dc740f05363b0c2033d002cb3 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -1774,7 +1774,7 @@ static void ath10k_pci_fw_dump_work(struct work_struct *work)
 
        mutex_unlock(&ar->dump_mutex);
 
-       queue_work(ar->workqueue, &ar->restart_work);
+       ath10k_core_start_recovery(ar);
 }
 
 static void ath10k_pci_fw_crashed_dump(struct ath10k *ar)

diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index 418e40560f59f4b7c460b5e64e7fa05e036b86a3..2ccbb6b4f1b5b8f29848e7b6b7cd014212b16e47 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -562,7 +562,7 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar,
                                    ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH);
                        ret = -ENOMEM;
 
-                       queue_work(ar->workqueue, &ar->restart_work);
+                       ath10k_core_start_recovery(ar);
                        ath10k_warn(ar, "exceeds length, start recovery\n");
 
                        goto err;
@@ -961,7 +961,7 @@ static int ath10k_sdio_mbox_read_int_status(struct ath10k *ar,
        ret = ath10k_sdio_read(ar, MBOX_HOST_INT_STATUS_ADDRESS,
                               irq_proc_reg, sizeof(*irq_proc_reg));
        if (ret) {
-               queue_work(ar->workqueue, &ar->restart_work);
+               ath10k_core_start_recovery(ar);
                ath10k_warn(ar, "read int status fail, start recovery\n");
                goto out;
        }
@@ -2505,7 +2505,7 @@ void ath10k_sdio_fw_crashed_dump(struct ath10k *ar)
 
        ath10k_sdio_enable_intrs(ar);
 
-       queue_work(ar->workqueue, &ar->restart_work);
+       ath10k_core_start_recovery(ar);
 }
 
 static int ath10k_sdio_probe(struct sdio_func *func,

diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index f7ee1032b1729587e7327f124b30752462e42829..ee5b16d79f14f97ce7292d801f6d2113c47c287c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -1315,7 +1315,7 @@ int ath10k_snoc_fw_indication(struct ath10k *ar, u64 type)
        switch (type) {
        case ATH10K_QMI_EVENT_FW_READY_IND:
                if (test_bit(ATH10K_SNOC_FLAG_REGISTERED, &ar_snoc->flags)) {
-                       queue_work(ar->workqueue, &ar->restart_work);
+                       ath10k_core_start_recovery(ar);
                        break;
                }
 

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index dc5d9f9be34f0e7b1c3227cf4d0e147e2885d638..c9a74f3e2e6011b1cab884310f6c45df38a77eb6 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -1957,7 +1957,7 @@ int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id)
        if (ret == -EAGAIN) {
                ath10k_warn(ar, "wmi command %d timeout, restarting hardware\n",
                            cmd_id);
-               queue_work(ar->workqueue, &ar->restart_work);
+               ath10k_core_start_recovery(ar);
        }
 
        return ret;