ath9k: simplify regulatory code

Now that cfg80211 has its own regulatory infrastructure we can
condense ath9k's regulatory code considerably. We only keep data
we need to provide our own regulatory_hint(), reg_notifier() and
information necessary for calibration.

Atheros hardware supports 12 world regulatory domains, since these
are custom we apply them through the the new wiphy_apply_custom_regulatory().
Although we have 12 we can consolidate these into 5 structures based on
frequency and apply a different set of flags that differentiate them on
a case by case basis through the reg_notifier().

If CRDA is not found our own custom world regulatory domain is applied,
this is identical to cfg80211's except we enable passive scan on most
frequencies.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 142 insertions, 121 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index b494a0d7e8b5..561a2c3adbbe 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -28,6 +28,77 @@ MODULE_DESCRIPTION("Support for Atheros 802.11n wireless LAN cards.");
 MODULE_SUPPORTED_DEVICE("Atheros 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
+/* We use the hw_value as an index into our private channel structure */
+
+#define CHAN2G(_freq, _idx)  { \
+        .center_freq = (_freq), \
+        .hw_value = (_idx), \
+        .max_power = 30, \
+}
+
+#define CHAN5G(_freq, _idx) { \
+        .band = IEEE80211_BAND_5GHZ, \
+        .center_freq = (_freq), \
+        .hw_value = (_idx), \
+        .max_power = 30, \
+}
+
+/* Some 2 GHz radios are actually tunable on 2312-2732
+ * on 5 MHz steps, we support the channels which we know
+ * we have calibration data for all cards though to make
+ * this static */
+static struct ieee80211_channel ath9k_2ghz_chantable[] = {
+        CHAN2G(2412, 0), /* Channel 1 */
+        CHAN2G(2417, 1), /* Channel 2 */
+        CHAN2G(2422, 2), /* Channel 3 */
+        CHAN2G(2427, 3), /* Channel 4 */
+        CHAN2G(2432, 4), /* Channel 5 */
+        CHAN2G(2437, 5), /* Channel 6 */
+        CHAN2G(2442, 6), /* Channel 7 */
+        CHAN2G(2447, 7), /* Channel 8 */
+        CHAN2G(2452, 8), /* Channel 9 */
+        CHAN2G(2457, 9), /* Channel 10 */
+        CHAN2G(2462, 10), /* Channel 11 */
+        CHAN2G(2467, 11), /* Channel 12 */
+        CHAN2G(2472, 12), /* Channel 13 */
+        CHAN2G(2484, 13), /* Channel 14 */
+};
+
+/* Some 5 GHz radios are actually tunable on XXXX-YYYY
+ * on 5 MHz steps, we support the channels which we know
+ * we have calibration data for all cards though to make
+ * this static */
+static struct ieee80211_channel ath9k_5ghz_chantable[] = {
+        /* _We_ call this UNII 1 */
+        CHAN5G(5180, 14), /* Channel 36 */
+        CHAN5G(5200, 15), /* Channel 40 */
+        CHAN5G(5220, 16), /* Channel 44 */
+        CHAN5G(5240, 17), /* Channel 48 */
+        /* _We_ call this UNII 2 */
+        CHAN5G(5260, 18), /* Channel 52 */
+        CHAN5G(5280, 19), /* Channel 56 */
+        CHAN5G(5300, 20), /* Channel 60 */
+        CHAN5G(5320, 21), /* Channel 64 */
+        /* _We_ call this "Middle band" */
+        CHAN5G(5500, 22), /* Channel 100 */
+        CHAN5G(5520, 23), /* Channel 104 */
+        CHAN5G(5540, 24), /* Channel 108 */
+        CHAN5G(5560, 25), /* Channel 112 */
+        CHAN5G(5580, 26), /* Channel 116 */
+        CHAN5G(5600, 27), /* Channel 120 */
+        CHAN5G(5620, 28), /* Channel 124 */
+        CHAN5G(5640, 29), /* Channel 128 */
+        CHAN5G(5660, 30), /* Channel 132 */
+        CHAN5G(5680, 31), /* Channel 136 */
+        CHAN5G(5700, 32), /* Channel 140 */
+        /* _We_ call this UNII 3 */
+        CHAN5G(5745, 33), /* Channel 149 */
+        CHAN5G(5765, 34), /* Channel 153 */
+        CHAN5G(5785, 35), /* Channel 157 */
+        CHAN5G(5805, 36), /* Channel 161 */
+        CHAN5G(5825, 37), /* Channel 165 */
+};
+
 static void ath_cache_conf_rate(struct ath_softc *sc,
                                 struct ieee80211_conf *conf)
 {
@@ -152,75 +223,6 @@ static void ath_setup_rates(struct ath_softc *sc, enum ieee80211_band band)
         }
 }
 
