9 files changed, 80 insertions, 49 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index 7706c99ec8bb..c586db227a9a 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -66,8 +66,10 @@ struct lpfc_sli2_slim;
  * queue depths when there are driver resource error or Firmware
  * resource error.
  */
-#define QUEUE_RAMP_DOWN_INTERVAL        (1 * HZ)   /* 1 Second */
-#define QUEUE_RAMP_UP_INTERVAL          (300 * HZ) /* 5 minutes */
+/* 1 Second */
+#define QUEUE_RAMP_DOWN_INTERVAL        (msecs_to_jiffies(1000 * 1))
+/* 5 minutes */
+#define QUEUE_RAMP_UP_INTERVAL          (msecs_to_jiffies(1000 * 300))
 
 /* Number of exchanges reserved for discovery to complete */
 #define LPFC_DISC_IOCB_BUFF_COUNT 20
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 888666892004..f79933366545 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -2576,7 +2576,8 @@ static int lpfcdiag_loop_get_xri(struct lpfc_hba *phba, uint16_t rpi,
         evt->wait_time_stamp = jiffies;
         time_left = wait_event_interruptible_timeout(
                 evt->wq, !list_empty(&evt->events_to_see),
-                ((phba->fc_ratov * 2) + LPFC_DRVR_TIMEOUT) * HZ);
+                msecs_to_jiffies(1000 *
+                        ((phba->fc_ratov * 2) + LPFC_DRVR_TIMEOUT)));
         if (list_empty(&evt->events_to_see))
                 ret_val = (time_left) ? -EINTR : -ETIMEDOUT;
         else {
@@ -3151,7 +3152,8 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)
         evt->waiting = 1;
         time_left = wait_event_interruptible_timeout(
                 evt->wq, !list_empty(&evt->events_to_see),
-                ((phba->fc_ratov * 2) + LPFC_DRVR_TIMEOUT) * HZ);
+                msecs_to_jiffies(1000 *
+                        ((phba->fc_ratov * 2) + LPFC_DRVR_TIMEOUT)));
         evt->waiting = 0;
         if (list_empty(&evt->events_to_see)) {
                 rc = (time_left) ? -EINTR : -ETIMEDOUT;
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 7bff3a19af56..ae1a07c57cae 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1811,7 +1811,8 @@ lpfc_fdmi_timeout_handler(struct lpfc_vport *vport)
                 if (init_utsname()->nodename[0] != '\0')
                         lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);
                 else
-                        mod_timer(&vport->fc_fdmitmo, jiffies + HZ * 60);
+                        mod_timer(&vport->fc_fdmitmo, jiffies +
+                                  msecs_to_jiffies(1000 * 60));
         }
         return;
 }
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index bbed8471bf0b..7ea0d35be977 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -6241,7 +6241,8 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport)
         }
 
         if (!list_empty(&phba->sli.ring[LPFC_ELS_RING].txcmplq))
-                mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);
+                mod_timer(&vport->els_tmofunc,
+                          jiffies + msecs_to_jiffies(1000 * timeout));
 }
 
 /**
@@ -7003,7 +7004,7 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport)
         if (vport->fc_flag & FC_DISC_DELAYED) {
                 spin_unlock_irq(shost->host_lock);
                 mod_timer(&vport->delayed_disc_tmo,
-                        jiffies + HZ * phba->fc_ratov);
+                        jiffies + msecs_to_jiffies(1000 * phba->fc_ratov));
                 return;
         }
         spin_unlock_irq(shost->host_lock);
@@ -7287,7 +7288,7 @@ lpfc_retry_pport_discovery(struct lpfc_hba *phba)
                 return;
 
         shost = lpfc_shost_from_vport(phba->pport);
-        mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+        mod_timer(&ndlp->nlp_delayfunc, jiffies + msecs_to_jiffies(1000));
         spin_lock_irq(shost->host_lock);
         ndlp->nlp_flag |= NLP_DELAY_TMO;
         spin_unlock_irq(shost->host_lock);
@@ -7791,7 +7792,8 @@ lpfc_block_fabric_iocbs(struct lpfc_hba *phba)
         blocked = test_and_set_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags);
         /* Start a timer to unblock fabric iocbs after 100ms */
         if (!blocked)
