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

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

b43: N-PHY: implement MIMO config update 



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

drivers/net/wireless/b43/phy_n.c

+15 −1
Original line number Diff line number Diff line
@@ -424,6 +424,20 @@ static void b43_nphy_reset_cca(struct b43_wldev *dev) 
	/* TODO: N PHY Force RF Seq with argument 2 */

}



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

static void b43_nphy_update_mimo_config(struct b43_wldev *dev, s32 preamble)

{

	u16 mimocfg = b43_phy_read(dev, B43_NPHY_MIMOCFG);



	mimocfg |= B43_NPHY_MIMOCFG_AUTO;

	if (preamble == 1)

		mimocfg |= B43_NPHY_MIMOCFG_GFMIX;

	else

		mimocfg &= ~B43_NPHY_MIMOCFG_GFMIX;



	b43_phy_write(dev, B43_NPHY_MIMOCFG, mimocfg);

}



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

static void b43_nphy_rx_iq_est(struct b43_wldev *dev, struct nphy_iq_est *est,

				u16 samps, u8 time, bool wait)
@@ -2180,7 +2194,7 @@ int b43_phy_initn(struct b43_wldev *dev) 
	b43_phy_write(dev, B43_NPHY_PLOAD_CSENSE_EXTLEN, 0x50);

	b43_phy_write(dev, B43_NPHY_TXRIFS_FRDEL, 0x30);



	/* TODO MIMO-Config */

	b43_nphy_update_mimo_config(dev, nphy->preamble_override);

	/* TODO Update TX/RX chain */



	if (phy->rev < 2) {

drivers/net/wireless/b43/phy_n.h

+1 −0
Original line number Diff line number Diff line
@@ -973,6 +973,7 @@ struct b43_phy_n { 
	bool hang_avoid;

	bool mute;

	u16 papd_epsilon_offset[2];

	s32 preamble_override;



	u8 mphase_cal_phase_id;

	u16 mphase_txcal_cmdidx;