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

Commit d1591314 authored by Michael Buesch's avatar Michael Buesch Committed by David S. Miller
Browse files

b43: Add NPHY channel switch code 



This adds code and table data for channel switching on NPHYs.

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

drivers/net/wireless/b43/nphy.c

+68 −2
Original line number Diff line number Diff line
@@ -35,12 +35,78 @@ void b43_nphy_xmitpower(struct b43_wldev *dev) 
{//TODO

}



static void b43_chantab_radio_upload(struct b43_wldev *dev,

				     const struct b43_nphy_channeltab_entry *e)

{

	b43_radio_write16(dev, B2055_PLL_REF, e->radio_pll_ref);

	b43_radio_write16(dev, B2055_RF_PLLMOD0, e->radio_rf_pllmod0);

	b43_radio_write16(dev, B2055_RF_PLLMOD1, e->radio_rf_pllmod1);

	b43_radio_write16(dev, B2055_VCO_CAPTAIL, e->radio_vco_captail);

	b43_radio_write16(dev, B2055_VCO_CAL1, e->radio_vco_cal1);

	b43_radio_write16(dev, B2055_VCO_CAL2, e->radio_vco_cal2);

	b43_radio_write16(dev, B2055_PLL_LFC1, e->radio_pll_lfc1);

	b43_radio_write16(dev, B2055_PLL_LFR1, e->radio_pll_lfr1);

	b43_radio_write16(dev, B2055_PLL_LFC2, e->radio_pll_lfc2);

	b43_radio_write16(dev, B2055_LGBUF_CENBUF, e->radio_lgbuf_cenbuf);

	b43_radio_write16(dev, B2055_LGEN_TUNE1, e->radio_lgen_tune1);

	b43_radio_write16(dev, B2055_LGEN_TUNE2, e->radio_lgen_tune2);

	b43_radio_write16(dev, B2055_C1_LGBUF_ATUNE, e->radio_c1_lgbuf_atune);

	b43_radio_write16(dev, B2055_C1_LGBUF_GTUNE, e->radio_c1_lgbuf_gtune);

	b43_radio_write16(dev, B2055_C1_RX_RFR1, e->radio_c1_rx_rfr1);

	b43_radio_write16(dev, B2055_C1_TX_PGAPADTN, e->radio_c1_tx_pgapadtn);

	b43_radio_write16(dev, B2055_C1_TX_MXBGTRIM, e->radio_c1_tx_mxbgtrim);

	b43_radio_write16(dev, B2055_C2_LGBUF_ATUNE, e->radio_c2_lgbuf_atune);

	b43_radio_write16(dev, B2055_C2_LGBUF_GTUNE, e->radio_c2_lgbuf_gtune);

	b43_radio_write16(dev, B2055_C2_RX_RFR1, e->radio_c2_rx_rfr1);

	b43_radio_write16(dev, B2055_C2_TX_PGAPADTN, e->radio_c2_tx_pgapadtn);

	b43_radio_write16(dev, B2055_C2_TX_MXBGTRIM, e->radio_c2_tx_mxbgtrim);

}



static void b43_chantab_phy_upload(struct b43_wldev *dev,

				   const struct b43_nphy_channeltab_entry *e)

{

	b43_phy_write(dev, B43_NPHY_BW1A, e->phy_bw1a);

	b43_phy_write(dev, B43_NPHY_BW2, e->phy_bw2);

	b43_phy_write(dev, B43_NPHY_BW3, e->phy_bw3);

	b43_phy_write(dev, B43_NPHY_BW4, e->phy_bw4);

	b43_phy_write(dev, B43_NPHY_BW5, e->phy_bw5);

	b43_phy_write(dev, B43_NPHY_BW6, e->phy_bw6);

}



static void b43_nphy_tx_power_fix(struct b43_wldev *dev)

{

	//TODO

}



/* Tune the hardware to a new channel. Don't call this directly.

 * Use b43_radio_selectchannel() */

void b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)

int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)

