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

b43: Rewrite LO calibration algorithm 



This patch distributes the Local Oscillator calibration bursts over time,
so that calibration only happens when it's actually needed.
Currently we periodically perform a recalibration of the whole table.
The table is huge and this takes lots of time. Additionally only small bits
of the table are actually needed at a given time. So instead of maintaining
a huge table with all possible calibration values, we create dynamic calibration
settings that
a) We only calibrate when they are actually needed.
b) Are cached for some time until they expire.
So a recalibration might happen if we need a calibration setting that's not
cached, or if the active calibration setting expires.
Currently the expire timeout is set to 30 seconds. We may raise that in future.

This patch reduces overall memory consumption by nuking the
huge static calibration tables.

This patch has been tested on several 4306, 4311 and 4318 flavours.

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

drivers/net/wireless/b43/debugfs.c

+46 −31
Original line number Diff line number Diff line
@@ -270,24 +270,22 @@ static int restart_write_file(struct b43_wldev *dev, 
	return err;

}



static ssize_t append_lo_table(ssize_t count, char *buf, const size_t bufsize,

			       struct b43_loctl table[B43_NR_BB][B43_NR_RF])

static unsigned long calc_expire_secs(unsigned long now,

				      unsigned long time,

				      unsigned long expire)

{

	unsigned int i, j;

	struct b43_loctl *ctl;

	expire = time + expire;



	for (i = 0; i < B43_NR_BB; i++) {

		for (j = 0; j < B43_NR_RF; j++) {

			ctl = &(table[i][j]);

			fappend("(bbatt %2u, rfatt %2u)  ->  "

				"(I %+3d, Q %+3d, Used: %d, Calibrated: %d)\n",

				i, j, ctl->i, ctl->q,

				ctl->used,

				b43_loctl_is_calibrated(ctl));

		}

	if (time_after(now, expire))

		return 0; /* expired */

	if (expire < now) {

		/* jiffies wrapped */

		expire -= MAX_JIFFY_OFFSET;

		now -= MAX_JIFFY_OFFSET;

	}

	B43_WARN_ON(expire < now);



	return count;

	return (expire - now) / HZ;

}



static ssize_t loctls_read_file(struct b43_wldev *dev,
@@ -296,27 +294,45 @@ static ssize_t loctls_read_file(struct b43_wldev *dev, 
	ssize_t count = 0;

	struct b43_txpower_lo_control *lo;

	int i, err = 0;

	struct b43_lo_calib *cal;

	unsigned long now = jiffies;

	struct b43_phy *phy = &dev->phy;



	if (dev->phy.type != B43_PHYTYPE_G) {

	if (phy->type != B43_PHYTYPE_G) {

		fappend("Device is not a G-PHY\n");

		err = -ENODEV;

		goto out;

	}

	lo = dev->phy.lo_control;

	lo = phy->lo_control;

	fappend("-- Local Oscillator calibration data --\n\n");

	fappend("Measured: %d,  Rebuild: %d,  HW-power-control: %d\n",

		lo->lo_measured,

		lo->rebuild,

	fappend("HW-power-control enabled: %d\n",

		dev->phy.hardware_power_control);

	fappend("TX Bias: 0x%02X,  TX Magn: 0x%02X\n",

		lo->tx_bias, lo->tx_magn);

	fappend("Power Vector: 0x%08X%08X\n",

	fappend("TX Bias: 0x%02X,  TX Magn: 0x%02X  (expire in %lu sec)\n",

		lo->tx_bias, lo->tx_magn,

		calc_expire_secs(now, lo->txctl_measured_time,

				 B43_LO_TXCTL_EXPIRE));

	fappend("Power Vector: 0x%08X%08X  (expires in %lu sec)\n",

		(unsigned int)((lo->power_vector & 0xFFFFFFFF00000000ULL) >> 32),

		(unsigned int)(lo->power_vector & 0x00000000FFFFFFFFULL));

	fappend("\nControl table WITH PADMIX:\n");

	count = append_lo_table(count, buf, bufsize, lo->with_padmix);

	fappend("\nControl table WITHOUT PADMIX:\n");

	count = append_lo_table(count, buf, bufsize, lo->no_padmix);

		(unsigned int)(lo->power_vector & 0x00000000FFFFFFFFULL),

		calc_expire_secs(now, lo->pwr_vec_read_time,

				 B43_LO_PWRVEC_EXPIRE));



	fappend("\nCalibrated settings:\n");

	list_for_each_entry(cal, &lo->calib_list, list) {

		bool active;



		active = (b43_compare_bbatt(&cal->bbatt, &phy->bbatt) &&

			  b43_compare_rfatt(&cal->rfatt, &phy->rfatt));

		fappend("BB(%d), RF(%d,%d)  ->  I=%d, Q=%d  "

			"(expires in %lu sec)%s\n",

			cal->bbatt.att,

			cal->rfatt.att, cal->rfatt.with_padmix,

			cal->ctl.i, cal->ctl.q,

			calc_expire_secs(now, cal->calib_time,

					 B43_LO_CALIB_EXPIRE),

			active ? "  ACTIVE" : "");

	}



	fappend("\nUsed RF attenuation values:  Value(WithPadmix flag)\n");

	for (i = 0; i < lo->rfatt_list.len; i++) {

		fappend("%u(%d), ",
@@ -351,7 +367,7 @@ static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf, 
	struct b43_dfs_file *dfile;

	ssize_t uninitialized_var(ret);

	char *buf;

	const size_t bufsize = 1024 * 128;

	const size_t bufsize = 1024 * 16; /* 16 kiB buffer */

	const size_t buforder = get_order(bufsize);

	int err = 0;
@@ -380,8 +396,6 @@ static ssize_t b43_debugfs_read(struct file *file, char __user *userbuf, 
			err = -ENOMEM;

			goto out_unlock;

		}

		/* Sparse warns about the following memset, because it has a big

		 * size value. That warning is bogus, so I will ignore it. --mb */

		memset(buf, 0, bufsize);

		if (dfops->take_irqlock) {

			spin_lock_irq(&dev->wl->irq_lock);
@@ -523,6 +537,7 @@ static void b43_add_dynamic_debug(struct b43_wldev *dev) 
	add_dyn_dbg("debug_dmaverbose", B43_DBG_DMAVERBOSE, 0);

	add_dyn_dbg("debug_pwork_fast", B43_DBG_PWORK_FAST, 0);

	add_dyn_dbg("debug_pwork_stop", B43_DBG_PWORK_STOP, 0);

	add_dyn_dbg("debug_lo", B43_DBG_LO, 0);



#undef add_dyn_dbg

}

drivers/net/wireless/b43/debugfs.h

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ enum b43_dyndbg { /* Dynamic debugging features */ 
	B43_DBG_DMAVERBOSE,

	B43_DBG_PWORK_FAST,

	B43_DBG_PWORK_STOP,

	B43_DBG_LO,

	__B43_NR_DYNDBG,

};

drivers/net/wireless/b43/lo.c

+249 −472

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/b43/lo.h

+44 −71
Original line number Diff line number Diff line
@@ -10,82 +10,63 @@ struct b43_loctl { 
	/* Control values. */

	s8 i;

	s8 q;

	/* "Used by hardware" flag. */

	bool used;

#ifdef CONFIG_B43_DEBUG

	/* Is this lo-control-array entry calibrated? */

	bool calibrated;

#endif

};



/* Debugging: Poison value for i and q values. */

#define B43_LOCTL_POISON	111



/* loctl->calibrated debugging mechanism */

#ifdef CONFIG_B43_DEBUG

static inline void b43_loctl_set_calibrated(struct b43_loctl *loctl,

					    bool calibrated)

{

	loctl->calibrated = calibrated;

}

static inline bool b43_loctl_is_calibrated(struct b43_loctl *loctl)

{

	return loctl->calibrated;

}

#else

static inline void b43_loctl_set_calibrated(struct b43_loctl *loctl,

					    bool calibrated)

{

}

static inline bool b43_loctl_is_calibrated(struct b43_loctl *loctl)

{

	return 1;

}

#endif



/* TX Power LO Control Array.

 * Value-pairs to adjust the LocalOscillator are stored

 * in this structure.

 * There are two different set of values. One for "Flag is Set"

 * and one for "Flag is Unset".

 * By "Flag" the flag in struct b43_rfatt is meant.

 * The Value arrays are two-dimensional. The first index

 * is the baseband attenuation and the second index

 * is the radio attenuation.

 * Use b43_get_lo_g_ctl() to retrieve a value from the lists.

 */

/* This struct holds calibrated LO settings for a set of

 * Baseband and RF attenuation settings. */

struct b43_lo_calib {

	/* The set of attenuation values this set of LO

	 * control values is calibrated for. */

	struct b43_bbatt bbatt;

	struct b43_rfatt rfatt;

	/* The set of control values for the LO. */

	struct b43_loctl ctl;

	/* The time when these settings were calibrated (in jiffies) */

	unsigned long calib_time;

	/* List. */

	struct list_head list;

};



/* Size of the DC Lookup Table in 16bit words. */

#define B43_DC_LT_SIZE		32



/* Local Oscillator calibration information */

struct b43_txpower_lo_control {

#define B43_NR_BB	12

#define B43_NR_RF	16

	/* LO Control values, with PAD Mixer */

	struct b43_loctl with_padmix[B43_NR_BB][B43_NR_RF];

	/* LO Control values, without PAD Mixer */

	struct b43_loctl no_padmix[B43_NR_BB][B43_NR_RF];



	/* Flag to indicate a complete rebuild of the two tables above

	 * to the LO measuring code. */

	bool rebuild;



	/* Lists of valid RF and BB attenuation values for this device. */

	/* Lists of RF and BB attenuation values for this device.

	 * Used for building hardware power control tables. */

	struct b43_rfatt_list rfatt_list;

	struct b43_bbatt_list bbatt_list;



	/* The DC Lookup Table is cached in memory here.

	 * Note that this is only used for Hardware Power Control. */

	u16 dc_lt[B43_DC_LT_SIZE];



	/* List of calibrated control values (struct b43_lo_calib). */

	struct list_head calib_list;

	/* Last time the power vector was read (jiffies). */

	unsigned long pwr_vec_read_time;

	/* Last time the txctl values were measured (jiffies). */

	unsigned long txctl_measured_time;



	/* Current TX Bias value */

	u8 tx_bias;

	/* Current TX Magnification Value (if used by the device) */

	u8 tx_magn;



	/* GPHY LO is measured. */

	bool lo_measured;



	/* Saved device PowerVector */

	u64 power_vector;

};



/* Measure the BPHY Local Oscillator. */

void b43_lo_b_measure(struct b43_wldev *dev);

/* Measure the BPHY/GPHY Local Oscillator. */

void b43_lo_g_measure(struct b43_wldev *dev);

/* Calibration expire timeouts.

 * Timeouts must be multiple of 15 seconds. To make sure

 * the item really expired when the 15 second timer hits, we

 * subtract two additional seconds from the timeout. */

#define B43_LO_CALIB_EXPIRE	(HZ * (30 - 2))

#define B43_LO_PWRVEC_EXPIRE	(HZ * (30 - 2))

#define B43_LO_TXCTL_EXPIRE	(HZ * (180 - 4))





/* Adjust the Local Oscillator to the saved attenuation

 * and txctl values.
@@ -95,18 +76,10 @@ void b43_lo_g_adjust(struct b43_wldev *dev); 
void b43_lo_g_adjust_to(struct b43_wldev *dev,

			u16 rfatt, u16 bbatt, u16 tx_control);



/* Mark all possible b43_lo_g_ctl as "unused" */

void b43_lo_g_ctl_mark_all_unused(struct b43_wldev *dev);

/* Mark the b43_lo_g_ctl corresponding to the current

 * attenuation values as used.

 */

void b43_lo_g_ctl_mark_cur_used(struct b43_wldev *dev);

void b43_gphy_dc_lt_init(struct b43_wldev *dev, bool update_all);



/* Get a reference to a LO Control value pair in the

 * TX Power LO Control Array.

 */

struct b43_loctl *b43_get_lo_g_ctl(struct b43_wldev *dev,

				   const struct b43_rfatt *rfatt,

				   const struct b43_bbatt *bbatt);

void b43_lo_g_maintanance_work(struct b43_wldev *dev);

void b43_lo_g_cleanup(struct b43_wldev *dev);

void b43_lo_g_init(struct b43_wldev *dev);



#endif /* B43_LO_H_ */

drivers/net/wireless/b43/main.c

+5 −21
Original line number Diff line number Diff line
@@ -2308,7 +2308,7 @@ static void b43_gpio_cleanup(struct b43_wldev *dev) 
}



/* http://bcm-specs.sipsolutions.net/EnableMac */

static void b43_mac_enable(struct b43_wldev *dev)

void b43_mac_enable(struct b43_wldev *dev)

{

	dev->mac_suspended--;

	B43_WARN_ON(dev->mac_suspended < 0);
@@ -2331,7 +2331,7 @@ static void b43_mac_enable(struct b43_wldev *dev) 
}



/* http://bcm-specs.sipsolutions.net/SuspendMAC */

static void b43_mac_suspend(struct b43_wldev *dev)

void b43_mac_suspend(struct b43_wldev *dev)

{

	int i;

	u32 tmp;
@@ -2503,6 +2503,7 @@ static void b43_chip_exit(struct b43_wldev *dev) 
{

	b43_radio_turn_off(dev, 1);

	b43_gpio_cleanup(dev);

	b43_lo_g_cleanup(dev);

	/* firmware is released later */

}
@@ -2609,28 +2610,12 @@ err_gpio_clean: 
	return err;

}



static void b43_periodic_every120sec(struct b43_wldev *dev)

{

	struct b43_phy *phy = &dev->phy;



	if (phy->type != B43_PHYTYPE_G || phy->rev < 2)

		return;



	b43_mac_suspend(dev);

	b43_lo_g_measure(dev);

	b43_mac_enable(dev);

	if (b43_has_hardware_pctl(phy))

		b43_lo_g_ctl_mark_all_unused(dev);

}



static void b43_periodic_every60sec(struct b43_wldev *dev)

{

	struct b43_phy *phy = &dev->phy;



	if (phy->type != B43_PHYTYPE_G)

		return;

	if (!b43_has_hardware_pctl(phy))

		b43_lo_g_ctl_mark_all_unused(dev);

	if (dev->dev->bus->sprom.boardflags_lo & B43_BFL_RSSI) {

		b43_mac_suspend(dev);

		b43_calc_nrssi_slope(dev);
@@ -2682,6 +2667,7 @@ static void b43_periodic_every15sec(struct b43_wldev *dev) 
		}

	}

	b43_phy_xmitpower(dev);	//FIXME: unless scanning?

	b43_lo_g_maintanance_work(dev);

	//TODO for APHY (temperature?)



	atomic_set(&phy->txerr_cnt, B43_PHY_TX_BADNESS_LIMIT);
@@ -2693,8 +2679,6 @@ static void do_periodic_work(struct b43_wldev *dev) 
	unsigned int state;



	state = dev->periodic_state;

	if (state % 8 == 0)

		b43_periodic_every120sec(dev);

	if (state % 4 == 0)

		b43_periodic_every60sec(dev);

	if (state % 2 == 0)
@@ -3668,8 +3652,8 @@ static void setup_struct_phy_for_init(struct b43_wldev *dev, 
	lo = phy->lo_control;

	if (lo) {

		memset(lo, 0, sizeof(*(phy->lo_control)));

		lo->rebuild = 1;

		lo->tx_bias = 0xFF;

		INIT_LIST_HEAD(&lo->calib_list);

	}

	phy->max_lb_gain = 0;

	phy->trsw_rx_gain = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE