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

Commit cdce6ac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI update from James Bottomley:
 "This is a much shorter set of patches that were on the go but didn't
  make it in to the early pull request for the merge window.  It's
  really a set of bug fixes plus some final cleanup work on the new tag
  queue API"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  storvsc: ring buffer failures may result in I/O freeze
  ipr: set scsi_level correctly for disk arrays
  ipr: add support for async scanning to speed up boot
  scsi_debug: fix missing "break;" in SDEBUG_UA_CAPACITY_CHANGED case
  scsi_debug: take sdebug_host_list_lock when changing capacity
  scsi_debug: improve driver description in Kconfig
  scsi_debug: fix compare and write errors
  qla2xxx: fix race in handling rport deletion during recovery causes panic
  scsi: blacklist RSOC for Microsoft iSCSI target devices
  scsi: fix random memory corruption with scsi-mq + T10 PI
  Revert "[SCSI] mpt3sas: Remove phys on topology change"
  Revert "[SCSI] mpt2sas: Remove phys on topology change."
  esas2r: Correct typos of "validate" in a comment
  fc: FCP_PTA_SIMPLE is 0
  ibmvfc: remove unused tag variable
  scsi: remove MSG_*_TAG defines
  scsi: remove scsi_set_tag_type
  scsi: remove scsi_get_tag_type
  scsi: never drop to untagged mode during queue ramp down
  scsi: remove ->change_queue_type method
parents 5d6a5468 e6174576

drivers/infiniband/ulp/srp/ib_srp.c

