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

Commit 50280c01 authored by Chad Dupuis's avatar Chad Dupuis Committed by James Bottomley
Browse files

[SCSI] Revert "qla2xxx: Ramp down queue depth for attached SCSI devices when... 


[SCSI] Revert "qla2xxx: Ramp down queue depth for attached SCSI devices when driver resources are low."

This reverts commit 3c290d0b

Signed-off-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 8f476115

drivers/scsi/qla2xxx/qla_def.h

+4 −13
Original line number Diff line number Diff line
@@ -2734,7 +2734,6 @@ struct req_que { 
	srb_t **outstanding_cmds;

	uint32_t current_outstanding_cmd;

	uint16_t num_outstanding_cmds;

#define	MAX_Q_DEPTH		32

	int max_q_depth;



	dma_addr_t  dma_fx00;
@@ -3303,12 +3302,6 @@ struct qla_hw_data { 
	struct work_struct idc_state_handler;

	struct work_struct nic_core_unrecoverable;



#define HOST_QUEUE_RAMPDOWN_INTERVAL           (60 * HZ)

#define HOST_QUEUE_RAMPUP_INTERVAL             (30 * HZ)

	unsigned long   host_last_rampdown_time;

	unsigned long   host_last_rampup_time;

	int             cfg_lun_q_depth;



	struct mr_data_fx00 mr;



	struct qlt_hw_data tgt;
@@ -3372,12 +3365,10 @@ typedef struct scsi_qla_host { 
#define MPI_RESET_NEEDED	19	/* Initiate MPI FW reset */

#define ISP_QUIESCE_NEEDED	20	/* Driver need some quiescence */

#define SCR_PENDING		21	/* SCR in target mode */

#define HOST_RAMP_DOWN_QUEUE_DEPTH     22

#define HOST_RAMP_UP_QUEUE_DEPTH       23

#define PORT_UPDATE_NEEDED	24

#define FX00_RESET_RECOVERY	25

#define FX00_TARGET_SCAN	26

#define FX00_CRITEMP_RECOVERY	27

#define PORT_UPDATE_NEEDED	22

#define FX00_RESET_RECOVERY	23

#define FX00_TARGET_SCAN	24

#define FX00_CRITEMP_RECOVERY	25



	uint32_t	device_flags;

#define SWITCH_FOUND		BIT_0

drivers/scsi/qla2xxx/qla_gbl.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ extern int qlport_down_retry; 
extern int ql2xplogiabsentdevice;

extern int ql2xloginretrycount;

extern int ql2xfdmienable;

extern int ql2xmaxqdepth;

extern int ql2xallocfwdump;

extern int ql2xextended_error_logging;

extern int ql2xiidmaenable;

drivers/scsi/qla2xxx/qla_inline.h

+0 −19
Original line number Diff line number Diff line
@@ -260,25 +260,6 @@ qla2x00_gid_list_size(struct qla_hw_data *ha) 
		return sizeof(struct gid_list_info) * ha->max_fibre_devices;

}



static inline void

qla2x00_do_host_ramp_up(scsi_qla_host_t *vha)

{

	if (vha->hw->cfg_lun_q_depth >= ql2xmaxqdepth)

		return;



	/* Wait at least HOST_QUEUE_RAMPDOWN_INTERVAL before ramping up */

	if (time_before(jiffies, (vha->hw->host_last_rampdown_time +

	    HOST_QUEUE_RAMPDOWN_INTERVAL)))

		return;



	/* Wait at least HOST_QUEUE_RAMPUP_INTERVAL between each ramp up */

	if (time_before(jiffies, (vha->hw->host_last_rampup_time +

	    HOST_QUEUE_RAMPUP_INTERVAL)))

		return;



	set_bit(HOST_RAMP_UP_QUEUE_DEPTH, &vha->dpc_flags);

}



static inline void

qla2x00_handle_mbx_completion(struct qla_hw_data *ha, int status)

{

drivers/scsi/qla2xxx/qla_isr.c

+0 −4
Original line number Diff line number Diff line
@@ -1991,7 +1991,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) 


	/* Fast path completion. */

	if (comp_status == CS_COMPLETE && scsi_status == 0) {

		qla2x00_do_host_ramp_up(vha);

		qla2x00_process_completed_request(vha, req, handle);



		return;
@@ -2250,9 +2249,6 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) 
		    cp->cmnd, scsi_bufflen(cp), rsp_info_len,

		    resid_len, fw_resid_len);



	if (!res)

		qla2x00_do_host_ramp_up(vha);



	if (rsp->status_srb == NULL)

		sp->done(ha, sp, res);

}

drivers/scsi/qla2xxx/qla_mr.c

+0 −4
Original line number Diff line number Diff line
@@ -2419,7 +2419,6 @@ qlafx00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) 


	/* Fast path completion. */

	if (comp_status == CS_COMPLETE && scsi_status == 0) {

		qla2x00_do_host_ramp_up(vha);

		qla2x00_process_completed_request(vha, req, handle);

		return;

	}
@@ -2630,9 +2629,6 @@ qlafx00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) 
		    rsp_info_len, resid_len, fw_resid_len, sense_len,

		    par_sense_len, rsp_info_len);



	if (!res)

		qla2x00_do_host_ramp_up(vha);



	if (rsp->status_srb == NULL)

		sp->done(ha, sp, res);

}