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

Commit 6054069a authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k_hw: validate and fix broken eeprom chainmask settings 



Some devices (e.g. Ubiquiti AirRouter) ship with broken EEPROM chainmask
data, which breaks the initial calibration after a hardware reset.
To fix this, mask the eeprom chainmask with the chainmask of the chip,
and use the chip chainmask if the result is zero.

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

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

+22 −0
Original line number Diff line number Diff line
@@ -1997,12 +1997,22 @@ EXPORT_SYMBOL(ath9k_hw_set_sta_beacon_timers); 
/* HW Capabilities */

/*******************/



static u8 fixup_chainmask(u8 chip_chainmask, u8 eeprom_chainmask)

{

	eeprom_chainmask &= chip_chainmask;

	if (eeprom_chainmask)

		return eeprom_chainmask;

	else

		return chip_chainmask;

}



int ath9k_hw_fill_cap_info(struct ath_hw *ah)

{

	struct ath9k_hw_capabilities *pCap = &ah->caps;

	struct ath_regulatory *regulatory = ath9k_hw_regulatory(ah);

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_btcoex_hw *btcoex_hw = &ah->btcoex_hw;

	unsigned int chip_chainmask;



	u16 eeval;

	u8 ant_div_ctl1, tx_chainmask, rx_chainmask;
@@ -2039,6 +2049,15 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	if (eeval & AR5416_OPFLAGS_11G)

		pCap->hw_caps |= ATH9K_HW_CAP_2GHZ;



	if (AR_SREV_9485(ah) || AR_SREV_9285(ah) || AR_SREV_9330(ah))

		chip_chainmask = 1;

	else if (!AR_SREV_9280_20_OR_LATER(ah))

		chip_chainmask = 7;

	else if (!AR_SREV_9300_20_OR_LATER(ah) || AR_SREV_9340(ah))

		chip_chainmask = 3;

	else

		chip_chainmask = 7;



	pCap->tx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_TX_MASK);

	/*

	 * For AR9271 we will temporarilly uses the rx chainmax as read from
@@ -2055,6 +2074,9 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
		/* Use rx_chainmask from EEPROM. */

		pCap->rx_chainmask = ah->eep_ops->get_eeprom(ah, EEP_RX_MASK);



	pCap->tx_chainmask = fixup_chainmask(chip_chainmask, pCap->tx_chainmask);

	pCap->rx_chainmask = fixup_chainmask(chip_chainmask, pCap->rx_chainmask);



	ah->misc_mode |= AR_PCU_MIC_NEW_LOC_ENA;



	/* enable key search for every frame in an aggregate */