Commit eff6eced authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by John W. Linville
Browse files

rt2800usb: add rt2800_bbp_[read,write]() wrappers 



Part of preparations for later code unification.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b4a77d0d

drivers/net/wireless/rt2x00/rt2800usb.c

+75 −63
Original line number Diff line number Diff line
@@ -122,6 +122,18 @@ static void rt2800usb_bbp_read(struct rt2x00_dev *rt2x00dev, 
	mutex_unlock(&rt2x00dev->csr_mutex);

}



static inline void rt2800_bbp_write(struct rt2x00_dev *rt2x00dev,

				    const unsigned int word, const u8 value)

{

	rt2800usb_bbp_write(rt2x00dev, word, value);

}



static inline void rt2800_bbp_read(struct rt2x00_dev *rt2x00dev,

				   const unsigned int word, u8 *value)

{

	rt2800usb_bbp_read(rt2x00dev, word, value);

}



static void rt2800usb_rfcsr_write(struct rt2x00_dev *rt2x00dev,

				  const unsigned int word, const u8 value)

{
@@ -248,8 +260,8 @@ static const struct rt2x00debug rt2800usb_rt2x00debug = { 
		.word_count	= EEPROM_SIZE / sizeof(u16),

	},

	.bbp	= {

		.read		= rt2800usb_bbp_read,

		.write		= rt2800usb_bbp_write,

		.read		= rt2800_bbp_read,

		.write		= rt2800_bbp_write,

		.word_base	= BBP_BASE,

		.word_size	= sizeof(u8),

		.word_count	= BBP_SIZE / sizeof(u8),
@@ -614,8 +626,8 @@ static void rt2800usb_config_ant(struct rt2x00_dev *rt2x00dev, 
	u8 r1;

	u8 r3;



	rt2800usb_bbp_read(rt2x00dev, 1, &r1);

	rt2800usb_bbp_read(rt2x00dev, 3, &r3);

	rt2800_bbp_read(rt2x00dev, 1, &r1);

	rt2800_bbp_read(rt2x00dev, 3, &r3);



	/*

	 * Configure the TX antenna.
@@ -647,8 +659,8 @@ static void rt2800usb_config_ant(struct rt2x00_dev *rt2x00dev, 
		break;

	}



	rt2800usb_bbp_write(rt2x00dev, 3, r3);

	rt2800usb_bbp_write(rt2x00dev, 1, r1);

	rt2800_bbp_write(rt2x00dev, 3, r3);

	rt2800_bbp_write(rt2x00dev, 1, r1);

}



static void rt2800usb_config_lna_gain(struct rt2x00_dev *rt2x00dev,
@@ -791,26 +803,26 @@ static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev, 
	/*

	 * Change BBP settings

	 */

	rt2800usb_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);

	rt2800usb_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);

	rt2800usb_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);

	rt2800usb_bbp_write(rt2x00dev, 86, 0);

	rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);

	rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);

	rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);

	rt2800_bbp_write(rt2x00dev, 86, 0);



	if (rf->channel <= 14) {

		if (test_bit(CONFIG_EXTERNAL_LNA_BG, &rt2x00dev->flags)) {

			rt2800usb_bbp_write(rt2x00dev, 82, 0x62);

			rt2800usb_bbp_write(rt2x00dev, 75, 0x46);

			rt2800_bbp_write(rt2x00dev, 82, 0x62);

			rt2800_bbp_write(rt2x00dev, 75, 0x46);

		} else {

			rt2800usb_bbp_write(rt2x00dev, 82, 0x84);

			rt2800usb_bbp_write(rt2x00dev, 75, 0x50);

			rt2800_bbp_write(rt2x00dev, 82, 0x84);

			rt2800_bbp_write(rt2x00dev, 75, 0x50);

		}

	} else {

		rt2800usb_bbp_write(rt2x00dev, 82, 0xf2);

		rt2800_bbp_write(rt2x00dev, 82, 0xf2);



		if (test_bit(CONFIG_EXTERNAL_LNA_A, &rt2x00dev->flags))

			rt2800usb_bbp_write(rt2x00dev, 75, 0x46);

			rt2800_bbp_write(rt2x00dev, 75, 0x46);

		else

			rt2800usb_bbp_write(rt2x00dev, 75, 0x50);

			rt2800_bbp_write(rt2x00dev, 75, 0x50);

	}



	rt2800_register_read(rt2x00dev, TX_BAND_CFG, &reg);
