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

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

ath9k_hw: Fix usec to hw clock conversion in 5Ghz for ar9003 



Fast clock operation (44Mhz) is enabled for 5Ghz in ar9003, so
take care of the conversion from usec to hw clock.

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

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

+8 −2
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#define ATH9K_CLOCK_RATE_CCK		22

#define ATH9K_CLOCK_RATE_5GHZ_OFDM	40

#define ATH9K_CLOCK_RATE_2GHZ_OFDM	44

#define ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM 44



static bool ath9k_hw_set_reset_reg(struct ath_hw *ah, u32 type);
@@ -90,6 +91,10 @@ static u32 ath9k_hw_mac_clks(struct ath_hw *ah, u32 usecs) 
		return usecs *ATH9K_CLOCK_RATE_CCK;

	if (conf->channel->band == IEEE80211_BAND_2GHZ)

		return usecs *ATH9K_CLOCK_RATE_2GHZ_OFDM;



	if (ah->caps.hw_caps & ATH9K_HW_CAP_FASTCLOCK)

		return usecs * ATH9K_CLOCK_FAST_RATE_5GHZ_OFDM;

	else

		return usecs * ATH9K_CLOCK_RATE_5GHZ_OFDM;

}
@@ -2188,7 +2193,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah) 
	}



	if (AR_SREV_9300_20_OR_LATER(ah)) {

		pCap->hw_caps |= ATH9K_HW_CAP_EDMA | ATH9K_HW_CAP_LDPC;

		pCap->hw_caps |= ATH9K_HW_CAP_EDMA | ATH9K_HW_CAP_LDPC |

				 ATH9K_HW_CAP_FASTCLOCK;

		pCap->rx_hp_qdepth = ATH9K_HW_RX_HP_QDEPTH;

		pCap->rx_lp_qdepth = ATH9K_HW_RX_LP_QDEPTH;

		pCap->rx_status_len = sizeof(struct ar9003_rxs);

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

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ enum ath9k_hw_caps { 
	ATH9K_HW_CAP_EDMA			= BIT(17),

	ATH9K_HW_CAP_RAC_SUPPORTED		= BIT(18),

	ATH9K_HW_CAP_LDPC			= BIT(19),

	ATH9K_HW_CAP_FASTCLOCK			= BIT(20),

};



enum ath9k_capability_type {