1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 6a512871176b..d95730c6e0f2 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -3903,7 +3903,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,
                         if (len)
                                 break;
                         /* on first few passes, just barely sleep */
-                        if (i < DFLT_HWRM_CMD_TIMEOUT)
+                        if (i < HWRM_SHORT_TIMEOUT_COUNTER)
                                 usleep_range(HWRM_SHORT_MIN_TIMEOUT,
                                              HWRM_SHORT_MAX_TIMEOUT);
                         else
@@ -3926,7 +3926,7 @@ static int bnxt_hwrm_do_send_msg(struct bnxt *bp, void *msg, u32 msg_len,
                         dma_rmb();
                         if (*valid)
                                 break;
-                        udelay(1);
+                        usleep_range(1, 5);
                 }
 
                 if (j >= HWRM_VALID_BIT_DELAY_USEC) {
@@ -4973,12 +4973,18 @@ static int bnxt_hwrm_ring_alloc(struct bnxt *bp)
                 struct bnxt_cp_ring_info *cpr = &bnapi->cp_ring;
                 struct bnxt_ring_struct *ring = &cpr->cp_ring_struct;
                 u32 map_idx = ring->map_idx;
+                unsigned int vector;
 
+                vector = bp->irq_tbl[map_idx].vector;
+                disable_irq_nosync(vector);
                 rc = hwrm_ring_alloc_send_msg(bp, ring, type, map_idx);
-                if (rc)
+                if (rc) {
+                        enable_irq(vector);
                         goto err_out;
+                }
                 bnxt_set_db(bp, &cpr->cp_db, type, map_idx, ring->fw_ring_id);
                 bnxt_db_nq(bp, &cpr->cp_db, cpr->cp_raw_cons);
+                enable_irq(vector);
                 bp->grp_info[i].cp_fw_ring_id = ring->fw_ring_id;
 
                 if (!i) {