Return-path: Received: from ti-out-0910.google.com ([209.85.142.185]:49944 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756956AbYGPQPK (ORCPT ); Wed, 16 Jul 2008 12:15:10 -0400 Received: by ti-out-0910.google.com with SMTP id b6so3029478tic.23 for ; Wed, 16 Jul 2008 09:15:08 -0700 (PDT) Message-ID: <40f31dec0807160915g8a5b083p9f21fae729839445@mail.gmail.com> (sfid-20080716_181516_082610_481545EA) Date: Wed, 16 Jul 2008 19:15:07 +0300 From: "Nick Kossifidis" To: "Jiri Slaby" Subject: Re: [PATCH 5/5] Ath5k: suspend/resume fixes Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" , "Jesse Barnes" In-Reply-To: <1216136661-10930-4-git-send-email-jirislaby@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 References: <1216136661-10930-1-git-send-email-jirislaby@gmail.com> <1216136661-10930-4-git-send-email-jirislaby@gmail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: 2008/7/15 Jiri Slaby : > - 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 > Cc: Nick Kossifidis > Cc: Luis R. Rodriguez > Cc: Jesse Barnes > --- > 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 -- GPG ID: 0xD21DB2DB As you read this post global entropy rises. Have Fun ;-) Nick