1 From: Hante Meuleman <meuleman@broadcom.com>
2 Date: Fri, 18 Sep 2015 22:08:06 +0200
3 Subject: [PATCH] brcmfmac: Fix set and get tx-power functions.
5 Implementation of tx-power (get and set) related functions are
6 still assuming mW interface. This is wrong as functions use dbm
7 (or mbm) nowadays. As a result a tx power configuration could
8 result in wrong power configuration.
10 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
11 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
12 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
13 Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
14 Signed-off-by: Arend van Spriel <arend@broadcom.com>
15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
18 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
19 +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
20 @@ -236,89 +236,6 @@ static int brcmf_roamoff;
21 module_param_named(roamoff, brcmf_roamoff, int, S_IRUSR);
22 MODULE_PARM_DESC(roamoff, "do not use internal roaming engine");
24 -/* Quarter dBm units to mW
25 - * Table starts at QDBM_OFFSET, so the first entry is mW for qdBm=153
26 - * Table is offset so the last entry is largest mW value that fits in
30 -#define QDBM_OFFSET 153 /* Offset for first entry */
31 -#define QDBM_TABLE_LEN 40 /* Table size */
33 -/* Smallest mW value that will round up to the first table entry, QDBM_OFFSET.
34 - * Value is ( mW(QDBM_OFFSET - 1) + mW(QDBM_OFFSET) ) / 2
36 -#define QDBM_TABLE_LOW_BOUND 6493 /* Low bound */
38 -/* Largest mW value that will round down to the last table entry,
39 - * QDBM_OFFSET + QDBM_TABLE_LEN-1.
40 - * Value is ( mW(QDBM_OFFSET + QDBM_TABLE_LEN - 1) +
41 - * mW(QDBM_OFFSET + QDBM_TABLE_LEN) ) / 2.
43 -#define QDBM_TABLE_HIGH_BOUND 64938 /* High bound */
45 -static const u16 nqdBm_to_mW_map[QDBM_TABLE_LEN] = {
46 -/* qdBm: +0 +1 +2 +3 +4 +5 +6 +7 */
47 -/* 153: */ 6683, 7079, 7499, 7943, 8414, 8913, 9441, 10000,
48 -/* 161: */ 10593, 11220, 11885, 12589, 13335, 14125, 14962, 15849,
49 -/* 169: */ 16788, 17783, 18836, 19953, 21135, 22387, 23714, 25119,
50 -/* 177: */ 26607, 28184, 29854, 31623, 33497, 35481, 37584, 39811,
51 -/* 185: */ 42170, 44668, 47315, 50119, 53088, 56234, 59566, 63096
54 -static u16 brcmf_qdbm_to_mw(u8 qdbm)
57 - int idx = qdbm - QDBM_OFFSET;
59 - if (idx >= QDBM_TABLE_LEN)
60 - /* clamp to max u16 mW value */
63 - /* scale the qdBm index up to the range of the table 0-40
64 - * where an offset of 40 qdBm equals a factor of 10 mW.
71 - /* return the mW value scaled down to the correct factor of 10,
72 - * adding in factor/2 to get proper rounding.
74 - return (nqdBm_to_mW_map[idx] + factor / 2) / factor;
77 -static u8 brcmf_mw_to_qdbm(u16 mw)
84 - /* handle boundary case */
88 - offset = QDBM_OFFSET;
90 - /* move mw into the range of the table */
91 - while (mw_uint < QDBM_TABLE_LOW_BOUND) {
96 - for (qdbm = 0; qdbm < QDBM_TABLE_LEN - 1; qdbm++) {
97 - boundary = nqdBm_to_mW_map[qdbm] + (nqdBm_to_mW_map[qdbm + 1] -
98 - nqdBm_to_mW_map[qdbm]) / 2;
99 - if (mw_uint < boundary)
103 - qdbm += (u8) offset;
108 static u16 chandef_to_chanspec(struct brcmu_d11inf *d11inf,
109 struct cfg80211_chan_def *ch)
110 @@ -2016,16 +1933,14 @@ static s32
111 brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
112 enum nl80211_tx_power_setting type, s32 mbm)
115 struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
116 struct net_device *ndev = cfg_to_ndev(cfg);
117 struct brcmf_if *ifp = netdev_priv(ndev);
121 - s32 dbm = MBM_TO_DBM(mbm);
126 - brcmf_dbg(TRACE, "Enter\n");
127 + brcmf_dbg(TRACE, "Enter %d %d\n", type, mbm);
128 if (!check_vif_up(ifp->vif))
131 @@ -2034,12 +1949,20 @@ brcmf_cfg80211_set_tx_power(struct wiphy
133 case NL80211_TX_POWER_LIMITED:
134 case NL80211_TX_POWER_FIXED:
137 brcmf_err("TX_POWER_FIXED - dbm is negative\n");
141 + qdbm = MBM_TO_DBM(4 * mbm);
144 + qdbm |= WL_TXPWR_OVERRIDE;
147 + brcmf_err("Unsupported type %d\n", type);
151 /* Make sure radio is off or on as far as software is concerned */
152 disable = WL_RADIO_SW_DISABLE << 16;
153 @@ -2047,52 +1970,44 @@ brcmf_cfg80211_set_tx_power(struct wiphy
155 brcmf_err("WLC_SET_RADIO error (%d)\n", err);
160 - txpwrmw = (u16) dbm;
161 - err = brcmf_fil_iovar_int_set(ifp, "qtxpower",
162 - (s32)brcmf_mw_to_qdbm(txpwrmw));
163 + err = brcmf_fil_iovar_int_set(ifp, "qtxpower", qdbm);
165 brcmf_err("qtxpower error (%d)\n", err);
166 - cfg->conf->tx_power = dbm;
169 - brcmf_dbg(TRACE, "Exit\n");
170 + brcmf_dbg(TRACE, "Exit %d (qdbm)\n", qdbm & ~WL_TXPWR_OVERRIDE);
174 -static s32 brcmf_cfg80211_get_tx_power(struct wiphy *wiphy,
175 - struct wireless_dev *wdev,
178 +brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
181 struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
182 - struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
186 + struct net_device *ndev = cfg_to_ndev(cfg);
187 + struct brcmf_if *ifp = netdev_priv(ndev);
191 brcmf_dbg(TRACE, "Enter\n");
192 if (!check_vif_up(ifp->vif))
195 - err = brcmf_fil_iovar_int_get(ifp, "qtxpower", &txpwrdbm);
196 + err = brcmf_fil_iovar_int_get(ifp, "qtxpower", &qdbm);
198 brcmf_err("error (%d)\n", err);
202 - result = (u8) (txpwrdbm & ~WL_TXPWR_OVERRIDE);
203 - *dbm = (s32) brcmf_qdbm_to_mw(result);
204 + *dbm = (qdbm & ~WL_TXPWR_OVERRIDE) / 4;
207 - brcmf_dbg(TRACE, "Exit\n");
208 + brcmf_dbg(TRACE, "Exit (0x%x %d)\n", qdbm, *dbm);
213 brcmf_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *ndev,
214 - u8 key_idx, bool unicast, bool multicast)
215 + u8 key_idx, bool unicast, bool multicast)
217 struct brcmf_if *ifp = netdev_priv(ndev);