Commit 74632d11 authored Mar 15, 2013 by Felix Fietkau Committed by John W. Linville Mar 18, 2013

ath9k_hw: revert chainmask to user configuration after calibration



The commit 'ath9k_hw: fix calibration issues on chainmask that don't
include chain 0' changed the hardware chainmask to the chip chainmask
for the duration of the calibration, but the revert to user
configuration in the reset path runs too early.

That causes some issues with limiting the number of antennas (including
spurious failure in hardware-generated packets).

Fix this by reverting the chainmask after the essential parts of the
calibration that need the workaround, and before NF calibration is run.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Reported-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
Tested-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
Cc: stable@vger.kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 7f42ace3

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1023,6 +1023,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
	AR_PHY_AGC_CONTROL_FLTR_CAL \|		AR_PHY_AGC_CONTROL_FLTR_CAL \|
	AR_PHY_AGC_CONTROL_PKDET_CAL;		AR_PHY_AGC_CONTROL_PKDET_CAL;

			/* Use chip chainmask only for calibration */
	ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);		ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);

	if (rtt) {		if (rtt) {
	@@ -1150,6 +1151,9 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah,
	ar9003_hw_rtt_disable(ah);		ar9003_hw_rtt_disable(ah);
	}		}

			/* Revert chainmask to runtime parameters */
			ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);

	/* Initialize list pointers */		/* Initialize list pointers */
	ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;		ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;