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

Commit 77d6d39a authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

ath9k_hw: abstract loading noisefloor 



This is the last call on calib.c which acceses PHY stuff,
with this change we calib.c is now generic between both
all supported hardware families.

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

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

+67 −0
Original line number Diff line number Diff line
@@ -1247,6 +1247,72 @@ static void ar5008_hw_do_getnf(struct ath_hw *ah, 
	nfarray[5] = nf;

}



static void ar5008_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)

{

	struct ath9k_nfcal_hist *h;

	int i, j;

	int32_t val;

	const u32 ar5416_cca_regs[6] = {

		AR_PHY_CCA,

		AR_PHY_CH1_CCA,

		AR_PHY_CH2_CCA,

		AR_PHY_EXT_CCA,

		AR_PHY_CH1_EXT_CCA,

		AR_PHY_CH2_EXT_CCA

	};

	u8 chainmask, rx_chain_status;



	rx_chain_status = REG_READ(ah, AR_PHY_RX_CHAINMASK);

	if (AR_SREV_9285(ah) || AR_SREV_9271(ah))

		chainmask = 0x9;

	else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) {

		if ((rx_chain_status & 0x2) || (rx_chain_status & 0x4))

			chainmask = 0x1B;

		else

			chainmask = 0x09;

	} else {

		if (rx_chain_status & 0x4)

			chainmask = 0x3F;

		else if (rx_chain_status & 0x2)

			chainmask = 0x1B;

		else

			chainmask = 0x09;

	}



	h = ah->nfCalHist;



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

		if (chainmask & (1 << i)) {

			val = REG_READ(ah, ar5416_cca_regs[i]);

			val &= 0xFFFFFE00;

			val |= (((u32) (h[i].privNF) << 1) & 0x1ff);

			REG_WRITE(ah, ar5416_cca_regs[i], val);

		}

	}



	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,

		    AR_PHY_AGC_CONTROL_ENABLE_NF);

	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,

		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);

	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);



	for (j = 0; j < 5; j++) {

		if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &

		     AR_PHY_AGC_CONTROL_NF) == 0)

			break;

		udelay(50);

	}



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

		if (chainmask & (1 << i)) {

			val = REG_READ(ah, ar5416_cca_regs[i]);

			val &= 0xFFFFFE00;

			val |= (((u32) (-50) << 1) & 0x1ff);

			REG_WRITE(ah, ar5416_cca_regs[i], val);

		}

	}

}



void ar5008_hw_attach_phy_ops(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -1270,6 +1336,7 @@ void ar5008_hw_attach_phy_ops(struct ath_hw *ah) 
	priv_ops->set_diversity = ar5008_set_diversity;

	priv_ops->ani_control = ar5008_hw_ani_control;

	priv_ops->do_getnf = ar5008_hw_do_getnf;

	priv_ops->loadnf = ar5008_hw_loadnf;



	if (AR_SREV_9100(ah))

		priv_ops->compute_pll_control = ar9100_hw_compute_pll_control;

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

+6 −0
Original line number Diff line number Diff line
@@ -195,6 +195,11 @@ static bool ar9003_hw_iscal_supported(struct ath_hw *ah, 
	return false;

}



static void ar9003_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)

{

	/* TODO */

}



void ar9003_hw_attach_calib_ops(struct ath_hw *ah)

{

	struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
@@ -204,6 +209,7 @@ void ar9003_hw_attach_calib_ops(struct ath_hw *ah) 
	priv_ops->init_cal = ar9003_hw_init_cal;

	priv_ops->setup_calibration = ar9003_hw_setup_calibration;

	priv_ops->iscal_supported = ar9003_hw_iscal_supported;

	priv_ops->loadnf = ar9003_hw_loadnf;



	ops->calibrate = ar9003_hw_calibrate;

}

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

+0 −67
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "hw.h"

#include "hw-ops.h"

#include "ar9002_phy.h"



/* Common calibration code */
@@ -174,72 +173,6 @@ void ath9k_hw_start_nfcal(struct ath_hw *ah) 
	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);

}



void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan)

{

	struct ath9k_nfcal_hist *h;

	int i, j;

	int32_t val;

	const u32 ar5416_cca_regs[6] = {

		AR_PHY_CCA,

		AR_PHY_CH1_CCA,

		AR_PHY_CH2_CCA,

		AR_PHY_EXT_CCA,

		AR_PHY_CH1_EXT_CCA,

		AR_PHY_CH2_EXT_CCA

	};

	u8 chainmask, rx_chain_status;



	rx_chain_status = REG_READ(ah, AR_PHY_RX_CHAINMASK);

	if (AR_SREV_9285(ah) || AR_SREV_9271(ah))

		chainmask = 0x9;

	else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) {

		if ((rx_chain_status & 0x2) || (rx_chain_status & 0x4))

			chainmask = 0x1B;

		else

			chainmask = 0x09;

	} else {

		if (rx_chain_status & 0x4)

			chainmask = 0x3F;

		else if (rx_chain_status & 0x2)

			chainmask = 0x1B;

		else

			chainmask = 0x09;

	}



	h = ah->nfCalHist;



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

		if (chainmask & (1 << i)) {

			val = REG_READ(ah, ar5416_cca_regs[i]);

			val &= 0xFFFFFE00;

			val |= (((u32) (h[i].privNF) << 1) & 0x1ff);

			REG_WRITE(ah, ar5416_cca_regs[i], val);

		}

	}



	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,

		    AR_PHY_AGC_CONTROL_ENABLE_NF);

	REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL,

		    AR_PHY_AGC_CONTROL_NO_UPDATE_NF);

	REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);



	for (j = 0; j < 5; j++) {

		if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &

		     AR_PHY_AGC_CONTROL_NF) == 0)

			break;

		udelay(50);

	}



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

		if (chainmask & (1 << i)) {

			val = REG_READ(ah, ar5416_cca_regs[i]);

			val &= 0xFFFFFE00;

			val |= (((u32) (-50) << 1) & 0x1ff);

			REG_WRITE(ah, ar5416_cca_regs[i], val);

		}

	}

}



int16_t ath9k_hw_getnf(struct ath_hw *ah,

		       struct ath9k_channel *chan)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ struct ath9k_pacal_info{ 


bool ath9k_hw_reset_calvalid(struct ath_hw *ah);

void ath9k_hw_start_nfcal(struct ath_hw *ah);

void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan);

int16_t ath9k_hw_getnf(struct ath_hw *ah,

		       struct ath9k_channel *chan);

void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah);

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

+6 −0
Original line number Diff line number Diff line
@@ -182,6 +182,12 @@ static inline void ath9k_hw_do_getnf(struct ath_hw *ah, 
	ath9k_hw_private_ops(ah)->do_getnf(ah, nfarray);

}



static inline void ath9k_hw_loadnf(struct ath_hw *ah,

				   struct ath9k_channel *chan)

{

	ath9k_hw_private_ops(ah)->loadnf(ah, chan);

}



static inline bool ath9k_hw_init_cal(struct ath_hw *ah,

				     struct ath9k_channel *chan)

{