ath5k: Wakeup fixes

* Don't put chip to full sleep because there are problems during
   wakeup. Instead hold MAC/Baseband on warm reset state via a new
   function ath5k_hw_on_hold.

 * Minor cleanups

Signed-off-by: Nick Kossifidis <mickflemm@gmail.com>
Tested-by: Ben Greear <greearb@candelatech.com>
Tested-by: Johannes Stezenbach <js@sig21.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 23 insertions, 21 deletions

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 5d5028538ac2..0370cba8356c 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -2446,27 +2446,29 @@ ath5k_stop_hw(struct ath5k_softc *sc)
         ret = ath5k_stop_locked(sc);
         if (ret == 0 && !test_bit(ATH_STAT_INVALID, sc->status)) {
                 /*
-                 * Set the chip in full sleep mode.  Note that we are
-                 * careful to do this only when bringing the interface
-                 * completely to a stop.  When the chip is in this state
-                 * it must be carefully woken up or references to
-                 * registers in the PCI clock domain may freeze the bus
-                 * (and system).  This varies by chip and is mostly an
-                 * issue with newer parts that go to sleep more quickly.
-                 */
-                if (sc->ah->ah_mac_srev >= 0x78) {
-                        /*
-                         * XXX
-                         * don't put newer MAC revisions > 7.8 to sleep because
-                         * of the above mentioned problems
-                         */
-                        ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "mac version > 7.8, "
-                                "not putting device to sleep\n");
-                } else {
-                        ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
-                                "putting device to full sleep\n");
-                        ath5k_hw_set_power(sc->ah, AR5K_PM_FULL_SLEEP, true, 0);
-                }
+                 * Don't set the card in full sleep mode!
+                 *
+                 * a) When the device is in this state it must be carefully
+                 * woken up or references to registers in the PCI clock
+                 * domain may freeze the bus (and system).  This varies
+                 * by chip and is mostly an issue with newer parts
+                 * (madwifi sources mentioned srev >= 0x78) that go to
+                 * sleep more quickly.
+                 *
+                 * b) On older chips full sleep results a weird behaviour
+                 * during wakeup. I tested various cards with srev < 0x78
+                 * and they don't wake up after module reload, a second
+                 * module reload is needed to bring the card up again.
+                 *
+                 * Until we figure out what's going on don't enable
+                 * full chip reset on any chip (this is what Legacy HAL
+                 * and Sam's HAL do anyway). Instead Perform a full reset
+                 * on the device (same as initial state after attach) and
+                 * leave it idle (keep MAC/BB on warm reset) */
+                ret = ath5k_hw_on_hold(sc->ah);
+
+                ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
+                                "putting device to sleep\n");
         }
         ath5k_txbuf_free(sc, sc->bbuf);