From: Bruno Randolf Date: Mon, 27 Sep 2010 03:22:32 +0000 (+0900) Subject: ath5k: Disable interrupts in ath5k_hw_get_tsf64 X-Git-Tag: upstream/snapshot3+hdmi~12689^2~265^2^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28df897a42aa41d6318be5b9872c4bb5c8d8d7e3;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git ath5k: Disable interrupts in ath5k_hw_get_tsf64 The code in ath5k_hw_get_tsf64() is time critical and will return wrong results if we get interrupted, so disable local interrupts. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c index 604114f..095d30b 100644 --- a/drivers/net/wireless/ath/ath5k/pcu.c +++ b/drivers/net/wireless/ath/ath5k/pcu.c @@ -495,6 +495,10 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah) { u32 tsf_lower, tsf_upper1, tsf_upper2; int i; + unsigned long flags; + + /* This code is time critical - we don't want to be interrupted here */ + local_irq_save(flags); /* * While reading TSF upper and then lower part, the clock is still @@ -517,6 +521,8 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah) tsf_upper1 = tsf_upper2; } + local_irq_restore(flags); + WARN_ON( i == ATH5K_MAX_TSF_READ ); return (((u64)tsf_upper1 << 32) | tsf_lower);