Commit 18c8adeb authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43: Rewrite TX power adjustment 



This patch rewrites the TX power recalculation algorithms to scale better
with changed enviromnent. If there's low
TX traffic, the power will be checked against the desired values
every 60 seconds.
If there is high TX traffic, the check is redone every 2 seconds. This improves
the reaction times a lot and confuses the rate control less.
It will also reduce the time it initially takes to tune to a new TX power
value. With the old algorithm it could take about 30 to 45 seconds to settle to
a new power value. This will happen in about two to four seconds now.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ef1a628d

drivers/net/wireless/b43/b43.h

+10 −0
Original line number Diff line number Diff line
@@ -173,6 +173,11 @@ enum { 
#define B43_SHM_SH_CHAN			0x00A0	/* Current channel (low 8bit only) */

#define  B43_SHM_SH_CHAN_5GHZ		0x0100	/* Bit set, if 5Ghz channel */

#define B43_SHM_SH_BCMCFIFOID		0x0108	/* Last posted cookie to the bcast/mcast FIFO */

/* TSSI information */

#define B43_SHM_SH_TSSI_CCK		0x0058	/* TSSI for last 4 CCK frames (32bit) */

#define B43_SHM_SH_TSSI_OFDM_A		0x0068	/* TSSI for last 4 OFDM frames (32bit) */

#define B43_SHM_SH_TSSI_OFDM_G		0x0070	/* TSSI for last 4 OFDM frames (32bit) */

#define  B43_TSSI_MAX			0x7F	/* Max value for one TSSI value */

/* SHM_SHARED TX FIFO variables */

#define B43_SHM_SH_SIZE01		0x0098	/* TX FIFO size for FIFO 0 (low) and 1 (high) */

#define B43_SHM_SH_SIZE23		0x009A	/* TX FIFO size for FIFO 2 and 3 */
@@ -648,6 +653,11 @@ struct b43_wl { 
	struct b43_qos_params qos_params[4];

	/* Workqueue for updating QOS parameters in hardware. */

	struct work_struct qos_update_work;



	/* Work for adjustment of the transmission power.

	 * This is scheduled when we determine that the actual TX output

	 * power doesn't match what we want. */

	struct work_struct txpower_adjust_work;

};



/* In-memory representation of a cached microcode file. */

drivers/net/wireless/b43/main.c

+13 −5
Original line number Diff line number Diff line
@@ -2805,6 +2805,9 @@ static void b43_periodic_every60sec(struct b43_wldev *dev) 


	if (ops->pwork_60sec)

		ops->pwork_60sec(dev);



	/* Force check the TX power emission now. */

	b43_phy_txpower_check(dev, B43_TXPWR_IGNORE_TIME);

}



static void b43_periodic_every30sec(struct b43_wldev *dev)
@@ -2835,8 +2838,6 @@ static void b43_periodic_every15sec(struct b43_wldev *dev) 
	if (phy->ops->pwork_15sec)

		phy->ops->pwork_15sec(dev);



	phy->ops->xmitpower(dev);



	atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);

	wmb();

}
@@ -3382,10 +3383,13 @@ static int b43_op_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf) 


	/* Adjust the desired TX power level. */

	if (conf->power_level != 0) {

		if (conf->power_level != phy->power_level) {

			phy->power_level = conf->power_level;

			phy->ops->xmitpower(dev);

		spin_lock_irqsave(&wl->irq_lock, flags);

		if (conf->power_level != phy->desired_txpower) {

			phy->desired_txpower = conf->power_level;

			b43_phy_txpower_check(dev, B43_TXPWR_IGNORE_TIME |

						   B43_TXPWR_IGNORE_TSSI);

		}

		spin_unlock_irqrestore(&wl->irq_lock, flags);

	}



	/* Antennas for RX and management frame TX. */
@@ -3785,6 +3789,7 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev, 
				      struct b43_phy *phy)

{

	phy->hardware_power_control = !!modparam_hwpctl;

	phy->next_txpwr_check_time = jiffies;

	/* PHY TX errors counter. */

	atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);

}
@@ -4204,6 +4209,8 @@ static void b43_op_stop(struct ieee80211_hw *hw) 
		b43_wireless_core_stop(dev);

	b43_wireless_core_exit(dev);

	mutex_unlock(&wl->mutex);



	cancel_work_sync(&(wl->txpower_adjust_work));

}



static int b43_op_set_retry_limit(struct ieee80211_hw *hw,
@@ -4581,6 +4588,7 @@ static int b43_wireless_init(struct ssb_device *dev) 
	INIT_LIST_HEAD(&wl->devlist);

	INIT_WORK(&wl->qos_update_work, b43_qos_update_work);

	INIT_WORK(&wl->beacon_update_trigger, b43_beacon_update_trigger_work);

	INIT_WORK(&wl->txpower_adjust_work, b43_phy_txpower_adjust_work);



	ssb_set_devtypedata(dev, wl);

	b43info(wl, "Broadcom %04X WLAN found\n", dev->bus->chip_id);

drivers/net/wireless/b43/nphy.c

+9 −6
Original line number Diff line number Diff line
@@ -34,10 +34,16 @@ void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna) 
{//TODO

}



void b43_nphy_xmitpower(struct b43_wldev *dev)

static void b43_nphy_op_adjust_txpower(struct b43_wldev *dev)

{//TODO

}



static enum b43_txpwr_result b43_nphy_op_recalc_txpower(struct b43_wldev *dev,

							bool ignore_tssi)

{//TODO

	return B43_TXPWR_RES_DONE;

}



static void b43_chantab_radio_upload(struct b43_wldev *dev,

				     const struct b43_nphy_channeltab_entry *e)

{
@@ -602,10 +608,6 @@ static unsigned int b43_nphy_op_get_default_chan(struct b43_wldev *dev) 
	return 36;

}



static void b43_nphy_op_xmitpower(struct b43_wldev *dev)

{//TODO

}



const struct b43_phy_operations b43_phyops_n = {

	.allocate		= b43_nphy_op_allocate,

	.init			= b43_nphy_op_init,
@@ -617,5 +619,6 @@ const struct b43_phy_operations b43_phyops_n = { 
	.software_rfkill	= b43_nphy_op_software_rfkill,

	.switch_channel		= b43_nphy_op_switch_channel,

	.get_default_chan	= b43_nphy_op_get_default_chan,

	.xmitpower		= b43_nphy_op_xmitpower,

	.recalc_txpower		= b43_nphy_op_recalc_txpower,

	.adjust_txpower		= b43_nphy_op_adjust_txpower,

};

drivers/net/wireless/b43/phy_a.c

+9 −2
Original line number Diff line number Diff line
@@ -505,10 +505,16 @@ static void b43_aphy_op_set_rx_antenna(struct b43_wldev *dev, int antenna) 
	b43_hf_write(dev, hf);

}



static void b43_aphy_op_xmitpower(struct b43_wldev *dev)

static void b43_aphy_op_adjust_txpower(struct b43_wldev *dev)

{//TODO

}



static enum b43_txpwr_result b43_aphy_op_recalc_txpower(struct b43_wldev *dev,

							bool ignore_tssi)

{//TODO

	return B43_TXPWR_RES_DONE;

}



static void b43_aphy_op_pwork_15sec(struct b43_wldev *dev)

{//TODO

}
@@ -530,7 +536,8 @@ const struct b43_phy_operations b43_phyops_a = { 
	.switch_channel		= b43_aphy_op_switch_channel,

	.get_default_chan	= b43_aphy_op_get_default_chan,

	.set_rx_antenna		= b43_aphy_op_set_rx_antenna,

	.xmitpower		= b43_aphy_op_xmitpower,

	.recalc_txpower		= b43_aphy_op_recalc_txpower,

	.adjust_txpower		= b43_aphy_op_adjust_txpower,

	.pwork_15sec		= b43_aphy_op_pwork_15sec,

	.pwork_60sec		= b43_aphy_op_pwork_60sec,

};

drivers/net/wireless/b43/phy_common.c

