ath9k_hw: Cleanup FastChannelChange

The logic to determine whether to use FCC is a bit convoluted.
Use a small helper function to decide whether FCC is to be
used.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 74 insertions, 36 deletions

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 02cc1ce3dd6..780ecd8aff6 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -1521,17 +1521,81 @@ bool ath9k_hw_check_alive(struct ath_hw *ah)
 }
 EXPORT_SYMBOL(ath9k_hw_check_alive);
 
+/*
+ * Fast channel change:
+ * (Change synthesizer based on channel freq without resetting chip)
+ *
+ * Don't do FCC when
+ *   - Flag is not set
+ *   - Chip is just coming out of full sleep
+ *   - Channel to be set is same as current channel
+ *   - Channel flags are different, (eg.,moving from 2GHz to 5GHz channel)
+ */
+static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan)
+{
+        struct ath_common *common = ath9k_hw_common(ah);
+        int ret;
+
+        if (AR_SREV_9280(ah) && common->bus_ops->ath_bus_type == ATH_PCI)
+                goto fail;
+
+        if (ah->chip_fullsleep)
+                goto fail;
+
+        if (!ah->curchan)
+                goto fail;
+
+        if (chan->channel == ah->curchan->channel)
+                goto fail;
+
+        if ((chan->channelFlags & CHANNEL_ALL) !=
+            (ah->curchan->channelFlags & CHANNEL_ALL))
+                goto fail;
+
+        if (!ath9k_hw_check_alive(ah))
+                goto fail;
+
+        /*
+         * For AR9462, make sure that calibration data for
+         * re-using are present.
+         */
+        if (AR_SREV_9462(ah) && (!ah->caldata ||
+                                 !ah->caldata->done_txiqcal_once ||
+                                 !ah->caldata->done_txclcal_once ||
+                                 !ah->caldata->rtt_hist.num_readings))
+                goto fail;
+
+        ath_dbg(common, RESET, "FastChannelChange for %d -> %d\n",
+                ah->curchan->channel, chan->channel);
+
+        ret = ath9k_hw_channel_change(ah, chan);
+        if (!ret)
+                goto fail;
+
+        ath9k_hw_loadnf(ah, ah->curchan);
+        ath9k_hw_start_nfcal(ah, true);
+
+        if ((ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && ar9003_mci_is_ready(ah))
+                ar9003_mci_2g5g_switch(ah, true);
+
+        if (AR_SREV_9271(ah))
+                ar9002_hw_load_ani_reg(ah, chan);
+
+        return 0;
+fail:
+        return -EINVAL;
+}
+
 int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
-                   struct ath9k_hw_cal_data *caldata, bool bChannelChange)
+                   struct ath9k_hw_cal_data *caldata, bool fastcc)
 {
         struct ath_common *common = ath9k_hw_common(ah);
         u32 saveLedState;
-        struct ath9k_channel *curchan = ah->curchan;
         u32 saveDefAntenna;
         u32 macStaId1;
         u64 tsf = 0;
         int i, r;
-        bool allow_fbs = false, start_mci_reset = false;
+        bool start_mci_reset = false;
         bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);
         bool save_fullsleep = ah->chip_fullsleep;
 
@@ -1544,8 +1608,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
                 return -EIO;
 
-        if (curchan && !ah->chip_fullsleep)
-                ath9k_hw_getnf(ah, curchan);
+        if (ah->curchan && !ah->chip_fullsleep)
+                ath9k_hw_getnf(ah, ah->curchan);
 
         ah->caldata = caldata;
         if (caldata &&
@@ -1558,32 +1622,10 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         }
         ah->noise = ath9k_hw_getchan_noise(ah, chan);
 
-        if (AR_SREV_9280(ah) && common->bus_ops->ath_bus_type == ATH_PCI)
-                bChannelChange = false;
-
-        if (caldata &&
-            caldata->done_txiqcal_once &&
-            caldata->done_txclcal_once &&
-            caldata->rtt_hist.num_readings)
-                allow_fbs = true;
-
-        if (bChannelChange &&
-            (ah->chip_fullsleep != true) &&
-            (ah->curchan != NULL) &&
-            (chan->channel != ah->curchan->channel) &&
-            (allow_fbs ||
-             ((chan->channelFlags & CHANNEL_ALL) ==
-              (ah->curchan->channelFlags & CHANNEL_ALL)))) {
-                if (ath9k_hw_channel_change(ah, chan)) {
-                        ath9k_hw_loadnf(ah, ah->curchan);
-                        ath9k_hw_start_nfcal(ah, true);
-                        if (mci && ar9003_mci_is_ready(ah))
-                                ar9003_mci_2g5g_switch(ah, true);
-
-                        if (AR_SREV_9271(ah))
-                                ar9002_hw_load_ani_reg(ah, chan);
-                        return 0;
-                }
+        if (fastcc) {
+                r = ath9k_hw_do_fastcc(ah, chan);
+                if (!r)
+                        return r;
         }
 
         if (mci)
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index 1707137e0a3..23c8dfae29f 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -924,7 +924,7 @@ const char *ath9k_hw_probe(u16 vendorid, u16 devid);
 void ath9k_hw_deinit(struct ath_hw *ah);
 int ath9k_hw_init(struct ath_hw *ah);
 int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
-                   struct ath9k_hw_cal_data *caldata, bool bChannelChange);
+                   struct ath9k_hw_cal_data *caldata, bool fastcc);
 int ath9k_hw_fill_cap_info(struct ath_hw *ah);
 u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan);
 
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 77c61bcd34e..a07565c730b 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -334,10 +334,6 @@ static int ath_reset_internal(struct ath_softc *sc, struct ath9k_channel *hchan,
                 hchan = ah->curchan;
         }
 
-        if (fastcc && (ah->chip_fullsleep ||
-            !ath9k_hw_check_alive(ah)))
-                fastcc = false;
-
         if (!ath_prepare_reset(sc, retry_tx, flush))
                 fastcc = false;