@@ -842,23 +854,23 @@ static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev, 


	rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);



	rt2800usb_bbp_read(rt2x00dev, 4, &bbp);

	rt2800_bbp_read(rt2x00dev, 4, &bbp);

	rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * conf_is_ht40(conf));

	rt2800usb_bbp_write(rt2x00dev, 4, bbp);

	rt2800_bbp_write(rt2x00dev, 4, bbp);



	rt2800usb_bbp_read(rt2x00dev, 3, &bbp);

	rt2800_bbp_read(rt2x00dev, 3, &bbp);

	rt2x00_set_field8(&bbp, BBP3_HT40_PLUS, conf_is_ht40_plus(conf));

	rt2800usb_bbp_write(rt2x00dev, 3, bbp);

	rt2800_bbp_write(rt2x00dev, 3, bbp);



	if (rt2x00_rev(&rt2x00dev->chip) == RT2860C_VERSION) {

		if (conf_is_ht40(conf)) {

			rt2800usb_bbp_write(rt2x00dev, 69, 0x1a);

			rt2800usb_bbp_write(rt2x00dev, 70, 0x0a);

			rt2800usb_bbp_write(rt2x00dev, 73, 0x16);

			rt2800_bbp_write(rt2x00dev, 69, 0x1a);

			rt2800_bbp_write(rt2x00dev, 70, 0x0a);

			rt2800_bbp_write(rt2x00dev, 73, 0x16);

		} else {

			rt2800usb_bbp_write(rt2x00dev, 69, 0x16);

			rt2800usb_bbp_write(rt2x00dev, 70, 0x08);

			rt2800usb_bbp_write(rt2x00dev, 73, 0x11);

			rt2800_bbp_write(rt2x00dev, 69, 0x16);

			rt2800_bbp_write(rt2x00dev, 70, 0x08);

			rt2800_bbp_write(rt2x00dev, 73, 0x11);

		}

	}
@@ -872,9 +884,9 @@ static void rt2800usb_config_txpower(struct rt2x00_dev *rt2x00dev, 
	u32 value = TXPOWER_G_TO_DEV(txpower);

	u8 r1;



	rt2800usb_bbp_read(rt2x00dev, 1, &r1);

	rt2800_bbp_read(rt2x00dev, 1, &r1);

	rt2x00_set_field8(&reg, BBP1_TX_POWER, 0);

	rt2800usb_bbp_write(rt2x00dev, 1, r1);

	rt2800_bbp_write(rt2x00dev, 1, r1);



	rt2800_register_read(rt2x00dev, TX_PWR_CFG_0, &reg);

	rt2x00_set_field32(&reg, TX_PWR_CFG_0_1MBS, value);
@@ -1027,7 +1039,7 @@ static inline void rt2800usb_set_vgc(struct rt2x00_dev *rt2x00dev, 
				     struct link_qual *qual, u8 vgc_level)

{

	if (qual->vgc_level != vgc_level) {

		rt2800usb_bbp_write(rt2x00dev, 66, vgc_level);

		rt2800_bbp_write(rt2x00dev, 66, vgc_level);

		qual->vgc_level = vgc_level;

		qual->vgc_level_reg = vgc_level;

	}
@@ -1570,7 +1582,7 @@ static int rt2800usb_wait_bbp_ready(struct rt2x00_dev *rt2x00dev) 
	msleep(1);



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

		rt2800usb_bbp_read(rt2x00dev, 0, &value);

		rt2800_bbp_read(rt2x00dev, 0, &value);

		if ((value != 0xff) && (value != 0x00))

			return 0;

		udelay(REGISTER_BUSY_DELAY);
@@ -1591,34 +1603,34 @@ static int rt2800usb_init_bbp(struct rt2x00_dev *rt2x00dev) 
		     rt2800usb_wait_bbp_ready(rt2x00dev)))

		return -EACCES;



	rt2800usb_bbp_write(rt2x00dev, 65, 0x2c);

	rt2800usb_bbp_write(rt2x00dev, 66, 0x38);

	rt2800usb_bbp_write(rt2x00dev, 69, 0x12);

	rt2800usb_bbp_write(rt2x00dev, 70, 0x0a);

	rt2800usb_bbp_write(rt2x00dev, 73, 0x10);

	rt2800usb_bbp_write(rt2x00dev, 81, 0x37);

	rt2800usb_bbp_write(rt2x00dev, 82, 0x62);

	rt2800usb_bbp_write(rt2x00dev, 83, 0x6a);

	rt2800usb_bbp_write(rt2x00dev, 84, 0x99);

	rt2800usb_bbp_write(rt2x00dev, 86, 0x00);

	rt2800usb_bbp_write(rt2x00dev, 91, 0x04);

	rt2800usb_bbp_write(rt2x00dev, 92, 0x00);

	rt2800usb_bbp_write(rt2x00dev, 103, 0x00);

	rt2800usb_bbp_write(rt2x00dev, 105, 0x05);

	rt2800_bbp_write(rt2x00dev, 65, 0x2c);

	rt2800_bbp_write(rt2x00dev, 66, 0x38);

	rt2800_bbp_write(rt2x00dev, 69, 0x12);

	rt2800_bbp_write(rt2x00dev, 70, 0x0a);

	rt2800_bbp_write(rt2x00dev, 73, 0x10);

	rt2800_bbp_write(rt2x00dev, 81, 0x37);

	rt2800_bbp_write(rt2x00dev, 82, 0x62);

	rt2800_bbp_write(rt2x00dev, 83, 0x6a);

	rt2800_bbp_write(rt2x00dev, 84, 0x99);

	rt2800_bbp_write(rt2x00dev, 86, 0x00);

	rt2800_bbp_write(rt2x00dev, 91, 0x04);

	rt2800_bbp_write(rt2x00dev, 92, 0x00);

	rt2800_bbp_write(rt2x00dev, 103, 0x00);

	rt2800_bbp_write(rt2x00dev, 105, 0x05);



	if (rt2x00_rev(&rt2x00dev->chip) == RT2860C_VERSION) {

		rt2800usb_bbp_write(rt2x00dev, 69, 0x16);

		rt2800usb_bbp_write(rt2x00dev, 73, 0x12);

		rt2800_bbp_write(rt2x00dev, 69, 0x16);

		rt2800_bbp_write(rt2x00dev, 73, 0x12);

	}



	if (rt2x00_rev(&rt2x00dev->chip) > RT2860D_VERSION) {

		rt2800usb_bbp_write(rt2x00dev, 84, 0x19);

		rt2800_bbp_write(rt2x00dev, 84, 0x19);

	}



	if (rt2x00_rev(&rt2x00dev->chip) == RT3070_VERSION) {

		rt2800usb_bbp_write(rt2x00dev, 70, 0x0a);

		rt2800usb_bbp_write(rt2x00dev, 84, 0x99);

		rt2800usb_bbp_write(rt2x00dev, 105, 0x05);

		rt2800_bbp_write(rt2x00dev, 70, 0x0a);

		rt2800_bbp_write(rt2x00dev, 84, 0x99);

		rt2800_bbp_write(rt2x00dev, 105, 0x05);

	}



	for (i = 0; i < EEPROM_BBP_SIZE; i++) {
@@ -1627,7 +1639,7 @@ static int rt2800usb_init_bbp(struct rt2x00_dev *rt2x00dev) 
		if (eeprom != 0xffff && eeprom != 0x0000) {

			reg_id = rt2x00_get_field16(eeprom, EEPROM_BBP_REG_ID);

			value = rt2x00_get_field16(eeprom, EEPROM_BBP_VALUE);

			rt2800usb_bbp_write(rt2x00dev, reg_id, value);

			rt2800_bbp_write(rt2x00dev, reg_id, value);

		}

	}
