]> Pileus Git - ~andy/linux/blobdiff - drivers/net/usb/smsc75xx.c
smsc75xx: expand check_ macros
[~andy/linux] / drivers / net / usb / smsc75xx.c
index b77ae76f4aa8f96bbbcabb2d2c4eac5a837d3c29..1cbd936bb0281efd8aed8783528af220215070b7 100644 (file)
@@ -26,6 +26,8 @@
 #include <linux/ethtool.h>
 #include <linux/mii.h>
 #include <linux/usb.h>
+#include <linux/bitrev.h>
+#include <linux/crc16.h>
 #include <linux/crc32.h>
 #include <linux/usb/usbnet.h>
 #include <linux/slab.h>
 #define USB_PRODUCT_ID_LAN7500         (0x7500)
 #define USB_PRODUCT_ID_LAN7505         (0x7505)
 #define RXW_PADDING                    2
-#define SUPPORTED_WAKE                 (WAKE_MAGIC)
+#define SUPPORTED_WAKE                 (WAKE_PHY | WAKE_UCAST | WAKE_BCAST | \
+                                        WAKE_MCAST | WAKE_ARP | WAKE_MAGIC)
 
-#define check_warn(ret, fmt, args...) \
-       ({ if (ret < 0) netdev_warn(dev->net, fmt, ##args); })
-
-#define check_warn_return(ret, fmt, args...) \
-       ({ if (ret < 0) { netdev_warn(dev->net, fmt, ##args); return ret; } })
-
-#define check_warn_goto_done(ret, fmt, args...) \
-       ({ if (ret < 0) { netdev_warn(dev->net, fmt, ##args); goto done; } })
+#define SUSPEND_SUSPEND0               (0x01)
+#define SUSPEND_SUSPEND1               (0x02)
+#define SUSPEND_SUSPEND2               (0x04)
+#define SUSPEND_SUSPEND3               (0x08)
+#define SUSPEND_ALLMODES               (SUSPEND_SUSPEND0 | SUSPEND_SUSPEND1 | \
+                                        SUSPEND_SUSPEND2 | SUSPEND_SUSPEND3)
 
 struct smsc75xx_priv {
        struct usbnet *dev;
@@ -71,6 +72,7 @@ struct smsc75xx_priv {
        struct mutex dataport_mutex;
        spinlock_t rfe_ctl_lock;
        struct work_struct set_multicast;
+       u8 suspend_flags;
 };
 
 struct usb_context {
@@ -82,96 +84,99 @@ static bool turbo_mode = true;
 module_param(turbo_mode, bool, 0644);
 MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
 
-static int __must_check smsc75xx_read_reg(struct usbnet *dev, u32 index,
-                                         u32 *data)
+static int __must_check __smsc75xx_read_reg(struct usbnet *dev, u32 index,
+                                           u32 *data, int in_pm)
 {
-       u32 *buf = kmalloc(4, GFP_KERNEL);
+       u32 buf;
        int ret;
+       int (*fn)(struct usbnet *, u8, u8, u16, u16, void *, u16);
 
        BUG_ON(!dev);
 
-       if (!buf)
-               return -ENOMEM;
-
-       ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
-               USB_VENDOR_REQUEST_READ_REGISTER,
-               USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-               00, index, buf, 4, USB_CTRL_GET_TIMEOUT);
+       if (!in_pm)
+               fn = usbnet_read_cmd;
+       else
+               fn = usbnet_read_cmd_nopm;
 
+       ret = fn(dev, USB_VENDOR_REQUEST_READ_REGISTER, USB_DIR_IN
+                | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                0, index, &buf, 4);
        if (unlikely(ret < 0))
-               netdev_warn(dev->net,
-                       "Failed to read reg index 0x%08x: %d", index, ret);
+               netdev_warn(dev->net, "Failed to read reg index 0x%08x: %d\n",
+                           index, ret);
 
-       le32_to_cpus(buf);
-       *data = *buf;
-       kfree(buf);
+       le32_to_cpus(&buf);
+       *data = buf;
 
        return ret;
 }
 
-static int __must_check smsc75xx_write_reg(struct usbnet *dev, u32 index,
-                                          u32 data)
+static int __must_check __smsc75xx_write_reg(struct usbnet *dev, u32 index,
+                                            u32 data, int in_pm)
 {
-       u32 *buf = kmalloc(4, GFP_KERNEL);
+       u32 buf;
        int ret;
+       int (*fn)(struct usbnet *, u8, u8, u16, u16, const void *, u16);
 
        BUG_ON(!dev);
 
-       if (!buf)
-               return -ENOMEM;
-
-       *buf = data;
-       cpu_to_le32s(buf);
+       if (!in_pm)
+               fn = usbnet_write_cmd;
+       else
+               fn = usbnet_write_cmd_nopm;
 
-       ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
-               USB_VENDOR_REQUEST_WRITE_REGISTER,
-               USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
-               00, index, buf, 4, USB_CTRL_SET_TIMEOUT);
+       buf = data;
+       cpu_to_le32s(&buf);
 
+       ret = fn(dev, USB_VENDOR_REQUEST_WRITE_REGISTER, USB_DIR_OUT
+                | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                0, index, &buf, 4);
        if (unlikely(ret < 0))
-               netdev_warn(dev->net,
-                       "Failed to write reg index 0x%08x: %d", index, ret);
-
-       kfree(buf);
+               netdev_warn(dev->net, "Failed to write reg index 0x%08x: %d\n",
+                           index, ret);
 
        return ret;
 }
 
-static int smsc75xx_set_feature(struct usbnet *dev, u32 feature)
+static int __must_check smsc75xx_read_reg_nopm(struct usbnet *dev, u32 index,
+                                              u32 *data)
 {
-       if (WARN_ON_ONCE(!dev))
-               return -EINVAL;
-
-       cpu_to_le32s(&feature);
-
-       return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
-               USB_REQ_SET_FEATURE, USB_RECIP_DEVICE, feature, 0, NULL, 0,
-               USB_CTRL_SET_TIMEOUT);
+       return __smsc75xx_read_reg(dev, index, data, 1);
 }
 
-static int smsc75xx_clear_feature(struct usbnet *dev, u32 feature)
+static int __must_check smsc75xx_write_reg_nopm(struct usbnet *dev, u32 index,
+                                               u32 data)
 {
-       if (WARN_ON_ONCE(!dev))
-               return -EINVAL;
+       return __smsc75xx_write_reg(dev, index, data, 1);
+}
 
-       cpu_to_le32s(&feature);
+static int __must_check smsc75xx_read_reg(struct usbnet *dev, u32 index,
+                                         u32 *data)
+{
+       return __smsc75xx_read_reg(dev, index, data, 0);
+}
 
-       return usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
-               USB_REQ_CLEAR_FEATURE, USB_RECIP_DEVICE, feature, 0, NULL, 0,
-               USB_CTRL_SET_TIMEOUT);
+static int __must_check smsc75xx_write_reg(struct usbnet *dev, u32 index,
+                                          u32 data)
+{
+       return __smsc75xx_write_reg(dev, index, data, 0);
 }
 
 /* Loop until the read is completed with timeout
  * called with phy_mutex held */
-static int smsc75xx_phy_wait_not_busy(struct usbnet *dev)
+static __must_check int __smsc75xx_phy_wait_not_busy(struct usbnet *dev,
+                                                    int in_pm)
 {
        unsigned long start_time = jiffies;
        u32 val;
        int ret;
 
        do {
-               ret = smsc75xx_read_reg(dev, MII_ACCESS, &val);
-               check_warn_return(ret, "Error reading MII_ACCESS");
+               ret = __smsc75xx_read_reg(dev, MII_ACCESS, &val, in_pm);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading MII_ACCESS\n");
+                       return ret;
+               }
 
                if (!(val & MII_ACCESS_BUSY))
                        return 0;
@@ -180,7 +185,8 @@ static int smsc75xx_phy_wait_not_busy(struct usbnet *dev)
        return -EIO;
 }
 
-static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
+static int __smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx,
+                               int in_pm)
 {
        struct usbnet *dev = netdev_priv(netdev);
        u32 val, addr;
@@ -189,8 +195,11 @@ static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
        mutex_lock(&dev->phy_mutex);
 
        /* confirm MII not busy */
-       ret = smsc75xx_phy_wait_not_busy(dev);
-       check_warn_goto_done(ret, "MII is busy in smsc75xx_mdio_read");
+       ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "MII is busy in smsc75xx_mdio_read\n");
+               goto done;
+       }
 
        /* set the address, index & direction (read from PHY) */
        phy_id &= dev->mii.phy_id_mask;
@@ -198,14 +207,23 @@ static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
        addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
                | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
                | MII_ACCESS_READ | MII_ACCESS_BUSY;
-       ret = smsc75xx_write_reg(dev, MII_ACCESS, addr);
-       check_warn_goto_done(ret, "Error writing MII_ACCESS");
+       ret = __smsc75xx_write_reg(dev, MII_ACCESS, addr, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing MII_ACCESS\n");
+               goto done;
+       }
 
-       ret = smsc75xx_phy_wait_not_busy(dev);
-       check_warn_goto_done(ret, "Timed out reading MII reg %02X", idx);
+       ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Timed out reading MII reg %02X\n", idx);
+               goto done;
+       }
 
-       ret = smsc75xx_read_reg(dev, MII_DATA, &val);
-       check_warn_goto_done(ret, "Error reading MII_DATA");
+       ret = __smsc75xx_read_reg(dev, MII_DATA, &val, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading MII_DATA\n");
+               goto done;
+       }
 
        ret = (u16)(val & 0xFFFF);
 
@@ -214,8 +232,8 @@ done:
        return ret;
 }
 
-static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
-                               int regval)
+static void __smsc75xx_mdio_write(struct net_device *netdev, int phy_id,
+                                 int idx, int regval, int in_pm)
 {
        struct usbnet *dev = netdev_priv(netdev);
        u32 val, addr;
@@ -224,12 +242,18 @@ static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
        mutex_lock(&dev->phy_mutex);
 
        /* confirm MII not busy */
-       ret = smsc75xx_phy_wait_not_busy(dev);
-       check_warn_goto_done(ret, "MII is busy in smsc75xx_mdio_write");
+       ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "MII is busy in smsc75xx_mdio_write\n");
+               goto done;
+       }
 
        val = regval;
-       ret = smsc75xx_write_reg(dev, MII_DATA, val);
-       check_warn_goto_done(ret, "Error writing MII_DATA");
+       ret = __smsc75xx_write_reg(dev, MII_DATA, val, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing MII_DATA\n");
+               goto done;
+       }
 
        /* set the address, index & direction (write to PHY) */
        phy_id &= dev->mii.phy_id_mask;
@@ -237,16 +261,45 @@ static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
        addr = ((phy_id << MII_ACCESS_PHY_ADDR_SHIFT) & MII_ACCESS_PHY_ADDR)
                | ((idx << MII_ACCESS_REG_ADDR_SHIFT) & MII_ACCESS_REG_ADDR)
                | MII_ACCESS_WRITE | MII_ACCESS_BUSY;
-       ret = smsc75xx_write_reg(dev, MII_ACCESS, addr);
-       check_warn_goto_done(ret, "Error writing MII_ACCESS");
+       ret = __smsc75xx_write_reg(dev, MII_ACCESS, addr, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing MII_ACCESS\n");
+               goto done;
+       }
 
-       ret = smsc75xx_phy_wait_not_busy(dev);
-       check_warn_goto_done(ret, "Timed out writing MII reg %02X", idx);
+       ret = __smsc75xx_phy_wait_not_busy(dev, in_pm);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Timed out writing MII reg %02X\n", idx);
+               goto done;
+       }
 
 done:
        mutex_unlock(&dev->phy_mutex);
 }
 
