ath11k: Handle failure in qmi firmware ready
authorSeevalamuthu Mariappan <quic_seevalam@quicinc.com>
Thu, 17 Feb 2022 06:26:35 +0000 (11:56 +0530)
committerKalle Valo <quic_kvalo@quicinc.com>
Mon, 21 Feb 2022 10:28:17 +0000 (12:28 +0200)
In some scenarios like firmware crashes during init time
and hardware gets restarted after qmi firmware ready event.
During restart, ath11k_core_qmi_firmware_ready() returns timeout.
But, this failure is not handled and ATH11K_FLAG_REGISTERED is set.

When hardware restart completed, firmware sends firmware ready event
again. Since ATH11K_FLAG_REGISTERED is already set, ath11k handles
this as core restart. Inits are not done because of previous timeout.
But ath11k_core_restart does deinit's which causes NULL pointer crash.

Fix this by handling failure from ath11k_core_qmi_firmware_ready().

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-00881-QCAHKSWPL_SILICONZ-1

Signed-off-by: Seevalamuthu Mariappan <quic_seevalam@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/1645079195-13564-1-git-send-email-quic_seevalam@quicinc.com
drivers/net/wireless/ath/ath11k/qmi.c

index d4d831566a894931d0e8a7de00057f2e86163f00..04e966830c188ababb6179a665c09b2e7ae5fe58 100644 (file)
@@ -2960,7 +2960,11 @@ static void ath11k_qmi_driver_event_work(struct work_struct *work)
                                clear_bit(ATH11K_FLAG_CRASH_FLUSH,
                                          &ab->dev_flags);
                                clear_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags);
-                               ath11k_core_qmi_firmware_ready(ab);
+                               ret = ath11k_core_qmi_firmware_ready(ab);
+                               if (ret) {
+                                       set_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags);
+                                       break;
+                               }
                                set_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags);
                        }