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

Commit 5955b2b0 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k_hw: Fix MCI usage 



MCI has to be handled only when BTCOEX is actually enabled.
Check for this condition before calling MCI related functions
from various reset/calibration call-sites.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 83c7a52d

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

+2 −3
Original line number Diff line number Diff line
@@ -901,7 +901,6 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
	bool is_reusable = true, status = true;

	bool run_rtt_cal = false, run_agc_cal;

	bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);

	bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);

	u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |

					  AR_PHY_AGC_CONTROL_FLTR_CAL   |

					  AR_PHY_AGC_CONTROL_PKDET_CAL;
@@ -970,7 +969,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
	} else if (caldata && !caldata->done_txiqcal_once)

		run_agc_cal = true;



	if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)

	if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)

		ar9003_mci_init_cal_req(ah, &is_reusable);



	if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
@@ -993,7 +992,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
				       0, AH_WAIT_TIMEOUT);

	}



	if (mci && IS_CHAN_2GHZ(chan) && run_agc_cal)

	if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)

		ar9003_mci_init_cal_done(ah);



	if (rtt && !run_rtt_cal) {

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

+0 −8
Original line number Diff line number Diff line
@@ -273,10 +273,6 @@ void ar9003_mci_get_interrupt(struct ath_hw *ah, u32 *raw_intr, 


#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT



static inline bool ar9003_mci_is_ready(struct ath_hw *ah)

{

	return ah->btcoex_hw.mci.ready;

}

void ar9003_mci_stop_bt(struct ath_hw *ah, bool save_fullsleep);

void ar9003_mci_init_cal_req(struct ath_hw *ah, bool *is_reusable);

void ar9003_mci_init_cal_done(struct ath_hw *ah);
@@ -292,10 +288,6 @@ void ar9003_mci_get_isr(struct ath_hw *ah, enum ath9k_int *masked); 


#else



static inline bool ar9003_mci_is_ready(struct ath_hw *ah)

{

	return false;

}

static inline void ar9003_mci_stop_bt(struct ath_hw *ah, bool save_fullsleep)

{

}

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

+7 −8
Original line number Diff line number Diff line
@@ -1707,7 +1707,7 @@ static int ath9k_hw_do_fastcc(struct ath_hw *ah, struct ath9k_channel *chan) 
	ath9k_hw_loadnf(ah, ah->curchan);

	ath9k_hw_start_nfcal(ah, true);



	if ((ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && ar9003_mci_is_ready(ah))

	if (ath9k_hw_mci_is_enabled(ah))

		ar9003_mci_2g5g_switch(ah, true);



	if (AR_SREV_9271(ah))
@@ -1728,10 +1728,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	u64 tsf = 0;

	int i, r;

	bool start_mci_reset = false;

	bool mci = !!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI);

	bool save_fullsleep = ah->chip_fullsleep;



	if (mci) {

	if (ath9k_hw_mci_is_enabled(ah)) {

		start_mci_reset = ar9003_mci_start_reset(ah, chan);

		if (start_mci_reset)

			return 0;
@@ -1760,7 +1759,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
			return r;

	}



	if (mci)

	if (ath9k_hw_mci_is_enabled(ah))

		ar9003_mci_stop_bt(ah, save_fullsleep);



	saveDefAntenna = REG_READ(ah, AR_DEF_ANTENNA);
@@ -1818,7 +1817,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	if (r)

		return r;



	if (mci)

	if (ath9k_hw_mci_is_enabled(ah))

		ar9003_mci_reset(ah, false, IS_CHAN_2GHZ(chan), save_fullsleep);



	/*
@@ -1937,7 +1936,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	ath9k_hw_loadnf(ah, chan);

	ath9k_hw_start_nfcal(ah, true);



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

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

		return -EIO;



	ENABLE_REGWRITE_BUFFER(ah);
@@ -1982,7 +1981,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	if (ath9k_hw_btcoex_is_enabled(ah))

		ath9k_hw_btcoex_enable(ah);



	if (mci)

	if (ath9k_hw_mci_is_enabled(ah))

		ar9003_mci_check_bt(ah);



	if (AR_SREV_9300_20_OR_LATER(ah)) {
@@ -2166,7 +2165,7 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode) 
		status = ath9k_hw_set_power_awake(ah, setChip);

		break;

	case ATH9K_PM_FULL_SLEEP:

		if (ah->caps.hw_caps & ATH9K_HW_CAP_MCI)

		if (ath9k_hw_mci_is_enabled(ah))

			ar9003_mci_set_full_sleep(ah);



		ath9k_set_power_sleep(ah, setChip);

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

+9 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,11 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah) 
{

	return ah->btcoex_hw.enabled;

}

static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)

{

	return ah->btcoex_hw.enabled && (ah->caps.hw_caps & ATH9K_HW_CAP_MCI);



}

void ath9k_hw_btcoex_enable(struct ath_hw *ah);

static inline enum ath_btcoex_scheme

ath9k_hw_get_btcoex_scheme(struct ath_hw *ah)
@@ -1048,6 +1053,10 @@ static inline bool ath9k_hw_btcoex_is_enabled(struct ath_hw *ah) 
{

	return false;

}

static inline bool ath9k_hw_mci_is_enabled(struct ath_hw *ah)

{

	return false;

}

static inline void ath9k_hw_btcoex_enable(struct ath_hw *ah)

{

}