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

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

ath9k_hw: small optimization in ar9002_hw_get_isr 



ah->config.rx_intr_mitigation does not need to be checked before checking
the rx interrupt mask for AR_ISR_RXMINTR or AR_ISR_RXINTM, as those
interrupts will be masked out if rx interrupt mitigation is disabled.

Avoid reading AR_ISR_S5_S twice by reordering the code to be more concise.

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

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

+11 −21
Original line number Diff line number Diff line
@@ -90,13 +90,10 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 


		*masked = isr & ATH9K_INT_COMMON;



		if (ah->config.rx_intr_mitigation) {

			if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM))

		if (isr & (AR_ISR_RXMINTR | AR_ISR_RXINTM |

			   AR_ISR_RXOK | AR_ISR_RXERR))

			*masked |= ATH9K_INT_RX;

		}



		if (isr & (AR_ISR_RXOK | AR_ISR_RXERR))

			*masked |= ATH9K_INT_RX;

		if (isr &

		    (AR_ISR_TXOK | AR_ISR_TXDESC | AR_ISR_TXERR |

		     AR_ISR_TXEOL)) {
@@ -118,14 +115,6 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 
				  "receive FIFO overrun interrupt\n");

		}



		if (!AR_SREV_9100(ah)) {

			if (!(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP)) {

				u32 isr5 = REG_READ(ah, AR_ISR_S5_S);

				if (isr5 & AR_ISR_S5_TIM_TIMER)

					*masked |= ATH9K_INT_TIM_TIMER;

			}

		}



		*masked |= mask2;

	}
@@ -136,7 +125,6 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 
		u32 s5_s;



		s5_s = REG_READ(ah, AR_ISR_S5_S);

		if (isr & AR_ISR_GENTMR) {

		ah->intr_gen_timer_trigger =

				MS(s5_s, AR_ISR_S5_GENTIMER_TRIG);
@@ -146,7 +134,9 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 
		if (ah->intr_gen_timer_trigger)

			*masked |= ATH9K_INT_GENTIMER;



		}

		if ((s5_s & AR_ISR_S5_TIM_TIMER) &&

		    !(pCap->hw_caps & ATH9K_HW_CAP_AUTOSLEEP))

			*masked |= ATH9K_INT_TIM_TIMER;

	}



	if (sync_cause) {