+static int smsc75xx_mdio_read_nopm(struct net_device *netdev, int phy_id,
+                                  int idx)
+{
+       return __smsc75xx_mdio_read(netdev, phy_id, idx, 1);
+}
+
+static void smsc75xx_mdio_write_nopm(struct net_device *netdev, int phy_id,
+                                    int idx, int regval)
+{
+       __smsc75xx_mdio_write(netdev, phy_id, idx, regval, 1);
+}
+
+static int smsc75xx_mdio_read(struct net_device *netdev, int phy_id, int idx)
+{
+       return __smsc75xx_mdio_read(netdev, phy_id, idx, 0);
+}
+
+static void smsc75xx_mdio_write(struct net_device *netdev, int phy_id, int idx,
+                               int regval)
+{
+       __smsc75xx_mdio_write(netdev, phy_id, idx, regval, 0);
+}
+
 static int smsc75xx_wait_eeprom(struct usbnet *dev)
 {
        unsigned long start_time = jiffies;
@@ -255,7 +308,10 @@ static int smsc75xx_wait_eeprom(struct usbnet *dev)
 
        do {
                ret = smsc75xx_read_reg(dev, E2P_CMD, &val);
-               check_warn_return(ret, "Error reading E2P_CMD");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading E2P_CMD\n");
+                       return ret;
+               }
 
                if (!(val & E2P_CMD_BUSY) || (val & E2P_CMD_TIMEOUT))
                        break;
@@ -263,7 +319,7 @@ static int smsc75xx_wait_eeprom(struct usbnet *dev)
        } while (!time_after(jiffies, start_time + HZ));
 
        if (val & (E2P_CMD_TIMEOUT | E2P_CMD_BUSY)) {
-               netdev_warn(dev->net, "EEPROM read operation timeout");
+               netdev_warn(dev->net, "EEPROM read operation timeout\n");
                return -EIO;
        }
 
@@ -278,7 +334,10 @@ static int smsc75xx_eeprom_confirm_not_busy(struct usbnet *dev)
 
        do {
                ret = smsc75xx_read_reg(dev, E2P_CMD, &val);
-               check_warn_return(ret, "Error reading E2P_CMD");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading E2P_CMD\n");
+                       return ret;
+               }
 
                if (!(val & E2P_CMD_BUSY))
                        return 0;
@@ -286,7 +345,7 @@ static int smsc75xx_eeprom_confirm_not_busy(struct usbnet *dev)
                udelay(40);
        } while (!time_after(jiffies, start_time + HZ));
 
-       netdev_warn(dev->net, "EEPROM is busy");
+       netdev_warn(dev->net, "EEPROM is busy\n");
        return -EIO;
 }
 
@@ -306,14 +365,20 @@ static int smsc75xx_read_eeprom(struct usbnet *dev, u32 offset, u32 length,
        for (i = 0; i < length; i++) {
                val = E2P_CMD_BUSY | E2P_CMD_READ | (offset & E2P_CMD_ADDR);
                ret = smsc75xx_write_reg(dev, E2P_CMD, val);
-               check_warn_return(ret, "Error writing E2P_CMD");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing E2P_CMD\n");
+                       return ret;
+               }
 
                ret = smsc75xx_wait_eeprom(dev);
                if (ret < 0)
                        return ret;
 
                ret = smsc75xx_read_reg(dev, E2P_DATA, &val);
-               check_warn_return(ret, "Error reading E2P_DATA");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading E2P_DATA\n");
+                       return ret;
+               }
 
                data[i] = val & 0xFF;
                offset++;
@@ -338,7 +403,10 @@ static int smsc75xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
        /* Issue write/erase enable command */
        val = E2P_CMD_BUSY | E2P_CMD_EWEN;
        ret = smsc75xx_write_reg(dev, E2P_CMD, val);
-       check_warn_return(ret, "Error writing E2P_CMD");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing E2P_CMD\n");
+               return ret;
+       }
 
        ret = smsc75xx_wait_eeprom(dev);
        if (ret < 0)
@@ -349,12 +417,18 @@ static int smsc75xx_write_eeprom(struct usbnet *dev, u32 offset, u32 length,
                /* Fill data register */
                val = data[i];
                ret = smsc75xx_write_reg(dev, E2P_DATA, val);
-               check_warn_return(ret, "Error writing E2P_DATA");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing E2P_DATA\n");
+                       return ret;
+               }
 
                /* Send "write" command */
                val = E2P_CMD_BUSY | E2P_CMD_WRITE | (offset & E2P_CMD_ADDR);
                ret = smsc75xx_write_reg(dev, E2P_CMD, val);
-               check_warn_return(ret, "Error writing E2P_CMD");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing E2P_CMD\n");
+                       return ret;
+               }
 
                ret = smsc75xx_wait_eeprom(dev);
                if (ret < 0)
@@ -373,7 +447,10 @@ static int smsc75xx_dataport_wait_not_busy(struct usbnet *dev)
        for (i = 0; i < 100; i++) {
                u32 dp_sel;
                ret = smsc75xx_read_reg(dev, DP_SEL, &dp_sel);
-               check_warn_return(ret, "Error reading DP_SEL");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading DP_SEL\n");
+                       return ret;
+               }
 
                if (dp_sel & DP_SEL_DPRDY)
                        return 0;
@@ -381,7 +458,7 @@ static int smsc75xx_dataport_wait_not_busy(struct usbnet *dev)
                udelay(40);
        }
 
-       netdev_warn(dev->net, "smsc75xx_dataport_wait_not_busy timed out");
+       netdev_warn(dev->net, "smsc75xx_dataport_wait_not_busy timed out\n");
 
        return -EIO;
 }
@@ -396,28 +473,49 @@ static int smsc75xx_dataport_write(struct usbnet *dev, u32 ram_select, u32 addr,
        mutex_lock(&pdata->dataport_mutex);
 
        ret = smsc75xx_dataport_wait_not_busy(dev);
-       check_warn_goto_done(ret, "smsc75xx_dataport_write busy on entry");
+       if (ret < 0) {
+               netdev_warn(dev->net, "smsc75xx_dataport_write busy on entry\n");
+               goto done;
+       }
 
        ret = smsc75xx_read_reg(dev, DP_SEL, &dp_sel);
-       check_warn_goto_done(ret, "Error reading DP_SEL");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading DP_SEL\n");
+               goto done;
+       }
 
        dp_sel &= ~DP_SEL_RSEL;
        dp_sel |= ram_select;
        ret = smsc75xx_write_reg(dev, DP_SEL, dp_sel);
