return 0;
 }
 
+/**
+ * __poll_for_resp   - self poll completion for rcfw command
+ * @rcfw      -   rcfw channel instance of rdev
+ * @cookie    -   cookie to track the command
+ * @opcode    -   rcfw submitted for given opcode
+ *
+ * It works same as __wait_for_resp except this function will
+ * do self polling in sort interval since interrupt is disabled.
+ * This function can not be called from non-sleepable context.
+ *
+ * Returns:
+ * -ETIMEOUT if command is not completed in specific time interval.
+ * 0 if command is completed by firmware.
+ */
+static int __poll_for_resp(struct bnxt_qplib_rcfw *rcfw, u16 cookie,
+                          u8 opcode)
+{
+       struct bnxt_qplib_cmdq_ctx *cmdq = &rcfw->cmdq;
+       unsigned long issue_time;
+       u16 cbit;
+
+       cbit = cookie % rcfw->cmdq_depth;
+       issue_time = jiffies;
+
+       do {
+               if (test_bit(ERR_DEVICE_DETACHED, &cmdq->flags))
+                       return bnxt_qplib_map_rc(opcode);
+
+               usleep_range(1000, 1001);
+
+               bnxt_qplib_service_creq(&rcfw->creq.creq_tasklet);
+               if (!test_bit(cbit, cmdq->cmdq_bitmap))
+                       return 0;
+               if (jiffies_to_msecs(jiffies - issue_time) > 10000)
+                       return -ETIMEDOUT;
+       } while (true);
+};
+
 static int __send_message_basic_sanity(struct bnxt_qplib_rcfw *rcfw,
                                       struct bnxt_qplib_cmdqmsg *msg)
 {
 
        if (msg->block)
                rc = __block_for_resp(rcfw, cookie, opcode);
-       else
+       else if (atomic_read(&rcfw->rcfw_intr_enabled))
                rc = __wait_for_resp(rcfw, cookie, opcode);
+       else
+               rc = __poll_for_resp(rcfw, cookie, opcode);
        if (rc) {
                /* timed out */
                dev_err(&rcfw->pdev->dev, "cmdq[%#x]=%#x timedout (%d)msec\n",
        kfree(creq->irq_name);
        creq->irq_name = NULL;
        creq->requested = false;
+       atomic_set(&rcfw->rcfw_intr_enabled, 0);
 }
 
 void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw)
        creq->requested = true;
 
        bnxt_qplib_ring_nq_db(&creq->creq_db.dbinfo, res->cctx, true);
+       atomic_inc(&rcfw->rcfw_intr_enabled);
 
        return 0;
 }