Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 256ec0d0 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.39: Remove driver dependency on HZ 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 737d4248

drivers/scsi/lpfc/lpfc.h

+4 −2
Original line number Diff line number Diff line
@@ -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

drivers/scsi/lpfc/lpfc_bsg.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

drivers/scsi/lpfc/lpfc_ct.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/scsi/lpfc/lpfc_els.c

+6 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/scsi/lpfc/lpfc_hbadisc.c

+3 −2
Original line number Diff line number Diff line
@@ -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.