Commit 1fe860ed authored by Rajkumar Manoharan's avatar Rajkumar Manoharan Committed by John W. Linville
Browse files

ath9k_hw: start noisefloor calibration after MCI reset 



noisefloor calibration has to be loaded and started after
chip reset completion and restoring chainmask. Right now it is
being started before MCI reset completion on full reset. Fix that.

Signed-off-by: default avatarRajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4795f096

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -1949,9 +1949,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	if (!ath9k_hw_init_cal(ah, chan))

	if (!ath9k_hw_init_cal(ah, chan))

		return -EIO;

		return -EIO;





	ath9k_hw_loadnf(ah, chan);

	ath9k_hw_start_nfcal(ah, true);



	if (ath9k_hw_mci_is_enabled(ah) && ar9003_mci_end_reset(ah, chan, caldata))

	if (ath9k_hw_mci_is_enabled(ah) && ar9003_mci_end_reset(ah, chan, caldata))

		return -EIO;

		return -EIO;
@@ -2000,6 +1997,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	if (ath9k_hw_mci_is_enabled(ah))

	if (ath9k_hw_mci_is_enabled(ah))

		ar9003_mci_check_bt(ah);

		ar9003_mci_check_bt(ah);





	ath9k_hw_loadnf(ah, chan);

	ath9k_hw_start_nfcal(ah, true);



	if (AR_SREV_9300_20_OR_LATER(ah)) {

	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ar9003_hw_bb_watchdog_config(ah);

		ar9003_hw_bb_watchdog_config(ah);