1 files changed, 25 insertions, 11 deletions

diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 9f6166f59268..35d2a5dd9bb4 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -131,42 +131,58 @@ static inline int c4iw_num_stags(struct c4iw_rdev *rdev)
 
 #define C4IW_WR_TO (10*HZ)
 
+enum {
+        REPLY_READY = 0,
+};
+
 struct c4iw_wr_wait {
         wait_queue_head_t wait;
-        int done;
+        unsigned long status;
         int ret;
 };
 
 static inline void c4iw_init_wr_wait(struct c4iw_wr_wait *wr_waitp)
 {
         wr_waitp->ret = 0;
-        wr_waitp->done = 0;
+        wr_waitp->status = 0;
         init_waitqueue_head(&wr_waitp->wait);
 }
 
+static inline void c4iw_wake_up(struct c4iw_wr_wait *wr_waitp, int ret)
+{
+        wr_waitp->ret = ret;
+        set_bit(REPLY_READY, &wr_waitp->status);
+        wake_up(&wr_waitp->wait);
+}
+
 static inline int c4iw_wait_for_reply(struct c4iw_rdev *rdev,
                                  struct c4iw_wr_wait *wr_waitp,
                                  u32 hwtid, u32 qpid,
                                  const char *func)
 {
         unsigned to = C4IW_WR_TO;
-        do {
+        int ret;
 
-                wait_event_timeout(wr_waitp->wait, wr_waitp->done, to);
-                if (!wr_waitp->done) {
+        do {
+                ret = wait_event_timeout(wr_waitp->wait,
+                        test_and_clear_bit(REPLY_READY, &wr_waitp->status), to);
+                if (!ret) {
                         printk(KERN_ERR MOD "%s - Device %s not responding - "
                                "tid %u qpid %u\n", func,
                                pci_name(rdev->lldi.pdev), hwtid, qpid);
+                        if (c4iw_fatal_error(rdev)) {
+                                wr_waitp->ret = -EIO;
+                                break;
+                        }
                         to = to << 2;
                 }
-        } while (!wr_waitp->done);
+        } while (!ret);
         if (wr_waitp->ret)
-                printk(KERN_WARNING MOD "%s: FW reply %d tid %u qpid %u\n",
-                       pci_name(rdev->lldi.pdev), wr_waitp->ret, hwtid, qpid);
+                PDBG("%s: FW reply %d tid %u qpid %u\n",
+                     pci_name(rdev->lldi.pdev), wr_waitp->ret, hwtid, qpid);
         return wr_waitp->ret;
 }
 
-
 struct c4iw_dev {
         struct ib_device ibdev;
         struct c4iw_rdev rdev;
@@ -175,9 +191,7 @@ struct c4iw_dev {
         struct idr qpidr;
         struct idr mmidr;
         spinlock_t lock;
-        struct list_head entry;
         struct dentry *debugfs_root;
-        u8 registered;
 };
 
 static inline struct c4iw_dev *to_c4iw_dev(struct ib_device *ibdev)