-static int ath_setup_channels(struct ath_softc *sc)
-{
-        struct ath_hal *ah = sc->sc_ah;
-        int nchan, i, a = 0, b = 0;
-        u8 regclassids[ATH_REGCLASSIDS_MAX];
-        u32 nregclass = 0;
-        struct ieee80211_supported_band *band_2ghz;
-        struct ieee80211_supported_band *band_5ghz;
-        struct ieee80211_channel *chan_2ghz;
-        struct ieee80211_channel *chan_5ghz;
-        struct ath9k_channel *c;
-
-        /* Fill in ah->ah_channels */
-        if (!ath9k_regd_init_channels(ah, ATH_CHAN_MAX, (u32 *)&nchan,
-                                      regclassids, ATH_REGCLASSIDS_MAX,
-                                      &nregclass, CTRY_DEFAULT, false, 1)) {
-                u32 rd = ah->ah_currentRD;
-                DPRINTF(sc, ATH_DBG_FATAL,
-                        "Unable to collect channel list; "
-                        "regdomain likely %u country code %u\n",
-                        rd, CTRY_DEFAULT);
-                return -EINVAL;
-        }
-
-        band_2ghz = &sc->sbands[IEEE80211_BAND_2GHZ];
-        band_5ghz = &sc->sbands[IEEE80211_BAND_5GHZ];
-        chan_2ghz = sc->channels[IEEE80211_BAND_2GHZ];
-        chan_5ghz = sc->channels[IEEE80211_BAND_5GHZ];
-
-        for (i = 0; i < nchan; i++) {
-                c = &ah->ah_channels[i];
-                if (IS_CHAN_2GHZ(c)) {
-                        chan_2ghz[a].band = IEEE80211_BAND_2GHZ;
-                        chan_2ghz[a].center_freq = c->channel;
-                        chan_2ghz[a].max_power = c->maxTxPower;
-                        c->chan = &chan_2ghz[a];
-
-                        if (c->privFlags & CHANNEL_DISALLOW_ADHOC)
-                                chan_2ghz[a].flags |= IEEE80211_CHAN_NO_IBSS;
-                        if (c->channelFlags & CHANNEL_PASSIVE)
-                                chan_2ghz[a].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
-                        band_2ghz->n_channels = ++a;
-
-                        DPRINTF(sc, ATH_DBG_CONFIG, "2MHz channel: %d, "
-                                "channelFlags: 0x%x\n",
-                                c->channel, c->channelFlags);
-                } else if (IS_CHAN_5GHZ(c)) {
-                        chan_5ghz[b].band = IEEE80211_BAND_5GHZ;
-                        chan_5ghz[b].center_freq = c->channel;
-                        chan_5ghz[b].max_power = c->maxTxPower;
-                        c->chan = &chan_5ghz[a];
-
-                        if (c->privFlags & CHANNEL_DISALLOW_ADHOC)
-                                chan_5ghz[b].flags |= IEEE80211_CHAN_NO_IBSS;
-                        if (c->channelFlags & CHANNEL_PASSIVE)
-                                chan_5ghz[b].flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
-                        band_5ghz->n_channels = ++b;
-
-                        DPRINTF(sc, ATH_DBG_CONFIG, "5MHz channel: %d, "
-                                "channelFlags: 0x%x\n",
-                                c->channel, c->channelFlags);
-                }
-        }
-
-        return 0;
-}
-
 /*
  * Set/change channels.  If the channel is really being changed, it's done
  * by reseting the chip.  To accomplish this we must first cleanup any pending
@@ -582,19 +584,6 @@ irqreturn_t ath_isr(int irq, void *dev)
         return IRQ_HANDLED;
 }
 
-static int ath_get_channel(struct ath_softc *sc,
-                           struct ieee80211_channel *chan)
-{
-        int i;
-
-        for (i = 0; i < sc->sc_ah->ah_nchan; i++) {
-                if (sc->sc_ah->ah_channels[i].channel == chan->center_freq)
-                        return i;
-        }
-
-        return -1;
-}
-
 static u32 ath_get_extchanmode(struct ath_softc *sc,
                                struct ieee80211_channel *chan,
                                enum nl80211_channel_type channel_type)
@@ -1349,16 +1338,12 @@ static int ath_init(u16 devid, struct ath_softc *sc)
         for (i = 0; i < sc->sc_keymax; i++)
                 ath9k_hw_keyreset(ah, (u16) i);
 
-        /* Collect the channel list using the default country code */
-
-        error = ath_setup_channels(sc);
-        if (error)
+        if (ath9k_regd_init(sc->sc_ah))
                 goto bad;
 
         /* default to MONITOR mode */
         sc->sc_ah->ah_opmode = NL80211_IFTYPE_MONITOR;
 