+91 −0
Original line number Diff line number Diff line
@@ -274,3 +274,94 @@ void b43_software_rfkill(struct b43_wldev *dev, enum rfkill_state state) 
	phy->ops->software_rfkill(dev, state);

	phy->radio_on = (state == RFKILL_STATE_UNBLOCKED);

}



/**

 * b43_phy_txpower_adjust_work - TX power workqueue.

 *

 * Workqueue for updating the TX power parameters in hardware.

 */

void b43_phy_txpower_adjust_work(struct work_struct *work)

{

	struct b43_wl *wl = container_of(work, struct b43_wl,

					 txpower_adjust_work);

	struct b43_wldev *dev;



	mutex_lock(&wl->mutex);

	dev = wl->current_dev;



	if (likely(dev && (b43_status(dev) >= B43_STAT_STARTED)))

		dev->phy.ops->adjust_txpower(dev);



	mutex_unlock(&wl->mutex);

}



/* Called with wl->irq_lock locked */

void b43_phy_txpower_check(struct b43_wldev *dev, unsigned int flags)

{

	struct b43_phy *phy = &dev->phy;

	unsigned long now = jiffies;

	enum b43_txpwr_result result;



	if (!(flags & B43_TXPWR_IGNORE_TIME)) {

		/* Check if it's time for a TXpower check. */

		if (time_before(now, phy->next_txpwr_check_time))

			return; /* Not yet */

	}

	/* The next check will be needed in two seconds, or later. */

	phy->next_txpwr_check_time = round_jiffies(now + (HZ * 2));



	if ((dev->dev->bus->boardinfo.vendor == SSB_BOARDVENDOR_BCM) &&

	    (dev->dev->bus->boardinfo.type == SSB_BOARD_BU4306))

		return; /* No software txpower adjustment needed */



	result = phy->ops->recalc_txpower(dev, !!(flags & B43_TXPWR_IGNORE_TSSI));

	if (result == B43_TXPWR_RES_DONE)

		return; /* We are done. */

	B43_WARN_ON(result != B43_TXPWR_RES_NEED_ADJUST);

	B43_WARN_ON(phy->ops->adjust_txpower == NULL);



	/* We must adjust the transmission power in hardware.

	 * Schedule b43_phy_txpower_adjust_work(). */

	queue_work(dev->wl->hw->workqueue, &dev->wl->txpower_adjust_work);

}



int b43_phy_shm_tssi_read(struct b43_wldev *dev, u16 shm_offset)

{

	const bool is_ofdm = (shm_offset != B43_SHM_SH_TSSI_CCK);

	unsigned int a, b, c, d;

	unsigned int average;

	u32 tmp;



	tmp = b43_shm_read32(dev, B43_SHM_SHARED, shm_offset);

	a = tmp & 0xFF;

	b = (tmp >> 8) & 0xFF;

	c = (tmp >> 16) & 0xFF;

	d = (tmp >> 24) & 0xFF;

	if (a == 0 || a == B43_TSSI_MAX ||

	    b == 0 || b == B43_TSSI_MAX ||

	    c == 0 || c == B43_TSSI_MAX ||

	    d == 0 || d == B43_TSSI_MAX)

		return -ENOENT;

	/* The values are OK. Clear them. */

	tmp = B43_TSSI_MAX | (B43_TSSI_MAX << 8) |

	      (B43_TSSI_MAX << 16) | (B43_TSSI_MAX << 24);

	b43_shm_write32(dev, B43_SHM_SHARED, shm_offset, tmp);



	if (is_ofdm) {

		a = (a + 32) & 0x3F;

		b = (b + 32) & 0x3F;

		c = (c + 32) & 0x3F;

		d = (d + 32) & 0x3F;

	}



	/* Get the average of the values with 0.5 added to each value. */

	average = (a + b + c + d + 2) / 4;

	if (is_ofdm) {

		/* Adjust for CCK-boost */

		if (b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_HOSTFLO)

		    & B43_HF_CCKBOOST)

			average = (average >= 13) ? (average - 13) : 0;

	}



	return average;

}