From: Ivo van Doorn <ivdoorn@gmail.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com
Subject: [PATCH 06/13] rt2x00: Don't recalculate HT40 compensation for each rate
Date: Mon, 28 Mar 2011 13:32:01 +0200 [thread overview]
Message-ID: <201103281332.01948.IvDoorn@gmail.com> (raw)
In-Reply-To: <201103281331.31575.IvDoorn@gmail.com>
From: Helmut Schaa <helmut.schaa@googlemail.com>
Previously the HT40 tx power compensation value was calculated for each
rate. However, the calculation is independent of the tx rate and as such
can be precalculated and just passed in for each rate.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2x00/rt2800lib.c | 32 +++++++++++++++++-------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 2f8af7a..26ac892 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1861,7 +1861,8 @@ static u8 rt2800_compesate_txpower(struct rt2x00_dev *rt2x00dev,
int is_rate_b,
enum ieee80211_band band,
int power_level,
- u8 txpower)
+ u8 txpower,
+ int delta)
{
u32 reg;
u16 eeprom;
@@ -1869,13 +1870,10 @@ static u8 rt2800_compesate_txpower(struct rt2x00_dev *rt2x00dev,
u8 eirp_txpower;
u8 eirp_txpower_criterion;
u8 reg_limit;
- int bw_comp;
if (!((band == IEEE80211_BAND_5GHZ) && is_rate_b))
return txpower;
- bw_comp = rt2800_get_txpower_bw_comp(rt2x00dev, band);
-
if (test_bit(CONFIG_SUPPORT_POWER_LIMIT, &rt2x00dev->flags)) {
/*
* Check if eirp txpower exceed txpower_limit.
@@ -1898,14 +1896,14 @@ static u8 rt2800_compesate_txpower(struct rt2x00_dev *rt2x00dev,
EEPROM_EIRP_MAX_TX_POWER_5GHZ);
eirp_txpower = eirp_txpower_criterion + (txpower - criterion) +
- (is_rate_b ? 4 : 0) + bw_comp;
+ (is_rate_b ? 4 : 0) + delta;
reg_limit = (eirp_txpower > power_level) ?
(eirp_txpower - power_level) : 0;
} else
reg_limit = 0;
- return txpower + bw_comp - reg_limit;
+ return txpower + delta - reg_limit;
}
static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
@@ -1919,6 +1917,12 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
u32 offset;
enum ieee80211_band band = conf->channel->band;
int power_level = conf->power_level;
+ int delta;
+
+ /*
+ * Calculate HT40 compensation delta
+ */
+ delta = rt2800_get_txpower_bw_comp(rt2x00dev, band);
/*
* set to normal bbp tx power control mode: +/- 0dBm
@@ -1948,7 +1952,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE0);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE0, txpower);
/*
@@ -1959,7 +1963,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE1);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE1, txpower);
/*
@@ -1970,7 +1974,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE2);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE2, txpower);
/*
@@ -1981,7 +1985,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE3);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE3, txpower);
/* read the next four txpower values */
@@ -1997,7 +2001,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE0);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE4, txpower);
/*
@@ -2008,7 +2012,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE1);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE5, txpower);
/*
@@ -2019,7 +2023,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE2);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE6, txpower);
/*
@@ -2030,7 +2034,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
txpower = rt2x00_get_field16(eeprom,
EEPROM_TXPOWER_BYRATE_RATE3);
txpower = rt2800_compesate_txpower(rt2x00dev, is_rate_b, band,
- power_level, txpower);
+ power_level, txpower, delta);
rt2x00_set_field32(®, TX_PWR_CFG_RATE7, txpower);
rt2800_register_write(rt2x00dev, offset, reg);
--
1.7.2.3
next prev parent reply other threads:[~2011-03-28 11:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-28 11:29 [PATCH 01/13] rt2x00: Limit rt2x00pci rxdone processing to 16 entries at once Ivo van Doorn
2011-03-28 11:30 ` [PATCH 02/13] rt2x00: Limit rt2800pci txdone " Ivo van Doorn
2011-03-28 11:30 ` [PATCH 03/13] rt2x00: Calculate tx status fifo size instead of hardcoding it Ivo van Doorn
2011-03-28 11:30 ` [PATCH 04/13] rt2x00: Remove DRIVER_SUPPORT_WATCHDOG flag Ivo van Doorn
2011-03-28 11:31 ` [PATCH 05/13] rt2x00: Restructure bw_comp calculationATCHDOG flag Ivo van Doorn
2011-03-28 11:32 ` Ivo van Doorn [this message]
2011-03-28 11:32 ` [PATCH 07/13] rt2x00: Indention cleanup in rt2800lib Ivo van Doorn
2011-03-28 11:33 ` [PATCH 08/13] rt2x00: Remove obsolete rt2x00queue_align_payload Ivo van Doorn
2011-03-28 11:33 ` [PATCH 09/13] rt2x00: Implement tx power temperature compensation Ivo van Doorn
2011-03-28 11:34 ` [PATCH 10/13] rt2x00: Fix STBC transmissions to STAs with Rx STBC > 1 Ivo van Doorn
2011-03-28 11:34 ` [PATCH 11/13] rt2x00: Add support for the ZyXEL NWD-211AN USB Ivo van Doorn
2011-03-28 11:35 ` [PATCH 12/13] rt2x00: Fix tx aggregation problems with some clients Ivo van Doorn
2011-03-28 11:35 ` [PATCH 13/13] rt2x00: Add an error message when trying to send on a full queue Ivo van Doorn
2011-03-29 0:37 ` [PATCH 05/13] rt2x00: Restructure bw_comp calculationATCHDOG flag Julian Calaby
2011-04-02 17:14 ` [PATCH 05/13 v2] rt2x00: Restructure bw_comp calculation Ivo van Doorn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201103281332.01948.IvDoorn@gmail.com \
--to=ivdoorn@gmail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=users@rt2x00.serialmonkey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).