-
         /* Setup rate tables */
 
         ath_rate_attach(sc);
@@ -1490,18 +1475,20 @@ static int ath_init(u16 devid, struct ath_softc *sc)
 
         /* setup channels and rates */
 
-        sc->sbands[IEEE80211_BAND_2GHZ].channels =
-                sc->channels[IEEE80211_BAND_2GHZ];
+        sc->sbands[IEEE80211_BAND_2GHZ].channels = ath9k_2ghz_chantable;
         sc->sbands[IEEE80211_BAND_2GHZ].bitrates =
                 sc->rates[IEEE80211_BAND_2GHZ];
         sc->sbands[IEEE80211_BAND_2GHZ].band = IEEE80211_BAND_2GHZ;
+        sc->sbands[IEEE80211_BAND_2GHZ].n_channels =
+                ARRAY_SIZE(ath9k_2ghz_chantable);
 
         if (test_bit(ATH9K_MODE_11A, sc->sc_ah->ah_caps.wireless_modes)) {
-                sc->sbands[IEEE80211_BAND_5GHZ].channels =
-                        sc->channels[IEEE80211_BAND_5GHZ];
+                sc->sbands[IEEE80211_BAND_5GHZ].channels = ath9k_5ghz_chantable;
                 sc->sbands[IEEE80211_BAND_5GHZ].bitrates =
                         sc->rates[IEEE80211_BAND_5GHZ];
                 sc->sbands[IEEE80211_BAND_5GHZ].band = IEEE80211_BAND_5GHZ;
+                sc->sbands[IEEE80211_BAND_5GHZ].n_channels =
+                        ARRAY_SIZE(ath9k_5ghz_chantable);
         }
 
         if (sc->sc_ah->ah_caps.hw_caps & ATH9K_HW_CAP_BT_COEX)
@@ -1550,6 +1537,9 @@ int ath_attach(u16 devid, struct ath_softc *sc)
                 BIT(NL80211_IFTYPE_STATION) |
                 BIT(NL80211_IFTYPE_ADHOC);
 
+        hw->wiphy->reg_notifier = ath9k_reg_notifier;
+        hw->wiphy->strict_regulatory = true;
+
         hw->queues = 4;
         hw->max_rates = 4;
         hw->max_rate_tries = ATH_11N_TXMAXTRY;
@@ -1588,11 +1578,36 @@ int ath_attach(u16 devid, struct ath_softc *sc)
                 goto detach;
 #endif
 
+        if (ath9k_is_world_regd(sc->sc_ah)) {
+                /* Anything applied here (prior to wiphy registratoin) gets
+                 * saved on the wiphy orig_* parameters */
+                const struct ieee80211_regdomain *regd =
+                        ath9k_world_regdomain(sc->sc_ah);
+                hw->wiphy->custom_regulatory = true;
+                hw->wiphy->strict_regulatory = false;
+                wiphy_apply_custom_regulatory(sc->hw->wiphy, regd);
+                ath9k_reg_apply_radar_flags(hw->wiphy);
+                ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_INIT);
+        } else {
+                /* This gets applied in the case of the absense of CRDA,
+                 * its our own custom world regulatory domain, similar to
+                 * cfg80211's but we enable passive scanning */
+                const struct ieee80211_regdomain *regd =
+                        ath9k_default_world_regdomain();
+                wiphy_apply_custom_regulatory(sc->hw->wiphy, regd);
+                ath9k_reg_apply_radar_flags(hw->wiphy);
+                ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_INIT);
+        }
+
         error = ieee80211_register_hw(hw);
 
