[PATCH] orinoco: support PCI suspend/resume for Nortel, PLX and TMD adaptors

Copy PCI suspend/resume functions from orinoco_pci.c.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 83 insertions, 4 deletions

diff --git a/drivers/net/wireless/orinoco_nortel.c b/drivers/net/wireless/orinoco_nortel.c
index d1a670b3533..3fff013f678 100644
--- a/drivers/net/wireless/orinoco_nortel.c
+++ b/drivers/net/wireless/orinoco_nortel.c
@@ -263,6 +263,83 @@ static void __devexit nortel_pci_remove_one(struct pci_dev *pdev)
         pci_disable_device(pdev);
 }
 
+static int orinoco_nortel_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct orinoco_private *priv = netdev_priv(dev);
+        unsigned long flags;
+        int err;
+
+        err = orinoco_lock(priv, &flags);
+        if (err) {
+                printk(KERN_ERR "%s: cannot lock hardware for suspend\n",
+                       dev->name);
+                return err;
+        }
+
+        err = __orinoco_down(dev);
+        if (err)
+                printk(KERN_WARNING "%s: error %d bringing interface down "
+                       "for suspend\n", dev->name, err);
+        
+        netif_device_detach(dev);
+
+        priv->hw_unavailable++;
+        
+        orinoco_unlock(priv, &flags);
+
+        free_irq(pdev->irq, dev);
+        pci_save_state(pdev);
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, PCI_D3hot);
+
+        return 0;
+}
+
+static int orinoco_nortel_resume(struct pci_dev *pdev)
+{
+        struct net_device *dev = pci_get_drvdata(pdev);
+        struct orinoco_private *priv = netdev_priv(dev);
+        unsigned long flags;
+        int err;
+
+        pci_set_power_state(pdev, 0);
+        pci_enable_device(pdev);
+        pci_restore_state(pdev);
+
+        err = request_irq(pdev->irq, orinoco_interrupt, SA_SHIRQ,
+                          dev->name, dev);
+        if (err) {
+                printk(KERN_ERR "%s: cannot re-allocate IRQ on resume\n",
+                       dev->name);
+                pci_disable_device(pdev);
+                return -EBUSY;
+        }
+
+        err = orinoco_reinit_firmware(dev);
+        if (err) {
+                printk(KERN_ERR "%s: error %d re-initializing firmware "
+                       "on resume\n", dev->name, err);
+                return err;
+        }
+
+        spin_lock_irqsave(&priv->lock, flags);
+
+        netif_device_attach(dev);
+
+        priv->hw_unavailable--;
+
+        if (priv->open && (! priv->hw_unavailable)) {
+                err = __orinoco_up(dev);
+                if (err)
+                        printk(KERN_ERR "%s: Error %d restarting card on resume\n",
+                               dev->name, err);
+        }
+        
+        spin_unlock_irqrestore(&priv->lock, flags);
+
+        return 0;
+}
 
 static struct pci_device_id nortel_pci_id_table[] = {
         /* Nortel emobility PCI */
@@ -275,10 +352,12 @@ static struct pci_device_id nortel_pci_id_table[] = {
 MODULE_DEVICE_TABLE(pci, nortel_pci_id_table);
 
 static struct pci_driver nortel_pci_driver = {
-        .name = DRIVER_NAME,
-        .id_table = nortel_pci_id_table,
-        .probe = nortel_pci_init_one,
-        .remove = __devexit_p(nortel_pci_remove_one),
+        .name           = DRIVER_NAME,
+        .id_table       = nortel_pci_id_table,
+        .probe          = nortel_pci_init_one,
+        .remove         = __devexit_p(nortel_pci_remove_one),
+        .suspend        = orinoco_nortel_suspend,
+        .resume         = orinoco_nortel_resume,
 };
 
 static char version[] __initdata = DRIVER_NAME " " DRIVER_VERSION