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

Commit 1e516ca7 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Handle abnormal NAV in AP mode 



Beacon transmission would get stuck if the NAV is
an invalid value for some reason. Check and correct
the NAV value in the HW when this happens.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9ef48932

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

+2 −0
Original line number Diff line number Diff line
@@ -334,6 +334,8 @@ void ath9k_beacon_tasklet(unsigned long data) 
	if (ath9k_hw_numtxpending(ah, sc->beacon.beaconq) != 0) {

		sc->beacon.bmisscnt++;



		ath9k_hw_check_nav(ah);



		if (!ath9k_hw_check_alive(ah))

			ieee80211_queue_work(sc->hw, &sc->hw_check_work);

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

+13 −0
Original line number Diff line number Diff line
@@ -1656,6 +1656,19 @@ static bool ath9k_hw_detect_mac_hang(struct ath_hw *ah) 
	return true;

}



void ath9k_hw_check_nav(struct ath_hw *ah)

{

	struct ath_common *common = ath9k_hw_common(ah);

	u32 val;



	val = REG_READ(ah, AR_NAV);

	if (val != 0xdeadbeef && val > 0x7fff) {

		ath_dbg(common, BSTUCK, "Abnormal NAV: 0x%x\n", val);

		REG_WRITE(ah, AR_NAV, 0);

	}

}

EXPORT_SYMBOL(ath9k_hw_check_nav);



bool ath9k_hw_check_alive(struct ath_hw *ah)

{

	int count = 50;

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

+1 −0
Original line number Diff line number Diff line
@@ -1031,6 +1031,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);

void ath9k_hw_check_nav(struct ath_hw *ah);

bool ath9k_hw_check_alive(struct ath_hw *ah);



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