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

Commit 4b9b42bf authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Use bitops for calibration flags 



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

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

+2 −2
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah, 


	nfcal = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF);

	if (ah->caldata)

		nfcal_pending = ah->caldata->nfcal_pending;

		nfcal_pending = test_bit(NFCAL_PENDING, &ah->caldata->cal_flags);



	if (currCal && !nfcal &&

	    (currCal->calState == CAL_RUNNING ||
@@ -861,7 +861,7 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan) 
	ar9002_hw_pa_cal(ah, true);



	if (ah->caldata)

		ah->caldata->nfcal_pending = true;

		set_bit(NFCAL_PENDING, &ah->caldata->cal_flags);



	ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;

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

+12 −8
Original line number Diff line number Diff line
@@ -727,8 +727,12 @@ static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah, 
	REG_RMW_FIELD(ah, AR_PHY_RX_IQCAL_CORR_B0,

		      AR_PHY_RX_IQCAL_CORR_B0_LOOPBACK_IQCORR_EN, 0x1);



	if (caldata)

		caldata->done_txiqcal_once = is_reusable;

	if (caldata) {

		if (is_reusable)

			set_bit(TXIQCAL_DONE, &caldata->cal_flags);

		else

			clear_bit(TXIQCAL_DONE, &caldata->cal_flags);

	}



	return;

}
@@ -990,7 +994,7 @@ static void ar9003_hw_cl_cal_post_proc(struct ath_hw *ah, bool is_reusable) 
	txclcal_done = !!(REG_READ(ah, AR_PHY_AGC_CONTROL) &

			  AR_PHY_AGC_CONTROL_CLC_SUCCESS);



	if (caldata->done_txclcal_once) {

	if (test_bit(TXCLCAL_DONE, &caldata->cal_flags)) {

		for (i = 0; i < AR9300_MAX_CHAINS; i++) {

			if (!(ah->txchainmask & (1 << i)))

				continue;
@@ -1006,7 +1010,7 @@ static void ar9003_hw_cl_cal_post_proc(struct ath_hw *ah, bool is_reusable) 
				caldata->tx_clcal[i][j] =

					REG_READ(ah, CL_TAB_ENTRY(cl_idx[i]));

		}

		caldata->done_txclcal_once = true;

		set_bit(TXCLCAL_DONE, &caldata->cal_flags);

	}

}
@@ -1053,7 +1057,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
	}



	if (ah->enabled_cals & TX_CL_CAL) {

		if (caldata && caldata->done_txclcal_once)

		if (caldata && test_bit(TXCLCAL_DONE, &caldata->cal_flags))

			REG_CLR_BIT(ah, AR_PHY_CL_CAL_CTL,

				    AR_PHY_CL_CAL_ENABLE);

		else {
@@ -1077,14 +1081,14 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
	 * AGC calibration

	 */

	if (ah->enabled_cals & TX_IQ_ON_AGC_CAL) {

		if (caldata && !caldata->done_txiqcal_once)

		if (caldata && !test_bit(TXIQCAL_DONE, &caldata->cal_flags))

			REG_SET_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,

				    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);

		else

			REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,

				    AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);

		txiqcal_done = run_agc_cal = true;

	} else if (caldata && !caldata->done_txiqcal_once) {

	} else if (caldata && !test_bit(TXIQCAL_DONE, &caldata->cal_flags)) {

		run_agc_cal = true;

		sep_iq_cal = true;

	}
@@ -1148,7 +1152,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 


	if (txiqcal_done)

		ar9003_hw_tx_iq_cal_post_proc(ah, is_reusable);

	else if (caldata && caldata->done_txiqcal_once)

	else if (caldata && test_bit(TXIQCAL_DONE, &caldata->cal_flags))

		ar9003_hw_tx_iq_cal_reload(ah);



	ar9003_hw_cl_cal_post_proc(ah, is_reusable);

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