-       check_warn_goto_done(ret, "Error writing DP_SEL");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing DP_SEL\n");
+               goto done;
+       }
 
        for (i = 0; i < length; i++) {
                ret = smsc75xx_write_reg(dev, DP_ADDR, addr + i);
-               check_warn_goto_done(ret, "Error writing DP_ADDR");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing DP_ADDR\n");
+                       goto done;
+               }
 
                ret = smsc75xx_write_reg(dev, DP_DATA, buf[i]);
-               check_warn_goto_done(ret, "Error writing DP_DATA");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing DP_DATA\n");
+                       goto done;
+               }
 
                ret = smsc75xx_write_reg(dev, DP_CMD, DP_CMD_WRITE);
-               check_warn_goto_done(ret, "Error writing DP_CMD");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing DP_CMD\n");
+                       goto done;
+               }
 
                ret = smsc75xx_dataport_wait_not_busy(dev);
-               check_warn_goto_done(ret, "smsc75xx_dataport_write timeout");
+               if (ret < 0) {
+                       netdev_warn(dev->net, "smsc75xx_dataport_write timeout\n");
+                       goto done;
+               }
        }
 
 done:
@@ -438,14 +536,15 @@ static void smsc75xx_deferred_multicast_write(struct work_struct *param)
        struct usbnet *dev = pdata->dev;
        int ret;
 
-       netif_dbg(dev, drv, dev->net, "deferred multicast write 0x%08x",
-               pdata->rfe_ctl);
+       netif_dbg(dev, drv, dev->net, "deferred multicast write 0x%08x\n",
+                 pdata->rfe_ctl);
 
        smsc75xx_dataport_write(dev, DP_SEL_VHF, DP_SEL_VHF_VLAN_LEN,
                DP_SEL_VHF_HASH_LEN, pdata->multicast_hash_table);
 
        ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-       check_warn(ret, "Error writing RFE_CRL");
+       if (ret < 0)
+               netdev_warn(dev->net, "Error writing RFE_CRL\n");
 }
 
 static void smsc75xx_set_multicast(struct net_device *netdev)
@@ -465,15 +564,15 @@ static void smsc75xx_set_multicast(struct net_device *netdev)
                pdata->multicast_hash_table[i] = 0;
 
        if (dev->net->flags & IFF_PROMISC) {
-               netif_dbg(dev, drv, dev->net, "promiscuous mode enabled");
+               netif_dbg(dev, drv, dev->net, "promiscuous mode enabled\n");
                pdata->rfe_ctl |= RFE_CTL_AM | RFE_CTL_AU;
        } else if (dev->net->flags & IFF_ALLMULTI) {
-               netif_dbg(dev, drv, dev->net, "receive all multicast enabled");
+               netif_dbg(dev, drv, dev->net, "receive all multicast enabled\n");
                pdata->rfe_ctl |= RFE_CTL_AM | RFE_CTL_DPF;
        } else if (!netdev_mc_empty(dev->net)) {
                struct netdev_hw_addr *ha;
 
-               netif_dbg(dev, drv, dev->net, "receive multicast hash filter");
+               netif_dbg(dev, drv, dev->net, "receive multicast hash filter\n");
 
                pdata->rfe_ctl |= RFE_CTL_MHF | RFE_CTL_DPF;
 
@@ -483,7 +582,7 @@ static void smsc75xx_set_multicast(struct net_device *netdev)
                                (1 << (bitnum % 32));
                }
        } else {
-               netif_dbg(dev, drv, dev->net, "receive own packets only");
+               netif_dbg(dev, drv, dev->net, "receive own packets only\n");
                pdata->rfe_ctl |= RFE_CTL_DPF;
        }
 
@@ -511,18 +610,24 @@ static int smsc75xx_update_flowcontrol(struct usbnet *dev, u8 duplex,
                if (cap & FLOW_CTRL_RX)
                        flow |= FLOW_RX_FCEN;
 
-               netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s",
-                       (cap & FLOW_CTRL_RX ? "enabled" : "disabled"),
-                       (cap & FLOW_CTRL_TX ? "enabled" : "disabled"));
+               netif_dbg(dev, link, dev->net, "rx pause %s, tx pause %s\n",
+                         (cap & FLOW_CTRL_RX ? "enabled" : "disabled"),
+                         (cap & FLOW_CTRL_TX ? "enabled" : "disabled"));
        } else {
-               netif_dbg(dev, link, dev->net, "half duplex");
+               netif_dbg(dev, link, dev->net, "half duplex\n");
        }
 
        ret = smsc75xx_write_reg(dev, FLOW, flow);
-       check_warn_return(ret, "Error writing FLOW");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing FLOW\n");
+               return ret;
+       }
 
        ret = smsc75xx_write_reg(dev, FCT_FLOW, fct_flow);
-       check_warn_return(ret, "Error writing FCT_FLOW");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing FCT_FLOW\n");
+               return ret;
+       }
 
        return 0;
 }
@@ -539,16 +644,18 @@ static int smsc75xx_link_reset(struct usbnet *dev)
                PHY_INT_SRC_CLEAR_ALL);
 
        ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
-       check_warn_return(ret, "Error writing INT_STS");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing INT_STS\n");
+               return ret;
+       }
 
        mii_check_media(mii, 1, 1);
        mii_ethtool_gset(&dev->mii, &ecmd);
        lcladv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_ADVERTISE);
        rmtadv = smsc75xx_mdio_read(dev->net, mii->phy_id, MII_LPA);
 
-       netif_dbg(dev, link, dev->net, "speed: %u duplex: %d lcladv: %04x"
-                 " rmtadv: %04x", ethtool_cmd_speed(&ecmd),
-                 ecmd.duplex, lcladv, rmtadv);
+       netif_dbg(dev, link, dev->net, "speed: %u duplex: %d lcladv: %04x rmtadv: %04x\n",
+                 ethtool_cmd_speed(&ecmd), ecmd.duplex, lcladv, rmtadv);
 
        return smsc75xx_update_flowcontrol(dev, ecmd.duplex, lcladv, rmtadv);
 }
@@ -558,21 +665,21 @@ static void smsc75xx_status(struct usbnet *dev, struct urb *urb)
        u32 intdata;
 
        if (urb->actual_length != 4) {
-               netdev_warn(dev->net,
-                       "unexpected urb length %d", urb->actual_length);
+               netdev_warn(dev->net, "unexpected urb length %d\n",
+                           urb->actual_length);
                return;
        }
 
        memcpy(&intdata, urb->transfer_buffer, 4);
        le32_to_cpus(&intdata);
 
-       netif_dbg(dev, link, dev->net, "intdata: 0x%08X", intdata);
+       netif_dbg(dev, link, dev->net, "intdata: 0x%08X\n", intdata);
 
        if (intdata & INT_ENP_PHY_INT)
                usbnet_defer_kevent(dev, EVENT_LINK_RESET);
        else
-               netdev_warn(dev->net,
-                       "unexpected interrupt, intdata=0x%08X", intdata);
+               netdev_warn(dev->net, "unexpected interrupt, intdata=0x%08X\n",
+                           intdata);
 }
 
 static int smsc75xx_ethtool_get_eeprom_len(struct net_device *net)
@@ -596,8 +703,8 @@ static int smsc75xx_ethtool_set_eeprom(struct net_device *netdev,
        struct usbnet *dev = netdev_priv(netdev);
 
        if (ee->magic != LAN75XX_EEPROM_MAGIC) {
-               netdev_warn(dev->net,
-                       "EEPROM: magic value mismatch: 0x%x", ee->magic);
+               netdev_warn(dev->net, "EEPROM: magic value mismatch: 0x%x\n",
+                           ee->magic);
                return -EINVAL;
        }
 
@@ -619,9 +726,15 @@ static int smsc75xx_ethtool_set_wol(struct net_device *net,
 {
        struct usbnet *dev = netdev_priv(net);
        struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       int ret;
 
        pdata->wolopts = wolinfo->wolopts & SUPPORTED_WAKE;
-       return 0;
+
+       ret = device_set_wakeup_enable(&dev->udev->dev, pdata->wolopts);
+       if (ret < 0)
+               netdev_warn(dev->net, "device_set_wakeup_enable error %d\n", ret);
+
+       return ret;
 }
 
 static const struct ethtool_ops smsc75xx_ethtool_ops = {
@@ -657,14 +770,14 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)
                if (is_valid_ether_addr(dev->net->dev_addr)) {
                        /* eeprom values are valid so use them */
                        netif_dbg(dev, ifup, dev->net,
-                               "MAC address read from EEPROM");
+                                 "MAC address read from EEPROM\n");
                        return;
                }
        }
 
        /* no eeprom, or eeprom values are invalid. generate random MAC */
        eth_hw_addr_random(dev->net);