-                mod_timer(&phba->fabric_block_timer, jiffies + HZ/10 );
+                mod_timer(&phba->fabric_block_timer,
+                          jiffies + msecs_to_jiffies(100));
 
         return;
 }
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 2ce2ebcc8f17..62deb31fa4b8 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -4247,7 +4247,7 @@ lpfc_set_disctmo(struct lpfc_vport *vport)
                         tmo, vport->port_state, vport->fc_flag);
         }
 
-        mod_timer(&vport->fc_disctmo, jiffies + HZ * tmo);
+        mod_timer(&vport->fc_disctmo, jiffies + msecs_to_jiffies(1000 * tmo));
         spin_lock_irq(shost->host_lock);
         vport->fc_flag |= FC_DISC_TMO;
         spin_unlock_irq(shost->host_lock);
@@ -5422,7 +5422,8 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
         if (vport->cfg_fdmi_on == 1)
                 lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);
         else
-                mod_timer(&vport->fc_fdmitmo, jiffies + HZ * 60);
+                mod_timer(&vport->fc_fdmitmo,
+                          jiffies + msecs_to_jiffies(1000 * 60));
 
         /* decrement the node reference count held for this callback
          * function.
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 8edef6c4d57a..ac210d7fc96a 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -541,13 +541,16 @@ lpfc_config_port_post(struct lpfc_hba *phba)
 
         /* Set up ring-0 (ELS) timer */
         timeout = phba->fc_ratov * 2;
-        mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);
+        mod_timer(&vport->els_tmofunc,
+                  jiffies + msecs_to_jiffies(1000 * timeout));
         /* Set up heart beat (HB) timer */
-        mod_timer(&phba->hb_tmofunc, jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+        mod_timer(&phba->hb_tmofunc,
+                  jiffies + msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
         phba->hb_outstanding = 0;
         phba->last_completion_time = jiffies;
         /* Set up error attention (ERATT) polling timer */
-        mod_timer(&phba->eratt_poll, jiffies + HZ * LPFC_ERATT_POLL_INTERVAL);
+        mod_timer(&phba->eratt_poll,
+                  jiffies + msecs_to_jiffies(1000 * LPFC_ERATT_POLL_INTERVAL));
 
         if (phba->hba_flag & LINK_DISABLED) {
                 lpfc_printf_log(phba,
@@ -1021,7 +1024,8 @@ lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
                 !(phba->link_state == LPFC_HBA_ERROR) &&
                 !(phba->pport->load_flag & FC_UNLOADING))
                 mod_timer(&phba->hb_tmofunc,
-                        jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+                          jiffies +
+                          msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
         return;
 }
 
@@ -1064,15 +1068,18 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
 
         spin_lock_irq(&phba->pport->work_port_lock);
 
-        if (time_after(phba->last_completion_time + LPFC_HB_MBOX_INTERVAL * HZ,
-                jiffies)) {
+        if (time_after(phba->last_completion_time +
+                        msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL),
+                        jiffies)) {
                 spin_unlock_irq(&phba->pport->work_port_lock);
                 if (!phba->hb_outstanding)
                         mod_timer(&phba->hb_tmofunc,
-                                jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+                                jiffies +
+                                msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
                 else
                         mod_timer(&phba->hb_tmofunc,
-                                jiffies + HZ * LPFC_HB_MBOX_TIMEOUT);
+                                jiffies +
+                                msecs_to_jiffies(1000 * LPFC_HB_MBOX_TIMEOUT));
                 return;
         }
         spin_unlock_irq(&phba->pport->work_port_lock);
@@ -1104,7 +1111,8 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
                                 if (!pmboxq) {
                                         mod_timer(&phba->hb_tmofunc,
                                                  jiffies +
-                                                 HZ * LPFC_HB_MBOX_INTERVAL);
+                                                 msecs_to_jiffies(1000 *
+                                                 LPFC_HB_MBOX_INTERVAL));
                                         return;
                                 }
 
@@ -1120,7 +1128,8 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
                                                         phba->mbox_mem_pool);
                                         mod_timer(&phba->hb_tmofunc,
                                                 jiffies +
-                                                HZ * LPFC_HB_MBOX_INTERVAL);
+                                                msecs_to_jiffies(1000 *
+                                                LPFC_HB_MBOX_INTERVAL));
                                         return;
                                 }
                                 phba->skipped_hb = 0;
