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

Commit 304e5ac1 authored by Felix Fietkau's avatar Felix Fietkau Committed by Kalle Valo
Browse files

Revert "ath9k_hw: implement temperature compensation support for AR9003+" 



This reverts commit 171f6402 ("ath9k_hw: implement temperature compensation
support for AR9003+"). Some users report that this commit causes a regression
in performance under some conditions.

Fixes: 171f6402 ("ath9k_hw: implement temperature compensation support for AR9003+")
Cc: <stable@vger.kernel.org> # 4.8
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
[kvalo@qca.qualcomm.com: improve commit log]
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent f67b107d

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

+3 −22
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct coeff { 


enum ar9003_cal_types {

	IQ_MISMATCH_CAL = BIT(0),

	TEMP_COMP_CAL = BIT(1),

};



static void ar9003_hw_setup_calibration(struct ath_hw *ah,
@@ -59,12 +58,6 @@ static void ar9003_hw_setup_calibration(struct ath_hw *ah, 
		/* Kick-off cal */

		REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);

		break;

	case TEMP_COMP_CAL:

		ath_dbg(common, CALIBRATE,

			"starting Temperature Compensation Calibration\n");

		REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_LOCAL);

		REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_START);

		break;

	default:

		ath_err(common, "Invalid calibration type\n");

		break;
@@ -93,7 +86,6 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah, 
		/*

		* Accumulate cal measures for active chains

		*/

		if (cur_caldata->calCollect)

		cur_caldata->calCollect(ah);

		ah->cal_samples++;
@@ -107,7 +99,6 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah, 
			/*

			* Process accumulated data

			*/

			if (cur_caldata->calPostProc)

			cur_caldata->calPostProc(ah, numChains);



			/* Calibration has finished. */
@@ -323,16 +314,9 @@ static const struct ath9k_percal_data iq_cal_single_sample = { 
	ar9003_hw_iqcalibrate

};



static const struct ath9k_percal_data temp_cal_single_sample = {

	TEMP_COMP_CAL,

	MIN_CAL_SAMPLES,

	PER_MAX_LOG_COUNT,

};



static void ar9003_hw_init_cal_settings(struct ath_hw *ah)

{

	ah->iq_caldata.calData = &iq_cal_single_sample;

	ah->temp_caldata.calData = &temp_cal_single_sample;



	if (AR_SREV_9300_20_OR_LATER(ah)) {

		ah->enabled_cals |= TX_IQ_CAL;
@@ -340,7 +324,7 @@ static void ar9003_hw_init_cal_settings(struct ath_hw *ah) 
			ah->enabled_cals |= TX_IQ_ON_AGC_CAL;

	}



	ah->supp_cals = IQ_MISMATCH_CAL | TEMP_COMP_CAL;

	ah->supp_cals = IQ_MISMATCH_CAL;

}



#define OFF_UPPER_LT 24
@@ -1399,9 +1383,6 @@ static void ar9003_hw_init_cal_common(struct ath_hw *ah) 
	INIT_CAL(&ah->iq_caldata);

	INSERT_CAL(ah, &ah->iq_caldata);



	INIT_CAL(&ah->temp_caldata);

	INSERT_CAL(ah, &ah->temp_caldata);



	/* Initialize current pointer to first element in list */

	ah->cal_list_curr = ah->cal_list;

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

+0 −1
Original line number Diff line number Diff line
@@ -830,7 +830,6 @@ struct ath_hw { 
	/* Calibration */

	u32 supp_cals;

	struct ath9k_cal_list iq_caldata;

	struct ath9k_cal_list temp_caldata;

	struct ath9k_cal_list adcgain_caldata;

	struct ath9k_cal_list adcdc_caldata;

	struct ath9k_cal_list *cal_list;