-       netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr");
+       netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
 }
 
 static int smsc75xx_set_mac_address(struct usbnet *dev)
@@ -674,19 +787,29 @@ static int smsc75xx_set_mac_address(struct usbnet *dev)
        u32 addr_hi = dev->net->dev_addr[4] | dev->net->dev_addr[5] << 8;
 
        int ret = smsc75xx_write_reg(dev, RX_ADDRH, addr_hi);
-       check_warn_return(ret, "Failed to write RX_ADDRH: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write RX_ADDRH: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_write_reg(dev, RX_ADDRL, addr_lo);
-       check_warn_return(ret, "Failed to write RX_ADDRL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write RX_ADDRL: %d\n", ret);
+               return ret;
+       }
 
        addr_hi |= ADDR_FILTX_FB_VALID;
        ret = smsc75xx_write_reg(dev, ADDR_FILTX, addr_hi);
-       check_warn_return(ret, "Failed to write ADDR_FILTX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write ADDR_FILTX: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_write_reg(dev, ADDR_FILTX + 4, addr_lo);
-       check_warn_return(ret, "Failed to write ADDR_FILTX+4: %d", ret);
+       if (ret < 0)
+               netdev_warn(dev->net, "Failed to write ADDR_FILTX+4: %d\n", ret);
 
-       return 0;
+       return ret;
 }
 
 static int smsc75xx_phy_initialize(struct usbnet *dev)
@@ -708,12 +831,15 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
        do {
                msleep(10);
                bmcr = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, MII_BMCR);
-               check_warn_return(bmcr, "Error reading MII_BMCR");
+               if (bmcr < 0) {
+                       netdev_warn(dev->net, "Error reading MII_BMCR\n");
+                       return bmcr;
+               }
                timeout++;
        } while ((bmcr & BMCR_RESET) && (timeout < 100));
 
        if (timeout >= 100) {
-               netdev_warn(dev->net, "timeout on PHY Reset");
+               netdev_warn(dev->net, "timeout on PHY Reset\n");
                return -EIO;
        }
 
@@ -725,14 +851,18 @@ static int smsc75xx_phy_initialize(struct usbnet *dev)
 
        /* read and write to clear phy interrupt status */
        ret = smsc75xx_mdio_read(dev->net, dev->mii.phy_id, PHY_INT_SRC);
-       check_warn_return(ret, "Error reading PHY_INT_SRC");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PHY_INT_SRC\n");
+               return ret;
+       }
+
        smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_SRC, 0xffff);
 
        smsc75xx_mdio_write(dev->net, dev->mii.phy_id, PHY_INT_MASK,
                PHY_INT_MASK_DEFAULT);
        mii_nway_restart(&dev->mii);
 
-       netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
+       netif_dbg(dev, ifup, dev->net, "phy initialised successfully\n");
        return 0;
 }
 
@@ -743,14 +873,20 @@ static int smsc75xx_set_rx_max_frame_length(struct usbnet *dev, int size)
        bool rxenabled;
 
        ret = smsc75xx_read_reg(dev, MAC_RX, &buf);
-       check_warn_return(ret, "Failed to read MAC_RX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
+               return ret;
+       }
 
        rxenabled = ((buf & MAC_RX_RXEN) != 0);
 
        if (rxenabled) {
                buf &= ~MAC_RX_RXEN;
                ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-               check_warn_return(ret, "Failed to write MAC_RX: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
+                       return ret;
+               }
        }
 
        /* add 4 to size for FCS */
@@ -758,12 +894,18 @@ static int smsc75xx_set_rx_max_frame_length(struct usbnet *dev, int size)
        buf |= (((size + 4) << MAC_RX_MAX_SIZE_SHIFT) & MAC_RX_MAX_SIZE);
 
        ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-       check_warn_return(ret, "Failed to write MAC_RX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
+               return ret;
+       }
 
        if (rxenabled) {
                buf |= MAC_RX_RXEN;
                ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-               check_warn_return(ret, "Failed to write MAC_RX: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
+                       return ret;
+               }
        }
 
        return 0;
@@ -774,7 +916,10 @@ static int smsc75xx_change_mtu(struct net_device *netdev, int new_mtu)
        struct usbnet *dev = netdev_priv(netdev);
 
        int ret = smsc75xx_set_rx_max_frame_length(dev, new_mtu);
-       check_warn_return(ret, "Failed to set mac rx frame length");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to set mac rx frame length\n");
+               return ret;
+       }
 
        return usbnet_change_mtu(netdev, new_mtu);
 }
@@ -799,19 +944,26 @@ static int smsc75xx_set_features(struct net_device *netdev,
        /* it's racing here! */
 
        ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-       check_warn_return(ret, "Error writing RFE_CTL");
+       if (ret < 0)
+               netdev_warn(dev->net, "Error writing RFE_CTL\n");
 
-       return 0;
+       return ret;
 }
 
-static int smsc75xx_wait_ready(struct usbnet *dev)
+static int smsc75xx_wait_ready(struct usbnet *dev, int in_pm)
 {
        int timeout = 0;
 
        do {
                u32 buf;
-               int ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
-               check_warn_return(ret, "Failed to read PMT_CTL: %d", ret);
+               int ret;
+
+               ret = __smsc75xx_read_reg(dev, PMT_CTL, &buf, in_pm);
+
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
+                       return ret;
+               }
 
                if (buf & PMT_CTL_DEV_RDY)
                        return 0;
@@ -820,7 +972,7 @@ static int smsc75xx_wait_ready(struct usbnet *dev)
                timeout++;
        } while (timeout < 100);
 
-       netdev_warn(dev->net, "timeout waiting for device ready");
+       netdev_warn(dev->net, "timeout waiting for device ready\n");
        return -EIO;
 }
 
@@ -830,79 +982,114 @@ static int smsc75xx_reset(struct usbnet *dev)
        u32 buf;
        int ret = 0, timeout;
 
-       netif_dbg(dev, ifup, dev->net, "entering smsc75xx_reset");
+       netif_dbg(dev, ifup, dev->net, "entering smsc75xx_reset\n");
 
-       ret = smsc75xx_wait_ready(dev);
-       check_warn_return(ret, "device not ready in smsc75xx_reset");
+       ret = smsc75xx_wait_ready(dev, 0);
+       if (ret < 0) {
+               netdev_warn(dev->net, "device not ready in smsc75xx_reset\n");
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-       check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
+               return ret;
+       }
 
        buf |= HW_CFG_LRST;
 
        ret = smsc75xx_write_reg(dev, HW_CFG, buf);
-       check_warn_return(ret, "Failed to write HW_CFG: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
+               return ret;
+       }
 
        timeout = 0;
        do {
                msleep(10);
                ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-               check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
+                       return ret;
+               }
                timeout++;
        } while ((buf & HW_CFG_LRST) && (timeout < 100));
 
        if (timeout >= 100) {
-               netdev_warn(dev->net, "timeout on completion of Lite Reset");
+               netdev_warn(dev->net, "timeout on completion of Lite Reset\n");
                return -EIO;
        }
 
-       netif_dbg(dev, ifup, dev->net, "Lite reset complete, resetting PHY");
+       netif_dbg(dev, ifup, dev->net, "Lite reset complete, resetting PHY\n");
 
        ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
-       check_warn_return(ret, "Failed to read PMT_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
+               return ret;
+       }
 
        buf |= PMT_CTL_PHY_RST;
 
        ret = smsc75xx_write_reg(dev, PMT_CTL, buf);
-       check_warn_return(ret, "Failed to write PMT_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write PMT_CTL: %d\n", ret);
+               return ret;
+       }
 
        timeout = 0;
        do {
                msleep(10);
                ret = smsc75xx_read_reg(dev, PMT_CTL, &buf);
-               check_warn_return(ret, "Failed to read PMT_CTL: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to read PMT_CTL: %d\n", ret);
+                       return ret;
+               }
                timeout++;
        } while ((buf & PMT_CTL_PHY_RST) && (timeout < 100));
 
        if (timeout >= 100) {
-               netdev_warn(dev->net, "timeout waiting for PHY Reset");
+               netdev_warn(dev->net, "timeout waiting for PHY Reset\n");
                return -EIO;
        }
 
-       netif_dbg(dev, ifup, dev->net, "PHY reset complete");
+       netif_dbg(dev, ifup, dev->net, "PHY reset complete\n");
 
        smsc75xx_init_mac_address(dev);
 
        ret = smsc75xx_set_mac_address(dev);
-       check_warn_return(ret, "Failed to set mac address");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to set mac address\n");
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "MAC Address: %pM", dev->net->dev_addr);
+       netif_dbg(dev, ifup, dev->net, "MAC Address: %pM\n",
+                 dev->net->dev_addr);
 
        ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-       check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG : 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG : 0x%08x\n",
