2008/7/15 Jiri Slaby <jirislaby@xxxxxxxxx>:
> - free and re-request irq since it might have changed during suspend
> - disable and enable msi
> - don't set D0 state of the device, it's already done by the PCI layer
> - do restore_state before enable_device, it's safer
> - check ath5k_init return value
>
> Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
> Cc: Nick Kossifidis <mickflemm@xxxxxxxxx>
> Cc: Luis R. Rodriguez <mcgrof@xxxxxxxxx>
> Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath5k/base.c | 26 +++++++++++++++++++++-----
> 1 files changed, 21 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
> index 713ee99..d58a883 100644
> --- a/drivers/net/wireless/ath5k/base.c
> +++ b/drivers/net/wireless/ath5k/base.c
> @@ -593,6 +593,9 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)
> ath5k_led_off(sc);
>
> ath5k_stop_hw(sc);
> +
> + free_irq(pdev->irq, sc);
> + pci_disable_msi(pdev);
> pci_save_state(pdev);
> pci_disable_device(pdev);
> pci_set_power_state(pdev, PCI_D3hot);
> @@ -608,15 +611,12 @@ ath5k_pci_resume(struct pci_dev *pdev)
> struct ath5k_hw *ah = sc->ah;
> int i, err;
>
> - err = pci_set_power_state(pdev, PCI_D0);
> - if (err)
> - return err;
> + pci_restore_state(pdev);
>
> err = pci_enable_device(pdev);
> if (err)
> return err;
>
> - pci_restore_state(pdev);
> /*
> * Suspend/Resume resets the PCI configuration space, so we have to
> * re-disable the RETRY_TIMEOUT register (0x41) to keep
> @@ -624,7 +624,17 @@ ath5k_pci_resume(struct pci_dev *pdev)
> */
> pci_write_config_byte(pdev, 0x41, 0);
>
> - ath5k_init(sc);
> + pci_enable_msi(pdev);
> +
> + err = request_irq(pdev->irq, ath5k_intr, IRQF_SHARED, "ath", sc);
> + if (err) {
> + ATH5K_ERR(sc, "request_irq failed\n");
> + goto err_msi;
> + }
> +
> + err = ath5k_init(sc);
> + if (err)
> + goto err_irq;
> ath5k_led_enable(sc);
>
> /*
> @@ -638,6 +648,12 @@ ath5k_pci_resume(struct pci_dev *pdev)
> ath5k_hw_reset_key(ah, i);
>
> return 0;
> +err_irq:
> + free_irq(pdev->irq, sc);
> +err_msi:
> + pci_disable_msi(pdev);
> + pci_disable_device(pdev);
> + return err;
> }
> #endif /* CONFIG_PM */
>
> --
> 1.5.6.2
>
>
It's ok for now, but have in mind that on my upcoming patch series i'm
disabling msi (commented out) since it results no interrupts on pci-e
cards (seems there is a bug in kernel's msi implementation).
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
--
GPG ID: 0xD21DB2DB
As you read this post global entropy rises. Have Fun ;-)
Nick
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