@@ -1136,7 +1145,8 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
                                 phba->skipped_hb = jiffies;
 
                         mod_timer(&phba->hb_tmofunc,
-                                  jiffies + HZ * LPFC_HB_MBOX_TIMEOUT);
+                                 jiffies +
+                                 msecs_to_jiffies(1000 * LPFC_HB_MBOX_TIMEOUT));
                         return;
                 } else {
                         /*
@@ -1150,7 +1160,8 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba)
                                         jiffies_to_msecs(jiffies
                                                  - phba->last_completion_time));
                         mod_timer(&phba->hb_tmofunc,
-                                  jiffies + HZ * LPFC_HB_MBOX_TIMEOUT);
+                                jiffies +
+                                msecs_to_jiffies(1000 * LPFC_HB_MBOX_TIMEOUT));
                 }
         }
 }
@@ -3207,14 +3218,15 @@ int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
                 stat = 1;
                 goto finished;
         }
-        if (time >= 30 * HZ) {
+        if (time >= msecs_to_jiffies(30 * 1000)) {
                 lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                 "0461 Scanning longer than 30 "
                                 "seconds.  Continuing initialization\n");
                 stat = 1;
                 goto finished;
         }
-        if (time >= 15 * HZ && phba->link_state <= LPFC_LINK_DOWN) {
+        if (time >= msecs_to_jiffies(15 * 1000) &&
+            phba->link_state <= LPFC_LINK_DOWN) {
                 lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                 "0465 Link down longer than 15 "
                                 "seconds.  Continuing initialization\n");
@@ -3226,7 +3238,7 @@ int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
                 goto finished;
         if (vport->num_disc_nodes || vport->fc_prli_sent)
                 goto finished;
-        if (vport->fc_map_cnt == 0 && time < 2 * HZ)
+        if (vport->fc_map_cnt == 0 && time < msecs_to_jiffies(2 * 1000))
                 goto finished;
         if ((phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE) != 0)
                 goto finished;
@@ -4225,7 +4237,8 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,
                          * If there are other active VLinks present,
                          * re-instantiate the Vlink using FDISC.
                          */
-                        mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+                        mod_timer(&ndlp->nlp_delayfunc,
+                                  jiffies + msecs_to_jiffies(1000));
                         shost = lpfc_shost_from_vport(vport);
                         spin_lock_irq(shost->host_lock);
                         ndlp->nlp_flag |= NLP_DELAY_TMO;
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 82f4d3542289..41e833ede571 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -574,7 +574,7 @@ out:
         lpfc_els_rsp_reject(vport, stat.un.lsRjtError, cmdiocb, ndlp, NULL);
 
         /* 1 sec timeout */
-        mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+        mod_timer(&ndlp->nlp_delayfunc, jiffies + msecs_to_jiffies(1000));
 
         spin_lock_irq(shost->host_lock);
         ndlp->nlp_flag |= NLP_DELAY_TMO;
@@ -631,7 +631,8 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                          * If there are other active VLinks present,
                          * re-instantiate the Vlink using FDISC.
                          */
-                        mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+                        mod_timer(&ndlp->nlp_delayfunc,
+                                  jiffies + msecs_to_jiffies(1000));
                         spin_lock_irq(shost->host_lock);
                         ndlp->nlp_flag |= NLP_DELAY_TMO;
                         spin_unlock_irq(shost->host_lock);
@@ -648,7 +649,8 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
                 !(ndlp->nlp_type & NLP_FCP_INITIATOR))) ||
                 (ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
                 /* Only try to re-login if this is NOT a Fabric Node */
-                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+                mod_timer(&ndlp->nlp_delayfunc,
+                          jiffies + msecs_to_jiffies(1000 * 1));
                 spin_lock_irq(shost->host_lock);
                 ndlp->nlp_flag |= NLP_DELAY_TMO;
                 spin_unlock_irq(shost->host_lock);
@@ -969,7 +971,7 @@ lpfc_rcv_els_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         }
 
         /* Put ndlp in npr state set plogi timer for 1 sec */