+                 buf);
 
        buf |= HW_CFG_BIR;
 
        ret = smsc75xx_write_reg(dev, HW_CFG, buf);
-       check_warn_return(ret, "Failed to write HW_CFG: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net,  "Failed to write HW_CFG: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-       check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG after "
-                       "writing HW_CFG_BIR: 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "Read Value from HW_CFG after writing HW_CFG_BIR: 0x%08x\n",
+                 buf);
 
        if (!turbo_mode) {
                buf = 0;
@@ -915,99 +1102,157 @@ static int smsc75xx_reset(struct usbnet *dev)
                dev->rx_urb_size = DEFAULT_FS_BURST_CAP_SIZE;
        }
 
-       netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld",
-               (ulong)dev->rx_urb_size);
+       netif_dbg(dev, ifup, dev->net, "rx_urb_size=%ld\n",
+                 (ulong)dev->rx_urb_size);
 
        ret = smsc75xx_write_reg(dev, BURST_CAP, buf);
-       check_warn_return(ret, "Failed to write BURST_CAP: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write BURST_CAP: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, BURST_CAP, &buf);
-       check_warn_return(ret, "Failed to read BURST_CAP: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read BURST_CAP: %d\n", ret);
+               return ret;
+       }
 
        netif_dbg(dev, ifup, dev->net,
-               "Read Value from BURST_CAP after writing: 0x%08x", buf);
+                 "Read Value from BURST_CAP after writing: 0x%08x\n", buf);
 
        ret = smsc75xx_write_reg(dev, BULK_IN_DLY, DEFAULT_BULK_IN_DELAY);
-       check_warn_return(ret, "Failed to write BULK_IN_DLY: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write BULK_IN_DLY: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, BULK_IN_DLY, &buf);
-       check_warn_return(ret, "Failed to read BULK_IN_DLY: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read BULK_IN_DLY: %d\n", ret);
+               return ret;
+       }
 
        netif_dbg(dev, ifup, dev->net,
-               "Read Value from BULK_IN_DLY after writing: 0x%08x", buf);
+                 "Read Value from BULK_IN_DLY after writing: 0x%08x\n", buf);
 
        if (turbo_mode) {
                ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-               check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
+                       return ret;
+               }
 
-               netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x", buf);
+               netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x\n", buf);
 
                buf |= (HW_CFG_MEF | HW_CFG_BCE);
 
                ret = smsc75xx_write_reg(dev, HW_CFG, buf);
-               check_warn_return(ret, "Failed to write HW_CFG: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to write HW_CFG: %d\n", ret);
+                       return ret;
+               }
 
                ret = smsc75xx_read_reg(dev, HW_CFG, &buf);
-               check_warn_return(ret, "Failed to read HW_CFG: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to read HW_CFG: %d\n", ret);
+                       return ret;
+               }
 
-               netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x", buf);
+               netif_dbg(dev, ifup, dev->net, "HW_CFG: 0x%08x\n", buf);
        }
 
        /* set FIFO sizes */
        buf = (MAX_RX_FIFO_SIZE - 512) / 512;
        ret = smsc75xx_write_reg(dev, FCT_RX_FIFO_END, buf);
-       check_warn_return(ret, "Failed to write FCT_RX_FIFO_END: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write FCT_RX_FIFO_END: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "FCT_RX_FIFO_END set to 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "FCT_RX_FIFO_END set to 0x%08x\n", buf);
 
        buf = (MAX_TX_FIFO_SIZE - 512) / 512;
        ret = smsc75xx_write_reg(dev, FCT_TX_FIFO_END, buf);
-       check_warn_return(ret, "Failed to write FCT_TX_FIFO_END: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write FCT_TX_FIFO_END: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "FCT_TX_FIFO_END set to 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "FCT_TX_FIFO_END set to 0x%08x\n", buf);
 
        ret = smsc75xx_write_reg(dev, INT_STS, INT_STS_CLEAR_ALL);
-       check_warn_return(ret, "Failed to write INT_STS: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write INT_STS: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, ID_REV, &buf);
-       check_warn_return(ret, "Failed to read ID_REV: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read ID_REV: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", buf);
 
        ret = smsc75xx_read_reg(dev, E2P_CMD, &buf);
-       check_warn_return(ret, "Failed to read E2P_CMD: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read E2P_CMD: %d\n", ret);
+               return ret;
+       }
 
        /* only set default GPIO/LED settings if no EEPROM is detected */
        if (!(buf & E2P_CMD_LOADED)) {
                ret = smsc75xx_read_reg(dev, LED_GPIO_CFG, &buf);
-               check_warn_return(ret, "Failed to read LED_GPIO_CFG: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to read LED_GPIO_CFG: %d\n", ret);
+                       return ret;
+               }
 
                buf &= ~(LED_GPIO_CFG_LED2_FUN_SEL | LED_GPIO_CFG_LED10_FUN_SEL);
                buf |= LED_GPIO_CFG_LEDGPIO_EN | LED_GPIO_CFG_LED2_FUN_SEL;
 
                ret = smsc75xx_write_reg(dev, LED_GPIO_CFG, buf);
-               check_warn_return(ret, "Failed to write LED_GPIO_CFG: %d", ret);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Failed to write LED_GPIO_CFG: %d\n", ret);
+                       return ret;
+               }
        }
 
        ret = smsc75xx_write_reg(dev, FLOW, 0);
-       check_warn_return(ret, "Failed to write FLOW: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write FLOW: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_write_reg(dev, FCT_FLOW, 0);
-       check_warn_return(ret, "Failed to write FCT_FLOW: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write FCT_FLOW: %d\n", ret);
+               return ret;
+       }
 
        /* Don't need rfe_ctl_lock during initialisation */
        ret = smsc75xx_read_reg(dev, RFE_CTL, &pdata->rfe_ctl);
-       check_warn_return(ret, "Failed to read RFE_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read RFE_CTL: %d\n", ret);
+               return ret;
+       }
 
        pdata->rfe_ctl |= RFE_CTL_AB | RFE_CTL_DPF;
 
        ret = smsc75xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
-       check_warn_return(ret, "Failed to write RFE_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write RFE_CTL: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, RFE_CTL, &pdata->rfe_ctl);
-       check_warn_return(ret, "Failed to read RFE_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read RFE_CTL: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "RFE_CTL set to 0x%08x", pdata->rfe_ctl);
+       netif_dbg(dev, ifup, dev->net, "RFE_CTL set to 0x%08x\n",
+                 pdata->rfe_ctl);
 
        /* Enable or disable checksum offload engines */
        smsc75xx_set_features(dev->net, dev->net->features);
@@ -1015,69 +1260,111 @@ static int smsc75xx_reset(struct usbnet *dev)
        smsc75xx_set_multicast(dev->net);
 
        ret = smsc75xx_phy_initialize(dev);
-       check_warn_return(ret, "Failed to initialize PHY: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to initialize PHY: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, INT_EP_CTL, &buf);
-       check_warn_return(ret, "Failed to read INT_EP_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read INT_EP_CTL: %d\n", ret);
+               return ret;
+       }
 
        /* enable PHY interrupts */
        buf |= INT_ENP_PHY_INT;
 
        ret = smsc75xx_write_reg(dev, INT_EP_CTL, buf);
-       check_warn_return(ret, "Failed to write INT_EP_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write INT_EP_CTL: %d\n", ret);
+               return ret;
+       }
 
        /* allow mac to detect speed and duplex from phy */
        ret = smsc75xx_read_reg(dev, MAC_CR, &buf);
-       check_warn_return(ret, "Failed to read MAC_CR: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read MAC_CR: %d\n", ret);
+               return ret;
+       }
 
        buf |= (MAC_CR_ADD | MAC_CR_ASD);
        ret = smsc75xx_write_reg(dev, MAC_CR, buf);
-       check_warn_return(ret, "Failed to write MAC_CR: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write MAC_CR: %d\n", ret);
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, MAC_TX, &buf);
-       check_warn_return(ret, "Failed to read MAC_TX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read MAC_TX: %d\n", ret);
+               return ret;
+       }
 
        buf |= MAC_TX_TXEN;
 
        ret = smsc75xx_write_reg(dev, MAC_TX, buf);
-       check_warn_return(ret, "Failed to write MAC_TX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write MAC_TX: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "MAC_TX set to 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "MAC_TX set to 0x%08x\n", buf);
 
        ret = smsc75xx_read_reg(dev, FCT_TX_CTL, &buf);
-       check_warn_return(ret, "Failed to read FCT_TX_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read FCT_TX_CTL: %d\n", ret);
+               return ret;
+       }
 
        buf |= FCT_TX_CTL_EN;
 
        ret = smsc75xx_write_reg(dev, FCT_TX_CTL, buf);
-       check_warn_return(ret, "Failed to write FCT_TX_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write FCT_TX_CTL: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "FCT_TX_CTL set to 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "FCT_TX_CTL set to 0x%08x\n", buf);
 
        ret = smsc75xx_set_rx_max_frame_length(dev, 1514);
