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

Commit a37a9910 authored May 23, 2013 by Felix Fietkau Committed by John W. Linville May 24, 2013

ath9k_hw: fix host interface reset on AR934x



If a local bus timeout has been detected, the host interface needs to be
reset to clear the errors. AR934x uses a different synchronous interrupt
bit to indicate this, so the check needs to be fixed.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 23dd9b2a

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -1306,9 +1306,13 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
		AR_RTC_RC_COLD_RESET \| AR_RTC_RC_WARM_RESET;
		} else {
		tmpReg = REG_READ(ah, AR_INTR_SYNC_CAUSE);
		if (tmpReg &
		(AR_INTR_SYNC_LOCAL_TIMEOUT \|
		AR_INTR_SYNC_RADM_CPL_TIMEOUT)) {
		if (AR_SREV_9340(ah))
		tmpReg &= AR9340_INTR_SYNC_LOCAL_TIMEOUT;
		else
		tmpReg &= AR_INTR_SYNC_LOCAL_TIMEOUT \|
		AR_INTR_SYNC_RADM_CPL_TIMEOUT;

		if (tmpReg) {
		u32 val;
		REG_WRITE(ah, AR_INTR_SYNC_ENABLE, 0);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1007,6 +1007,8 @@ enum {
		AR_INTR_SYNC_LOCAL_TIMEOUT \|
		AR_INTR_SYNC_MAC_SLEEP_ACCESS),

		AR9340_INTR_SYNC_LOCAL_TIMEOUT = 0x00000010,

		AR_INTR_SYNC_SPURIOUS = 0xFFFFFFFF,

		};