[005] dmfe : Add support for wake-on-lan [FIXED]
Subsystems (2)
PATCH 1/1 [005] dmfe : Add support for wake-on-lan [FIXED]
Hello , I just noticed a error in my patch , just a mistake , sorry please
in dmfe_resume I mixed DMFE_WOL_LINKCHANGE | DMFE_WOL_MAGICPACKET , and WAKE_PHY | WAKE_MAGIC
here goes updated patch:
From: Maxim Levitsky <[email protected]>
Subject: [PATCH] [NET] [005] dmfe : Add support for wake-on-lan
Adds support for wake on lan feature
---
This board supports WOL on magic packet / link change / specific packet This adds support for WOL on magic packet / link change
Note : WOL is enabled when you suspend system ether to disk or ram, and is not enabled when you turn system off
drivers/net/tulip/dmfe.c +62 -2
@@ -122,6 +122,11 @@#define DM9801_NOISE_FLOOR 8#define DM9802_NOISE_FLOOR 5 +#define DMFE_WOL_LINKCHANGE 0x20000000 +#define DMFE_WOL_SAMPLEPACKET 0x10000000 +#define DMFE_WOL_MAGICPACKET 0x08000000 + +#define DMFE_10MHF 0#define DMFE_100MHF 1#define DMFE_10MFD 4
@@ -242,6 +247,7 @@ struct dmfe_board_info {u8 wait_reset;/* Hardware failed, need to reset */ u8 dm910x_chk_mode;/* Operating mode check */ u8 first_in_callback;/* Flag to record state */ +u8 wol_mode;/* user WOL settings */ struct timer_list timer;/* System defined statistic counter */
@@ -423,6 +429,7 @@ static int __devinit dmfe_init_one (stru db->chip_id = ent->driver_data; db->ioaddr =pci_resource_start (pdev,0 ); db->chip_revision = dev_rev; + db->wol_mode =0 ; db->pdev = pdev;
@@ -1054,7 +1061,11 @@ static void dmfe_set_filter_mode(structspin_unlock_irqrestore (&db->lock, flags); } -static void netdev_get_drvinfo (struct net_device *dev, +/* +* Ethtool interace +*/ + +static void dmfe_ethtool_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct dmfe_board_info *np =netdev_priv (dev);
@@ -1068,9 +1079,35 @@ static void netdev_get_drvinfo(struct ne dev->base_addr, dev->irq); } +static int dmfe_ethtool_set_wol (struct net_device *dev, +struct ethtool_wolinfo *wolinfo) +{ +struct dmfe_board_info *db =netdev_priv (dev); + +if (wolinfo->wolopts & (WAKE_UCAST |WAKE_MCAST |WAKE_BCAST | +WAKE_ARP |WAKE_MAGICSECURE )) +return -EOPNOTSUPP ; + + db->wol_mode = wolinfo->wolopts; +return 0 ; +} + +static void dmfe_ethtool_get_wol (struct net_device *dev, +struct ethtool_wolinfo *wolinfo) +{ +struct dmfe_board_info *db =netdev_priv (dev); + + wolinfo->supported =WAKE_PHY |WAKE_MAGIC ; + wolinfo->wolopts = db->wol_mode; +return ; +} + +static const struct ethtool_ops netdev_ethtool_ops = { - .get_drvinfo = netdev_get_drvinfo, + .get_drvinfo = dmfe_ethtool_get_drvinfo, .get_link = ethtool_op_get_link, + .set_wol = dmfe_ethtool_set_wol, + .get_wol = dmfe_ethtool_get_wol, };/*
@@ -2046,6 +2083,20 @@ static int dmfe_suspend(struct pci_dev */* Fre RX buffers */ dmfe_free_rxbuffer (db); +/* Enable WOL */ +pci_read_config_dword (pci_dev,0x40 , &tmp); + tmp &= ~(DMFE_WOL_LINKCHANGE |DMFE_WOL_MAGICPACKET ); + +if (db->wol_mode &WAKE_PHY ) + tmp |=DMFE_WOL_LINKCHANGE ; +if (db->wol_mode &WAKE_MAGIC ) + tmp |=DMFE_WOL_MAGICPACKET ; + +pci_write_config_dword (pci_dev,0x40 , tmp); + +pci_enable_wake (pci_dev, PCI_D3hot,1 ); +pci_enable_wake (pci_dev, PCI_D3cold,1 ); +/* Power down device*/ pci_set_power_state (pci_dev ,pci_choose_state (pci_dev,state));pci_save_state (pci_dev);
@@ -2064,6 +2115,15 @@ static int dmfe_resume(struct pci_dev *p/* Re-initilize DM910X board */ dmfe_init_dm910x (dev); +/* Disable WOL */ +pci_read_config_dword (pci_dev,0x40 , &tmp); + + tmp &= (DMFE_WOL_LINKCHANGE |DMFE_WOL_MAGICPACKET ); +pci_write_config_dword (pci_dev,0x40 , tmp); + +pci_enable_wake (pci_dev, PCI_D3hot,0 ); +pci_enable_wake (pci_dev, PCI_D3cold,0 ); +/* Restart upper layer interface */ netif_device_attach (dev);
____________________________________________________________________________________
No need to miss a message. Get email on-the-go
with Yahoo! Mail for Mobile. Get started.
http://mobile.yahoo.com/mail