-       check_warn_return(ret, "Failed to set max rx frame length");
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to set max rx frame length\n");
+               return ret;
+       }
 
        ret = smsc75xx_read_reg(dev, MAC_RX, &buf);
-       check_warn_return(ret, "Failed to read MAC_RX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
+               return ret;
+       }
 
        buf |= MAC_RX_RXEN;
 
        ret = smsc75xx_write_reg(dev, MAC_RX, buf);
-       check_warn_return(ret, "Failed to write MAC_RX: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "MAC_RX set to 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "MAC_RX set to 0x%08x\n", buf);
 
        ret = smsc75xx_read_reg(dev, FCT_RX_CTL, &buf);
-       check_warn_return(ret, "Failed to read FCT_RX_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read FCT_RX_CTL: %d\n", ret);
+               return ret;
+       }
 
        buf |= FCT_RX_CTL_EN;
 
        ret = smsc75xx_write_reg(dev, FCT_RX_CTL, buf);
-       check_warn_return(ret, "Failed to write FCT_RX_CTL: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write FCT_RX_CTL: %d\n", ret);
+               return ret;
+       }
 
-       netif_dbg(dev, ifup, dev->net, "FCT_RX_CTL set to 0x%08x", buf);
+       netif_dbg(dev, ifup, dev->net, "FCT_RX_CTL set to 0x%08x\n", buf);
 
-       netif_dbg(dev, ifup, dev->net, "smsc75xx_reset, return 0");
+       netif_dbg(dev, ifup, dev->net, "smsc75xx_reset, return 0\n");
        return 0;
 }
 
@@ -1102,14 +1389,17 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
        printk(KERN_INFO SMSC_CHIPNAME " v" SMSC_DRIVER_VERSION "\n");
 
        ret = usbnet_get_endpoints(dev, intf);
-       check_warn_return(ret, "usbnet_get_endpoints failed: %d", ret);
+       if (ret < 0) {
+               netdev_warn(dev->net, "usbnet_get_endpoints failed: %d\n", ret);
+               return ret;
+       }
 
        dev->data[0] = (unsigned long)kzalloc(sizeof(struct smsc75xx_priv),
                GFP_KERNEL);
 
        pdata = (struct smsc75xx_priv *)(dev->data[0]);
        if (!pdata) {
-               netdev_warn(dev->net, "Unable to allocate smsc75xx_priv");
+               netdev_warn(dev->net, "Unable to allocate smsc75xx_priv\n");
                return -ENOMEM;
        }
 
@@ -1134,6 +1424,10 @@ static int smsc75xx_bind(struct usbnet *dev, struct usb_interface *intf)
 
        /* Init all registers */
        ret = smsc75xx_reset(dev);
+       if (ret < 0) {
+               netdev_warn(dev->net, "smsc75xx_reset error %d\n", ret);
+               return ret;
+       }
 
        dev->net->netdev_ops = &smsc75xx_netdev_ops;
        dev->net->ethtool_ops = &smsc75xx_ethtool_ops;
@@ -1147,172 +1441,647 @@ static void smsc75xx_unbind(struct usbnet *dev, struct usb_interface *intf)
 {
        struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
        if (pdata) {
-               netif_dbg(dev, ifdown, dev->net, "free pdata");
+               netif_dbg(dev, ifdown, dev->net, "free pdata\n");
                kfree(pdata);
                pdata = NULL;
                dev->data[0] = 0;
        }
 }
 
+static u16 smsc_crc(const u8 *buffer, size_t len)
+{
+       return bitrev16(crc16(0xFFFF, buffer, len));
+}
+
+static int smsc75xx_write_wuff(struct usbnet *dev, int filter, u32 wuf_cfg,
+                              u32 wuf_mask1)
+{
+       int cfg_base = WUF_CFGX + filter * 4;
+       int mask_base = WUF_MASKX + filter * 16;
+       int ret;
+
+       ret = smsc75xx_write_reg(dev, cfg_base, wuf_cfg);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing WUF_CFGX\n");
+               return ret;
+       }
+
+       ret = smsc75xx_write_reg(dev, mask_base, wuf_mask1);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing WUF_MASKX\n");
+               return ret;
+       }
+
+       ret = smsc75xx_write_reg(dev, mask_base + 4, 0);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing WUF_MASKX\n");
+               return ret;
+       }
+
+       ret = smsc75xx_write_reg(dev, mask_base + 8, 0);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing WUF_MASKX\n");
+               return ret;
+       }
+
+       ret = smsc75xx_write_reg(dev, mask_base + 12, 0);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing WUF_MASKX\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+static int smsc75xx_enter_suspend0(struct usbnet *dev)
+{
+       struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       u32 val;
+       int ret;
+
+       ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PMT_CTL\n");
+               return ret;
+       }
+
+       val &= (~(PMT_CTL_SUS_MODE | PMT_CTL_PHY_RST));
+       val |= PMT_CTL_SUS_MODE_0 | PMT_CTL_WOL_EN | PMT_CTL_WUPS;
+
+       ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing PMT_CTL\n");
+               return ret;
+       }
+
+       pdata->suspend_flags |= SUSPEND_SUSPEND0;
+
+       return 0;
+}
+
+static int smsc75xx_enter_suspend1(struct usbnet *dev)
+{
+       struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       u32 val;
+       int ret;
+
+       ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PMT_CTL\n");
+               return ret;
+       }
+
+       val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
+       val |= PMT_CTL_SUS_MODE_1;
+
+       ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing PMT_CTL\n");
+               return ret;
+       }
+
+       /* clear wol status, enable energy detection */
+       val &= ~PMT_CTL_WUPS;
+       val |= (PMT_CTL_WUPS_ED | PMT_CTL_ED_EN);
+
+       ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing PMT_CTL\n");
+               return ret;
+       }
+
+       pdata->suspend_flags |= SUSPEND_SUSPEND1;
+
+       return 0;
+}
+
+static int smsc75xx_enter_suspend2(struct usbnet *dev)
+{
+       struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       u32 val;
+       int ret;
+
+       ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PMT_CTL\n");
+               return ret;
+       }
+
+       val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
+       val |= PMT_CTL_SUS_MODE_2;
+
+       ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing PMT_CTL\n");
+               return ret;
+       }
+
+       pdata->suspend_flags |= SUSPEND_SUSPEND2;
+
+       return 0;
+}
+
+static int smsc75xx_enter_suspend3(struct usbnet *dev)
+{
+       struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       u32 val;
+       int ret;
+
+       ret = smsc75xx_read_reg_nopm(dev, FCT_RX_CTL, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading FCT_RX_CTL\n");
+               return ret;
+       }
+
+       if (val & FCT_RX_CTL_RXUSED) {
+               netdev_dbg(dev->net, "rx fifo not empty in autosuspend\n");
+               return -EBUSY;
+       }
+
+       ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PMT_CTL\n");
+               return ret;
+       }
+
+       val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
+       val |= PMT_CTL_SUS_MODE_3 | PMT_CTL_RES_CLR_WKP_EN;
+
+       ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing PMT_CTL\n");
+               return ret;
+       }
+
+       /* clear wol status */
+       val &= ~PMT_CTL_WUPS;
+       val |= PMT_CTL_WUPS_WOL;
+
+       ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing PMT_CTL\n");
+               return ret;
+       }
+
+       pdata->suspend_flags |= SUSPEND_SUSPEND3;
+
+       return 0;
+}
+
+static int smsc75xx_enable_phy_wakeup_interrupts(struct usbnet *dev, u16 mask)
+{
+       struct mii_if_info *mii = &dev->mii;
+       int ret;
+
+       netdev_dbg(dev->net, "enabling PHY wakeup interrupts\n");
+
+       /* read to clear */
+       ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_SRC);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PHY_INT_SRC\n");
+               return ret;
+       }
+
+       /* enable interrupt source */
+       ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, PHY_INT_MASK);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading PHY_INT_MASK\n");
+               return ret;
+       }
+
+       ret |= mask;
+
+       smsc75xx_mdio_write_nopm(dev->net, mii->phy_id, PHY_INT_MASK, ret);
+
+       return 0;
+}
+
+static int smsc75xx_link_ok_nopm(struct usbnet *dev)
+{
+       struct mii_if_info *mii = &dev->mii;
+       int ret;
+
+       /* first, a dummy read, needed to latch some MII phys */
+       ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading MII_BMSR\n");
+               return ret;
+       }
+
+       ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id, MII_BMSR);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading MII_BMSR\n");
+               return ret;
+       }
+
+       return !!(ret & BMSR_LSTATUS);
+}
+
+static int smsc75xx_autosuspend(struct usbnet *dev, u32 link_up)
+{
+       int ret;
+
+       if (!netif_running(dev->net)) {
+               /* interface is ifconfig down so fully power down hw */
+               netdev_dbg(dev->net, "autosuspend entering SUSPEND2\n");
+               return smsc75xx_enter_suspend2(dev);
+       }
+
+       if (!link_up) {
+               /* link is down so enter EDPD mode */
+               netdev_dbg(dev->net, "autosuspend entering SUSPEND1\n");
+
+               /* enable PHY wakeup events for if cable is attached */
+               ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
+                       PHY_INT_MASK_ANEG_COMP);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
+                       return ret;
+               }
+
+               netdev_info(dev->net, "entering SUSPEND1 mode\n");
+               return smsc75xx_enter_suspend1(dev);
+       }
+
+       /* enable PHY wakeup events so we remote wakeup if cable is pulled */
+       ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
+               PHY_INT_MASK_LINK_DOWN);
+       if (ret < 0) {
+               netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
+               return ret;
+       }
+
+       netdev_dbg(dev->net, "autosuspend entering SUSPEND3\n");
+       return smsc75xx_enter_suspend3(dev);
+}
+
 static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
 {
        struct usbnet *dev = usb_get_intfdata(intf);
        struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       u32 val, link_up;
        int ret;
-       u32 val;
 
        ret = usbnet_suspend(intf, message);
-       check_warn_return(ret, "usbnet_suspend error");
+       if (ret < 0) {
+               netdev_warn(dev->net, "usbnet_suspend error\n");
+               return ret;
+       }
+
+       if (pdata->suspend_flags) {
+               netdev_warn(dev->net, "error during last resume\n");
+               pdata->suspend_flags = 0;
+       }
+
+       /* determine if link is up using only _nopm functions */
+       link_up = smsc75xx_link_ok_nopm(dev);
+
+       if (message.event == PM_EVENT_AUTO_SUSPEND) {
+               ret = smsc75xx_autosuspend(dev, link_up);
+               goto done;
+       }
 
-       /* if no wol options set, enter lowest power SUSPEND2 mode */
-       if (!(pdata->wolopts & SUPPORTED_WAKE)) {
-               netdev_info(dev->net, "entering SUSPEND2 mode");
+       /* if we get this far we're not autosuspending */
+       /* if no wol options set, or if link is down and we're not waking on
+        * PHY activity, enter lowest power SUSPEND2 mode
+        */
+       if (!(pdata->wolopts & SUPPORTED_WAKE) ||
+               !(link_up || (pdata->wolopts & WAKE_PHY))) {
+               netdev_info(dev->net, "entering SUSPEND2 mode\n");
 
                /* disable energy detect (link up) & wake up events */
-               ret = smsc75xx_read_reg(dev, WUCSR, &val);
-               check_warn_return(ret, "Error reading WUCSR");
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
 
                val &= ~(WUCSR_MPEN | WUCSR_WUEN);
 
-               ret = smsc75xx_write_reg(dev, WUCSR, val);
-               check_warn_return(ret, "Error writing WUCSR");
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
 
-               ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-               check_warn_return(ret, "Error reading PMT_CTL");
+               ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading PMT_CTL\n");
+                       goto done;
+               }
 
                val &= ~(PMT_CTL_ED_EN | PMT_CTL_WOL_EN);
 
-               ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-               check_warn_return(ret, "Error writing PMT_CTL");
+               ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing PMT_CTL\n");
+                       goto done;
+               }
+
+               ret = smsc75xx_enter_suspend2(dev);
+               goto done;
+       }
+
+       if (pdata->wolopts & WAKE_PHY) {
+               ret = smsc75xx_enable_phy_wakeup_interrupts(dev,
+                       (PHY_INT_MASK_ANEG_COMP | PHY_INT_MASK_LINK_DOWN));
+               if (ret < 0) {
+                       netdev_warn(dev->net, "error enabling PHY wakeup ints\n");
+                       goto done;
+               }
 
-               /* enter suspend2 mode */
-               ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-               check_warn_return(ret, "Error reading PMT_CTL");
+               /* if link is down then configure EDPD and enter SUSPEND1,
+                * otherwise enter SUSPEND0 below
+                */
+               if (!link_up) {
+                       struct mii_if_info *mii = &dev->mii;
+                       netdev_info(dev->net, "entering SUSPEND1 mode\n");
+
+                       /* enable energy detect power-down mode */
+                       ret = smsc75xx_mdio_read_nopm(dev->net, mii->phy_id,
+                               PHY_MODE_CTRL_STS);
+                       if (ret < 0) {
+                               netdev_warn(dev->net, "Error reading PHY_MODE_CTRL_STS\n");
+                               goto done;
+                       }
 
-               val &= ~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST);
-               val |= PMT_CTL_SUS_MODE_2;
+                       ret |= MODE_CTRL_STS_EDPWRDOWN;
 
-               ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-               check_warn_return(ret, "Error writing PMT_CTL");
+                       smsc75xx_mdio_write_nopm(dev->net, mii->phy_id,
+                               PHY_MODE_CTRL_STS, ret);
 
-               return 0;
+                       /* enter SUSPEND1 mode */
+                       ret = smsc75xx_enter_suspend1(dev);
+                       goto done;
+               }
        }
 
