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

Commit 31bfffba authored by Rafał Miłecki's avatar Rafał Miłecki
Browse files

b43: N-PHY: clean init tables 



Sort defines, use one macro for all revs, support for 5GHz when
uploading antenna table.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
parent 3cc8ff9f

drivers/net/wireless/b43/tables_nphy.c

+48 −46
Original line number Original line Diff line number Diff line
@@ -2174,7 +2174,7 @@ static const u16 b43_ntab_loftlt1_r3[] = { 
/* volatile  tables, PHY revision >= 3 */

/* volatile  tables, PHY revision >= 3 */





/* indexed by antswctl2g */

/* indexed by antswctl2g */

static const u16 b43_ntab_antswctl2g_r3[4][32] = {

static const u16 b43_ntab_antswctl_r3[4][32] = {

	{

	{

		0x0082, 0x0082, 0x0211, 0x0222, 0x0328,

		0x0082, 0x0082, 0x0211, 0x0222, 0x0328,

		0x0000, 0x0000, 0x0000, 0x0144, 0x0000,

		0x0000, 0x0000, 0x0000, 0x0144, 0x0000,
@@ -3095,8 +3095,54 @@ void b43_ntab_write_bulk(struct b43_wldev *dev, u32 offset, 
}

}





#define ntab_upload(dev, offset, data) do { \

#define ntab_upload(dev, offset, data) do { \

		b43_ntab_write_bulk(dev, offset, offset##_SIZE, data);	\

		b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \

	} while (0)

	} while (0)



static void b43_nphy_tables_init_rev3(struct b43_wldev *dev)

{

	struct ssb_sprom *sprom = dev->dev->bus_sprom;

	u8 antswlut;



	if (b43_current_band(dev->wl) == IEEE80211_BAND_5GHZ)

		antswlut = sprom->fem.ghz5.antswlut;

	else

		antswlut = sprom->fem.ghz2.antswlut;



	/* Static tables */

	ntab_upload(dev, B43_NTAB_FRAMESTRUCT_R3, b43_ntab_framestruct_r3);

	ntab_upload(dev, B43_NTAB_PILOT_R3, b43_ntab_pilot_r3);

	ntab_upload(dev, B43_NTAB_TMAP_R3, b43_ntab_tmap_r3);

	ntab_upload(dev, B43_NTAB_INTLEVEL_R3, b43_ntab_intlevel_r3);

	ntab_upload(dev, B43_NTAB_TDTRN_R3, b43_ntab_tdtrn_r3);

	ntab_upload(dev, B43_NTAB_NOISEVAR0_R3, b43_ntab_noisevar0_r3);

	ntab_upload(dev, B43_NTAB_NOISEVAR1_R3, b43_ntab_noisevar1_r3);

	ntab_upload(dev, B43_NTAB_MCS_R3, b43_ntab_mcs_r3);

	ntab_upload(dev, B43_NTAB_TDI20A0_R3, b43_ntab_tdi20a0_r3);

	ntab_upload(dev, B43_NTAB_TDI20A1_R3, b43_ntab_tdi20a1_r3);

	ntab_upload(dev, B43_NTAB_TDI40A0_R3, b43_ntab_tdi40a0_r3);

	ntab_upload(dev, B43_NTAB_TDI40A1_R3, b43_ntab_tdi40a1_r3);

	ntab_upload(dev, B43_NTAB_PILOTLT_R3, b43_ntab_pilotlt_r3);

	ntab_upload(dev, B43_NTAB_CHANEST_R3, b43_ntab_channelest_r3);

	ntab_upload(dev, B43_NTAB_FRAMELT_R3, b43_ntab_framelookup_r3);

	ntab_upload(dev, B43_NTAB_C0_ESTPLT_R3, b43_ntab_estimatepowerlt0_r3);

	ntab_upload(dev, B43_NTAB_C1_ESTPLT_R3, b43_ntab_estimatepowerlt1_r3);

	ntab_upload(dev, B43_NTAB_C0_ADJPLT_R3, b43_ntab_adjustpower0_r3);

	ntab_upload(dev, B43_NTAB_C1_ADJPLT_R3, b43_ntab_adjustpower1_r3);

	ntab_upload(dev, B43_NTAB_C0_GAINCTL_R3, b43_ntab_gainctl0_r3);

	ntab_upload(dev, B43_NTAB_C1_GAINCTL_R3, b43_ntab_gainctl1_r3);

	ntab_upload(dev, B43_NTAB_C0_IQLT_R3, b43_ntab_iqlt0_r3);

	ntab_upload(dev, B43_NTAB_C1_IQLT_R3, b43_ntab_iqlt1_r3);

	ntab_upload(dev, B43_NTAB_C0_LOFEEDTH_R3, b43_ntab_loftlt0_r3);

	ntab_upload(dev, B43_NTAB_C1_LOFEEDTH_R3, b43_ntab_loftlt1_r3);



	/* Volatile tables */

	if (antswlut < ARRAY_SIZE(b43_ntab_antswctl_r3))

		ntab_upload(dev, B43_NTAB_ANT_SW_CTL_R3,

			    b43_ntab_antswctl_r3[antswlut]);

	else

		B43_WARN_ON(1);

}



static void b43_nphy_tables_init_rev0(struct b43_wldev *dev)

static void b43_nphy_tables_init_rev0(struct b43_wldev *dev)

{

{

	/* Static tables */

	/* Static tables */
@@ -3130,50 +3176,6 @@ static void b43_nphy_tables_init_rev0(struct b43_wldev *dev) 
	ntab_upload(dev, B43_NTAB_C1_LOFEEDTH, b43_ntab_loftlt1);

	ntab_upload(dev, B43_NTAB_C1_LOFEEDTH, b43_ntab_loftlt1);

}

}





#define ntab_upload_r3(dev, offset, data) do { \

		b43_ntab_write_bulk(dev, offset, ARRAY_SIZE(data), data); \

	} while (0)

static void b43_nphy_tables_init_rev3(struct b43_wldev *dev)

{

	struct ssb_sprom *sprom = dev->dev->bus_sprom;



	/* Static tables */

	ntab_upload_r3(dev, B43_NTAB_FRAMESTRUCT_R3, b43_ntab_framestruct_r3);

	ntab_upload_r3(dev, B43_NTAB_PILOT_R3, b43_ntab_pilot_r3);

	ntab_upload_r3(dev, B43_NTAB_TMAP_R3, b43_ntab_tmap_r3);

	ntab_upload_r3(dev, B43_NTAB_INTLEVEL_R3, b43_ntab_intlevel_r3);

	ntab_upload_r3(dev, B43_NTAB_TDTRN_R3, b43_ntab_tdtrn_r3);

	ntab_upload_r3(dev, B43_NTAB_NOISEVAR0_R3, b43_ntab_noisevar0_r3);

	ntab_upload_r3(dev, B43_NTAB_NOISEVAR1_R3, b43_ntab_noisevar1_r3);

	ntab_upload_r3(dev, B43_NTAB_MCS_R3, b43_ntab_mcs_r3);

	ntab_upload_r3(dev, B43_NTAB_TDI20A0_R3, b43_ntab_tdi20a0_r3);

	ntab_upload_r3(dev, B43_NTAB_TDI20A1_R3, b43_ntab_tdi20a1_r3);

	ntab_upload_r3(dev, B43_NTAB_TDI40A0_R3, b43_ntab_tdi40a0_r3);

	ntab_upload_r3(dev, B43_NTAB_TDI40A1_R3, b43_ntab_tdi40a1_r3);

	ntab_upload_r3(dev, B43_NTAB_PILOTLT_R3, b43_ntab_pilotlt_r3);

	ntab_upload_r3(dev, B43_NTAB_CHANEST_R3, b43_ntab_channelest_r3);

	ntab_upload_r3(dev, B43_NTAB_FRAMELT_R3, b43_ntab_framelookup_r3);

	ntab_upload_r3(dev, B43_NTAB_C0_ESTPLT_R3,

		       b43_ntab_estimatepowerlt0_r3);

	ntab_upload_r3(dev, B43_NTAB_C1_ESTPLT_R3,

		       b43_ntab_estimatepowerlt1_r3);

	ntab_upload_r3(dev, B43_NTAB_C0_ADJPLT_R3, b43_ntab_adjustpower0_r3);

	ntab_upload_r3(dev, B43_NTAB_C1_ADJPLT_R3, b43_ntab_adjustpower1_r3);

	ntab_upload_r3(dev, B43_NTAB_C0_GAINCTL_R3, b43_ntab_gainctl0_r3);

	ntab_upload_r3(dev, B43_NTAB_C1_GAINCTL_R3, b43_ntab_gainctl1_r3);

	ntab_upload_r3(dev, B43_NTAB_C0_IQLT_R3, b43_ntab_iqlt0_r3);

	ntab_upload_r3(dev, B43_NTAB_C1_IQLT_R3, b43_ntab_iqlt1_r3);

	ntab_upload_r3(dev, B43_NTAB_C0_LOFEEDTH_R3, b43_ntab_loftlt0_r3);

	ntab_upload_r3(dev, B43_NTAB_C1_LOFEEDTH_R3, b43_ntab_loftlt1_r3);



	/* Volatile tables */

	if (sprom->fem.ghz2.antswlut < ARRAY_SIZE(b43_ntab_antswctl2g_r3))

		ntab_upload_r3(dev, B43_NTAB_ANT_SW_CTL_R3,

			       b43_ntab_antswctl2g_r3[sprom->fem.ghz2.antswlut]);

	else

		B43_WARN_ON(1);

}



/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables */

/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/InitTables */

void b43_nphy_tables_init(struct b43_wldev *dev)

void b43_nphy_tables_init(struct b43_wldev *dev)

{

{

drivers/net/wireless/b43/tables_nphy.h

+14 −12
Original line number Original line Diff line number Diff line
@@ -115,22 +115,22 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent( 
#define B43_NTAB_NOISEVAR11_SIZE	256

#define B43_NTAB_NOISEVAR11_SIZE	256

#define B43_NTAB_C0_ESTPLT		B43_NTAB8 (0x1A, 0x000) /* Estimate Power Lookup Table Core 0 */

#define B43_NTAB_C0_ESTPLT		B43_NTAB8 (0x1A, 0x000) /* Estimate Power Lookup Table Core 0 */

#define B43_NTAB_C0_ESTPLT_SIZE		64

#define B43_NTAB_C0_ESTPLT_SIZE		64

#define B43_NTAB_C1_ESTPLT		B43_NTAB8 (0x1B, 0x000) /* Estimate Power Lookup Table Core 1 */

#define B43_NTAB_C1_ESTPLT_SIZE		64

#define B43_NTAB_C0_ADJPLT		B43_NTAB8 (0x1A, 0x040) /* Adjust Power Lookup Table Core 0 */

#define B43_NTAB_C0_ADJPLT		B43_NTAB8 (0x1A, 0x040) /* Adjust Power Lookup Table Core 0 */

#define B43_NTAB_C0_ADJPLT_SIZE		128

#define B43_NTAB_C0_ADJPLT_SIZE		128

#define B43_NTAB_C1_ADJPLT		B43_NTAB8 (0x1B, 0x040) /* Adjust Power Lookup Table Core 1 */

#define B43_NTAB_C1_ADJPLT_SIZE		128

#define B43_NTAB_C0_GAINCTL		B43_NTAB32(0x1A, 0x0C0) /* Gain Control Lookup Table Core 0 */

#define B43_NTAB_C0_GAINCTL		B43_NTAB32(0x1A, 0x0C0) /* Gain Control Lookup Table Core 0 */

#define B43_NTAB_C0_GAINCTL_SIZE	128

#define B43_NTAB_C0_GAINCTL_SIZE	128

#define B43_NTAB_C1_GAINCTL		B43_NTAB32(0x1B, 0x0C0) /* Gain Control Lookup Table Core 1 */

#define B43_NTAB_C1_GAINCTL_SIZE	128

#define B43_NTAB_C0_IQLT		B43_NTAB32(0x1A, 0x140) /* IQ Lookup Table Core 0 */

#define B43_NTAB_C0_IQLT		B43_NTAB32(0x1A, 0x140) /* IQ Lookup Table Core 0 */

#define B43_NTAB_C0_IQLT_SIZE		128

#define B43_NTAB_C0_IQLT_SIZE		128

#define B43_NTAB_C1_IQLT		B43_NTAB32(0x1B, 0x140) /* IQ Lookup Table Core 1 */

#define B43_NTAB_C1_IQLT_SIZE		128

#define B43_NTAB_C0_LOFEEDTH		B43_NTAB16(0x1A, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 0 */

#define B43_NTAB_C0_LOFEEDTH		B43_NTAB16(0x1A, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 0 */

#define B43_NTAB_C0_LOFEEDTH_SIZE	128

#define B43_NTAB_C0_LOFEEDTH_SIZE	128

#define B43_NTAB_C1_ESTPLT		B43_NTAB8 (0x1B, 0x000) /* Estimate Power Lookup Table Core 1 */

#define B43_NTAB_C1_ESTPLT_SIZE		64

#define B43_NTAB_C1_ADJPLT		B43_NTAB8 (0x1B, 0x040) /* Adjust Power Lookup Table Core 1 */

#define B43_NTAB_C1_ADJPLT_SIZE		128

#define B43_NTAB_C1_GAINCTL		B43_NTAB32(0x1B, 0x0C0) /* Gain Control Lookup Table Core 1 */

#define B43_NTAB_C1_GAINCTL_SIZE	128

#define B43_NTAB_C1_IQLT		B43_NTAB32(0x1B, 0x140) /* IQ Lookup Table Core 1 */

#define B43_NTAB_C1_IQLT_SIZE		128

#define B43_NTAB_C1_LOFEEDTH		B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */

#define B43_NTAB_C1_LOFEEDTH		B43_NTAB16(0x1B, 0x1C0) /* Local Oscillator Feed Through Lookup Table Core 1 */

#define B43_NTAB_C1_LOFEEDTH_SIZE	128

#define B43_NTAB_C1_LOFEEDTH_SIZE	128
@@ -154,15 +154,17 @@ struct nphy_gain_ctl_workaround_entry *b43_nphy_get_gain_ctl_workaround_ent( 
#define B43_NTAB_CHANEST_R3		B43_NTAB32(22,   0) /* channel estimate  */

#define B43_NTAB_CHANEST_R3		B43_NTAB32(22,   0) /* channel estimate  */

#define B43_NTAB_FRAMELT_R3		 B43_NTAB8(24,   0) /* frame lookup  */

#define B43_NTAB_FRAMELT_R3		 B43_NTAB8(24,   0) /* frame lookup  */

#define B43_NTAB_C0_ESTPLT_R3		 B43_NTAB8(26,   0) /* estimated power lookup 0  */

#define B43_NTAB_C0_ESTPLT_R3		 B43_NTAB8(26,   0) /* estimated power lookup 0  */

#define B43_NTAB_C1_ESTPLT_R3		 B43_NTAB8(27,   0) /* estimated power lookup 1  */

#define B43_NTAB_C0_ADJPLT_R3		 B43_NTAB8(26,  64) /* adjusted power lookup 0  */

#define B43_NTAB_C0_ADJPLT_R3		 B43_NTAB8(26,  64) /* adjusted power lookup 0  */

#define B43_NTAB_C1_ADJPLT_R3		 B43_NTAB8(27,  64) /* adjusted power lookup 1  */

#define B43_NTAB_C0_GAINCTL_R3		B43_NTAB32(26, 192) /* gain control lookup 0  */

#define B43_NTAB_C0_GAINCTL_R3		B43_NTAB32(26, 192) /* gain control lookup 0  */

#define B43_NTAB_C1_GAINCTL_R3		B43_NTAB32(27, 192) /* gain control lookup 1  */

#define B43_NTAB_C0_IQLT_R3		B43_NTAB32(26, 320) /* I/Q lookup 0  */

#define B43_NTAB_C0_IQLT_R3		B43_NTAB32(26, 320) /* I/Q lookup 0  */

#define B43_NTAB_C1_IQLT_R3		B43_NTAB32(27, 320) /* I/Q lookup 1  */

#define B43_NTAB_C0_LOFEEDTH_R3		B43_NTAB16(26, 448) /* Local Oscillator Feed Through lookup 0  */

#define B43_NTAB_C0_LOFEEDTH_R3		B43_NTAB16(26, 448) /* Local Oscillator Feed Through lookup 0  */

#define B43_NTAB_C0_PAPD_COMP_R3	B43_NTAB16(26, 576)

#define B43_NTAB_C1_ESTPLT_R3		 B43_NTAB8(27,   0) /* estimated power lookup 1  */

#define B43_NTAB_C1_ADJPLT_R3		 B43_NTAB8(27,  64) /* adjusted power lookup 1  */

#define B43_NTAB_C1_GAINCTL_R3		B43_NTAB32(27, 192) /* gain control lookup 1  */

#define B43_NTAB_C1_IQLT_R3		B43_NTAB32(27, 320) /* I/Q lookup 1  */

#define B43_NTAB_C1_LOFEEDTH_R3		B43_NTAB16(27, 448) /* Local Oscillator Feed Through lookup 1 */

#define B43_NTAB_C1_LOFEEDTH_R3		B43_NTAB16(27, 448) /* Local Oscillator Feed Through lookup 1 */

#define B43_NTAB_C1_PAPD_COMP_R3	B43_NTAB16(27, 576)





#define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_40_SIZE	18

#define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_40_SIZE	18

#define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_20_SIZE	18

#define B43_NTAB_TX_IQLO_CAL_LOFT_LADDER_20_SIZE	18