+        if (!ath9k_is_world_regd(sc->sc_ah))
+                regulatory_hint(hw->wiphy, sc->sc_ah->alpha2);
+
         /* Initialize LED control */
         ath_init_leds(sc);
 
+
         return 0;
 detach:
         ath_detach(sc);
@@ -1818,6 +1833,37 @@ int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc)
         return qnum;
 }
 
+/* XXX: Remove me once we don't depend on ath9k_channel for all
+ * this redundant data */
+static void ath9k_update_ichannel(struct ath_softc *sc,
+                          struct ath9k_channel *ichan)
+{
+        struct ieee80211_hw *hw = sc->hw;
+        struct ieee80211_channel *chan = hw->conf.channel;
+        struct ieee80211_conf *conf = &hw->conf;
+
+        ichan->channel = chan->center_freq;
+        ichan->chan = chan;
+
+        if (chan->band == IEEE80211_BAND_2GHZ) {
+                ichan->chanmode = CHANNEL_G;
+                ichan->channelFlags = CHANNEL_2GHZ | CHANNEL_OFDM;
+        } else {
+                ichan->chanmode = CHANNEL_A;
+                ichan->channelFlags = CHANNEL_5GHZ | CHANNEL_OFDM;
+        }
+
+        sc->tx_chan_width = ATH9K_HT_MACMODE_20;
+
+        if (conf_is_ht(conf)) {
+                if (conf_is_ht40(conf))
+                        sc->tx_chan_width = ATH9K_HT_MACMODE_2040;
+
+                ichan->chanmode = ath_get_extchanmode(sc, chan,
+                                            conf->channel_type);
+        }
+}
+
 /**********************/
 /* mac80211 callbacks */
 /**********************/
@@ -1834,16 +1880,10 @@ static int ath9k_start(struct ieee80211_hw *hw)
 
         /* setup initial channel */
 
-        pos = ath_get_channel(sc, curchan);
-        if (pos == -1) {
-                DPRINTF(sc, ATH_DBG_FATAL, "Invalid channel: %d\n", curchan->center_freq);
-                return -EINVAL;
-        }
+        pos = curchan->hw_value;
 
-        sc->tx_chan_width = ATH9K_HT_MACMODE_20;
-        sc->sc_ah->ah_channels[pos].chanmode =
-                (curchan->band == IEEE80211_BAND_2GHZ) ? CHANNEL_G : CHANNEL_A;
         init_channel = &sc->sc_ah->ah_channels[pos];
+        ath9k_update_ichannel(sc, init_channel);
 
         /* Reset SERDES registers */
         ath9k_hw_configpcipowersave(sc->sc_ah, 0);
@@ -2127,32 +2167,13 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)
 
         if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
                 struct ieee80211_channel *curchan = hw->conf.channel;
-                int pos;
+                int pos = curchan->hw_value;
 
                 DPRINTF(sc, ATH_DBG_CONFIG, "Set channel: %d MHz\n",
                         curchan->center_freq);
 
-                pos = ath_get_channel(sc, curchan);
-                if (pos == -1) {
-                        DPRINTF(sc, ATH_DBG_FATAL, "Invalid channel: %d\n",
-                                curchan->center_freq);
-                        mutex_unlock(&sc->mutex);
-                        return -EINVAL;
-                }
-
-                sc->tx_chan_width = ATH9K_HT_MACMODE_20;
-                sc->sc_ah->ah_channels[pos].chanmode =
-                        (curchan->band == IEEE80211_BAND_2GHZ) ?
-                        CHANNEL_G : CHANNEL_A;
-
-                if (conf_is_ht(conf)) {
-                        if (conf_is_ht40(conf))
-                                sc->tx_chan_width = ATH9K_HT_MACMODE_2040;
-
-                        sc->sc_ah->ah_channels[pos].chanmode =
-                                ath_get_extchanmode(sc, curchan,
-                                                    conf->channel_type);
-                }
+                /* XXX: remove me eventualy */
+                ath9k_update_ichannel(sc, &sc->sc_ah->ah_channels[pos]);
 
                 ath_update_chainmask(sc, conf_is_ht(conf));