-       if (pdata->wolopts & WAKE_MAGIC) {
-               /* clear any pending magic packet status */
-               ret = smsc75xx_read_reg(dev, WUCSR, &val);
-               check_warn_return(ret, "Error reading WUCSR");
+       if (pdata->wolopts & (WAKE_MCAST | WAKE_ARP)) {
+               int i, filter = 0;
 
-               val |= WUCSR_MPR;
+               /* disable all filters */
+               for (i = 0; i < WUF_NUM; i++) {
+                       ret = smsc75xx_write_reg_nopm(dev, WUF_CFGX + i * 4, 0);
+                       if (ret < 0) {
+                               netdev_warn(dev->net, "Error writing WUF_CFGX\n");
+                               goto done;
+                       }
+               }
 
-               ret = smsc75xx_write_reg(dev, WUCSR, val);
-               check_warn_return(ret, "Error writing WUCSR");
-       }
+               if (pdata->wolopts & WAKE_MCAST) {
+                       const u8 mcast[] = {0x01, 0x00, 0x5E};
+                       netdev_info(dev->net, "enabling multicast detection\n");
 
-       /* enable/disable magic packup wake */
-       ret = smsc75xx_read_reg(dev, WUCSR, &val);
-       check_warn_return(ret, "Error reading WUCSR");
+                       val = WUF_CFGX_EN | WUF_CFGX_ATYPE_MULTICAST
+                               | smsc_crc(mcast, 3);
+                       ret = smsc75xx_write_wuff(dev, filter++, val, 0x0007);
+                       if (ret < 0) {
+                               netdev_warn(dev->net, "Error writing wakeup filter\n");
+                               goto done;
+                       }
+               }
 
-       if (pdata->wolopts & WAKE_MAGIC) {
-               netdev_info(dev->net, "enabling magic packet wakeup");
-               val |= WUCSR_MPEN;
+               if (pdata->wolopts & WAKE_ARP) {
+                       const u8 arp[] = {0x08, 0x06};
+                       netdev_info(dev->net, "enabling ARP detection\n");
+
+                       val = WUF_CFGX_EN | WUF_CFGX_ATYPE_ALL | (0x0C << 16)
+                               | smsc_crc(arp, 2);
+                       ret = smsc75xx_write_wuff(dev, filter++, val, 0x0003);
+                       if (ret < 0) {
+                               netdev_warn(dev->net, "Error writing wakeup filter\n");
+                               goto done;
+                       }
+               }
+
+               /* clear any pending pattern match packet status */
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
+
+               val |= WUCSR_WUFR;
+
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
+
+               netdev_info(dev->net, "enabling packet match detection\n");
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
+
+               val |= WUCSR_WUEN;
+
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
        } else {
-               netdev_info(dev->net, "disabling magic packet wakeup");
-               val &= ~WUCSR_MPEN;
+               netdev_info(dev->net, "disabling packet match detection\n");
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
+
+               val &= ~WUCSR_WUEN;
+
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
        }
 
-       ret = smsc75xx_write_reg(dev, WUCSR, val);
-       check_warn_return(ret, "Error writing WUCSR");
+       /* disable magic, bcast & unicast wakeup sources */
+       ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error reading WUCSR\n");
+               goto done;
+       }
 
-       /* enable wol wakeup source */
-       ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-       check_warn_return(ret, "Error reading PMT_CTL");
+       val &= ~(WUCSR_MPEN | WUCSR_BCST_EN | WUCSR_PFDA_EN);
 
-       val |= PMT_CTL_WOL_EN;
+       ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Error writing WUCSR\n");
+               goto done;
+       }
 
-       ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-       check_warn_return(ret, "Error writing PMT_CTL");
+       if (pdata->wolopts & WAKE_PHY) {
+               netdev_info(dev->net, "enabling PHY wakeup\n");
 
-       /* enable receiver */
-       ret = smsc75xx_read_reg(dev, MAC_RX, &val);
-       check_warn_return(ret, "Failed to read MAC_RX: %d", ret);
+               ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading PMT_CTL\n");
+                       goto done;
+               }
 
