ath10k_core_wake_all_waiters() still misses several completions, leaving their callers blocked after the driver has given up on the device. In particular, callers waiting on peer_delete_done, target_suspend, wow.wakeup_completed, peer_stats_info_complete or wmi.radar_confirm continue sleeping until their individual timeouts expire even though no further progress is possible. The WoW and suspend waits are on the suspend and resume paths, where these delays consume watchdog budget. Add the missing completions to ath10k_core_wake_all_waiters() so the callers are released immediately. peer_delete_done is not otherwise reinitialized before every wait. A completion left signaled by recovery would therefore make a later peer-delete wait return immediately. Reinitialize it before sending each peer-delete command. Tested-on: QCA6174 hw3.2 PCI WLAN.RM.4.4.1-00288-QCARMSWPZ-1 Tested-on: QCA6174 hw3.2 SDIO WLAN.RMH.4.4.1-00189 Signed-off-by: Kang Yang --- drivers/net/wireless/ath/ath10k/core.c | 5 +++++ drivers/net/wireless/ath/ath10k/mac.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 3bb4d2742c30..99960f12dc66 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -2542,7 +2542,12 @@ static void ath10k_core_wake_all_waiters(struct ath10k *ar) complete(&ar->install_key_done); complete(&ar->vdev_setup_done); complete(&ar->vdev_delete_done); + complete(&ar->peer_delete_done); + complete(&ar->target_suspend); + complete(&ar->wow.wakeup_completed); + complete(&ar->peer_stats_info_complete); complete(&ar->thermal.wmi_sync); + complete(&ar->wmi.radar_confirm); complete(&ar->bss_survey_done); wake_up(&ar->htt.empty_tx_wq); wake_up(&ar->wmi.tx_credits_wq); diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 74aca0af11c8..695df1821e5c 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -843,6 +843,7 @@ static int ath10k_peer_delete(struct ath10k *ar, u32 vdev_id, const u8 *addr) lockdep_assert_held(&ar->conf_mutex); + reinit_completion(&ar->peer_delete_done); ret = ath10k_wmi_peer_delete(ar, vdev_id, addr); if (ret) return ret; @@ -5897,6 +5898,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, err_peer_delete: if (arvif->vdev_type == WMI_VDEV_TYPE_AP || arvif->vdev_type == WMI_VDEV_TYPE_IBSS) { + reinit_completion(&ar->peer_delete_done); ath10k_wmi_peer_delete(ar, arvif->vdev_id, vif->addr); ath10k_wait_for_peer_delete_done(ar, arvif->vdev_id, vif->addr); @@ -5959,6 +5961,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, if (arvif->vdev_type == WMI_VDEV_TYPE_AP || arvif->vdev_type == WMI_VDEV_TYPE_IBSS) { + reinit_completion(&ar->peer_delete_done); ret = ath10k_wmi_peer_delete(arvif->ar, arvif->vdev_id, vif->addr); if (ret) -- 2.34.1