Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9145834e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by John W. Linville
Browse files

b43: N-PHY: implement and add multi-dimensional table reading 



Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c643a66e

drivers/net/wireless/b43/phy_n.c

+11 −19
Original line number Diff line number Diff line
@@ -829,8 +829,7 @@ static void b43_nphy_tx_pwr_ctrl_coef_setup(struct b43_wldev *dev) 
	if (nphy->hang_avoid)

		b43_nphy_stay_in_carrier_search(dev, true);



	/* TODO: Read an N PHY Table with ID 15, length 7, offset 80,

		width 16, and data pointer buffer */

	b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 7, buffer);



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

		tmp = ((buffer[i * 2] & 0x3FF) << 10) |
@@ -1507,8 +1506,7 @@ static struct nphy_txgains b43_nphy_get_tx_gains(struct b43_wldev *dev) 


		if (nphy->hang_avoid)

			b43_nphy_stay_in_carrier_search(dev, true);

		/* TODO: Read an N PHY Table with ID 7, length 2,

			offset 0x110, width 16, and curr_gain */

		b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, curr_gain);

		if (nphy->hang_avoid)

			b43_nphy_stay_in_carrier_search(dev, false);
@@ -1768,8 +1766,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, 
		nphy->hang_avoid = 0;

	}



	/* TODO: Read an N PHY Table with ID 7, length 2, offset 0x110,

		width 16, and data pointer save */

	b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, save);



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

		b43_nphy_iq_cal_gain_params(dev, i, target, &params[i]);
@@ -1890,9 +1887,8 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, 
				udelay(10);

			}



			/* TODO: Read an N PHY Table with ID 15,

				length table_length, offset 96, width 16,

				and data pointer buffer */

			b43_ntab_read_bulk(dev, B43_NTAB16(15, 96), length,

						buffer);

			b43_ntab_write_bulk(dev, B43_NTAB16(15, 64), length,

						buffer);
@@ -1907,8 +1903,7 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, 


		if (!mphase || nphy->mphase_cal_phase_id == last) {

			b43_ntab_write_bulk(dev, B43_NTAB16(15, 96), 4, buffer);

			/* TODO: Read an N PHY Table with ID 15, length 4,

				offset 80, width 16, and data pointer buffer */

			b43_ntab_read_bulk(dev, B43_NTAB16(15, 80), 4, buffer);

			if (dev->phy.rev < 3) {

				buffer[0] = 0;

				buffer[1] = 0;
@@ -1926,9 +1921,8 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, 
			length = 11;

			if (dev->phy.rev < 3)

				length -= 2;

			/* TODO: Read an N PHY Table with ID 15, length length,

				offset 96, width 16, and data pointer

				nphy->txiqlocal_bestc */

			b43_ntab_read_bulk(dev, B43_NTAB16(15, 96), length,

						nphy->txiqlocal_bestc);

			nphy->txiqlocal_coeffsvalid = true;

			/* TODO: Set nphy->txiqlocal_chanspec to

				the current channel */
@@ -1936,9 +1930,8 @@ static int b43_nphy_cal_tx_iq_lo(struct b43_wldev *dev, 
			length = 11;

			if (dev->phy.rev < 3)

				length -= 2;

			/* TODO: Read an N PHY Table with ID 5, length length,

				offset 96, width 16, and data pointer

				nphy->mphase_txcal_bestcoeffs */

			b43_ntab_read_bulk(dev, B43_NTAB16(15, 96), length,

						nphy->mphase_txcal_bestcoeffs);

		}



		b43_nphy_stop_playback(dev);
@@ -1990,8 +1983,7 @@ static int b43_nphy_rev2_cal_rx_iq(struct b43_wldev *dev, 


	if (dev->phy.rev < 2)

		;/* TODO: Call N PHY Reapply TX Cal Coeffs */

	/* TODO: Read an N PHY Table with ID 7, length 2, offset 0x110,

		width 16, and data gain_save */

	b43_ntab_read_bulk(dev, B43_NTAB16(7, 0x110), 2, gain_save);

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

		b43_nphy_iq_cal_gain_params(dev, i, target, &cal_params[i]);

		cal_gain[i] = cal_params[i].cal_gain;

drivers/net/wireless/b43/tables_nphy.c

+35 −0
Original line number Diff line number Diff line
@@ -2950,6 +2950,41 @@ u32 b43_ntab_read(struct b43_wldev *dev, u32 offset) 
	return value;

}



void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,

			 unsigned int nr_elements, void *_data)

{

	u32 type;

	u8 *data = _data;

	unsigned int i;



	type = offset & B43_NTAB_TYPEMASK;

	offset &= ~B43_NTAB_TYPEMASK;

	B43_WARN_ON(offset > 0xFFFF);



	b43_phy_write(dev, B43_NPHY_TABLE_ADDR, offset);



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

		switch (type) {

		case B43_NTAB_8BIT:

			*data = b43_phy_read(dev, B43_NPHY_TABLE_DATALO) & 0xFF;

			data++;

			break;

		case B43_NTAB_16BIT:

			*((u16 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATALO);

			data += 2;

			break;

		case B43_NTAB_32BIT:

			*((u32 *)data) = b43_phy_read(dev, B43_NPHY_TABLE_DATAHI);

			*((u32 *)data) <<= 16;

			*((u32 *)data) |= b43_phy_read(dev, B43_NPHY_TABLE_DATALO);

			data += 4;

			break;

		default:

			B43_WARN_ON(1);

		}

	}

}



void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value)

{

	u32 type;

drivers/net/wireless/b43/tables_nphy.h

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ b43_nphy_get_chantabent(struct b43_wldev *dev, u8 channel); 
#define B43_NTAB_TX_IQLO_CAL_CMDS_FULLCAL_REV3		12



u32 b43_ntab_read(struct b43_wldev *dev, u32 offset);

void b43_ntab_read_bulk(struct b43_wldev *dev, u32 offset,

			 unsigned int nr_elements, void *_data);

void b43_ntab_write(struct b43_wldev *dev, u32 offset, u32 value);

void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset,

			  unsigned int nr_elements, const void *_data);