OSDN Git Service

ath10k: prevent fw reg dump spam
authorMichal Kazior <michal.kazior@tieto.com>
Mon, 12 Jan 2015 14:29:37 +0000 (15:29 +0100)
committerKalle Valo <kvalo@qca.qualcomm.com>
Thu, 15 Jan 2015 10:34:54 +0000 (12:34 +0200)
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.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath10k/pci.c

index 5e50214..3b40a86 100644 (file)
@@ -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;
        }