@@ -1646,9 +1658,9 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev, 


	rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);



	rt2800usb_bbp_read(rt2x00dev, 4, &bbp);

	rt2800_bbp_read(rt2x00dev, 4, &bbp);

	rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * bw40);

	rt2800usb_bbp_write(rt2x00dev, 4, bbp);

	rt2800_bbp_write(rt2x00dev, 4, bbp);



	rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 1);
@@ -1657,13 +1669,13 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev, 
	/*

	 * Set power & frequency of passband test tone

	 */

	rt2800usb_bbp_write(rt2x00dev, 24, 0);

	rt2800_bbp_write(rt2x00dev, 24, 0);



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

		rt2800usb_bbp_write(rt2x00dev, 25, 0x90);

		rt2800_bbp_write(rt2x00dev, 25, 0x90);

		msleep(1);



		rt2800usb_bbp_read(rt2x00dev, 55, &passband);

		rt2800_bbp_read(rt2x00dev, 55, &passband);

		if (passband)

			break;

	}
@@ -1671,13 +1683,13 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev, 
	/*

	 * Set power & frequency of stopband test tone

	 */

	rt2800usb_bbp_write(rt2x00dev, 24, 0x06);

	rt2800_bbp_write(rt2x00dev, 24, 0x06);



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

		rt2800usb_bbp_write(rt2x00dev, 25, 0x90);

		rt2800_bbp_write(rt2x00dev, 25, 0x90);

		msleep(1);



		rt2800usb_bbp_read(rt2x00dev, 55, &stopband);

		rt2800_bbp_read(rt2x00dev, 55, &stopband);



		if ((passband - stopband) <= filter_target) {

			rfcsr24++;
@@ -1744,7 +1756,7 @@ static int rt2800usb_init_rfcsr(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Set back to initial state

	 */

	rt2800usb_bbp_write(rt2x00dev, 24, 0);

	rt2800_bbp_write(rt2x00dev, 24, 0);



	rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr);

	rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 0);
@@ -1753,9 +1765,9 @@ static int rt2800usb_init_rfcsr(struct rt2x00_dev *rt2x00dev) 
	/*

	 * set BBP back to BW20

	 */

	rt2800usb_bbp_read(rt2x00dev, 4, &bbp);

	rt2800_bbp_read(rt2x00dev, 4, &bbp);

	rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 0);

	rt2800usb_bbp_write(rt2x00dev, 4, bbp);

	rt2800_bbp_write(rt2x00dev, 4, bbp);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE