| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Sun, 11 Mar 2007 14:47:45 +0100
From: "Rafael J. Wysocki" <rjw@...k.pl>
To: netdev@...r.kernel.org
Cc: pm list <linux-pm@...ts.osdl.org>
Subject: [PATCH] Attempt to add suspend/resume support to uli526x
Hi,
The uli526x network driver doesn't implement .suspend and .resume methods
and the interface handled by it is unuseable after the resume. Since I have
one of these boards in a box which is used to test the suspend/resume
functionality, I've prepared the appended patch that adds the .suspend and
.resume routines to the uli526x driver based on the ones implemented by 3c59x.
Please have a look at it and let me know if there's anything wrong with it (it
seems to work and doesn't seem to break anything).
Greetings,
Rafael
---
drivers/net/tulip/uli526x.c | 125 ++++++++++++++++++++++++++++++++++++++------
1 file changed, 110 insertions(+), 15 deletions(-)
Index: linux-2.6.21-rc3-mm2/drivers/net/tulip/uli526x.c
===================================================================
--- linux-2.6.21-rc3-mm2.orig/drivers/net/tulip/uli526x.c 2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-rc3-mm2/drivers/net/tulip/uli526x.c 2007-03-11 14:24:29.000000000 +0100
@@ -425,21 +425,14 @@ static void __devexit uli526x_remove_one
/*
- * Open the interface.
- * The interface is opened whenever "ifconfig" activates it.
+ * Bring the interface up.
+ * Used by uli526x_open and uli526x_resume.
*/
-static int uli526x_open(struct net_device *dev)
+static void uli526x_up(struct net_device *dev)
{
- int ret;
struct uli526x_board_info *db = netdev_priv(dev);
- ULI526X_DBUG(0, "uli526x_open", 0);
-
- ret = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED, dev->name, dev);
- if (ret)
- return ret;
-
/* system variable init */
db->cr6_data = CR6_DEFAULT | uli526x_cr6_user_set;
db->tx_packet_cnt = 0;
@@ -467,7 +460,25 @@ static int uli526x_open(struct net_devic
db->timer.data = (unsigned long)dev;
db->timer.function = &uli526x_timer;
add_timer(&db->timer);
+}
+
+
+/*
+ * Open the interface.
+ * The interface is opened whenever "ifconfig" activates it.
+ */
+
+static int uli526x_open(struct net_device *dev)
+{
+ int ret;
+
+ ULI526X_DBUG(0, "uli526x_open", 0);
+
+ ret = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED, dev->name, dev);
+ if (ret)
+ return ret;
+ uli526x_up(dev);
return 0;
}
@@ -613,17 +624,15 @@ static int uli526x_start_xmit(struct sk_
/*
- * Stop the interface.
- * The interface is stopped when it is brought.
+ * Take the interface down.
+ * Used by uli526x_stop and uli526x_suspend.
*/
-static int uli526x_stop(struct net_device *dev)
+static void uli526x_down(struct net_device *dev)
{
struct uli526x_board_info *db = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr;
- ULI526X_DBUG(0, "uli526x_stop", 0);
-
/* disable system */
netif_stop_queue(dev);
@@ -634,6 +643,21 @@ static int uli526x_stop(struct net_devic
outl(ULI526X_RESET, ioaddr + DCR0);
udelay(5);
phy_write(db->ioaddr, db->phy_addr, 0, 0x8000, db->chip_id);
+}
+
+
+/*
+ * Stop the interface.
+ * The interface is stopped when it is brought.
+ */
+
+static int uli526x_stop(struct net_device *dev)
+{
+ struct uli526x_board_info *db = netdev_priv(dev);
+
+ ULI526X_DBUG(0, "uli526x_stop", 0);
+
+ uli526x_down(dev);
/* free interrupt */
free_irq(dev->irq, dev);
@@ -654,6 +678,73 @@ static int uli526x_stop(struct net_devic
}
+#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);
+
+ ULI526X_DBUG(0, "uli526x_suspend", 0);
+
+ if (dev && netdev_priv(dev)) {
+ if (netif_running(dev)) {
+ netif_device_detach(dev);
+ uli526x_down(dev);
+ }
+ pci_save_state(pdev);
+ pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
+ free_irq(dev->irq, dev);
+ pci_disable_device(pdev);
+ pci_set_power_state(pdev, pci_choose_state(pdev, state));
+ }
+ return 0;
+}
+
+/*
+ * Resume the interface.
+ */
+
+static int uli526x_resume(struct pci_dev *pdev)
+{
+ struct net_device *dev = pci_get_drvdata(pdev);
+ struct uli526x_board_info *db = netdev_priv(dev);
+ int err;
+
+ ULI526X_DBUG(0, "uli526x_resume", 0);
+
+ if (dev && db) {
+ pci_set_power_state(pdev, PCI_D0);
+ pci_restore_state(pdev);
+ err = pci_enable_device(pdev);
+ if (err) {
+ printk(KERN_WARNING "%s: Could not enable device \n",
+ dev->name);
+ return err;
+ }
+ pci_set_master(pdev);
+ err = request_irq(dev->irq, &uli526x_interrupt, IRQF_SHARED,
+ dev->name, dev);
+ if (err) {
+ printk(KERN_WARNING "%s: Could not reserve IRQ %d\n",
+ dev->name, dev->irq);
+ pci_disable_device(pdev);
+ return err;
+ }
+ if (netif_running(dev)) {
+ uli526x_up(dev);
+ netif_device_attach(dev);
+ }
+ }
+ return 0;
+}
+
+#endif /* CONFIG_PM */
+
+
/*
* M5261/M5263 insterrupt handler
* receive the packet to upper layer, free the transmitted packet
@@ -1683,6 +1774,10 @@ static struct pci_driver uli526x_driver
.id_table = uli526x_pci_tbl,
.probe = uli526x_init_one,
.remove = __devexit_p(uli526x_remove_one),
+#ifdef CONFIG_PM
+ .suspend = uli526x_suspend,
+ .resume = uli526x_resume,
+#endif
};
MODULE_AUTHOR("Peer Chen, peer.chen@....com.tw");
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists