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

Commit 641d9921 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: Split out the function for reading the noise floor 



Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b5c80475

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

+50 −0
Original line number Diff line number Diff line
@@ -1198,6 +1198,55 @@ static bool ar5008_hw_ani_control(struct ath_hw *ah, 
	return true;

}



static void ar5008_hw_do_getnf(struct ath_hw *ah,

			      int16_t nfarray[NUM_NF_READINGS])

{

	struct ath_common *common = ath9k_hw_common(ah);

	int16_t nf;



	nf = MS(REG_READ(ah, AR_PHY_CCA), AR_PHY_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 0] is %d\n", nf);

	nfarray[0] = nf;



	nf = MS(REG_READ(ah, AR_PHY_CH1_CCA), AR_PHY_CH1_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 1] is %d\n", nf);

	nfarray[1] = nf;



	nf = MS(REG_READ(ah, AR_PHY_CH2_CCA), AR_PHY_CH2_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 2] is %d\n", nf);

	nfarray[2] = nf;



	nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR_PHY_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 0] is %d\n", nf);

	nfarray[3] = nf;



	nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA), AR_PHY_CH1_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 1] is %d\n", nf);

	nfarray[4] = nf;



	nf = MS(REG_READ(ah, AR_PHY_CH2_EXT_CCA), AR_PHY_CH2_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 2] is %d\n", nf);

	nfarray[5] = nf;

}



void ar5008_hw_attach_phy_ops(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -1220,6 +1269,7 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah) 
	priv_ops->restore_chainmask = ar5008_restore_chainmask;

	priv_ops->set_diversity = ar5008_set_diversity;

	priv_ops->ani_control = ar5008_hw_ani_control;

	priv_ops->do_getnf = ar5008_hw_do_getnf;



	if (AR_SREV_9100(ah))

		priv_ops->compute_pll_control = ar9100_hw_compute_pll_control;

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

+53 −0
Original line number Diff line number Diff line
@@ -467,6 +467,58 @@ static u32 ar9002_hw_compute_pll_control(struct ath_hw *ah, 
	return pll;

}



static void ar9002_hw_do_getnf(struct ath_hw *ah,

			      int16_t nfarray[NUM_NF_READINGS])

{

	struct ath_common *common = ath9k_hw_common(ah);

	int16_t nf;



	nf = MS(REG_READ(ah, AR_PHY_CCA), AR9280_PHY_MINCCA_PWR);



	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 0] is %d\n", nf);



	if (AR_SREV_9271(ah) && (nf >= -114))

		nf = -116;



	nfarray[0] = nf;



	if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {

		nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),

				AR9280_PHY_CH1_MINCCA_PWR);



		if (nf & 0x100)

			nf = 0 - ((nf ^ 0x1ff) + 1);

		ath_print(common, ATH_DBG_CALIBRATE,

			  "NF calibrated [ctl] [chain 1] is %d\n", nf);

		nfarray[1] = nf;

	}



	nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR9280_PHY_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 0] is %d\n", nf);



	if (AR_SREV_9271(ah) && (nf >= -114))

		nf = -116;



	nfarray[3] = nf;



	if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {

		nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),

				AR9280_PHY_CH1_EXT_MINCCA_PWR);



		if (nf & 0x100)

			nf = 0 - ((nf ^ 0x1ff) + 1);

		ath_print(common, ATH_DBG_CALIBRATE,

			  "NF calibrated [ext] [chain 1] is %d\n", nf);

		nfarray[4] = nf;

	}

}



void ar9002_hw_attach_phy_ops(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -478,4 +530,5 @@ void ar9002_hw_attach_phy_ops(struct ath_hw *ah) 
	priv_ops->spur_mitigate_freq = ar9002_hw_spur_mitigate;

	priv_ops->olc_init = ar9002_olc_init;

	priv_ops->compute_pll_control = ar9002_hw_compute_pll_control;

	priv_ops->do_getnf = ar9002_hw_do_getnf;

}

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

+110 −0
Original line number Diff line number Diff line
@@ -705,6 +705,115 @@ static bool ar9003_hw_ani_control(struct ath_hw *ah, 
	return true;

}



static void ar9003_hw_nf_sanitize_2g(struct ath_hw *ah, s16 *nf)

