ath5k: avoid PCI FATAL interrupts by restoring RETRY_TIMEOUT disabling
authorJouni Malinen <jouni.malinen@atheros.com>
Tue, 16 Jun 2009 08:59:23 +0000 (11:59 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 19 Jun 2009 15:50:18 +0000 (11:50 -0400)
This reverts 'ath5k: remove dummy PCI "retry timeout" fix' on the
same theory as in 'ath9k: Fix PCI FATAL interrupts by restoring
RETRY_TIMEOUT disabling'.

Reported-by: Bob Copeland <me@bobcopeland.com>
Cc: stable@kernel.org
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath5k/base.c

index 55f7de09d134bc3341ac4da3fa78373b2a6a8cbd..fc5ba0e3a6812262c10160242da41f08256fc8aa 100644 (file)
@@ -686,6 +686,13 @@ ath5k_pci_resume(struct pci_dev *pdev)
        if (err)
                return err;
 
+       /*
+        * Suspend/Resume resets the PCI configuration space, so we have to
+        * re-disable the RETRY_TIMEOUT register (0x41) to keep
+        * PCI Tx retries from interfering with C3 CPU state
+        */
+       pci_write_config_byte(pdev, 0x41, 0);
+
        err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
        if (err) {
                ATH5K_ERR(sc, "request_irq failed\n");