{

	const struct b43_nphy_channeltab_entry *tabent;



//TODO

	tabent = b43_nphy_get_chantabent(dev, channel);

	if (!tabent)

		return -ESRCH;



	//FIXME enable/disable band select upper20 in RXCTL

	if (0 /*FIXME 5Ghz*/)

		b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x20);

	else

		b43_radio_maskset(dev, B2055_MASTER1, 0xFF8F, 0x50);

	b43_chantab_radio_upload(dev, tabent);

	udelay(50);

	b43_radio_write16(dev, B2055_VCO_CAL10, 5);

	b43_radio_write16(dev, B2055_VCO_CAL10, 45);

	b43_radio_write16(dev, B2055_VCO_CAL10, 65);

	udelay(300);

	if (0 /*FIXME 5Ghz*/)

		b43_phy_set(dev, B43_NPHY_BANDCTL, B43_NPHY_BANDCTL_5GHZ);

	else

		b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ);

	b43_chantab_phy_upload(dev, tabent);

	b43_nphy_tx_power_fix(dev);



	return 0;

}



static void b43_radio_init2055_pre(struct b43_wldev *dev)

drivers/net/wireless/b43/nphy.h

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#define B43_NPHY_CHANNEL			B43_PHY_N(0x005) /* Channel */

#define B43_NPHY_TXERR				B43_PHY_N(0x007) /* TX error */

#define B43_NPHY_BANDCTL			B43_PHY_N(0x009) /* Band control */

#define  B43_NPHY_BANDCTL_5GHZ			0x0001 /* Use the 5GHz band */

#define B43_NPHY_4WI_ADDR			B43_PHY_N(0x00B) /* Four-wire bus address */

#define B43_NPHY_4WI_DATAHI			B43_PHY_N(0x00C) /* Four-wire bus data high */

#define B43_NPHY_4WI_DATALO			B43_PHY_N(0x00D) /* Four-wire bus data low */
@@ -917,7 +918,7 @@ int b43_phy_initn(struct b43_wldev *dev); 
void b43_nphy_radio_turn_on(struct b43_wldev *dev);

void b43_nphy_radio_turn_off(struct b43_wldev *dev);



void b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel);

int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel);



void b43_nphy_xmitpower(struct b43_wldev *dev);

void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna);

drivers/net/wireless/b43/phy.c

+20 −8
Original line number Diff line number Diff line
@@ -3883,7 +3883,8 @@ int b43_radio_selectchannel(struct b43_wldev *dev, 
	struct b43_phy *phy = &dev->phy;

	u16 r8, tmp;

	u16 freq;

	u16 channelcookie;

	u16 channelcookie, savedcookie;

	int err = 0;



	if (channel == 0xFF) {

		switch (phy->type) {
@@ -3910,12 +3911,15 @@ int b43_radio_selectchannel(struct b43_wldev *dev, 
	if (0 /*FIXME on 5Ghz */)

		channelcookie |= 0x100;

	//FIXME set 40Mhz flag if required

	savedcookie = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_CHAN);

	b43_shm_write16(dev, B43_SHM_SHARED, B43_SHM_SH_CHAN, channelcookie);



	switch (phy->type) {

	case B43_PHYTYPE_A:

		if (channel > 200)

			return -EINVAL;

		if (channel > 200) {

			err = -EINVAL;

			goto out;

		}

		freq = channel2freq_a(channel);



		r8 = b43_radio_read16(dev, 0x0008);
@@ -3964,8 +3968,10 @@ int b43_radio_selectchannel(struct b43_wldev *dev, 
		b43_phy_xmitpower(dev);	//FIXME correct?

		break;

	case B43_PHYTYPE_G:

		if ((channel < 1) || (channel > 14))

			return -EINVAL;

		if ((channel < 1) || (channel > 14)) {

			err = -EINVAL;

			goto out;

		}



		if (synthetic_pu_workaround)

			b43_synth_pu_workaround(dev, channel);
@@ -3990,7 +3996,9 @@ int b43_radio_selectchannel(struct b43_wldev *dev, 
		}

		break;

	case B43_PHYTYPE_N:

		b43_nphy_selectchannel(dev, channel);

		err = b43_nphy_selectchannel(dev, channel);

		if (err)

			goto out;

		break;

	default:

		B43_WARN_ON(1);
@@ -3999,8 +4007,12 @@ int b43_radio_selectchannel(struct b43_wldev *dev, 
	phy->channel = channel;

	/* Wait for the radio to tune to the channel and stabilize. */

	msleep(8);



	return 0;

out:

	if (err) {

		b43_shm_write16(dev, B43_SHM_SHARED,

				B43_SHM_SH_CHAN, savedcookie);

	}

	return err;

}



void b43_radio_turn_on(struct b43_wldev *dev)