+3 −3
Original line number Diff line number Diff line
@@ -753,9 +753,9 @@ int ar9003_mci_end_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
		    1 << AR_PHY_TIMING_CONTROL4_DO_GAIN_DC_IQ_CAL_SHIFT);



	if (caldata) {

		caldata->done_txiqcal_once = false;

		caldata->done_txclcal_once = false;

		caldata->rtt_done = false;

		clear_bit(TXIQCAL_DONE, &caldata->cal_flags);

		clear_bit(TXCLCAL_DONE, &caldata->cal_flags);

		clear_bit(RTT_DONE, &caldata->cal_flags);

	}



	if (!ath9k_hw_init_cal(ah, chan))

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

+3 −3
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ void ar9003_hw_rtt_fill_hist(struct ath_hw *ah) 
		}

	}



	ah->caldata->rtt_done = true;

	set_bit(RTT_DONE, &ah->caldata->cal_flags);

}



void ar9003_hw_rtt_clear_hist(struct ath_hw *ah)
@@ -176,7 +176,7 @@ void ar9003_hw_rtt_clear_hist(struct ath_hw *ah) 
	}



	if (ah->caldata)

		ah->caldata->rtt_done = false;

		clear_bit(RTT_DONE, &ah->caldata->cal_flags);

}



bool ar9003_hw_rtt_restore(struct ath_hw *ah, struct ath9k_channel *chan)
@@ -186,7 +186,7 @@ bool ar9003_hw_rtt_restore(struct ath_hw *ah, struct ath9k_channel *chan) 
	if (!ah->caldata)

		return false;



	if (!ah->caldata->rtt_done)

	if (!test_bit(RTT_DONE, &ah->caldata->cal_flags))

		return false;



	ar9003_hw_rtt_enable(ah);

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

+7 −7
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath_hw *ah, 
			ath_dbg(common, CALIBRATE,

				"NFmid[%d] (%d) > MAX (%d), %s\n",

				i, h[i].privNF, limit->max,

				(cal->nfcal_interference ?

				(test_bit(NFCAL_INTF, &cal->cal_flags) ?

				 "not corrected (due to interference)" :

				 "correcting to MAX"));
@@ -130,7 +130,7 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath_hw *ah, 
			 * we bypass this limit here in order to better deal

			 * with our environment.

			 */

			if (!cal->nfcal_interference)

			if (!test_bit(NFCAL_INTF, &cal->cal_flags))

				h[i].privNF = limit->max;

		}

	}
@@ -141,7 +141,7 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath_hw *ah, 
	 * Re-enable the enforcement of the NF maximum again.

	 */

	if (!high_nf_mid)

		cal->nfcal_interference = false;

		clear_bit(NFCAL_INTF, &cal->cal_flags);

}



static bool ath9k_hw_get_nf_thresh(struct ath_hw *ah,
@@ -220,7 +220,7 @@ EXPORT_SYMBOL(ath9k_hw_reset_calvalid); 
void ath9k_hw_start_nfcal(struct ath_hw *ah, bool update)

{

	if (ah->caldata)

		ah->caldata->nfcal_pending = true;

		set_bit(NFCAL_PENDING, &ah->caldata->cal_flags);



	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,

		    AR_PHY_AGC_CONTROL_ENABLE_NF);
@@ -391,7 +391,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan) 
	}



	h = caldata->nfCalHist;

	caldata->nfcal_pending = false;

	clear_bit(NFCAL_PENDING, &caldata->cal_flags);

	ath9k_hw_update_nfcal_hist_buffer(ah, caldata, nfarray);

	chan->noisefloor = h[0].privNF;

	ah->noise = ath9k_hw_getchan_noise(ah, chan);
@@ -437,12 +437,12 @@ void ath9k_hw_bstuck_nfcal(struct ath_hw *ah) 
	 * the baseband update the internal NF value itself, similar to

	 * what is being done after a full reset.

	 */

	if (!caldata->nfcal_pending)

	if (!test_bit(NFCAL_PENDING, &caldata->cal_flags))

		ath9k_hw_start_nfcal(ah, true);

	else if (!(REG_READ(ah, AR_PHY_AGC_CONTROL) & AR_PHY_AGC_CONTROL_NF))

		ath9k_hw_getnf(ah, ah->curchan);



	caldata->nfcal_interference = true;

	set_bit(NFCAL_INTF, &caldata->cal_flags);

}

EXPORT_SYMBOL(ath9k_hw_bstuck_nfcal);