wifi: ath12k: move peer delete after vdev stop of station for WCN7850

In current code, when STA/P2P Client connect to AP/P2P GO, the WMI
command sequence is:

peer_create->vdev_start->vdev_up

And sequence of STA/P2P Client disconnect from AP/P2P GO is:

peer_delete->vdev_down->vdev_stop

This sequence of disconnect is not opposite of connect. For STA or P2P
GO, bss peer is not needed by firmware during handling vdev stop
command. So with this sequence, STA and P2P GO can work normally.

But for P2P Client, firmware needs bss peer in some functions during
handling vdev stop command. The opposite sequence of disconnect should
be:

vdev_down->vdev_stop->peer_delete

So change the sequence of disconnect as above opposite sequence for
WCN7850.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1

Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240130040303.370590-10-quic_kangyang@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 04a4a7c0eedfca065e96fa7984f14852e5af2782..810be179e8b675853a4a995e0593ca7c6b6435ee 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -1084,6 +1084,46 @@ static int ath12k_mac_monitor_stop(struct ath12k *ar)
        return ret;
 }
 
+static int ath12k_mac_vdev_stop(struct ath12k_vif *arvif)
+{
+       struct ath12k *ar = arvif->ar;
+       int ret;
+
+       lockdep_assert_held(&ar->conf_mutex);
+
+       reinit_completion(&ar->vdev_setup_done);
+
+       ret = ath12k_wmi_vdev_stop(ar, arvif->vdev_id);
+       if (ret) {
+               ath12k_warn(ar->ab, "failed to stop WMI vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               goto err;
+       }
+
+       ret = ath12k_mac_vdev_setup_sync(ar);
+       if (ret) {
+               ath12k_warn(ar->ab, "failed to synchronize setup for vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               goto err;
+       }
+
+       WARN_ON(ar->num_started_vdevs == 0);
+
+       ar->num_started_vdevs--;
+       ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "vdev %pM stopped, vdev_id %d\n",
+                  arvif->vif->addr, arvif->vdev_id);
+
+       if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) {
+               clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags);
+               ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "CAC Stopped for vdev %d\n",
+                          arvif->vdev_id);
+       }
+
+       return 0;
+err:
+       return ret;
+}
+
 static int ath12k_mac_config(struct ath12k *ar, u32 changed)
 {
        struct ieee80211_hw *hw = ath12k_ar_to_hw(ar);
@@ -3959,6 +3999,13 @@ static int ath12k_mac_op_sta_state(struct ieee80211_hw *hw,
                                    sta->addr, arvif->vdev_id);
        } else if ((old_state == IEEE80211_STA_NONE &&
                    new_state == IEEE80211_STA_NOTEXIST)) {
+               if (arvif->vdev_type == WMI_VDEV_TYPE_STA) {
+                       ath12k_bss_disassoc(ar, arvif);
+                       ret = ath12k_mac_vdev_stop(arvif);
+                       if (ret)
+                               ath12k_warn(ar->ab, "failed to stop vdev %i: %d\n",
+                                           arvif->vdev_id, ret);
+               }
                ath12k_dp_peer_cleanup(ar, arvif->vdev_id, sta->addr);
 
                ret = ath12k_peer_delete(ar, arvif->vdev_id, sta->addr);
@@ -6395,46 +6442,6 @@ ath12k_mac_vdev_start_restart(struct ath12k_vif *arvif,
        return 0;
 }
 
-static int ath12k_mac_vdev_stop(struct ath12k_vif *arvif)
-{
-       struct ath12k *ar = arvif->ar;
-       int ret;
-
-       lockdep_assert_held(&ar->conf_mutex);
-
-       reinit_completion(&ar->vdev_setup_done);
-
-       ret = ath12k_wmi_vdev_stop(ar, arvif->vdev_id);
-       if (ret) {
-               ath12k_warn(ar->ab, "failed to stop WMI vdev %i: %d\n",
-                           arvif->vdev_id, ret);
-               goto err;
-       }
-
-       ret = ath12k_mac_vdev_setup_sync(ar);
-       if (ret) {
-               ath12k_warn(ar->ab, "failed to synchronize setup for vdev %i: %d\n",
-                           arvif->vdev_id, ret);
-               goto err;
-       }
-
-       WARN_ON(ar->num_started_vdevs == 0);
-
-       ar->num_started_vdevs--;
-       ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "vdev %pM stopped, vdev_id %d\n",
-                  arvif->vif->addr, arvif->vdev_id);
-
-       if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) {
-               clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags);
-               ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "CAC Stopped for vdev %d\n",
-                          arvif->vdev_id);
-       }
-
-       return 0;
-err:
-       return ret;
-}
-
 static int ath12k_mac_vdev_start(struct ath12k_vif *arvif,
                                 struct ieee80211_chanctx_conf *ctx)
 {
@@ -6801,11 +6808,13 @@ ath12k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw,
                arvif->is_started = false;
        }
 
-       ret = ath12k_mac_vdev_stop(arvif);
-       if (ret)
-               ath12k_warn(ab, "failed to stop vdev %i: %d\n",
-                           arvif->vdev_id, ret);
-
+       if (arvif->vdev_type != WMI_VDEV_TYPE_STA) {
+               ath12k_bss_disassoc(ar, arvif);
+               ret = ath12k_mac_vdev_stop(arvif);
+               if (ret)
+                       ath12k_warn(ab, "failed to stop vdev %i: %d\n",
+                                   arvif->vdev_id, ret);
+       }
        arvif->is_started = false;
 
        if (ab->hw_params->vdev_start_delay &&