+0 −1
Original line number Diff line number Diff line
@@ -2740,7 +2740,6 @@ static struct scsi_host_template srp_template = { 
	.info				= srp_target_info,

	.queuecommand			= srp_queuecommand,

	.change_queue_depth             = srp_change_queue_depth,

	.change_queue_type              = scsi_change_queue_type,

	.eh_abort_handler		= srp_abort,

	.eh_device_reset_handler	= srp_reset_device,

	.eh_host_reset_handler		= srp_reset_host,

drivers/infiniband/ulp/srpt/ib_srpt.c

+5 −5
Original line number Diff line number Diff line
@@ -1708,17 +1708,17 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, 


	switch (srp_cmd->task_attr) {

	case SRP_CMD_SIMPLE_Q:

		cmd->sam_task_attr = MSG_SIMPLE_TAG;

		cmd->sam_task_attr = TCM_SIMPLE_TAG;

		break;

	case SRP_CMD_ORDERED_Q:

	default:

		cmd->sam_task_attr = MSG_ORDERED_TAG;

		cmd->sam_task_attr = TCM_ORDERED_TAG;

		break;

	case SRP_CMD_HEAD_OF_Q:

		cmd->sam_task_attr = MSG_HEAD_TAG;

		cmd->sam_task_attr = TCM_HEAD_TAG;

		break;

	case SRP_CMD_ACA:

		cmd->sam_task_attr = MSG_ACA_TAG;

		cmd->sam_task_attr = TCM_ACA_TAG;

		break;

	}
@@ -1733,7 +1733,7 @@ static int srpt_handle_cmd(struct srpt_rdma_ch *ch, 
				       sizeof(srp_cmd->lun));

	rc = target_submit_cmd(cmd, ch->sess, srp_cmd->cdb,

			&send_ioctx->sense_data[0], unpacked_lun, data_len,

			MSG_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF);

			TCM_SIMPLE_TAG, dir, TARGET_SCF_ACK_KREF);

	if (rc != 0) {

		ret = TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;

		goto send_sense;

drivers/scsi/53c700.c

+3 −38
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ STATIC int NCR_700_slave_alloc(struct scsi_device *SDpnt); 
STATIC int NCR_700_slave_configure(struct scsi_device *SDpnt);

STATIC void NCR_700_slave_destroy(struct scsi_device *SDpnt);

static int NCR_700_change_queue_depth(struct scsi_device *SDpnt, int depth);

static int NCR_700_change_queue_type(struct scsi_device *SDpnt, int depth);



STATIC struct device_attribute *NCR_700_dev_attrs[];
@@ -326,7 +325,6 @@ NCR_700_detect(struct scsi_host_template *tpnt, 
	tpnt->slave_destroy = NCR_700_slave_destroy;

	tpnt->slave_alloc = NCR_700_slave_alloc;

	tpnt->change_queue_depth = NCR_700_change_queue_depth;

	tpnt->change_queue_type = NCR_700_change_queue_type;

	tpnt->use_blk_tags = 1;



	if(tpnt->name == NULL)
@@ -904,8 +902,8 @@ process_message(struct Scsi_Host *host, struct NCR_700_Host_Parameters *hostdata 
			hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));



			SCp->device->tagged_supported = 0;

			SCp->device->simple_tags = 0;

			scsi_change_queue_depth(SCp->device, host->cmd_per_lun);

			scsi_set_tag_type(SCp->device, 0);

		} else {

			shost_printk(KERN_WARNING, host,

				"(%d:%d) Unexpected REJECT Message %s\n",
@@ -1818,8 +1816,8 @@ NCR_700_queuecommand_lck(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *) 
		hostdata->tag_negotiated &= ~(1<<scmd_id(SCp));

	}



	if((hostdata->tag_negotiated &(1<<scmd_id(SCp)))

	   && scsi_get_tag_type(SCp->device)) {

	if ((hostdata->tag_negotiated & (1<<scmd_id(SCp))) &&

	    SCp->device->simple_tags) {

		slot->tag = SCp->request->tag;

		CDEBUG(KERN_DEBUG, SCp, "sending out tag %d, slot %p\n",

		       slot->tag, slot);
@@ -2082,39 +2080,6 @@ NCR_700_change_queue_depth(struct scsi_device *SDp, int depth) 
	return scsi_change_queue_depth(SDp, depth);

}



static int NCR_700_change_queue_type(struct scsi_device *SDp, int tag_type)

{

	int change_tag = ((tag_type ==0 &&  scsi_get_tag_type(SDp) != 0)

			  || (tag_type != 0 && scsi_get_tag_type(SDp) == 0));

	struct NCR_700_Host_Parameters *hostdata = 

		(struct NCR_700_Host_Parameters *)SDp->host->hostdata[0];



	/* We have a global (per target) flag to track whether TCQ is

	 * enabled, so we'll be turning it off for the entire target here.

	 * our tag algorithm will fail if we mix tagged and untagged commands,

	 * so quiesce the device before doing this */

	if (change_tag)

		scsi_target_quiesce(SDp->sdev_target);



	scsi_set_tag_type(SDp, tag_type);

	if (!tag_type) {

		/* shift back to the default unqueued number of commands

		 * (the user can still raise this) */

		scsi_change_queue_depth(SDp, SDp->host->cmd_per_lun);

		hostdata->tag_negotiated &= ~(1 << sdev_id(SDp));

	} else {

		/* Here, we cleared the negotiation flag above, so this

		 * will force the driver to renegotiate */

		scsi_change_queue_depth(SDp, SDp->queue_depth);

		if (change_tag)

			NCR_700_set_tag_neg_state(SDp, NCR_700_START_TAG_NEGOTIATION);

	}

	if (change_tag)

		scsi_target_resume(SDp->sdev_target);



	return tag_type;

}



static ssize_t

NCR_700_show_active_tags(struct device *dev, struct device_attribute *attr, char *buf)

{

drivers/scsi/Kconfig

+8 −9
Original line number Diff line number Diff line
@@ -1462,18 +1462,17 @@ config SCSI_WD719X 
	  SCSI controllers (based on WD33C296A chip).



config SCSI_DEBUG

	tristate "SCSI debugging host simulator"

	tristate "SCSI debugging host and device simulator"

	depends on SCSI

	select CRC_T10DIF

	help

	  This is a host adapter simulator that can simulate multiple hosts

	  each with multiple dummy SCSI devices (disks). It defaults to one

	  host adapter with one dummy SCSI disk. Each dummy disk uses kernel

	  RAM as storage (i.e. it is a ramdisk). To save space when multiple

	  dummy disks are simulated, they share the same kernel RAM for 

	  their storage. See <http://sg.danny.cz/sg/sdebug26.html> for more

	  information. This driver is primarily of use to those testing the

	  SCSI and block subsystems. If unsure, say N.

	  This pseudo driver simulates one or more hosts (SCSI initiators),

	  each with one or more targets, each with one or more logical units.

	  Defaults to one of each, creating a small RAM disk device. Many

	  parameters found in the /sys/bus/pseudo/drivers/scsi_debug

	  directory can be tweaked at run time.

	  See <http://sg.danny.cz/sg/sdebug26.html> for more information.

	  Mainly used for testing and best as a module. If unsure, say N.



config SCSI_MESH

	tristate "MESH (Power Mac internal SCSI) support"

drivers/scsi/advansys.c

+4 −4
Original line number Diff line number Diff line
@@ -7921,9 +7921,9 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, 
	 */

	if ((asc_dvc->cur_dvc_qng[scp->device->id] > 0) &&

	    (boardp->reqcnt[scp->device->id] % 255) == 0) {

		asc_scsi_q->q2.tag_code = MSG_ORDERED_TAG;

		asc_scsi_q->q2.tag_code = ORDERED_QUEUE_TAG;

	} else {

		asc_scsi_q->q2.tag_code = MSG_SIMPLE_TAG;

		asc_scsi_q->q2.tag_code = SIMPLE_QUEUE_TAG;

	}



	/* Build ASC_SCSI_Q */
@@ -8351,7 +8351,7 @@ static int AscPutReadyQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq, uchar q_no) 
	}

	q_addr = ASC_QNO_TO_QADDR(q_no);

	if ((scsiq->q1.target_id & asc_dvc->use_tagged_qng) == 0) {

		scsiq->q2.tag_code &= ~MSG_SIMPLE_TAG;

		scsiq->q2.tag_code &= ~SIMPLE_QUEUE_TAG;

	}

	scsiq->q1.status = QS_FREE;

	AscMemWordCopyPtrToLram(iop_base,
@@ -8669,7 +8669,7 @@ static int AscExeScsiQueue(ASC_DVC_VAR *asc_dvc, ASC_SCSI_Q *scsiq) 
		}

	}

	if (disable_syn_offset_one_fix) {

		scsiq->q2.tag_code &= ~MSG_SIMPLE_TAG;

		scsiq->q2.tag_code &= ~SIMPLE_QUEUE_TAG;

		scsiq->q2.tag_code |= (ASC_TAG_FLAG_DISABLE_ASYN_USE_SYN_FIX |

				       ASC_TAG_FLAG_DISABLE_DISCONNECT);

	} else {