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

Commit 60544603 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by Kalle Valo
Browse files

ath9k: Handle MCI_STATE_AIC_CAL 



Add the main AIC calibration function to
handle MCI_STATE_AIC_CAL.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f2ef792a

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

+26 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void ar9003_aic_gain_table(struct ath_hw *ah) 
	}

}



static void ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)

static u8 ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count)

{

	struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;

	int i;
@@ -257,6 +257,8 @@ static void ar9003_aic_cal_start(struct ath_hw *ah, u8 min_valid_count) 


	aic->aic_caled_chan = 0;

	aic->aic_cal_state = AIC_CAL_STATE_STARTED;



	return aic->aic_cal_state;

}



static bool ar9003_aic_cal_post_process(struct ath_hw *ah)
@@ -513,6 +515,28 @@ static u8 ar9003_aic_cal_continue(struct ath_hw *ah, bool cal_once) 


}



u8 ar9003_aic_calibration(struct ath_hw *ah)

{

	struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;

	u8 cal_ret = AIC_CAL_STATE_ERROR;



	switch (aic->aic_cal_state) {

	case AIC_CAL_STATE_IDLE:

		cal_ret = ar9003_aic_cal_start(ah, 1);

		break;

	case AIC_CAL_STATE_STARTED:

		cal_ret = ar9003_aic_cal_continue(ah, false);

		break;

	case AIC_CAL_STATE_DONE:

		cal_ret = AIC_CAL_STATE_DONE;

		break;

	default:

		break;

	}



	return cal_ret;

}



u8 ar9003_aic_start_normal(struct ath_hw *ah)

{

	struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
@@ -561,7 +585,7 @@ u8 ar9003_aic_calibration_single(struct ath_hw *ah) 


	num_chan = MS(mci_hw->config, ATH_MCI_CONFIG_AIC_CAL_NUM_CHAN);



	ar9003_aic_cal_start(ah, num_chan);

	(void) ar9003_aic_cal_start(ah, num_chan);

	cal_ret = ar9003_aic_cal_continue(ah, true);



	return cal_ret;

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct ath_aic_out_info { 
	struct ath_aic_sram_info sram;

};



u8 ar9003_aic_calibration(struct ath_hw *ah);

u8 ar9003_aic_start_normal(struct ath_hw *ah);

u8 ar9003_aic_cal_reset(struct ath_hw *ah);

u8 ar9003_aic_calibration_single(struct ath_hw *ah);

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

+4 −0
Original line number Diff line number Diff line
@@ -1363,6 +1363,10 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type) 
		value = (!mci->unhalt_bt_gpm && mci->need_flush_btinfo) ? 1 : 0;

		mci->need_flush_btinfo = false;

		break;

	case MCI_STATE_AIC_CAL:

		if (ath9k_hw_is_aic_enabled(ah))

			value = ar9003_aic_calibration(ah);

		break;

	case MCI_STATE_AIC_START:

		if (ath9k_hw_is_aic_enabled(ah))

			ar9003_aic_start_normal(ah);