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

Commit 64a87b24 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[SCSI] Let scsi_cmnd->cmnd use request->cmd buffer 



 - struct scsi_cmnd had a 16 bytes command buffer of its own.
   This is an unnecessary duplication and copy of request's
   cmd. It is probably left overs from the time that scsi_cmnd
   could function without a request attached. So clean that up.

 - Once above is done, few places, apart from scsi-ml, needed
   adjustments due to changing the data type of scsi_cmnd->cmnd.

 - Lots of drivers still use MAX_COMMAND_SIZE. So I have left
   that #define but equate it to BLK_MAX_CDB. The way I see it
   and is reflected in the patch below is.
   MAX_COMMAND_SIZE - means: The longest fixed-length (*) SCSI CDB
                      as per the SCSI standard and is not related
                      to the implementation.
   BLK_MAX_CDB.     - The allocated space at the request level

 - I have audit all ISA drivers and made sure none use ->cmnd in a DMA
   Operation. Same audit was done by Andi Kleen.

(*)fixed-length here means commands that their size can be determined
   by their opcode and the CDB does not carry a length specifier, (unlike
   the VARIABLE_LENGTH_CMD(0x7f) command). This is actually not exactly
   true and the SCSI standard also defines extended commands and
   vendor specific commands that can be bigger than 16 bytes. The kernel
   will support these using the same infrastructure used for VARLEN CDB's.
   So in effect MAX_COMMAND_SIZE means the maximum size command
   scsi-ml supports without specifying a cmd_len by ULD's

Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 9f5de6b1

drivers/firewire/fw-sbp2.c

+1 −1
Original line number Diff line number Diff line
@@ -1487,7 +1487,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done) 
	if (scsi_sg_count(cmd) && sbp2_map_scatterlist(orb, device, lu) < 0)

		goto out;



	memcpy(orb->request.command_block, cmd->cmnd, COMMAND_SIZE(*cmd->cmnd));

	memcpy(orb->request.command_block, cmd->cmnd, cmd->cmd_len);



	orb->base.callback = complete_command_orb;

	orb->base.request_bus =

drivers/s390/scsi/zfcp_dbf.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,7 @@ static void zfcp_scsi_dbf_event(const char *tag, const char *tag2, int level, 
				rec->scsi_result = scsi_cmnd->result;

				rec->scsi_cmnd = (unsigned long)scsi_cmnd;

				rec->scsi_serial = scsi_cmnd->serial_number;

				memcpy(rec->scsi_opcode, &scsi_cmnd->cmnd,

				memcpy(rec->scsi_opcode, scsi_cmnd->cmnd,

					min((int)scsi_cmnd->cmd_len,

						ZFCP_DBF_SCSI_OPCODE));

				rec->scsi_retries = scsi_cmnd->retries;

drivers/s390/scsi/zfcp_fsf.c

+1 −1
Original line number Diff line number Diff line
@@ -4014,7 +4014,7 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req) 
		ZFCP_LOG_TRACE("scpnt->result =0x%x, command was:\n",

			       scpnt->result);

		ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_TRACE,

			      (void *) &scpnt->cmnd, scpnt->cmd_len);

			      scpnt->cmnd, scpnt->cmd_len);



		ZFCP_LOG_TRACE("%i bytes sense data provided by FCP\n",

			       fcp_rsp_iu->fcp_sns_len);

drivers/scsi/53c700.c

+3 −3
Original line number Diff line number Diff line
@@ -599,7 +599,7 @@ NCR_700_scsi_done(struct NCR_700_Host_Parameters *hostdata, 
			(struct NCR_700_command_slot *)SCp->host_scribble;

		

		dma_unmap_single(hostdata->dev, slot->pCmd,

				 sizeof(SCp->cmnd), DMA_TO_DEVICE);

				 MAX_COMMAND_SIZE, DMA_TO_DEVICE);

		if (slot->flags == NCR_700_FLAG_AUTOSENSE) {

			char *cmnd = NCR_700_get_sense_cmnd(SCp->device);

#ifdef NCR_700_DEBUG
@@ -1004,7 +1004,7 @@ process_script_interrupt(__u32 dsps, __u32 dsp, struct scsi_cmnd *SCp, 
				 * here */

				NCR_700_unmap(hostdata, SCp, slot);

				dma_unmap_single(hostdata->dev, slot->pCmd,

						 sizeof(SCp->cmnd),

						 MAX_COMMAND_SIZE,

						 DMA_TO_DEVICE);



				cmnd[0] = REQUEST_SENSE;
@@ -1901,7 +1901,7 @@ NCR_700_queuecommand(struct scsi_cmnd *SCp, void (*done)(struct scsi_cmnd *)) 
	}

	slot->resume_offset = 0;

	slot->pCmd = dma_map_single(hostdata->dev, SCp->cmnd,

				    sizeof(SCp->cmnd), DMA_TO_DEVICE);

				    MAX_COMMAND_SIZE, DMA_TO_DEVICE);

	NCR_700_start_command(SCp);

	return 0;

}

drivers/scsi/a100u2w.c

+1 −1
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ static void inia100_build_scb(struct orc_host * host, struct orc_scb * scb, stru 
	} else {

		scb->tag_msg = 0;	/* No tag support               */

	}

	memcpy(&scb->cdb[0], &cmd->cmnd, scb->cdb_len);

	memcpy(scb->cdb, cmd->cmnd, scb->cdb_len);

}



/**