Commit b6aec32a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by David S. Miller

uli526x: Add suspend and resume routines (updated)

Add suspend/resume support to the uli526x network driver (tested on x86_64,
with 'Ethernet controller: ALi Corporation M5263 Ethernet Controller, rev 40').

This patch is based on the suspend/resume code in the tg3 driver.
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 917270c6
...@@ -1110,19 +1110,15 @@ static void uli526x_timer(unsigned long data) ...@@ -1110,19 +1110,15 @@ static void uli526x_timer(unsigned long data)
/* /*
* Dynamic reset the ULI526X board
* Stop ULI526X board * Stop ULI526X board
* Free Tx/Rx allocated memory * Free Tx/Rx allocated memory
* Reset ULI526X board * Init system variable
* Re-initialize ULI526X board
*/ */
static void uli526x_dynamic_reset(struct net_device *dev) static void uli526x_reset_prepare(struct net_device *dev)
{ {
struct uli526x_board_info *db = netdev_priv(dev); struct uli526x_board_info *db = netdev_priv(dev);
ULI526X_DBUG(0, "uli526x_dynamic_reset()", 0);
/* Sopt MAC controller */ /* Sopt MAC controller */
db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */ db->cr6_data &= ~(CR6_RXSC | CR6_TXSC); /* Disable Tx/Rx */
update_cr6(db->cr6_data, dev->base_addr); update_cr6(db->cr6_data, dev->base_addr);
...@@ -1141,6 +1137,22 @@ static void uli526x_dynamic_reset(struct net_device *dev) ...@@ -1141,6 +1137,22 @@ static void uli526x_dynamic_reset(struct net_device *dev)
db->link_failed = 1; db->link_failed = 1;
db->init=1; db->init=1;
db->wait_reset = 0; db->wait_reset = 0;
}
/*
* Dynamic reset the ULI526X board
* Stop ULI526X board
* Free Tx/Rx allocated memory
* Reset ULI526X board
* Re-initialize ULI526X board
*/
static void uli526x_dynamic_reset(struct net_device *dev)
{
ULI526X_DBUG(0, "uli526x_dynamic_reset()", 0);
uli526x_reset_prepare(dev);
/* Re-initialize ULI526X board */ /* Re-initialize ULI526X board */
uli526x_init(dev); uli526x_init(dev);
...@@ -1150,6 +1162,88 @@ static void uli526x_dynamic_reset(struct net_device *dev) ...@@ -1150,6 +1162,88 @@ static void uli526x_dynamic_reset(struct net_device *dev)
} }
#ifdef CONFIG_PM
/*
* Suspend the interface.
*/
static int uli526x_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct net_device *dev = pci_get_drvdata(pdev);
pci_power_t power_state;
int err;
ULI526X_DBUG(0, "uli526x_suspend", 0);
if (!netdev_priv(dev))
return 0;
pci_save_state(pdev);
if (!netif_running(dev))
return 0;
netif_device_detach(dev);
uli526x_reset_prepare(dev);
power_state = pci_choose_state(pdev, state);
pci_enable_wake(pdev, power_state, 0);
err = pci_set_power_state(pdev, power_state);
if (err) {
netif_device_attach(dev);
/* Re-initialize ULI526X board */
uli526x_init(dev);
/* Restart upper layer interface */
netif_wake_queue(dev);
}
return err;
}
/*
* Resume the interface.
*/
static int uli526x_resume(struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
int err;
ULI526X_DBUG(0, "uli526x_resume", 0);
if (!netdev_priv(dev))
return 0;
pci_restore_state(pdev);
if (!netif_running(dev))
return 0;
err = pci_set_power_state(pdev, PCI_D0);
if (err) {
printk(KERN_WARNING "%s: Could not put device into D0\n",
dev->name);
return err;
}
netif_device_attach(dev);
/* Re-initialize ULI526X board */
uli526x_init(dev);
/* Restart upper layer interface */
netif_wake_queue(dev);
return 0;
}
#else /* !CONFIG_PM */
#define uli526x_suspend NULL
#define uli526x_resume NULL
#endif /* !CONFIG_PM */
/* /*
* free all allocated rx buffer * free all allocated rx buffer
*/ */
...@@ -1689,6 +1783,8 @@ static struct pci_driver uli526x_driver = { ...@@ -1689,6 +1783,8 @@ static struct pci_driver uli526x_driver = {
.id_table = uli526x_pci_tbl, .id_table = uli526x_pci_tbl,
.probe = uli526x_init_one, .probe = uli526x_init_one,
.remove = __devexit_p(uli526x_remove_one), .remove = __devexit_p(uli526x_remove_one),
.suspend = uli526x_suspend,
.resume = uli526x_resume,
}; };
MODULE_AUTHOR("Peer Chen, peer.chen@uli.com.tw"); MODULE_AUTHOR("Peer Chen, peer.chen@uli.com.tw");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment