- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / net / wireless / ath / ar9170 / phy.c

diff --git a/drivers/net/wireless/ath/ar9170/phy.c b/drivers/net/wireless/ath/ar9170/phy.c
index dbd488d..45a415e 100644 (file)
--- a/drivers/net/wireless/ath/ar9170/phy.c
+++ b/drivers/net/wireless/ath/ar9170/phy.c
@@ -1239,9 +1239,6 @@ static u8 ar9170_get_max_edge_power(struct ar9170 *ar,
                                    struct ar9170_calctl_edges edges[],
                                    u32 freq)
 {
-/* TODO: move somewhere else */
-#define AR5416_MAX_RATE_POWER        63
-
        int i;
        u8 rc = AR5416_MAX_RATE_POWER;
        u8 f;
@@ -1259,10 +1256,11 @@ static u8 ar9170_get_max_edge_power(struct ar9170 *ar,
                        break;
                }
                if (i > 0 && f < edges[i].channel) {
-                       if (f > edges[i-1].channel &&
-                           edges[i-1].power_flags & AR9170_CALCTL_EDGE_FLAGS) {
+                       if (f > edges[i - 1].channel &&
+                           edges[i - 1].power_flags &
+                           AR9170_CALCTL_EDGE_FLAGS) {
                                /* lower channel has the inband flag set */
-                               rc = edges[i-1].power_flags &
+                               rc = edges[i - 1].power_flags &
                                        ~AR9170_CALCTL_EDGE_FLAGS;
                        }
                        break;
@@ -1270,18 +1268,48 @@ static u8 ar9170_get_max_edge_power(struct ar9170 *ar,
        }
 
        if (i == AR5416_NUM_BAND_EDGES) {
-               if (f > edges[i-1].channel &&
-                   edges[i-1].power_flags & AR9170_CALCTL_EDGE_FLAGS) {
+               if (f > edges[i - 1].channel &&
+                   edges[i - 1].power_flags & AR9170_CALCTL_EDGE_FLAGS) {
                        /* lower channel has the inband flag set */
-                       rc = edges[i-1].power_flags &
+                       rc = edges[i - 1].power_flags &
                                ~AR9170_CALCTL_EDGE_FLAGS;
                }
        }
        return rc;
 }
 
-/* calculate the conformance test limits and apply them to ar->power*
- * (derived from otus hal/hpmain.c, line 3706 ff.)
+static u8 ar9170_get_heavy_clip(struct ar9170 *ar,
+                               struct ar9170_calctl_edges edges[],
+                               u32 freq, enum ar9170_bw bw)
+{
+       u8 f;
+       int i;
+       u8 rc = 0;
+
+       if (freq < 3000)
+               f = freq - 2300;
+       else
+               f = (freq - 4800) / 5;
+
+       if (bw == AR9170_BW_40_BELOW || bw == AR9170_BW_40_ABOVE)
+               rc |= 0xf0;
+
+       for (i = 0; i < AR5416_NUM_BAND_EDGES; i++) {
+               if (edges[i].channel == 0xff)
+                       break;
+               if (f == edges[i].channel) {
+                       if (!(edges[i].power_flags & AR9170_CALCTL_EDGE_FLAGS))
+                               rc |= 0x0f;
+                       break;
+               }
+       }
+
+       return rc;
+}
+
+/*
+ * calculate the conformance test limits and the heavy clip parameter
+ * and apply them to ar->power* (derived from otus hal/hpmain.c, line 3706)
  */
 static void ar9170_calc_ctl(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
 {
@@ -1295,7 +1323,8 @@ static void ar9170_calc_ctl(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
                int pwr_cal_len;
        } *modes;
 
-       /* order is relevant in the mode_list_*: we fall back to the
+       /*
+        * order is relevant in the mode_list_*: we fall back to the
         * lower indices if any mode is missed in the EEPROM.
         */
        struct ctl_modes mode_list_2ghz[] = {
@@ -1313,7 +1342,10 @@ static void ar9170_calc_ctl(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
 
 #define EDGES(c, n) (ar->eeprom.ctl_data[c].control_edges[n])
 
-       /* TODO: investigate the differences between OTUS'
+       ar->phy_heavy_clip = 0;
+
+       /*
+        * TODO: investigate the differences between OTUS'
         * hpreg.c::zfHpGetRegulatoryDomain() and
         * ath/regd.c::ath_regd_get_band_ctl() -
         * e.g. for FCC3_WORLD the OTUS procedure
@@ -1347,6 +1379,15 @@ static void ar9170_calc_ctl(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
                if (ctl_idx < AR5416_NUM_CTLS) {
                        int f_off = 0;
 
+                       /* determine heav clip parameter from
+                          the 11G edges array */
+                       if (modes[i].ctl_mode == CTL_11G) {
+                               ar->phy_heavy_clip =
+                                       ar9170_get_heavy_clip(ar,
+                                                             EDGES(ctl_idx, 1),
+                                                             freq, bw);
+                       }
+
                        /* adjust freq for 40MHz */
                        if (modes[i].ctl_mode == CTL_2GHT40 ||
                            modes[i].ctl_mode == CTL_5GHT40) {
@@ -1360,13 +1401,15 @@ static void ar9170_calc_ctl(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
                                ar9170_get_max_edge_power(ar, EDGES(ctl_idx, 1),
                                                          freq+f_off);
 
-                       /* TODO: check if the regulatory max. power is
+                       /*
+                        * TODO: check if the regulatory max. power is
                         *  controlled by cfg80211 for DFS
                         * (hpmain applies it to max_power itself for DFS freq)
                         */
 
                } else {
-                       /* Workaround in otus driver, hpmain.c, line 3906:
+                       /*
+                        * Workaround in otus driver, hpmain.c, line 3906:
                         * if no data for 5GHT20 are found, take the
                         * legacy 5G value.
                         * We extend this here to fallback from any other *HT or
@@ -1390,6 +1433,19 @@ static void ar9170_calc_ctl(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
                                                       modes[i].max_power);
                }
        }
+
+       if (ar->phy_heavy_clip & 0xf0) {
+               ar->power_2G_ht40[0]--;
+               ar->power_2G_ht40[1]--;
+               ar->power_2G_ht40[2]--;
+       }
+       if (ar->phy_heavy_clip & 0xf) {
+               ar->power_2G_ht20[0]++;
+               ar->power_2G_ht20[1]++;
+               ar->power_2G_ht20[2]++;
+       }
+
+
 #undef EDGES
 }
 
@@ -1499,8 +1555,6 @@ static int ar9170_set_power_cal(struct ar9170 *ar, u32 freq, enum ar9170_bw bw)
        /* calc. conformance test limits and apply to ar->power*[] */
        ar9170_calc_ctl(ar, freq, bw);
 
-       /* TODO: (heavy clip) regulatory domain power level fine-tuning. */
-
        /* set ACK/CTS TX power */
        ar9170_regwrite_begin(ar);
 
@@ -1643,6 +1697,17 @@ int ar9170_set_channel(struct ar9170 *ar, struct ieee80211_channel *channel,
        if (err)
                return err;
 
+       if (ar->phy_heavy_clip) {
+               err = ar9170_write_reg(ar, 0x1c59e0,
+                                      0x200 | ar->phy_heavy_clip);
+               if (err) {
+                       if (ar9170_nag_limiter(ar))
+                               printk(KERN_ERR "%s: failed to set "
+                                      "heavy clip\n",
+                                      wiphy_name(ar->hw->wiphy));
+               }
+       }
+
        for (i = 0; i < 2; i++) {
                ar->noise[i] = ar9170_calc_noise_dbm(
                                (le32_to_cpu(vals[2 + i]) >> 19) & 0x1ff);