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

Commit e881a172 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] modify change_queue_depth to take in reason why it is being called 



This patch modifies scsi_host_template->change_queue_depth so that
it takes an argument indicating why it is being called. This will be
used so that if a LLD needs to do some extra processing when
handling queue fulls or later ramp ups, it can do so.

This is a simple port of the drivers setting a change_queue_depth
callback. In the patch I just have these LLDs adjust the queue depth
if the user was requesting it.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>

[Vasu.Dev: v2
	Also converted pmcraid_change_queue_depth and then verified
all modules compile  using "make allmodconfig" for any new build
warnings on X86_64.

	Updated original description after combing two original
patches from Mike to make this patch git bisectable.]
Signed-off-by: default avatarVasu Dev <vasu.dev@intel.com>
[jejb: fixed up 53c700]
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent dbf9bfe6

drivers/ata/libata-scsi.c

+6 −1
Original line number Diff line number Diff line
@@ -1208,6 +1208,7 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev) 
 *	ata_scsi_change_queue_depth - SCSI callback for queue depth config

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *	@reason: calling context

 *

 *	This is libata standard hostt->change_queue_depth callback.

 *	SCSI will call into this callback when user tries to set queue
@@ -1219,12 +1220,16 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev) 
 *	RETURNS:

 *	Newly configured queue depth.

 */

int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)

int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth,

				int reason)

{

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *dev;

	unsigned long flags;



	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	if (queue_depth < 1 || queue_depth == sdev->queue_depth)

		return sdev->queue_depth;

drivers/ata/sata_nv.c

+1 −1
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ static int nv_swncq_slave_config(struct scsi_device *sdev) 
	ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));



	if (strncmp(model_num, "Maxtor", 6) == 0) {

		ata_scsi_change_queue_depth(sdev, 1);

		ata_scsi_change_queue_depth(sdev, 1, SCSI_QDEPTH_DEFAULT);

		ata_dev_printk(dev, KERN_NOTICE,

			"Disabling SWNCQ mode (depth %x)\n", sdev->queue_depth);

	}

drivers/message/fusion/mptscsih.c

+7 −2
Original line number Diff line number Diff line
@@ -2351,11 +2351,12 @@ mptscsih_slave_destroy(struct scsi_device *sdev) 
 *	mptscsih_change_queue_depth - This function will set a devices queue depth

 *	@sdev: per scsi_device pointer

 *	@qdepth: requested queue depth

 *	@reason: calling context

 *

 *	Adding support for new 'change_queue_depth' api.

*/

int

mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth)

mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)

{

	MPT_SCSI_HOST		*hd = shost_priv(sdev->host);

	VirtTarget 		*vtarget;
@@ -2367,6 +2368,9 @@ mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth) 
	starget = scsi_target(sdev);

	vtarget = starget->hostdata;



	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	if (ioc->bus_type == SPI) {

		if (!(vtarget->tflags & MPT_TARGET_FLAGS_Q_YES))

			max_depth = 1;
@@ -2433,7 +2437,8 @@ mptscsih_slave_configure(struct scsi_device *sdev) 
		    ioc->name, vtarget->negoFlags, vtarget->maxOffset,

		    vtarget->minSyncFactor));



	mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH);

	mptscsih_change_queue_depth(sdev, MPT_SCSI_CMD_PER_DEV_HIGH,

				    SCSI_QDEPTH_DEFAULT);

	dsprintk(ioc, printk(MYIOC_s_DEBUG_FMT

		"tagged %d, simple %d, ordered %d\n",

		ioc->name,sdev->tagged_supported, sdev->simple_tags,

drivers/message/fusion/mptscsih.h

+2 −1
Original line number Diff line number Diff line
@@ -128,7 +128,8 @@ extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_F 
extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r);

extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply);

extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset);

extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth);

extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth,

				       int reason);

extern u8 mptscsih_raid_id_to_num(MPT_ADAPTER *ioc, u8 channel, u8 id);

extern int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, u8 channel, u8 id);

extern struct device_attribute *mptscsih_host_attrs[];

drivers/s390/scsi/zfcp_scsi.c

+5 −1
Original line number Diff line number Diff line
@@ -29,8 +29,12 @@ char *zfcp_get_fcp_sns_info_ptr(struct fcp_rsp_iu *fcp_rsp_iu) 
	return fcp_sns_info_ptr;

}



static int zfcp_scsi_change_queue_depth(struct scsi_device *sdev, int depth)

static int zfcp_scsi_change_queue_depth(struct scsi_device *sdev, int depth,

					int reason)

{

	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), depth);

	return sdev->queue_depth;

}