Commit 7b8aaead authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: restart hardware after noise floor calibration failure 



When NF calibration fails, the radio often becomes deaf. The usual
hardware hang checks do not detect this, so it's better to issue a reset
when that happens.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 70e535ed

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

+6 −5
Original line number Diff line number Diff line
@@ -657,14 +657,13 @@ static void ar9002_hw_olc_temp_compensation(struct ath_hw *ah) 
		ar9280_hw_olc_temp_compensation(ah);

}



static bool ar9002_hw_calibrate(struct ath_hw *ah,

				struct ath9k_channel *chan,

				u8 rxchainmask,

				bool longcal)

static int ar9002_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,

			       u8 rxchainmask, bool longcal)

{

	bool iscaldone = true;

	struct ath9k_cal_list *currCal = ah->cal_list_curr;

	bool nfcal, nfcal_pending = false;

	int ret;



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

	if (ah->caldata)
@@ -698,7 +697,9 @@ static bool ar9002_hw_calibrate(struct ath_hw *ah, 
			 * NF is slow time-variant, so it is OK to use a

			 * historical value.

			 */

			ath9k_hw_loadnf(ah, ah->curchan);

			ret = ath9k_hw_loadnf(ah, ah->curchan);

			if (ret < 0)

				return ret;

		}



		if (longcal) {

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

+6 −5
Original line number Diff line number Diff line
@@ -121,13 +121,12 @@ static bool ar9003_hw_per_calibration(struct ath_hw *ah, 
	return iscaldone;

}



static bool ar9003_hw_calibrate(struct ath_hw *ah,

				struct ath9k_channel *chan,

				u8 rxchainmask,

				bool longcal)

static int ar9003_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,

			       u8 rxchainmask, bool longcal)

{

	bool iscaldone = true;

	struct ath9k_cal_list *currCal = ah->cal_list_curr;

	int ret;



	/*

	 * For given calibration:
@@ -163,7 +162,9 @@ static bool ar9003_hw_calibrate(struct ath_hw *ah, 
		 * NF is slow time-variant, so it is OK to use a historical

		 * value.

		 */

		ath9k_hw_loadnf(ah, ah->curchan);

		ret = ath9k_hw_loadnf(ah, ah->curchan);

		if (ret < 0)

			return ret;



		/* start NF calibration, without updating BB NF register */

		ath9k_hw_start_nfcal(ah, false);

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

+4 −2
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ void ath9k_hw_start_nfcal(struct ath_hw *ah, bool update) 
	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)

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

{

	struct ath9k_nfcal_hist *h = NULL;

	unsigned i, j;
@@ -301,7 +301,7 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan) 
		ath_dbg(common, ANY,

			"Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",

			REG_READ(ah, AR_PHY_AGC_CONTROL));

		return;

		return -ETIMEDOUT;

	}



	/*
@@ -322,6 +322,8 @@ void ath9k_hw_loadnf(struct ath_hw *ah, struct ath9k_channel *chan) 
		}

	}

	REGWRITE_BUFFER_FLUSH(ah);



	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ struct ath9k_pacal_info{ 


bool ath9k_hw_reset_calvalid(struct ath_hw *ah);

void ath9k_hw_start_nfcal(struct ath_hw *ah, bool update);

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

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

bool ath9k_hw_getnf(struct ath_hw *ah, struct ath9k_channel *chan);

void ath9k_init_nfcal_hist_buffer(struct ath_hw *ah,

				  struct ath9k_channel *chan);

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

+1 −0
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ static ssize_t read_file_reset(struct file *file, char __user *user_buf, 
		[RESET_TYPE_MAC_HANG] = "MAC Hang",

		[RESET_TYPE_BEACON_STUCK] = "Stuck Beacon",

		[RESET_TYPE_MCI] = "MCI Reset",

		[RESET_TYPE_CALIBRATION] = "Calibration error",

	};

	char buf[512];

	unsigned int len = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE