lpfc 8.3.45: Incorporate changes to use reason in change_queue_depth function.

PATCH New James Smart 1 participant 1 message Feb 20, 2014

Subsystems (2)

SCSI Emulex/Broadcom lpfc FC/FCoE SCSI driver

lore

Share & tools

lore

James Smart

author

2014-02-20 14:57 UTC #0 lore raw

PATCH 3/8 lpfc 8.3.45: Incorporate changes to use reason in change_queue_depth function.

Incorporate changes to use reason in change_queue_depth function.

Signed-off-by James Smart <[email protected]>

---

 lpfc.h         |    3 -
 lpfc_crtn.h    |    1 
 lpfc_hbadisc.c |    2 
 lpfc_scsi.c    |  126 ++++++++-------------------------------------------------
 4 files changed, 19 insertions(+), 113 deletions(-)

drivers/scsi/lpfc/lpfc_crtn.h +0 -1

diff -upNr a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -405,7 +405,6 @@ void lpfc_fabric_block_timeout(unsigned
 void lpfc_unblock_fabric_iocbs(struct lpfc_hba *);
 void lpfc_rampdown_queue_depth(struct lpfc_hba *);
 void lpfc_ramp_down_queue_handler(struct lpfc_hba *);
-void lpfc_ramp_up_queue_handler(struct lpfc_hba *);
 void lpfc_scsi_dev_block(struct lpfc_hba *);
 
 void

drivers/scsi/lpfc/lpfc.h +0 -3

diff -upNr a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
@@ -73,8 +73,6 @@ struct lpfc_sli2_slim;
  */
 /* 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

@@ -885,7 +883,6 @@ struct lpfc_hba {
 	atomic_t num_cmd_success;
 	unsigned long last_rsrc_error_time;
 	unsigned long last_ramp_down_time;
-	unsigned long last_ramp_up_time;
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 	struct dentry *hba_debugfs_root;
 	atomic_t debugfs_vport_count;

drivers/scsi/lpfc/lpfc_hbadisc.c +0 -2

diff -upNr a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -674,8 +674,6 @@ lpfc_work_done(struct lpfc_hba *phba)
 				lpfc_fdmi_timeout_handler(vport);
 			if (work_port_events & WORKER_RAMP_DOWN_QUEUE)
 				lpfc_ramp_down_queue_handler(phba);
-			if (work_port_events & WORKER_RAMP_UP_QUEUE)
-				lpfc_ramp_up_queue_handler(phba);
 			if (work_port_events & WORKER_DELAYED_DISC_TMO)
 				lpfc_delayed_disc_timeout_handler(vport);
 		}

drivers/scsi/lpfc/lpfc_scsi.c +19 ~~-107~~

156 lines not on this page · raw message