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

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

ath9k: check for specific rx stuck conditions and recover from them 



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

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

+28 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,34 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah, 
	return true;

}



bool ath9k_hw_check_alive(struct ath_hw *ah)

{

	int count = 50;

	u32 reg;



	if (AR_SREV_9285_10_OR_LATER(ah))

		return true;



	do {

		reg = REG_READ(ah, AR_OBS_BUS_1);



		if ((reg & 0x7E7FFFEF) == 0x00702400)

			continue;



		switch (reg & 0x7E000B00) {

		case 0x1E000000:

		case 0x52000B00:

		case 0x18000B00:

			continue;

		default:

			return true;

		}

	} while (count-- > 0);



	return false;

}

EXPORT_SYMBOL(ath9k_hw_check_alive);



int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,

		    bool bChannelChange)

{

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

+1 −0
Original line number Diff line number Diff line
@@ -869,6 +869,7 @@ void ath9k_hw_set11nmac2040(struct ath_hw *ah); 
void ath9k_hw_beaconinit(struct ath_hw *ah, u32 next_beacon, u32 beacon_period);

void ath9k_hw_set_sta_beacon_timers(struct ath_hw *ah,

				    const struct ath9k_beacon_state *bs);

bool ath9k_hw_check_alive(struct ath_hw *ah);



bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);

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

+2 −1
Original line number Diff line number Diff line
@@ -405,7 +405,8 @@ void ath9k_tasklet(unsigned long data) 


	ath9k_ps_wakeup(sc);



	if (status & ATH9K_INT_FATAL) {

	if ((status & ATH9K_INT_FATAL) ||

	    !ath9k_hw_check_alive(ah)) {

		ath_reset(sc, false);

		ath9k_ps_restore(sc);

		return;