Re: Subject: [PATCH 2.6.20 004/005] dmfe: Add support for suspend/resume
From: Maxim <maximlevitsky@gmail.com>
Date: 2007-02-17 22:30:46
Also in:
lkml
On Saturday 17 February 2007 13:50:29 Pavel Machek wrote:
Hi!quoted
@@ -2050,11 +2047,56 @@ static struct pci_device_id dmfe_pci_tbl MODULE_DEVICE_TABLE(pci, dmfe_pci_tbl); + +static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) +{ + struct net_device *dev = pci_get_drvdata(pci_dev); + struct dmfe_board_info *db = netdev_priv(dev); + + /* Disable upper layer interface */ + netif_device_detach (dev); + + /* Disable Tx/Rx */ + db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); + update_cr6(db->cr6_data, dev->base_addr); + + /* Disable Interrupt */ + outl (0, dev->base_addr + DCR7); + outl (inl (dev->base_addr + DCR5), dev->base_addr + DCR5);Please no space between function and "(".
I missed that part of coding style about no space after function name
quoted
+ /* Fre RX buffers */Free?
Of course :-)
quoted
+ dmfe_free_rxbuffer (db);quoted
+ /* Power down device*/" */"quoted
+ pci_set_power_state (pci_dev, pci_choose_state (pci_dev,state));Let it be ", state", and delete spaces between function and "(".
Sure
quoted
+static int dmfe_resume (struct pci_dev *pci_dev)delete spaces between function and "(".quoted
+ pci_restore_state(pci_dev); + pci_set_power_state(pci_dev ,PCI_D0); +", " Otherwise looks ok to me.
Hello , I am sorry that I missed some parts of coding style. I need to reread it :-) There is a updated patch :
--- linux-2.6.20-mod/drivers/net/tulip/dmfe.c 2007-02-15 18:24:47.000000000 +0200
+++ linux-2.6.20-test/drivers/net/tulip/dmfe.c 2007-02-15 18:26:34.000000000 +0200@@ -55,9 +55,6 @@ TODO - Implement pci_driver::suspend() and pci_driver::resume() - power management methods. - Check on 64 bit boxes. Check and fix on big endian boxes.
@@ -2050,11 +2047,56 @@ static struct pci_device_id dmfe_pci_tbl MODULE_DEVICE_TABLE(pci, dmfe_pci_tbl); + +static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state) +{ + struct net_device *dev = pci_get_drvdata(pci_dev); + struct dmfe_board_info *db = netdev_priv(dev); + + /* Disable upper layer interface */ + netif_device_detach(dev); + + /* Disable Tx/Rx */ + db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); + update_cr6(db->cr6_data, dev->base_addr); + + /* Disable Interrupt */ + outl (0, dev->base_addr + DCR7); + outl (inl(dev->base_addr + DCR5), dev->base_addr + DCR5); + + /* Free RX buffers */ + dmfe_free_rxbuffer(db); + + /* Power down device*/ + pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state)); + pci_save_state(pci_dev); + + return 0; +} + +static int dmfe_resume(struct pci_dev *pci_dev) +{ + struct net_device *dev = pci_get_drvdata(pci_dev); + + pci_restore_state(pci_dev); + pci_set_power_state(pci_dev, PCI_D0); + + /* Re-initialize DM910X board */ + dmfe_init_dm910x(dev); + + /* Restart upper layer interface */ + netif_device_attach(dev); + + return 0; +} + static struct pci_driver dmfe_driver = { .name = "dmfe", .id_table = dmfe_pci_tbl, .probe = dmfe_init_one, .remove = __devexit_p(dmfe_remove_one), + .suspend = dmfe_suspend, + .resume = dmfe_resume }; MODULE_AUTHOR("Sten Wang, sten_wang@davicom.com.tw");