-       val |= MAC_RX_RXEN;
+               /* clear wol status, enable energy detection */
+               val &= ~PMT_CTL_WUPS;
+               val |= (PMT_CTL_WUPS_ED | PMT_CTL_ED_EN);
 
-       ret = smsc75xx_write_reg(dev, MAC_RX, val);
-       check_warn_return(ret, "Failed to write MAC_RX: %d", ret);
+               ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing PMT_CTL\n");
+                       goto done;
+               }
+       }
 
-       /* some wol options are enabled, so enter SUSPEND0 */
-       netdev_info(dev->net, "entering SUSPEND0 mode");
+       if (pdata->wolopts & WAKE_MAGIC) {
+               netdev_info(dev->net, "enabling magic packet wakeup\n");
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
 
-       ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-       check_warn_return(ret, "Error reading PMT_CTL");
+               /* clear any pending magic packet status */
+               val |= WUCSR_MPR | WUCSR_MPEN;
 
-       val &= (~(PMT_CTL_SUS_MODE | PMT_CTL_WUPS | PMT_CTL_PHY_RST));
-       val |= PMT_CTL_SUS_MODE_0;
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
+       }
 
-       ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-       check_warn_return(ret, "Error writing PMT_CTL");
+       if (pdata->wolopts & WAKE_BCAST) {
+               netdev_info(dev->net, "enabling broadcast detection\n");
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
 
-       /* clear wol status */
-       val &= ~PMT_CTL_WUPS;
-       val |= PMT_CTL_WUPS_WOL;
-       ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-       check_warn_return(ret, "Error writing PMT_CTL");
+               val |= WUCSR_BCAST_FR | WUCSR_BCST_EN;
 
-       /* read back PMT_CTL */
-       ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-       check_warn_return(ret, "Error reading PMT_CTL");
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
+       }
 
-       smsc75xx_set_feature(dev, USB_DEVICE_REMOTE_WAKEUP);
+       if (pdata->wolopts & WAKE_UCAST) {
+               netdev_info(dev->net, "enabling unicast detection\n");
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       goto done;
+               }
 
-       return 0;
+               val |= WUCSR_WUFR | WUCSR_PFDA_EN;
+
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       goto done;
+               }
+       }
+
+       /* enable receiver to enable frame reception */
+       ret = smsc75xx_read_reg_nopm(dev, MAC_RX, &val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to read MAC_RX: %d\n", ret);
+               goto done;
+       }
+
+       val |= MAC_RX_RXEN;
+
+       ret = smsc75xx_write_reg_nopm(dev, MAC_RX, val);
+       if (ret < 0) {
+               netdev_warn(dev->net, "Failed to write MAC_RX: %d\n", ret);
+               goto done;
+       }
+
+       /* some wol options are enabled, so enter SUSPEND0 */
+       netdev_info(dev->net, "entering SUSPEND0 mode\n");
+       ret = smsc75xx_enter_suspend0(dev);
+
+done:
+       if (ret)
+               usbnet_resume(intf);
+       return ret;
 }
 
 static int smsc75xx_resume(struct usb_interface *intf)
 {
        struct usbnet *dev = usb_get_intfdata(intf);
        struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0]);
+       u8 suspend_flags = pdata->suspend_flags;
        int ret;
        u32 val;
 
-       if (pdata->wolopts & WAKE_MAGIC) {
-               netdev_info(dev->net, "resuming from SUSPEND0");
+       netdev_dbg(dev->net, "resume suspend_flags=0x%02x\n", suspend_flags);
 
-               smsc75xx_clear_feature(dev, USB_DEVICE_REMOTE_WAKEUP);
+       /* do this first to ensure it's cleared even in error case */
+       pdata->suspend_flags = 0;
 
-               /* Disable magic packup wake */
-               ret = smsc75xx_read_reg(dev, WUCSR, &val);
-               check_warn_return(ret, "Error reading WUCSR");
+       if (suspend_flags & SUSPEND_ALLMODES) {
+               /* Disable wakeup sources */
+               ret = smsc75xx_read_reg_nopm(dev, WUCSR, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading WUCSR\n");
+                       return ret;
+               }
 
-               val &= ~WUCSR_MPEN;
+               val &= ~(WUCSR_WUEN | WUCSR_MPEN | WUCSR_PFDA_EN
+                       | WUCSR_BCST_EN);
 
-               ret = smsc75xx_write_reg(dev, WUCSR, val);
-               check_warn_return(ret, "Error writing WUCSR");
+               ret = smsc75xx_write_reg_nopm(dev, WUCSR, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing WUCSR\n");
+                       return ret;
+               }
 
                /* clear wake-up status */
-               ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-               check_warn_return(ret, "Error reading PMT_CTL");
+               ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading PMT_CTL\n");
+                       return ret;
+               }
 
                val &= ~PMT_CTL_WOL_EN;
                val |= PMT_CTL_WUPS;
 
-               ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-               check_warn_return(ret, "Error writing PMT_CTL");
-       } else {
-               netdev_info(dev->net, "resuming from SUSPEND2");
+               ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing PMT_CTL\n");
+                       return ret;
+               }
+       }
 
-               ret = smsc75xx_read_reg(dev, PMT_CTL, &val);
-               check_warn_return(ret, "Error reading PMT_CTL");
+       if (suspend_flags & SUSPEND_SUSPEND2) {
+               netdev_info(dev->net, "resuming from SUSPEND2\n");
+
+               ret = smsc75xx_read_reg_nopm(dev, PMT_CTL, &val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error reading PMT_CTL\n");
+                       return ret;
+               }
 
                val |= PMT_CTL_PHY_PWRUP;
 
-               ret = smsc75xx_write_reg(dev, PMT_CTL, val);
-               check_warn_return(ret, "Error writing PMT_CTL");
+               ret = smsc75xx_write_reg_nopm(dev, PMT_CTL, val);
+               if (ret < 0) {
+                       netdev_warn(dev->net, "Error writing PMT_CTL\n");
+                       return ret;
+               }
        }
 
-       ret = smsc75xx_wait_ready(dev);
-       check_warn_return(ret, "device not ready in smsc75xx_resume");
+       ret = smsc75xx_wait_ready(dev, 1);
+       if (ret < 0) {
+               netdev_warn(dev->net, "device not ready in smsc75xx_resume\n");
+               return ret;
+       }
 
        return usbnet_resume(intf);
 }
@@ -1352,7 +2121,7 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                if (unlikely(rx_cmd_a & RX_CMD_A_RED)) {
                        netif_dbg(dev, rx_err, dev->net,
-                               "Error rx_cmd_a=0x%08x", rx_cmd_a);
+                                 "Error rx_cmd_a=0x%08x\n", rx_cmd_a);
                        dev->net->stats.rx_errors++;
                        dev->net->stats.rx_dropped++;
 
@@ -1364,7 +2133,8 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
                        /* ETH_FRAME_LEN + 4(CRC) + 2(COE) + 4(Vlan) */
                        if (unlikely(size > (ETH_FRAME_LEN + 12))) {
                                netif_dbg(dev, rx_err, dev->net,
-                                       "size err rx_cmd_a=0x%08x", rx_cmd_a);
+                                         "size err rx_cmd_a=0x%08x\n",
+                                         rx_cmd_a);
                                return 0;
                        }
 
@@ -1381,7 +2151,7 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 
                        ax_skb = skb_clone(skb, GFP_ATOMIC);
                        if (unlikely(!ax_skb)) {
-                               netdev_warn(dev->net, "Error allocating skb");
+                               netdev_warn(dev->net, "Error allocating skb\n");
                                return 0;
                        }
 
@@ -1406,7 +2176,7 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
        }
 
        if (unlikely(skb->len < 0)) {
-               netdev_warn(dev->net, "invalid rx length<0 %d", skb->len);
+               netdev_warn(dev->net, "invalid rx length<0 %d\n", skb->len);
                return 0;
        }
 
@@ -1454,6 +2224,12 @@ static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev,
        return skb;
 }
 
+static int smsc75xx_manage_power(struct usbnet *dev, int on)
+{
+       dev->intf->needs_remote_wakeup = on;
+       return 0;
+}
+
 static const struct driver_info smsc75xx_info = {
        .description    = "smsc75xx USB 2.0 Gigabit Ethernet",
        .bind           = smsc75xx_bind,
@@ -1463,6 +2239,7 @@ static const struct driver_info smsc75xx_info = {
        .rx_fixup       = smsc75xx_rx_fixup,
        .tx_fixup       = smsc75xx_tx_fixup,
        .status         = smsc75xx_status,
+       .manage_power   = smsc75xx_manage_power,
        .flags          = FLAG_ETHER | FLAG_SEND_ZLP | FLAG_LINK_INTR,
 };
 
@@ -1490,6 +2267,7 @@ static struct usb_driver smsc75xx_driver = {
        .reset_resume   = smsc75xx_resume,
        .disconnect     = usbnet_disconnect,
        .disable_hub_initiated_lpm = 1,
+       .supports_autosuspend = 1,
 };
 
 module_usb_driver(smsc75xx_driver);