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

Commit 50668633 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

scsi: remove abuses of scsi_populate_tag 



Unless we want to build a SPI tag message we should just check SCMD_TAGGED
instead of reverse engineering a tag type through the use of
scsi_populate_tag_msg.

Also rename the function to spi_populate_tag_msg, make it behave like the
other spi message helpers, and move it to the spi transport class.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
parent abd0c533

drivers/s390/scsi/zfcp_fc.h

+1 −13
Original line number Diff line number Diff line
@@ -212,8 +212,6 @@ static inline 
void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi,

			 u8 tm_flags)

{

	char tag[2];



	int_to_scsilun(scsi->device->lun, (struct scsi_lun *) &fcp->fc_lun);



	if (unlikely(tm_flags)) {
@@ -221,16 +219,6 @@ void zfcp_fc_scsi_to_fcp(struct fcp_cmnd *fcp, struct scsi_cmnd *scsi, 
		return;

	}



	if (scsi_populate_tag_msg(scsi, tag)) {

		switch (tag[0]) {

		case MSG_ORDERED_TAG:

			fcp->fc_pri_ta |= FCP_PTA_ORDERED;

			break;

		case MSG_SIMPLE_TAG:

			fcp->fc_pri_ta |= FCP_PTA_SIMPLE;

			break;

		};

	} else

	fcp->fc_pri_ta = FCP_PTA_SIMPLE;



	if (scsi->sc_data_direction == DMA_FROM_DEVICE)

drivers/scsi/53c700.c

+1 −1
Original line number Diff line number Diff line
@@ -1427,7 +1427,7 @@ NCR_700_start_command(struct scsi_cmnd *SCp) 
	if((hostdata->tag_negotiated & (1<<scmd_id(SCp)))

	   && (slot->tag != SCSI_NO_TAG && SCp->cmnd[0] != REQUEST_SENSE &&

	       slot->flags != NCR_700_FLAG_AUTOSENSE)) {

		count += scsi_populate_tag_msg(SCp, &hostdata->msgout[count]);

		count += spi_populate_tag_msg(&hostdata->msgout[count], SCp);

	}



	if(hostdata->fast &&

drivers/scsi/aic7xxx/aic79xx_osm.c

+0 −9
Original line number Diff line number Diff line
@@ -1619,15 +1619,6 @@ ahd_linux_run_command(struct ahd_softc *ahd, struct ahd_linux_device *dev, 
	}



	if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {

		int	msg_bytes;

		uint8_t tag_msgs[2];



		msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);

		if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {

			hscb->control |= tag_msgs[0];

			if (tag_msgs[0] == MSG_ORDERED_TASK)

				dev->commands_since_idle_or_otag = 0;

		} else

		if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH

		 && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {

			hscb->control |= MSG_ORDERED_TASK;

drivers/scsi/aic7xxx/aic7xxx_osm.c

+1 −9
Original line number Diff line number Diff line
@@ -1501,15 +1501,7 @@ ahc_linux_run_command(struct ahc_softc *ahc, struct ahc_linux_device *dev, 
	}



	if ((dev->flags & (AHC_DEV_Q_TAGGED|AHC_DEV_Q_BASIC)) != 0) {

		int	msg_bytes;

		uint8_t tag_msgs[2];

		

		msg_bytes = scsi_populate_tag_msg(cmd, tag_msgs);

		if (msg_bytes && tag_msgs[0] != MSG_SIMPLE_TASK) {

			hscb->control |= tag_msgs[0];

			if (tag_msgs[0] == MSG_ORDERED_TASK)

				dev->commands_since_idle_or_otag = 0;

		} else if (dev->commands_since_idle_or_otag == AHC_OTAG_THRESH

		if (dev->commands_since_idle_or_otag == AHC_OTAG_THRESH

				&& (dev->flags & AHC_DEV_Q_TAGGED) != 0) {

			hscb->control |= MSG_ORDERED_TASK;

			dev->commands_since_idle_or_otag = 0;

drivers/scsi/bnx2fc/bnx2fc_io.c

+3 −15
Original line number Diff line number Diff line
@@ -1725,7 +1725,6 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req, 
				  struct fcp_cmnd *fcp_cmnd)

{

	struct scsi_cmnd *sc_cmd = io_req->sc_cmd;

	char tag[2];



	memset(fcp_cmnd, 0, sizeof(struct fcp_cmnd));
@@ -1739,22 +1738,11 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req, 
	fcp_cmnd->fc_tm_flags = io_req->mp_req.tm_flags;

	fcp_cmnd->fc_flags = io_req->io_req_flags;



	if (scsi_populate_tag_msg(sc_cmd, tag)) {

		switch (tag[0]) {

		case HEAD_OF_QUEUE_TAG:

			fcp_cmnd->fc_pri_ta = FCP_PTA_HEADQ;

			break;

		case ORDERED_QUEUE_TAG:

			fcp_cmnd->fc_pri_ta = FCP_PTA_ORDERED;

			break;

		default:

	if (sc_cmd->flags & SCMD_TAGGED)

		fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;

			break;

		}

	} else {

	else

		fcp_cmnd->fc_pri_ta = 0;

}

}



static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req,

				 struct fcoe_fcp_rsp_payload *fcp_rsp,