{

	struct ath_common *common = ath9k_hw_common(ah);



	if (*nf > ah->nf_2g_max) {

		ath_print(common, ATH_DBG_CALIBRATE,

			  "2 GHz NF (%d) > MAX (%d), "

			  "correcting to MAX",

			  *nf, ah->nf_2g_max);

		*nf = ah->nf_2g_max;

	} else if (*nf < ah->nf_2g_min) {

		ath_print(common, ATH_DBG_CALIBRATE,

			  "2 GHz NF (%d) < MIN (%d), "

			  "correcting to MIN",

			  *nf, ah->nf_2g_min);

		*nf = ah->nf_2g_min;

	}

}



static void ar9003_hw_nf_sanitize_5g(struct ath_hw *ah, s16 *nf)

{

	struct ath_common *common = ath9k_hw_common(ah);



	if (*nf > ah->nf_5g_max) {

		ath_print(common, ATH_DBG_CALIBRATE,

			  "5 GHz NF (%d) > MAX (%d), "

			  "correcting to MAX",

			  *nf, ah->nf_5g_max);

		*nf = ah->nf_5g_max;

	} else if (*nf < ah->nf_5g_min) {

		ath_print(common, ATH_DBG_CALIBRATE,

			  "5 GHz NF (%d) < MIN (%d), "

			  "correcting to MIN",

			  *nf, ah->nf_5g_min);

		*nf = ah->nf_5g_min;

	}

}



static void ar9003_hw_nf_sanitize(struct ath_hw *ah, s16 *nf)

{

	if (IS_CHAN_2GHZ(ah->curchan))

		ar9003_hw_nf_sanitize_2g(ah, nf);

	else

		ar9003_hw_nf_sanitize_5g(ah, nf);

}



static void ar9003_hw_do_getnf(struct ath_hw *ah,

			      int16_t nfarray[NUM_NF_READINGS])

{

	struct ath_common *common = ath9k_hw_common(ah);

	int16_t nf;



	nf = MS(REG_READ(ah, AR_PHY_CCA_0), AR_PHY_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ar9003_hw_nf_sanitize(ah, &nf);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 0] is %d\n", nf);

	nfarray[0] = nf;



	nf = MS(REG_READ(ah, AR_PHY_CCA_1), AR_PHY_CH1_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ar9003_hw_nf_sanitize(ah, &nf);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 1] is %d\n", nf);

	nfarray[1] = nf;



	nf = MS(REG_READ(ah, AR_PHY_CCA_2), AR_PHY_CH2_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ar9003_hw_nf_sanitize(ah, &nf);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 2] is %d\n", nf);

	nfarray[2] = nf;



	nf = MS(REG_READ(ah, AR_PHY_EXT_CCA), AR_PHY_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ar9003_hw_nf_sanitize(ah, &nf);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 0] is %d\n", nf);

	nfarray[3] = nf;



	nf = MS(REG_READ(ah, AR_PHY_EXT_CCA_1), AR_PHY_CH1_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ar9003_hw_nf_sanitize(ah, &nf);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 1] is %d\n", nf);

	nfarray[4] = nf;



	nf = MS(REG_READ(ah, AR_PHY_EXT_CCA_2), AR_PHY_CH2_EXT_MINCCA_PWR);

	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ar9003_hw_nf_sanitize(ah, &nf);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 2] is %d\n", nf);

	nfarray[5] = nf;

}



void ar9003_hw_set_nf_limits(struct ath_hw *ah)

{

	ah->nf_2g_max = AR_PHY_CCA_MAX_GOOD_VAL_9300_2GHZ;

	ah->nf_2g_min = AR_PHY_CCA_MIN_GOOD_VAL_9300_2GHZ;

	ah->nf_5g_max = AR_PHY_CCA_MAX_GOOD_VAL_9300_5GHZ;

	ah->nf_5g_min = AR_PHY_CCA_MIN_GOOD_VAL_9300_5GHZ;

}



void ar9003_hw_attach_phy_ops(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -723,4 +832,5 @@ void ar9003_hw_attach_phy_ops(struct ath_hw *ah) 
	priv_ops->enable_rfkill = ar9003_hw_enable_rfkill;

	priv_ops->set_diversity = ar9003_hw_set_diversity;

	priv_ops->ani_control = ar9003_hw_ani_control;

	priv_ops->do_getnf = ar9003_hw_do_getnf;

}

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

+1 −89
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include "hw.h"

#include "hw-ops.h"

#include "ar9002_phy.h"



/* We can tune this as we go by monitoring really low values */
@@ -88,95 +89,6 @@ static void ath9k_hw_update_nfcal_hist_buffer(struct ath9k_nfcal_hist *h, 
	return;

}



