From: Mark Einon Date: Sat, 1 Oct 2011 10:14:13 +0000 (+0100) Subject: staging: et131x: Add pci suspend & resume functions X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=25e1c2780c2cef0456c850237abd895781d34e44;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging: et131x: Add pci suspend & resume functions Added basic suspend & resume functionality. Tested on an et1310 device, and putting Fedora15 host in and out of hibernation successfully. Signed-off-by: Mark Einon Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/et131x/README b/drivers/staging/et131x/README index d24ef84dcd8a..42c388d2098d 100644 --- a/drivers/staging/et131x/README +++ b/drivers/staging/et131x/README @@ -10,7 +10,6 @@ driver as they did not build properly at the time. TODO: - add_timer call in et131x_netdev.c is correct? - - Add power saving functionality (suspend, sleep, resume) - Implement a few more kernel Parameter (set mac ) Please send patches to: diff --git a/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h index d967c5a1fe72..15486d11f959 100644 --- a/drivers/staging/et131x/et131x.h +++ b/drivers/staging/et131x/et131x.h @@ -82,6 +82,8 @@ void et1310_setup_device_for_multicast(struct et131x_adapter *adapter); void et1310_setup_device_for_unicast(struct et131x_adapter *adapter); /* et131x_netdev.c */ +int et131x_open(struct net_device *netdev); +int et131x_close(struct net_device *netdev); struct net_device *et131x_device_alloc(void); void et131x_enable_txrx(struct net_device *netdev); void et131x_disable_txrx(struct net_device *netdev); diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 10283a397c9d..e166fde8997a 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -869,6 +869,45 @@ static void __devexit et131x_pci_remove(struct pci_dev *pdev) pci_disable_device(pdev); } +static int et131x_pci_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + + if (!netif_running(netdev)) + return 0; + + et131x_close(netdev); + netif_device_detach(netdev); + + pci_save_state(pdev); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); + + return 0; +} + +static int et131x_pci_resume(struct pci_dev *pdev) +{ + struct net_device *netdev = pci_get_drvdata(pdev); + int err = 0; + + if (!netif_running(netdev)) + return 0; + + pci_set_power_state(pdev, PCI_D0); + pci_restore_state(pdev); + + err = et131x_open(netdev); + if (err) { + dev_err(&pdev->dev, "Can't resume interface!\n"); + goto out; + } + + netif_device_attach(netdev); + +out: + return err; +} + static struct pci_device_id et131x_pci_table[] __devinitdata = { {ET131X_PCI_VENDOR_ID, ET131X_PCI_DEVICE_ID_GIG, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL}, @@ -884,8 +923,10 @@ static struct pci_driver et131x_driver = { .id_table = et131x_pci_table, .probe = et131x_pci_setup, .remove = __devexit_p(et131x_pci_remove), - .suspend = NULL, /* et131x_pci_suspend */ - .resume = NULL, /* et131x_pci_resume */ +#ifdef CONFIG_PM + .suspend = et131x_pci_suspend, + .resume = et131x_pci_resume, +#endif }; /**