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

Commit d50ec001 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmsmac: fix TSSI idle estimation 



The baseband multiplier must be zero during TSSI idle estimation
and restored afterwards.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Tested-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7de64685

drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c

+9 −0
Original line number Diff line number Diff line
@@ -2836,6 +2836,8 @@ static void wlc_lcnphy_idle_tssi_est(struct brcms_phy_pub *ppi) 
		read_radio_reg(pi, RADIO_2064_REG007) & 1;

	u16 SAVE_jtag_auxpga = read_radio_reg(pi, RADIO_2064_REG0FF) & 0x10;

	u16 SAVE_iqadc_aux_en = read_radio_reg(pi, RADIO_2064_REG11F) & 4;

	u8 SAVE_bbmult = wlc_lcnphy_get_bbmult(pi);



	idleTssi = read_phy_reg(pi, 0x4ab);

	suspend = (0 == (bcma_read32(pi->d11core, D11REGOFFS(maccontrol)) &

			 MCTL_EN_MAC));
@@ -2853,6 +2855,12 @@ static void wlc_lcnphy_idle_tssi_est(struct brcms_phy_pub *ppi) 
	mod_radio_reg(pi, RADIO_2064_REG0FF, 0x10, 1 << 4);

	mod_radio_reg(pi, RADIO_2064_REG11F, 0x4, 1 << 2);

	wlc_lcnphy_tssi_setup(pi);



	mod_phy_reg(pi, 0x4d7, (0x1 << 0), (1 << 0));

	mod_phy_reg(pi, 0x4d7, (0x1 << 6), (1 << 6));



	wlc_lcnphy_set_bbmult(pi, 0x0);



	wlc_phy_do_dummy_tx(pi, true, OFF);

	idleTssi = ((read_phy_reg(pi, 0x4ab) & (0x1ff << 0))

		    >> 0);
@@ -2874,6 +2882,7 @@ static void wlc_lcnphy_idle_tssi_est(struct brcms_phy_pub *ppi) 


	mod_phy_reg(pi, 0x44c, (0x1 << 12), (0) << 12);



	wlc_lcnphy_set_bbmult(pi, SAVE_bbmult);

	wlc_lcnphy_set_tx_gain_override(pi, tx_gain_override_old);

	wlc_lcnphy_set_tx_gain(pi, &old_gains);

	wlc_lcnphy_set_tx_pwr_ctrl(pi, SAVE_txpwrctrl);