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

Commit 4a8f1995 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: fix calibration issues on chainmask that don't include chain 0 



Cc: stable@vger.kernel.org
Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 430d2525

drivers/net/wireless/ath/ath9k/ar9003_calib.c

+2 −0
Original line number Diff line number Diff line
@@ -976,6 +976,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
					  AR_PHY_CL_TAB_1,

					  AR_PHY_CL_TAB_2 };



	ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);



	if (rtt) {

		if (!ar9003_hw_rtt_restore(ah, chan))

			run_rtt_cal = true;

drivers/net/wireless/ath/ath9k/ar9003_phy.c

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static void ar9003_hw_init_bb(struct ath_hw *ah, 
	ath9k_hw_synth_delay(ah, chan, synthDelay);

}



static void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)

void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx)

{

	switch (rx) {

	case 0x5:

drivers/net/wireless/ath/ath9k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -1066,6 +1066,7 @@ void ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain); 
int ar9003_paprd_init_table(struct ath_hw *ah);

bool ar9003_paprd_is_done(struct ath_hw *ah);

bool ar9003_is_paprd_enabled(struct ath_hw *ah);

void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);



/* Hardware family op attach helpers */

void ar5008_hw_attach_phy_ops(struct ath_hw *ah);