ath11k: fix WARN_ON during ath11k_mac_update_vif_chan

Fix WARN_ON() from ath11k_mac_update_vif_chan() if vdev is not up.
Since change_chanctx can be called even before vdev_up from
ieee80211_start_ap->ieee80211_vif_use_channel->
ieee80211_recalc_radar_chanctx.

Do vdev stop followed by a vdev start in case of vdev is down.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1

Signed-off-by: Venkateswara Naralasetty <quic_vnaralas@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/1644416019-820-1-git-send-email-quic_vnaralas@quicinc.com

diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index ed89905..d5922a0 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -6856,13 +6856,33 @@ ath11k_mac_update_vif_chan(struct ath11k *ar,
                if (WARN_ON(!arvif->is_started))
                        continue;
 
-               if (WARN_ON(!arvif->is_up))
-                       continue;
+               /* change_chanctx can be called even before vdev_up from
+                * ieee80211_start_ap->ieee80211_vif_use_channel->
+                * ieee80211_recalc_radar_chanctx.
+                *
+                * Firmware expect vdev_restart only if vdev is up.
+                * If vdev is down then it expect vdev_stop->vdev_start.
+                */
+               if (arvif->is_up) {
+                       ret = ath11k_mac_vdev_restart(arvif, &vifs[i].new_ctx->def);
+                       if (ret) {
+                               ath11k_warn(ab, "failed to restart vdev %d: %d\n",
+                                           arvif->vdev_id, ret);
+                               continue;
+                       }
+               } else {
+                       ret = ath11k_mac_vdev_stop(arvif);
+                       if (ret) {
+                               ath11k_warn(ab, "failed to stop vdev %d: %d\n",
+                                           arvif->vdev_id, ret);
+                               continue;
+                       }
+
+                       ret = ath11k_mac_vdev_start(arvif, &vifs[i].new_ctx->def);
+                       if (ret)
+                               ath11k_warn(ab, "failed to start vdev %d: %d\n",
+                                           arvif->vdev_id, ret);
 
-               ret = ath11k_mac_vdev_restart(arvif, &vifs[i].new_ctx->def);
-               if (ret) {
-                       ath11k_warn(ab, "failed to restart vdev %d: %d\n",
-                                   arvif->vdev_id, ret);
                        continue;
                }