-        mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+        mod_timer(&ndlp->nlp_delayfunc, jiffies + msecs_to_jiffies(1000 * 1));
         spin_lock_irq(shost->host_lock);
         ndlp->nlp_flag |= NLP_DELAY_TMO;
         spin_unlock_irq(shost->host_lock);
@@ -1303,7 +1305,8 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport,
         if ((irsp->ulpStatus) ||
             (!lpfc_check_adisc(vport, ndlp, &ap->nodeName, &ap->portName))) {
                 /* 1 sec timeout */
-                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ);
+                mod_timer(&ndlp->nlp_delayfunc,
+                          jiffies + msecs_to_jiffies(1000));
                 spin_lock_irq(shost->host_lock);
                 ndlp->nlp_flag |= NLP_DELAY_TMO;
                 spin_unlock_irq(shost->host_lock);
@@ -1509,7 +1512,8 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport,
                 }
 
                 /* Put ndlp in npr state set plogi timer for 1 sec */
-                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+                mod_timer(&ndlp->nlp_delayfunc,
+                          jiffies + msecs_to_jiffies(1000 * 1));
                 spin_lock_irq(shost->host_lock);
                 ndlp->nlp_flag |= NLP_DELAY_TMO;
                 spin_unlock_irq(shost->host_lock);
@@ -2145,7 +2149,8 @@ lpfc_rcv_prlo_npr_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,
         lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);
 
         if ((ndlp->nlp_flag & NLP_DELAY_TMO) == 0) {
-                mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);
+                mod_timer(&ndlp->nlp_delayfunc,
+                          jiffies + msecs_to_jiffies(1000 * 1));
                 spin_lock_irq(shost->host_lock);
                 ndlp->nlp_flag |= NLP_DELAY_TMO;
                 ndlp->nlp_flag &= ~NLP_NPR_ADISC;
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index dacde58b602c..d096402ae4d7 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4771,7 +4771,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd)
         /* Wait for abort to complete */
         wait_event_timeout(waitq,
                           (lpfc_cmd->pCmd != cmnd),
-                           (2*vport->cfg_devloss_tmo*HZ));
+                           msecs_to_jiffies(2*vport->cfg_devloss_tmo*1000));
         lpfc_cmd->waitq = NULL;
 
         if (lpfc_cmd->pCmd == cmnd) {
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 96fe1ef24689..89a3a4059064 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -667,7 +667,7 @@ lpfc_handle_rrq_active(struct lpfc_hba *phba)
 
         spin_lock_irqsave(&phba->hbalock, iflags);
         phba->hba_flag &= ~HBA_RRQ_ACTIVE;
-        next_time = jiffies + HZ * (phba->fc_ratov + 1);
+        next_time = jiffies + msecs_to_jiffies(1000 * (phba->fc_ratov + 1));
         list_for_each_entry_safe(rrq, nextrrq,
                                  &phba->active_rrq_list, list) {
                 if (time_after(jiffies, rrq->rrq_stop_time))
@@ -782,7 +782,7 @@ lpfc_cleanup_wt_rrqs(struct lpfc_hba *phba)
                 return;
         spin_lock_irqsave(&phba->hbalock, iflags);
         phba->hba_flag &= ~HBA_RRQ_ACTIVE;
-        next_time = jiffies + HZ * (phba->fc_ratov * 2);
+        next_time = jiffies + msecs_to_jiffies(1000 * (phba->fc_ratov * 2));
         list_splice_init(&phba->active_rrq_list, &rrq_list);
         spin_unlock_irqrestore(&phba->hbalock, iflags);
 
@@ -878,7 +878,8 @@ lpfc_set_rrq_active(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp,
         else
                 rrq->send_rrq = 0;
         rrq->xritag = xritag;
-        rrq->rrq_stop_time = jiffies + HZ * (phba->fc_ratov + 1);
+        rrq->rrq_stop_time = jiffies +
+                                msecs_to_jiffies(1000 * (phba->fc_ratov + 1));
         rrq->ndlp = ndlp;
         rrq->nlp_DID = ndlp->nlp_DID;
         rrq->vport = ndlp->vport;
@@ -1339,7 +1340,8 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         BUG();
                 else
                         mod_timer(&piocb->vport->els_tmofunc,
-                                  jiffies + HZ * (phba->fc_ratov << 1));
+                                jiffies +
+                                msecs_to_jiffies(1000 * (phba->fc_ratov << 1)));
         }
 
 
@@ -2908,8 +2910,9 @@ void lpfc_poll_eratt(unsigned long ptr)
                 lpfc_worker_wake_up(phba);
         else
                 /* Restart the timer for next eratt poll */
-                mod_timer(&phba->eratt_poll, jiffies +
-                                        HZ * LPFC_ERATT_POLL_INTERVAL);
+                mod_timer(&phba->eratt_poll,
+                          jiffies +
+                          msecs_to_jiffies(1000 * LPFC_ERATT_POLL_INTERVAL));
         return;
 }
 
