Originally the explicit fw register dump was added
to wait_for_target_init because interrupts are
masked early during power_up.

Due to some changes in power_up/reset sequences
sometimes when fw crashed ath10k would print the
dump more than once via hif_stop -> warm_reset ->
wait_for_target_init, possibly with different
values each.

Prevent this by doing the explicit fw register
dump only during power_up instead of
wait_for_target_init.

Signed-off-by: Michal Kazior <michal.kaz...@tieto.com>
---
 drivers/net/wireless/ath/ath10k/pci.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c 
b/drivers/net/wireless/ath/ath10k/pci.c
index 5e50214..3b40a86 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -1910,6 +1910,12 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
         */
        ret = ath10k_pci_chip_reset(ar);
        if (ret) {
+               if (ath10k_pci_has_fw_crashed(ar)) {
+                       ath10k_warn(ar, "firmware crashed during chip reset\n");
+                       ath10k_pci_fw_crashed_clear(ar);
+                       ath10k_pci_fw_crashed_dump(ar);
+               }
+
                ath10k_err(ar, "failed to reset chip: %d\n", ret);
                goto err_sleep;
        }
@@ -2352,8 +2358,6 @@ static int ath10k_pci_wait_for_target_init(struct ath10k 
*ar)
 
        if (val & FW_IND_EVENT_PENDING) {
                ath10k_warn(ar, "device has crashed during init\n");
-               ath10k_pci_fw_crashed_clear(ar);
-               ath10k_pci_fw_crashed_dump(ar);
                return -ECOMM;
        }
 
-- 
1.8.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to