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

Commit 9b9cc61c authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by John W. Linville
Browse files

ath9k_hw: Abort rx if hw is not coming out of full sleep in reset 



Signed-off-by: default avatarVasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent afe754d6

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

+7 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,13 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	ah->txchainmask = common->tx_chainmask;

	ah->rxchainmask = common->rx_chainmask;



	if (!ah->chip_fullsleep) {

		ath9k_hw_abortpcurecv(ah);

		if (!ath9k_hw_stopdmarecv(ah))

			ath_print(common, ATH_DBG_XMIT,

				"Failed to stop receive dma\n");

	}



	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))

		return -EIO;

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

+8 −0
Original line number Diff line number Diff line
@@ -747,6 +747,14 @@ void ath9k_hw_stoppcurecv(struct ath_hw *ah) 
}

EXPORT_SYMBOL(ath9k_hw_stoppcurecv);



void ath9k_hw_abortpcurecv(struct ath_hw *ah)

{

	REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);



	ath9k_hw_disable_mib_counters(ah);

}

EXPORT_SYMBOL(ath9k_hw_abortpcurecv);



bool ath9k_hw_stopdmarecv(struct ath_hw *ah)

{

#define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */

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

+1 −0
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *ah, bool set); 
void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);

void ath9k_hw_startpcureceive(struct ath_hw *ah);

void ath9k_hw_stoppcurecv(struct ath_hw *ah);

void ath9k_hw_abortpcurecv(struct ath_hw *ah);

bool ath9k_hw_stopdmarecv(struct ath_hw *ah);

int ath9k_hw_beaconq_setup(struct ath_hw *ah);