Commit 242ab7ad authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville

ath5k: fix SWI calibration interrupt storm

The calibration period is now invoked by triggering a software
interrupt from within the ISR by ath5k_hw_calibration_poll()
instead of via a timer.

However, the calibration interval isn't initialized before
interrupts are enabled, so we can have a situation where an
interrupt occurs before the interval is assigned, so the
interval is actually negative.  As a result, the ISR will
arm a software interrupt to schedule the tasklet, and then
rearm it when the SWI is processed, and so on, leading to a
softlockup at modprobe time.

Move the initialization order around so the calibration interval
is set before interrupts are active.  Another possible fix
is to schedule the tasklet directly from the poll routine,
but I think there are additional plans for the SWI.
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2e10d330
...@@ -2381,6 +2381,9 @@ ath5k_init(struct ath5k_softc *sc) ...@@ -2381,6 +2381,9 @@ ath5k_init(struct ath5k_softc *sc)
*/ */
ath5k_stop_locked(sc); ath5k_stop_locked(sc);
/* Set PHY calibration interval */
ah->ah_cal_intval = ath5k_calinterval;
/* /*
* The basic interface to setting the hardware in a good * The basic interface to setting the hardware in a good
* state is ``reset''. On return the hardware is known to * state is ``reset''. On return the hardware is known to
...@@ -2408,10 +2411,6 @@ ath5k_init(struct ath5k_softc *sc) ...@@ -2408,10 +2411,6 @@ ath5k_init(struct ath5k_softc *sc)
/* Set ack to be sent at low bit-rates */ /* Set ack to be sent at low bit-rates */
ath5k_hw_set_ack_bitrate_high(ah, false); ath5k_hw_set_ack_bitrate_high(ah, false);
/* Set PHY calibration inteval */
ah->ah_cal_intval = ath5k_calinterval;
ret = 0; ret = 0;
done: done:
mmiowb(); mmiowb();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment