ath10k: refactor radar detection code

If 20MHz CAC completed successfully then
subsequent CAC with wider bandwidth (40Mhz, 80Mhz)
with identical control frequency did not start
monitor vdev making it impossible to detect any
radar pulses during intended CAC.

It also was incorrect to assume ath10k_config() will
be called after CAC is finished. Theoretically for
non-HT channels nothing changes between CAC and
start_ap() (albeit in practice this can be
different). The incorrect assumption led to CAC
not being stopped on non-HT chandefs leading to
all Rx being drooped making it impossible for
clients to associate.

While at it clean up the code a bit.

kvalo: separate WARN_ON() from the if statement

Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

2 files changed, 23 insertions, 37 deletions

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 33029767a412..2c1dfd719146 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -436,6 +436,10 @@ struct ath10k {
         unsigned long dev_flags;
         u32 dfs_block_radar_events;
 
+        /* protected by conf_mutex */
+        bool radar_enabled;
+        int num_started_vdevs;
+
         struct wmi_pdev_set_wmm_params_arg wmm_params;
         struct completion install_key_done;
 
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 7a56caca4fc0..8385a7ad02ac 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -767,49 +767,18 @@ static int ath10k_stop_cac(struct ath10k *ar)
         return 0;
 }
 
-static const char *ath10k_dfs_state(enum nl80211_dfs_state dfs_state)
+static void ath10k_recalc_radar_detection(struct ath10k *ar)
 {
-        switch (dfs_state) {
-        case NL80211_DFS_USABLE:
-                return "USABLE";
-        case NL80211_DFS_UNAVAILABLE:
-                return "UNAVAILABLE";
-        case NL80211_DFS_AVAILABLE:
-                return "AVAILABLE";
-        default:
-                WARN_ON(1);
-                return "bug";
-        }
-}
-
-static void ath10k_config_radar_detection(struct ath10k *ar)
-{
-        struct ieee80211_channel *chan = ar->hw->conf.chandef.chan;
-        bool radar = ar->hw->conf.radar_enabled;
-        bool chan_radar = !!(chan->flags & IEEE80211_CHAN_RADAR);
-        enum nl80211_dfs_state dfs_state = chan->dfs_state;
         int ret;
 
         lockdep_assert_held(&ar->conf_mutex);
 
-        ath10k_dbg(ATH10K_DBG_MAC,
-                   "mac radar config update: chan %dMHz radar %d chan radar %d chan state %s\n",
-                   chan->center_freq, radar, chan_radar,
-                   ath10k_dfs_state(dfs_state));
-
-        /*
-         * It's safe to call it even if CAC is not started.
-         * This call here guarantees changing channel, etc. will stop CAC.
-         */
         ath10k_stop_cac(ar);
 
-        if (!radar)
-                return;
-
-        if (!chan_radar)
+        if (!ar->radar_enabled)
                 return;
 
-        if (dfs_state != NL80211_DFS_USABLE)
+        if (ar->num_started_vdevs > 0)
                 return;
 
         ret = ath10k_start_cac(ar);
@@ -880,6 +849,9 @@ static int ath10k_vdev_start(struct ath10k_vif *arvif)
                 return ret;
         }
 
+        ar->num_started_vdevs++;
+        ath10k_recalc_radar_detection(ar);
+
         return ret;
 }
 
@@ -906,6 +878,13 @@ static int ath10k_vdev_stop(struct ath10k_vif *arvif)
                 return ret;
         }
 
+        WARN_ON(ar->num_started_vdevs == 0);
+
+        if (ar->num_started_vdevs != 0) {
+                ar->num_started_vdevs--;
+                ath10k_recalc_radar_detection(ar);
+        }
+
         return ret;
 }
 
@@ -2395,6 +2374,7 @@ static int ath10k_start(struct ieee80211_hw *hw)
                 goto exit;
         }
 
+        ar->num_started_vdevs = 0;
         ath10k_regd_update(ar);
         ret = 0;
 
@@ -2541,15 +2521,17 @@ static int ath10k_config(struct ieee80211_hw *hw, u32 changed)
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 ath10k_dbg(ATH10K_DBG_MAC,
-                           "mac config channel %d mhz flags 0x%x\n",
+                           "mac config channel %dMHz flags 0x%x radar %d\n",
                            conf->chandef.chan->center_freq,
-                           conf->chandef.chan->flags);
+                           conf->chandef.chan->flags,
+                           conf->radar_enabled);
 
                 spin_lock_bh(&ar->data_lock);
                 ar->rx_channel = conf->chandef.chan;
                 spin_unlock_bh(&ar->data_lock);
 
-                ath10k_config_radar_detection(ar);
+                ar->radar_enabled = conf->radar_enabled;
+                ath10k_recalc_radar_detection(ar);
 
                 if (!cfg80211_chandef_identical(&ar->chandef, &conf->chandef)) {
                         ar->chandef = conf->chandef;