static void ath9k_hw_do_getnf(struct ath_hw *ah,

			      int16_t nfarray[NUM_NF_READINGS])

{

	struct ath_common *common = ath9k_hw_common(ah);

	int16_t nf;



	if (AR_SREV_9280_10_OR_LATER(ah))

		nf = MS(REG_READ(ah, AR_PHY_CCA), AR9280_PHY_MINCCA_PWR);

	else

		nf = MS(REG_READ(ah, AR_PHY_CCA), AR_PHY_MINCCA_PWR);



	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ctl] [chain 0] is %d\n", nf);



	if (AR_SREV_9271(ah) && (nf >= -114))

		nf = -116;



	nfarray[0] = nf;



	if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {

		if (AR_SREV_9280_10_OR_LATER(ah))

			nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),

					AR9280_PHY_CH1_MINCCA_PWR);

		else

			nf = MS(REG_READ(ah, AR_PHY_CH1_CCA),

					AR_PHY_CH1_MINCCA_PWR);



		if (nf & 0x100)

			nf = 0 - ((nf ^ 0x1ff) + 1);

		ath_print(common, ATH_DBG_CALIBRATE,

			  "NF calibrated [ctl] [chain 1] is %d\n", nf);

		nfarray[1] = nf;



		if (!AR_SREV_9280(ah) && !AR_SREV_9287(ah)) {

			nf = MS(REG_READ(ah, AR_PHY_CH2_CCA),

					AR_PHY_CH2_MINCCA_PWR);

			if (nf & 0x100)

				nf = 0 - ((nf ^ 0x1ff) + 1);

			ath_print(common, ATH_DBG_CALIBRATE,

				  "NF calibrated [ctl] [chain 2] is %d\n", nf);

			nfarray[2] = nf;

		}

	}



	if (AR_SREV_9280_10_OR_LATER(ah))

		nf = MS(REG_READ(ah, AR_PHY_EXT_CCA),

			AR9280_PHY_EXT_MINCCA_PWR);

	else

		nf = MS(REG_READ(ah, AR_PHY_EXT_CCA),

			AR_PHY_EXT_MINCCA_PWR);



	if (nf & 0x100)

		nf = 0 - ((nf ^ 0x1ff) + 1);

	ath_print(common, ATH_DBG_CALIBRATE,

		  "NF calibrated [ext] [chain 0] is %d\n", nf);



	if (AR_SREV_9271(ah) && (nf >= -114))

		nf = -116;



	nfarray[3] = nf;



	if (!AR_SREV_9285(ah) && !AR_SREV_9271(ah)) {

		if (AR_SREV_9280_10_OR_LATER(ah))

			nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),

					AR9280_PHY_CH1_EXT_MINCCA_PWR);

		else

			nf = MS(REG_READ(ah, AR_PHY_CH1_EXT_CCA),

					AR_PHY_CH1_EXT_MINCCA_PWR);



		if (nf & 0x100)

			nf = 0 - ((nf ^ 0x1ff) + 1);

		ath_print(common, ATH_DBG_CALIBRATE,

			  "NF calibrated [ext] [chain 1] is %d\n", nf);

		nfarray[4] = nf;



		if (!AR_SREV_9280(ah) && !AR_SREV_9287(ah)) {

			nf = MS(REG_READ(ah, AR_PHY_CH2_EXT_CCA),

					AR_PHY_CH2_EXT_MINCCA_PWR);

			if (nf & 0x100)

				nf = 0 - ((nf ^ 0x1ff) + 1);

			ath_print(common, ATH_DBG_CALIBRATE,

				  "NF calibrated [ext] [chain 2] is %d\n", nf);

			nfarray[5] = nf;

		}

	}

}



static bool getNoiseFloorThresh(struct ath_hw *ah,

				enum ieee80211_band band,

				int16_t *nft)

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

+6 −0
Original line number Diff line number Diff line
@@ -163,4 +163,10 @@ static inline bool ath9k_hw_ani_control(struct ath_hw *ah, 
	return ath9k_hw_private_ops(ah)->ani_control(ah, cmd, param);

}



static inline void ath9k_hw_do_getnf(struct ath_hw *ah,

				     int16_t nfarray[NUM_NF_READINGS])

{

	return ath9k_hw_private_ops(ah)->do_getnf(ah, nfarray);

}



#endif /* ATH9K_HW_OPS_H */