1 files changed, 167 insertions, 196 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 484a6e4f23a2..914c56fe6c5f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -14,24 +14,12 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/kthread.h>
-#include <linux/slab.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
-#include <linux/spinlock.h>
-#include <linux/ethtool.h>
-#include <linux/fcntl.h>
-#include <linux/fs.h>
-#include <linux/uaccess.h>
 #include <linux/firmware.h>
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
-#include <net/cfg80211.h>
 
-#include <defs.h>
 #include <brcmu_utils.h>
 #include <brcmu_wifi.h>
 #include <dhd_bus.h>
@@ -42,13 +30,11 @@
 
 #define IOCTL_RESP_TIMEOUT  2000
 
-#define BRCMF_USB_DLIMAGE_SPINWAIT      100     /* in unit of ms */
-#define BRCMF_USB_DLIMAGE_LIMIT         500     /* spinwait limit (ms) */
+#define BRCMF_USB_RESET_GETVER_SPINWAIT 100     /* in unit of ms */
+#define BRCMF_USB_RESET_GETVER_LOOP_CNT 10
 
 #define BRCMF_POSTBOOT_ID               0xA123  /* ID to detect if dongle
                                                    has boot up */
-#define BRCMF_USB_RESETCFG_SPINWAIT     1       /* wait after resetcfg (ms) */
-
 #define BRCMF_USB_NRXQ  50
 #define BRCMF_USB_NTXQ  50
 
@@ -69,16 +55,6 @@
 #define BRCMF_USB_43236_FW_NAME "brcm/brcmfmac43236b.bin"
 #define BRCMF_USB_43242_FW_NAME "brcm/brcmfmac43242a.bin"
 
-enum usbdev_suspend_state {
-        USBOS_SUSPEND_STATE_DEVICE_ACTIVE = 0, /* Device is busy, won't allow
-                                                  suspend */
-        USBOS_SUSPEND_STATE_SUSPEND_PENDING,    /* Device is idle, can be
-                                                 * suspended. Wating PM to
-                                                 * suspend the device
-                                                 */
-        USBOS_SUSPEND_STATE_SUSPENDED   /* Device suspended */
-};
-
 struct brcmf_usb_image {
         struct list_head list;
         s8 *fwname;
@@ -99,10 +75,8 @@ struct brcmf_usbdev_info {
         struct list_head rx_postq;
         struct list_head tx_freeq;
         struct list_head tx_postq;
-        enum usbdev_suspend_state suspend_state;
         uint rx_pipe, tx_pipe, intr_pipe, rx_pipe2;
 
-        bool activity;
         int rx_low_watermark;
         int tx_low_watermark;
         int tx_high_watermark;
@@ -170,6 +144,7 @@ static void brcmf_usb_ioctl_resp_wake(struct brcmf_usbdev_info *devinfo)
 static void
 brcmf_usb_ctl_complete(struct brcmf_usbdev_info *devinfo, int type, int status)
 {
+        brcmf_dbg(USB, "Enter, status=%d\n", status);
 
         if (unlikely(devinfo == NULL))
                 return;
@@ -197,6 +172,7 @@ brcmf_usb_ctlread_complete(struct urb *urb)
         struct brcmf_usbdev_info *devinfo =
                 (struct brcmf_usbdev_info *)urb->context;
 
+        brcmf_dbg(USB, "Enter\n");
         devinfo->ctl_urb_actual_length = urb->actual_length;
         brcmf_usb_ctl_complete(devinfo, BRCMF_USB_CBCTL_READ,
                 urb->status);
@@ -208,33 +184,22 @@ brcmf_usb_ctlwrite_complete(struct urb *urb)
         struct brcmf_usbdev_info *devinfo =
                 (struct brcmf_usbdev_info *)urb->context;
 
+        brcmf_dbg(USB, "Enter\n");
         brcmf_usb_ctl_complete(devinfo, BRCMF_USB_CBCTL_WRITE,
                 urb->status);
 }
 
-static int brcmf_usb_pnp(struct brcmf_usbdev_info *devinfo, uint state)
-{
-        return 0;
-}
-
 static int
 brcmf_usb_send_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len)
 {
         int ret;
         u16 size;
 
+        brcmf_dbg(USB, "Enter\n");
         if (devinfo == NULL || buf == NULL ||
             len == 0 || devinfo->ctl_urb == NULL)
                 return -EINVAL;
 
-        /* If the USB/HSIC bus in sleep state, wake it up */
-        if (devinfo->suspend_state == USBOS_SUSPEND_STATE_SUSPENDED)
-                if (brcmf_usb_pnp(devinfo, BCMFMAC_USB_PNP_RESUME) != 0) {
-                        brcmf_dbg(ERROR, "Could not Resume the bus!\n");
-                        return -EIO;
-                }
-
-        devinfo->activity = true;
         size = len;
         devinfo->ctl_write.wLength = cpu_to_le16p(&size);
         devinfo->ctl_urb->transfer_buffer_length = size;
@@ -251,7 +216,7 @@ brcmf_usb_send_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len)
 
         ret = usb_submit_urb(devinfo->ctl_urb, GFP_ATOMIC);
         if (ret < 0)
-                brcmf_dbg(ERROR, "usb_submit_urb failed %d\n", ret);
+                brcmf_err("usb_submit_urb failed %d\n", ret);
 
         return ret;
 }
@@ -262,6 +227,7 @@ brcmf_usb_recv_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len)
         int ret;
         u16 size;
 
+        brcmf_dbg(USB, "Enter\n");
         if ((devinfo == NULL) || (buf == NULL) || (len == 0)
                 || (devinfo->ctl_urb == NULL))
                 return -EINVAL;
@@ -284,7 +250,7 @@ brcmf_usb_recv_ctl(struct brcmf_usbdev_info *devinfo, u8 *buf, int len)
 
         ret = usb_submit_urb(devinfo->ctl_urb, GFP_ATOMIC);
         if (ret < 0)
-                brcmf_dbg(ERROR, "usb_submit_urb failed %d\n", ret);
+                brcmf_err("usb_submit_urb failed %d\n", ret);
 
         return ret;
 }
@@ -295,10 +261,9 @@ static int brcmf_usb_tx_ctlpkt(struct device *dev, u8 *buf, u32 len)
         int timeout = 0;
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev);
 
-        if (devinfo->bus_pub.state != BCMFMAC_USB_STATE_UP) {
-                /* TODO: handle suspend/resume */
+        brcmf_dbg(USB, "Enter\n");
+        if (devinfo->bus_pub.state != BRCMFMAC_USB_STATE_UP)
                 return -EIO;
-        }
 
         if (test_and_set_bit(0, &devinfo->ctl_op))
                 return -EIO;
@@ -306,14 +271,14 @@ static int brcmf_usb_tx_ctlpkt(struct device *dev, u8 *buf, u32 len)
         devinfo->ctl_completed = false;
         err = brcmf_usb_send_ctl(devinfo, buf, len);
         if (err) {
-                brcmf_dbg(ERROR, "fail %d bytes: %d\n", err, len);
+                brcmf_err("fail %d bytes: %d\n", err, len);
                 clear_bit(0, &devinfo->ctl_op);
                 return err;
         }
         timeout = brcmf_usb_ioctl_resp_wait(devinfo);
         clear_bit(0, &devinfo->ctl_op);
         if (!timeout) {
-                brcmf_dbg(ERROR, "Txctl wait timed out\n");
+                brcmf_err("Txctl wait timed out\n");
                 err = -EIO;
         }
         return err;
@@ -325,17 +290,17 @@ static int brcmf_usb_rx_ctlpkt(struct device *dev, u8 *buf, u32 len)
         int timeout = 0;
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev);
 
-        if (devinfo->bus_pub.state != BCMFMAC_USB_STATE_UP) {
-                /* TODO: handle suspend/resume */
+        brcmf_dbg(USB, "Enter\n");
+        if (devinfo->bus_pub.state != BRCMFMAC_USB_STATE_UP)
                 return -EIO;
-        }
+
         if (test_and_set_bit(0, &devinfo->ctl_op))
                 return -EIO;
 
         devinfo->ctl_completed = false;
         err = brcmf_usb_recv_ctl(devinfo, buf, len);
         if (err) {
-                brcmf_dbg(ERROR, "fail %d bytes: %d\n", err, len);
+                brcmf_err("fail %d bytes: %d\n", err, len);
                 clear_bit(0, &devinfo->ctl_op);
                 return err;
         }
@@ -343,7 +308,7 @@ static int brcmf_usb_rx_ctlpkt(struct device *dev, u8 *buf, u32 len)
         err = devinfo->ctl_urb_status;
         clear_bit(0, &devinfo->ctl_op);
         if (!timeout) {
-                brcmf_dbg(ERROR, "rxctl wait timed out\n");
+                brcmf_err("rxctl wait timed out\n");
                 err = -EIO;
         }
         if (!err)
@@ -391,7 +356,7 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
 
         reqs = kzalloc(sizeof(struct brcmf_usbreq) * qsize, GFP_ATOMIC);
         if (reqs == NULL) {
-                brcmf_dbg(ERROR, "fail to allocate memory!\n");
+                brcmf_err("fail to allocate memory!\n");
                 return NULL;
         }
         req = reqs;
@@ -407,7 +372,7 @@ brcmf_usbdev_qinit(struct list_head *q, int qsize)
         }
         return reqs;
 fail:
-        brcmf_dbg(ERROR, "fail!\n");
+        brcmf_err("fail!\n");
         while (!list_empty(q)) {
                 req = list_entry(q->next, struct brcmf_usbreq, list);
                 if (req && req->urb)
@@ -424,7 +389,7 @@ static void brcmf_usb_free_q(struct list_head *q, bool pending)
         int i = 0;
         list_for_each_entry_safe(req, next, q, list) {
                 if (!req->urb) {
-                        brcmf_dbg(ERROR, "bad req\n");
+                        brcmf_err("bad req\n");
                         break;
                 }
                 i++;
@@ -453,6 +418,8 @@ static void brcmf_usb_tx_complete(struct urb *urb)
         struct brcmf_usbreq *req = (struct brcmf_usbreq *)urb->context;
         struct brcmf_usbdev_info *devinfo = req->devinfo;
 
+        brcmf_dbg(USB, "Enter, urb->status=%d, skb=%p\n", urb->status,
+                  req->skb);
         brcmf_usb_del_fromq(devinfo, req);
         if (urb->status == 0)
                 devinfo->bus_pub.bus->dstats.tx_packets++;
@@ -478,6 +445,7 @@ static void brcmf_usb_rx_complete(struct urb *urb)
         struct sk_buff *skb;
         int ifidx = 0;
 
+        brcmf_dbg(USB, "Enter, urb->status=%d\n", urb->status);
         brcmf_usb_del_fromq(devinfo, req);
         skb = req->skb;
         req->skb = NULL;
@@ -491,10 +459,10 @@ static void brcmf_usb_rx_complete(struct urb *urb)
                 return;
         }
 
-        if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP) {
+        if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_UP) {
                 skb_put(skb, urb->actual_length);
                 if (brcmf_proto_hdrpull(devinfo->dev, &ifidx, skb) != 0) {
-                        brcmf_dbg(ERROR, "rx protocol error\n");
+                        brcmf_err("rx protocol error\n");
                         brcmu_pkt_buf_free_skb(skb);
                         devinfo->bus_pub.bus->dstats.rx_errors++;
                 } else
@@ -544,8 +512,8 @@ static void brcmf_usb_rx_fill_all(struct brcmf_usbdev_info *devinfo)
 {
         struct brcmf_usbreq *req;
 
-        if (devinfo->bus_pub.state != BCMFMAC_USB_STATE_UP) {
-                brcmf_dbg(ERROR, "bus is not up\n");
+        if (devinfo->bus_pub.state != BRCMFMAC_USB_STATE_UP) {
+                brcmf_err("bus is not up=%d\n", devinfo->bus_pub.state);
                 return;
         }
         while ((req = brcmf_usb_deq(devinfo, &devinfo->rx_freeq, NULL)) != NULL)
@@ -558,29 +526,24 @@ brcmf_usb_state_change(struct brcmf_usbdev_info *devinfo, int state)
         struct brcmf_bus *bcmf_bus = devinfo->bus_pub.bus;
         int old_state;
 
+        brcmf_dbg(USB, "Enter, current state=%d, new state=%d\n",
+                  devinfo->bus_pub.state, state);
 
         if (devinfo->bus_pub.state == state)
                 return;
 
         old_state = devinfo->bus_pub.state;
-        brcmf_dbg(TRACE, "dbus state change from %d to to %d\n",
-                  old_state, state);
-
-        /* Don't update state if it's PnP firmware re-download */
-        if (state != BCMFMAC_USB_STATE_PNP_FWDL) /* TODO */
-                devinfo->bus_pub.state = state;
-
-        if ((old_state  == BCMFMAC_USB_STATE_SLEEP)
-                && (state == BCMFMAC_USB_STATE_UP)) {
-                brcmf_usb_rx_fill_all(devinfo);
-        }
+        devinfo->bus_pub.state = state;
 
         /* update state of upper layer */
-        if (state == BCMFMAC_USB_STATE_DOWN) {
-                brcmf_dbg(INFO, "DBUS is down\n");
+        if (state == BRCMFMAC_USB_STATE_DOWN) {
+                brcmf_dbg(USB, "DBUS is down\n");
                 bcmf_bus->state = BRCMF_BUS_DOWN;
+        } else if (state == BRCMFMAC_USB_STATE_UP) {
+                brcmf_dbg(USB, "DBUS is up\n");
+                bcmf_bus->state = BRCMF_BUS_DATA;
         } else {
-                brcmf_dbg(INFO, "DBUS current state=%d\n", state);
+                brcmf_dbg(USB, "DBUS current state=%d\n", state);
         }
 }
 
@@ -589,30 +552,32 @@ brcmf_usb_intr_complete(struct urb *urb)
 {
         struct brcmf_usbdev_info *devinfo =
                         (struct brcmf_usbdev_info *)urb->context;
-        bool killed;
+        int err;
+
+        brcmf_dbg(USB, "Enter, urb->status=%d\n", urb->status);
 
         if (devinfo == NULL)
                 return;
 
         if (unlikely(urb->status)) {
-                if (devinfo->suspend_state ==
-                        USBOS_SUSPEND_STATE_SUSPEND_PENDING)
-                        killed = true;
-
-                if ((urb->status == -ENOENT && (!killed))
-                        || urb->status == -ESHUTDOWN ||
-                        urb->status == -ENODEV) {
-                        brcmf_usb_state_change(devinfo, BCMFMAC_USB_STATE_DOWN);
+                if (urb->status == -ENOENT ||
+                    urb->status == -ESHUTDOWN ||
+                    urb->status == -ENODEV) {
+                        brcmf_usb_state_change(devinfo,
+                                               BRCMFMAC_USB_STATE_DOWN);
                 }
         }
 
-        if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_DOWN) {
-                brcmf_dbg(ERROR, "intr cb when DBUS down, ignoring\n");
+        if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_DOWN) {
+                brcmf_err("intr cb when DBUS down, ignoring\n");
                 return;
         }
 
-        if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP)
-                usb_submit_urb(devinfo->intr_urb, GFP_ATOMIC);
+        if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_UP) {
+                err = usb_submit_urb(devinfo->intr_urb, GFP_ATOMIC);
+                if (err)
+                        brcmf_err("usb_submit_urb, err=%d\n", err);
+        }
 }
 
 static int brcmf_usb_tx(struct device *dev, struct sk_buff *skb)
@@ -621,16 +586,15 @@ static int brcmf_usb_tx(struct device *dev, struct sk_buff *skb)
         struct brcmf_usbreq  *req;
         int ret;
 
-        if (devinfo->bus_pub.state != BCMFMAC_USB_STATE_UP) {
-                /* TODO: handle suspend/resume */
+        brcmf_dbg(USB, "Enter, skb=%p\n", skb);
+        if (devinfo->bus_pub.state != BRCMFMAC_USB_STATE_UP)
                 return -EIO;
-        }
 
         req = brcmf_usb_deq(devinfo, &devinfo->tx_freeq,
                                         &devinfo->tx_freecount);
         if (!req) {
                 brcmu_pkt_buf_free_skb(skb);
-                brcmf_dbg(ERROR, "no req to send\n");
+                brcmf_err("no req to send\n");
                 return -ENOMEM;
         }
 
@@ -642,7 +606,7 @@ static int brcmf_usb_tx(struct device *dev, struct sk_buff *skb)
         brcmf_usb_enq(devinfo, &devinfo->tx_postq, req, NULL);
         ret = usb_submit_urb(req->urb, GFP_ATOMIC);
         if (ret) {
-                brcmf_dbg(ERROR, "brcmf_usb_tx usb_submit_urb FAILED\n");
+                brcmf_err("brcmf_usb_tx usb_submit_urb FAILED\n");
                 brcmf_usb_del_fromq(devinfo, req);
                 brcmu_pkt_buf_free_skb(req->skb);
                 req->skb = NULL;
@@ -664,25 +628,16 @@ static int brcmf_usb_up(struct device *dev)
 {
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev);
         u16 ifnum;
+        int ret;
 
-        if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_UP)
+        brcmf_dbg(USB, "Enter\n");
+        if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_UP)
                 return 0;
 