@@ -6448,16 +6451,17 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
 
         /* Start the ELS watchdog timer */
         mod_timer(&vport->els_tmofunc,
-                  jiffies + HZ * (phba->fc_ratov * 2));
+                  jiffies + msecs_to_jiffies(1000 * (phba->fc_ratov * 2)));
 
         /* Start heart beat timer */
         mod_timer(&phba->hb_tmofunc,
-                  jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+                  jiffies + msecs_to_jiffies(1000 * LPFC_HB_MBOX_INTERVAL));
         phba->hb_outstanding = 0;
         phba->last_completion_time = jiffies;
 
         /* Start error attention (ERATT) polling timer */
-        mod_timer(&phba->eratt_poll, jiffies + HZ * LPFC_ERATT_POLL_INTERVAL);
+        mod_timer(&phba->eratt_poll,
+                  jiffies + msecs_to_jiffies(1000 * LPFC_ERATT_POLL_INTERVAL));
 
         /* Enable PCIe device Advanced Error Reporting (AER) if configured */
         if (phba->cfg_aer_support == 1 && !(phba->hba_flag & HBA_AER_ENABLED)) {
@@ -6824,8 +6828,9 @@ lpfc_sli_issue_mbox_s3(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox,
                         goto out_not_finished;
                 }
                 /* timeout active mbox command */
-                mod_timer(&psli->mbox_tmo, (jiffies +
-                               (HZ * lpfc_mbox_tmo_val(phba, pmbox))));
+                timeout = msecs_to_jiffies(lpfc_mbox_tmo_val(phba, pmbox) *
+                                           1000);
+                mod_timer(&psli->mbox_tmo, jiffies + timeout);
         }
 
         /* Mailbox cmd <cmd> issue */
@@ -7498,7 +7503,7 @@ lpfc_sli4_post_async_mbox(struct lpfc_hba *phba)
 
         /* Start timer for the mbox_tmo and log some mailbox post messages */
         mod_timer(&psli->mbox_tmo, (jiffies +
-                  (HZ * lpfc_mbox_tmo_val(phba, mboxq))));
+                  msecs_to_jiffies(1000 * lpfc_mbox_tmo_val(phba, mboxq))));
 
         lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
                         "(%d):0355 Mailbox cmd x%x (x%x/x%x) issue Data: "
@@ -10005,7 +10010,7 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
         retval = lpfc_sli_issue_iocb(phba, ring_number, piocb,
                                      SLI_IOCB_RET_IOCB);
         if (retval == IOCB_SUCCESS) {
-                timeout_req = timeout * HZ;
+                timeout_req = msecs_to_jiffies(timeout * 1000);
                 timeleft = wait_event_timeout(done_q,
                                 lpfc_chk_iocb_flg(phba, piocb, LPFC_IO_WAKE),
                                 timeout_req);
@@ -10110,7 +10115,7 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
         if (retval == MBX_BUSY || retval == MBX_SUCCESS) {
                 wait_event_interruptible_timeout(done_q,
                                 pmboxq->mbox_flag & LPFC_MBX_WAKE,
-                                timeout * HZ);
+                                msecs_to_jiffies(timeout * 1000));
 
                 spin_lock_irqsave(&phba->hbalock, flag);
                 pmboxq->context1 = NULL;