-        /* If the USB/HSIC bus in sleep state, wake it up */
-        if (devinfo->suspend_state == USBOS_SUSPEND_STATE_SUSPENDED) {
-                if (brcmf_usb_pnp(devinfo, BCMFMAC_USB_PNP_RESUME) != 0) {
-                        brcmf_dbg(ERROR, "Could not Resume the bus!\n");
-                        return -EIO;
-                }
-        }
-        devinfo->activity = true;
-
         /* Success, indicate devinfo is fully up */
-        brcmf_usb_state_change(devinfo, BCMFMAC_USB_STATE_UP);
+        brcmf_usb_state_change(devinfo, BRCMFMAC_USB_STATE_UP);
 
         if (devinfo->intr_urb) {
-                int ret;
-
                 usb_fill_int_urb(devinfo->intr_urb, devinfo->usbdev,
                         devinfo->intr_pipe,
                         &devinfo->intr,
@@ -693,7 +648,7 @@ static int brcmf_usb_up(struct device *dev)
 
                 ret = usb_submit_urb(devinfo->intr_urb, GFP_ATOMIC);
                 if (ret) {
-                        brcmf_dbg(ERROR, "USB_SUBMIT_URB failed with status %d\n",
+                        brcmf_err("USB_SUBMIT_URB failed with status %d\n",
                                   ret);
                         return -EINVAL;
                 }
@@ -727,14 +682,14 @@ static void brcmf_usb_down(struct device *dev)
 {
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(dev);
 
+        brcmf_dbg(USB, "Enter\n");
         if (devinfo == NULL)
                 return;
 
-        brcmf_dbg(TRACE, "enter\n");
-        if (devinfo->bus_pub.state == BCMFMAC_USB_STATE_DOWN)
+        if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_DOWN)
                 return;
 
-        brcmf_usb_state_change(devinfo, BCMFMAC_USB_STATE_DOWN);
+        brcmf_usb_state_change(devinfo, BRCMFMAC_USB_STATE_DOWN);
         if (devinfo->intr_urb)
                 usb_kill_urb(devinfo->intr_urb);
 
@@ -790,7 +745,7 @@ static bool brcmf_usb_dl_cmd(struct brcmf_usbdev_info *devinfo, u8 cmd,
         devinfo->ctl_completed = false;
         ret = usb_submit_urb(devinfo->ctl_urb, GFP_ATOMIC);
         if (ret < 0) {
-                brcmf_dbg(ERROR, "usb_submit_urb failed %d\n", ret);
+                brcmf_err("usb_submit_urb failed %d\n", ret);
                 kfree(tmpbuf);
                 return false;
         }
@@ -808,27 +763,25 @@ brcmf_usb_dlneeded(struct brcmf_usbdev_info *devinfo)
         struct bootrom_id_le id;
         u32 chipid, chiprev;
 
-        brcmf_dbg(TRACE, "enter\n");
+        brcmf_dbg(USB, "Enter\n");
 
         if (devinfo == NULL)
                 return false;
 
         /* Check if firmware downloaded already by querying runtime ID */
         id.chip = cpu_to_le32(0xDEAD);
-        brcmf_usb_dl_cmd(devinfo, DL_GETVER, &id,
-                sizeof(struct bootrom_id_le));
+        brcmf_usb_dl_cmd(devinfo, DL_GETVER, &id, sizeof(id));
 
         chipid = le32_to_cpu(id.chip);
         chiprev = le32_to_cpu(id.chiprev);
 
         if ((chipid & 0x4300) == 0x4300)
-                brcmf_dbg(INFO, "chip %x rev 0x%x\n", chipid, chiprev);
+                brcmf_dbg(USB, "chip %x rev 0x%x\n", chipid, chiprev);
         else
-                brcmf_dbg(INFO, "chip %d rev 0x%x\n", chipid, chiprev);
+                brcmf_dbg(USB, "chip %d rev 0x%x\n", chipid, chiprev);
         if (chipid == BRCMF_POSTBOOT_ID) {
-                brcmf_dbg(INFO, "firmware already downloaded\n");
-                brcmf_usb_dl_cmd(devinfo, DL_RESETCFG, &id,
-                        sizeof(struct bootrom_id_le));
+                brcmf_dbg(USB, "firmware already downloaded\n");
+                brcmf_usb_dl_cmd(devinfo, DL_RESETCFG, &id, sizeof(id));
                 return false;
         } else {
                 devinfo->bus_pub.devid = chipid;
@@ -841,38 +794,29 @@ static int
 brcmf_usb_resetcfg(struct brcmf_usbdev_info *devinfo)
 {
         struct bootrom_id_le id;
-        u16 wait = 0, wait_time;
-
-        brcmf_dbg(TRACE, "enter\n");
+        u32 loop_cnt;
 
-        if (devinfo == NULL)
-                return -EINVAL;
+        brcmf_dbg(USB, "Enter\n");
 
-        /* Give dongle chance to boot */
-        wait_time = BRCMF_USB_DLIMAGE_SPINWAIT;
-        while (wait < BRCMF_USB_DLIMAGE_LIMIT) {
-                mdelay(wait_time);
-                wait += wait_time;
+        loop_cnt = 0;
+        do {
+                mdelay(BRCMF_USB_RESET_GETVER_SPINWAIT);
+                loop_cnt++;
                 id.chip = cpu_to_le32(0xDEAD);       /* Get the ID */
-                brcmf_usb_dl_cmd(devinfo, DL_GETVER, &id,
-                        sizeof(struct bootrom_id_le));
+                brcmf_usb_dl_cmd(devinfo, DL_GETVER, &id, sizeof(id));
                 if (id.chip == cpu_to_le32(BRCMF_POSTBOOT_ID))
                         break;
-        }
+        } while (loop_cnt < BRCMF_USB_RESET_GETVER_LOOP_CNT);
 
         if (id.chip == cpu_to_le32(BRCMF_POSTBOOT_ID)) {
-                brcmf_dbg(INFO, "download done %d ms postboot chip 0x%x/rev 0x%x\n",
-                          wait, le32_to_cpu(id.chip), le32_to_cpu(id.chiprev));
+                brcmf_dbg(USB, "postboot chip 0x%x/rev 0x%x\n",
+                          le32_to_cpu(id.chip), le32_to_cpu(id.chiprev));
 
-                brcmf_usb_dl_cmd(devinfo, DL_RESETCFG, &id,
-                        sizeof(struct bootrom_id_le));
-
-                /* XXX this wait may not be necessary */
-                mdelay(BRCMF_USB_RESETCFG_SPINWAIT);
+                brcmf_usb_dl_cmd(devinfo, DL_RESETCFG, &id, sizeof(id));
                 return 0;
         } else {
-                brcmf_dbg(ERROR, "Cannot talk to Dongle. Firmware is not UP, %d ms\n",
-                          wait);
+                brcmf_err("Cannot talk to Dongle. Firmware is not UP, %d ms\n",
+                          BRCMF_USB_RESET_GETVER_SPINWAIT * loop_cnt);
                 return -EINVAL;
         }
 }
@@ -896,7 +840,7 @@ brcmf_usb_dl_send_bulk(struct brcmf_usbdev_info *devinfo, void *buffer, int len)
         devinfo->ctl_completed = false;
         ret = usb_submit_urb(devinfo->bulk_urb, GFP_ATOMIC);
         if (ret) {
-                brcmf_dbg(ERROR, "usb_submit_urb failed %d\n", ret);
+                brcmf_err("usb_submit_urb failed %d\n", ret);
                 return ret;
         }
         ret = brcmf_usb_ioctl_resp_wait(devinfo);
@@ -911,7 +855,8 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
         struct rdl_state_le state;
         u32 rdlstate, rdlbytes;
         int err = 0;
-        brcmf_dbg(TRACE, "fw %p, len %d\n", fw, fwlen);
+
+        brcmf_dbg(USB, "Enter, fw %p, len %d\n", fw, fwlen);
 
         bulkchunk = kmalloc(RDL_CHUNK, GFP_ATOMIC);
         if (bulkchunk == NULL) {
@@ -928,7 +873,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
 
         /* 2) Check we are in the Waiting state */
         if (rdlstate != DL_WAITING) {
-                brcmf_dbg(ERROR, "Failed to DL_START\n");
+                brcmf_err("Failed to DL_START\n");
                 err = -EINVAL;
                 goto fail;
         }
@@ -957,7 +902,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
                         memcpy(bulkchunk, dlpos, sendlen);
                         if (brcmf_usb_dl_send_bulk(devinfo, bulkchunk,
                                                    sendlen)) {
-                                brcmf_dbg(ERROR, "send_bulk failed\n");
+                                brcmf_err("send_bulk failed\n");
                                 err = -EINVAL;
                                 goto fail;
                         }
@@ -967,7 +912,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
                 }
                 if (!brcmf_usb_dl_cmd(devinfo, DL_GETSTATE, &state,
                                       sizeof(struct rdl_state_le))) {
-                        brcmf_dbg(ERROR, "DL_GETSTATE Failed xxxx\n");
+                        brcmf_err("DL_GETSTATE Failed xxxx\n");
                         err = -EINVAL;
                         goto fail;
                 }
@@ -977,7 +922,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
 
                 /* restart if an error is reported */
                 if (rdlstate == DL_BAD_HDR || rdlstate == DL_BAD_CRC) {
-                        brcmf_dbg(ERROR, "Bad Hdr or Bad CRC state %d\n",
+                        brcmf_err("Bad Hdr or Bad CRC state %d\n",
                                   rdlstate);
                         err = -EINVAL;
                         goto fail;
@@ -986,7 +931,7 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen)
 
 fail:
         kfree(bulkchunk);
-        brcmf_dbg(TRACE, "err=%d\n", err);
+        brcmf_dbg(USB, "Exit, err=%d\n", err);
         return err;
 }
 
@@ -994,7 +939,7 @@ static int brcmf_usb_dlstart(struct brcmf_usbdev_info *devinfo, u8 *fw, int len)
 {
         int err;
 
-        brcmf_dbg(TRACE, "enter\n");
+        brcmf_dbg(USB, "Enter\n");
 
         if (devinfo == NULL)
                 return -EINVAL;
@@ -1004,10 +949,10 @@ static int brcmf_usb_dlstart(struct brcmf_usbdev_info *devinfo, u8 *fw, int len)
 
         err = brcmf_usb_dl_writeimage(devinfo, fw, len);
         if (err == 0)
-                devinfo->bus_pub.state = BCMFMAC_USB_STATE_DL_DONE;
+                devinfo->bus_pub.state = BRCMFMAC_USB_STATE_DL_DONE;
         else
-                devinfo->bus_pub.state = BCMFMAC_USB_STATE_DL_PENDING;
-        brcmf_dbg(TRACE, "exit: err=%d\n", err);
+                devinfo->bus_pub.state = BRCMFMAC_USB_STATE_DL_FAIL;
+        brcmf_dbg(USB, "Exit, err=%d\n", err);
 
         return err;
 }
@@ -1016,7 +961,7 @@ static int brcmf_usb_dlrun(struct brcmf_usbdev_info *devinfo)
 {
         struct rdl_state_le state;
 
-        brcmf_dbg(TRACE, "enter\n");
+        brcmf_dbg(USB, "Enter\n");
         if (!devinfo)
                 return -EINVAL;
 
@@ -1036,10 +981,10 @@ static int brcmf_usb_dlrun(struct brcmf_usbdev_info *devinfo)
                         return -ENODEV;
                 /* The Dongle may go for re-enumeration. */
         } else {
-                brcmf_dbg(ERROR, "Dongle not runnable\n");
+                brcmf_err("Dongle not runnable\n");
                 return -EINVAL;
         }
-        brcmf_dbg(TRACE, "exit\n");
+        brcmf_dbg(USB, "Exit\n");
         return 0;
 }
 
@@ -1066,7 +1011,7 @@ brcmf_usb_fw_download(struct brcmf_usbdev_info *devinfo)
         int devid, chiprev;
         int err;
 
-        brcmf_dbg(TRACE, "enter\n");
+        brcmf_dbg(USB, "Enter\n");
         if (devinfo == NULL)
                 return -ENODEV;
 
@@ -1074,13 +1019,13 @@ brcmf_usb_fw_download(struct brcmf_usbdev_info *devinfo)
         chiprev = devinfo->bus_pub.chiprev;
 
         if (!brcmf_usb_chip_support(devid, chiprev)) {
-                brcmf_dbg(ERROR, "unsupported chip %d rev %d\n",
+                brcmf_err("unsupported chip %d rev %d\n",
                           devid, chiprev);
                 return -EINVAL;
         }
 
         if (!devinfo->image) {
-                brcmf_dbg(ERROR, "No firmware!\n");
+                brcmf_err("No firmware!\n");
                 return -ENOENT;
         }
 
@@ -1094,7 +1039,7 @@ brcmf_usb_fw_download(struct brcmf_usbdev_info *devinfo)
 
 static void brcmf_usb_detach(struct brcmf_usbdev_info *devinfo)
 {
-        brcmf_dbg(TRACE, "devinfo %p\n", devinfo);
+        brcmf_dbg(USB, "Enter, devinfo %p\n", devinfo);
 
         /* free the URBS */
         brcmf_usb_free_q(&devinfo->rx_freeq, false);
@@ -1129,6 +1074,7 @@ static int check_file(const u8 *headers)
         struct trx_header_le *trx;
         int actual_len = -1;
 
+        brcmf_dbg(USB, "Enter\n");
         /* Extract trx header */
         trx = (struct trx_header_le *) headers;
         if (trx->magic != cpu_to_le32(TRX_MAGIC))
@@ -1150,6 +1096,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
         struct brcmf_usb_image *fw_image;
         int err;
 
+        brcmf_dbg(USB, "Enter\n");
         switch (devinfo->bus_pub.devid) {
         case 43143:
                 fwname = BRCMF_USB_43143_FW_NAME;
@@ -1166,7 +1113,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
                 return -EINVAL;
                 break;
         }
-
+        brcmf_dbg(USB, "Loading FW %s\n", fwname);
         list_for_each_entry(fw_image, &fw_image_list, list) {
                 if (fw_image->fwname == fwname) {
                         devinfo->image = fw_image->image;
@@ -1177,11 +1124,11 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
         /* fw image not yet loaded. Load it now and add to list */
         err = request_firmware(&fw, fwname, devinfo->dev);
         if (!fw) {
-                brcmf_dbg(ERROR, "fail to request firmware %s\n", fwname);
+                brcmf_err("fail to request firmware %s\n", fwname);
                 return err;
         }
         if (check_file(fw->data) < 0) {
-                brcmf_dbg(ERROR, "invalid firmware %s\n", fwname);
+                brcmf_err("invalid firmware %s\n", fwname);
                 return -EINVAL;
         }
 
@@ -1211,10 +1158,13 @@ static
 struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo,
                                       int nrxq, int ntxq)
 {
+        brcmf_dbg(USB, "Enter\n");
+
         devinfo->bus_pub.nrxq = nrxq;
         devinfo->rx_low_watermark = nrxq / 2;
         devinfo->bus_pub.devinfo = devinfo;
         devinfo->bus_pub.ntxq = ntxq;
+        devinfo->bus_pub.state = BRCMFMAC_USB_STATE_DOWN;
 
         /* flow control when too many tx urbs posted */
         devinfo->tx_low_watermark = ntxq / 4;
@@ -1246,24 +1196,24 @@ struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo,
 
         devinfo->intr_urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!devinfo->intr_urb) {
-                brcmf_dbg(ERROR, "usb_alloc_urb (intr) failed\n");
+                brcmf_err("usb_alloc_urb (intr) failed\n");
                 goto error;
         }
         devinfo->ctl_urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!devinfo->ctl_urb) {
-                brcmf_dbg(ERROR, "usb_alloc_urb (ctl) failed\n");
+                brcmf_err("usb_alloc_urb (ctl) failed\n");
                 goto error;
         }
         devinfo->bulk_urb = usb_alloc_urb(0, GFP_ATOMIC);
         if (!devinfo->bulk_urb) {
-                brcmf_dbg(ERROR, "usb_alloc_urb (bulk) failed\n");
+                brcmf_err("usb_alloc_urb (bulk) failed\n");
                 goto error;
         }
 
         if (!brcmf_usb_dlneeded(devinfo))
                 return &devinfo->bus_pub;
 
-        brcmf_dbg(TRACE, "start fw downloading\n");
+        brcmf_dbg(USB, "Start fw downloading\n");
         if (brcmf_usb_get_fw(devinfo))
                 goto error;
 
@@ -1273,19 +1223,27 @@ struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo,
         return &devinfo->bus_pub;
 
 error:
-        brcmf_dbg(ERROR, "failed!\n");
+        brcmf_err("failed!\n");
         brcmf_usb_detach(devinfo);
         return NULL;
 }
 
-static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
-                              const char *desc, u32 bustype, u32 hdrlen)
+static struct brcmf_bus_ops brcmf_usb_bus_ops = {
+        .txdata = brcmf_usb_tx,
+        .init = brcmf_usb_up,
+        .stop = brcmf_usb_down,
+        .txctl = brcmf_usb_tx_ctlpkt,
+        .rxctl = brcmf_usb_rx_ctlpkt,
+};
+
+static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo)
 {
         struct brcmf_bus *bus = NULL;
         struct brcmf_usbdev *bus_pub = NULL;
         int ret;
         struct device *dev = devinfo->dev;
 
+        brcmf_dbg(USB, "Enter\n");
         bus_pub = brcmf_usb_attach(devinfo, BRCMF_USB_NRXQ, BRCMF_USB_NTXQ);
         if (!bus_pub)
                 return -ENODEV;
@@ -1296,26 +1254,22 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
                 goto fail;
         }
 
+        bus->dev = dev;
         bus_pub->bus = bus;
-        bus->brcmf_bus_txdata = brcmf_usb_tx;
-        bus->brcmf_bus_init = brcmf_usb_up;
-        bus->brcmf_bus_stop = brcmf_usb_down;
-        bus->brcmf_bus_txctl = brcmf_usb_tx_ctlpkt;
-        bus->brcmf_bus_rxctl = brcmf_usb_rx_ctlpkt;
-        bus->type = bustype;
         bus->bus_priv.usb = bus_pub;
         dev_set_drvdata(dev, bus);
+        bus->ops = &brcmf_usb_bus_ops;
 
         /* Attach to the common driver interface */
-        ret = brcmf_attach(hdrlen, dev);
+        ret = brcmf_attach(0, dev);
         if (ret) {
-                brcmf_dbg(ERROR, "dhd_attach failed\n");
+                brcmf_err("brcmf_attach failed\n");
                 goto fail;
         }
 
         ret = brcmf_bus_start(dev);
         if (ret) {
-                brcmf_dbg(ERROR, "dongle is not responding\n");
+                brcmf_err("dongle is not responding\n");
                 brcmf_detach(dev);
                 goto fail;
         }
@@ -1333,7 +1287,7 @@ brcmf_usb_disconnect_cb(struct brcmf_usbdev_info *devinfo)
 {
         if (!devinfo)
                 return;
-        brcmf_dbg(TRACE, "enter: bus_pub %p\n", devinfo);
+        brcmf_dbg(USB, "Enter, bus_pub %p\n", devinfo);
 
         brcmf_detach(devinfo->dev);
         kfree(devinfo->bus_pub.bus);
@@ -1351,7 +1305,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         u8 endpoint_num;
         struct brcmf_usbdev_info *devinfo;
 
-        brcmf_dbg(TRACE, "enter\n");
+        brcmf_dbg(USB, "Enter\n");
 
         devinfo = kzalloc(sizeof(*devinfo), GFP_ATOMIC);
         if (devinfo == NULL)
@@ -1390,7 +1344,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (IFDESC(usb, CONTROL_IF).bInterfaceClass != USB_CLASS_VENDOR_SPEC ||
             IFDESC(usb, CONTROL_IF).bInterfaceSubClass != 2 ||
             IFDESC(usb, CONTROL_IF).bInterfaceProtocol != 0xff) {
-                brcmf_dbg(ERROR, "invalid control interface: class %d, subclass %d, proto %d\n",
+                brcmf_err("invalid control interface: class %d, subclass %d, proto %d\n",
                           IFDESC(usb, CONTROL_IF).bInterfaceClass,
                           IFDESC(usb, CONTROL_IF).bInterfaceSubClass,
                           IFDESC(usb, CONTROL_IF).bInterfaceProtocol);
@@ -1402,7 +1356,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         endpoint = &IFEPDESC(usb, CONTROL_IF, 0);
         if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
                 != USB_ENDPOINT_XFER_INT) {
-                brcmf_dbg(ERROR, "invalid control endpoint %d\n",
+                brcmf_err("invalid control endpoint %d\n",
                           endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK);
                 ret = -1;
                 goto fail;
@@ -1421,7 +1375,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
                 endpoint = &IFEPDESC(usb, BULK_IF, ep);
                 if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) !=
                     USB_ENDPOINT_XFER_BULK) {
-                        brcmf_dbg(ERROR, "invalid data endpoint %d\n", ep);
+                        brcmf_err("invalid data endpoint %d\n", ep);
                         ret = -1;
                         goto fail;
                 }
@@ -1452,11 +1406,11 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         devinfo->interval = IFEPDESC(usb, CONTROL_IF, 0).bInterval;
 
         if (usb->speed == USB_SPEED_HIGH)
-                brcmf_dbg(INFO, "Broadcom high speed USB wireless device detected\n");
+                brcmf_dbg(USB, "Broadcom high speed USB wireless device detected\n");
         else
-                brcmf_dbg(INFO, "Broadcom full speed USB wireless device detected\n");
+                brcmf_dbg(USB, "Broadcom full speed USB wireless device detected\n");
 
-        ret = brcmf_usb_probe_cb(devinfo, "", USB_BUS, 0);
+        ret = brcmf_usb_probe_cb(devinfo);
         if (ret)
                 goto fail;
 
@@ -1464,7 +1418,7 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
         return 0;
 
 fail:
-        brcmf_dbg(ERROR, "failed with errno %d\n", ret);
+        brcmf_err("failed with errno %d\n", ret);
         kfree(devinfo);
         usb_set_intfdata(intf, NULL);
         return ret;
@@ -1476,40 +1430,55 @@ brcmf_usb_disconnect(struct usb_interface *intf)
 {
         struct brcmf_usbdev_info *devinfo;
 
-        brcmf_dbg(TRACE, "enter\n");
+        brcmf_dbg(USB, "Enter\n");
         devinfo = (struct brcmf_usbdev_info *)usb_get_intfdata(intf);
         brcmf_usb_disconnect_cb(devinfo);
         kfree(devinfo);
+        brcmf_dbg(USB, "Exit\n");
 }
 
 /*
- *      only need to signal the bus being down and update the suspend state.
+ * only need to signal the bus being down and update the state.
  */
 static int brcmf_usb_suspend(struct usb_interface *intf, pm_message_t state)
 {
         struct usb_device *usb = interface_to_usbdev(intf);
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(&usb->dev);
 
-        brcmf_dbg(TRACE, "enter\n");
-        devinfo->bus_pub.state = BCMFMAC_USB_STATE_DOWN;
-        devinfo->suspend_state = USBOS_SUSPEND_STATE_SUSPENDED;
+        brcmf_dbg(USB, "Enter\n");
+        devinfo->bus_pub.state = BRCMFMAC_USB_STATE_SLEEP;
+        brcmf_detach(&usb->dev);
         return 0;
 }
 
 /*
- *      mark suspend state active and crank up the bus.
+ * (re-) start the bus.
  */
 static int brcmf_usb_resume(struct usb_interface *intf)
 {
         struct usb_device *usb = interface_to_usbdev(intf);
         struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(&usb->dev);
 
-        brcmf_dbg(TRACE, "enter\n");
-        devinfo->suspend_state = USBOS_SUSPEND_STATE_DEVICE_ACTIVE;
-        brcmf_bus_start(&usb->dev);
+        brcmf_dbg(USB, "Enter\n");
+        if (!brcmf_attach(0, devinfo->dev))
+                return brcmf_bus_start(&usb->dev);
+
         return 0;
 }
 
+static int brcmf_usb_reset_resume(struct usb_interface *intf)
+{
+        struct usb_device *usb = interface_to_usbdev(intf);
+        struct brcmf_usbdev_info *devinfo = brcmf_usb_get_businfo(&usb->dev);
+
+        brcmf_dbg(USB, "Enter\n");
+
+        if (!brcmf_usb_fw_download(devinfo))
+                return brcmf_usb_resume(intf);
+
+        return -EIO;
+}
+
 #define BRCMF_USB_VENDOR_ID_BROADCOM    0x0a5c
 #define BRCMF_USB_DEVICE_ID_43143       0xbd1e
 #define BRCMF_USB_DEVICE_ID_43236       0xbd17
@@ -1529,7 +1498,6 @@ MODULE_FIRMWARE(BRCMF_USB_43143_FW_NAME);
 MODULE_FIRMWARE(BRCMF_USB_43236_FW_NAME);
 MODULE_FIRMWARE(BRCMF_USB_43242_FW_NAME);
 
-/* TODO: suspend and resume entries */
 static struct usb_driver brcmf_usbdrvr = {
         .name = KBUILD_MODNAME,
         .probe = brcmf_usb_probe,
@@ -1537,6 +1505,7 @@ static struct usb_driver brcmf_usbdrvr = {
         .id_table = brcmf_usb_devid_table,
         .suspend = brcmf_usb_suspend,
         .resume = brcmf_usb_resume,
+        .reset_resume = brcmf_usb_reset_resume,
         .supports_autosuspend = 1,
         .disable_hub_initiated_lpm = 1,
 };
@@ -1554,12 +1523,14 @@ static void brcmf_release_fw(struct list_head *q)
 
 void brcmf_usb_exit(void)
 {
+        brcmf_dbg(USB, "Enter\n");
         usb_deregister(&brcmf_usbdrvr);
         brcmf_release_fw(&fw_image_list);
 }
 
 void brcmf_usb_init(void)
 {
+        brcmf_dbg(USB, "Enter\n");
         INIT_LIST_HEAD(&fw_image_list);
         usb_register(&brcmf_usbdrvr);
 }