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

Commit e73823f7 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] libsas: implement > 16 byte CDB support 



Remove the arbitrary expectation in libsas that all SCSI commands are 16 bytes
or less.  Instead do all copies via cmd->cmd_len (and use a pointer to this in
the libsas task instead of a copy).  Note that this still doesn't enable > 16
byte CDB support in the underlying drivers because their internal format has
to be fixed and the wire format of > 16 byte CDBs according to the SAS spec is
different.  the libsas drivers (isci, aic94xx, mvsas and pm8xxx are all
updated for this change.

Cc: Lukasz Dorau <lukasz.dorau@intel.com>
Cc: Maciej Patelczyk <maciej.patelczyk@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Jack Wang <xjtuwjp@gmail.com>
Cc: Lindar Liu <lindar_liu@usish.com>
Cc: Xiangliang Yu <yuxiangl@marvell.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 9edf7d75

drivers/scsi/aic94xx/aic94xx_task.c

+2 −1
Original line number Diff line number Diff line
@@ -505,7 +505,8 @@ static int asd_build_ssp_ascb(struct asd_ascb *ascb, struct sas_task *task, 
		scb->ssp_task.ssp_cmd.efb_prio_attr |= EFB_MASK;

	scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_prio << 3);

	scb->ssp_task.ssp_cmd.efb_prio_attr |= (task->ssp_task.task_attr & 7);

	memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cdb, 16);

	memcpy(scb->ssp_task.ssp_cmd.cdb, task->ssp_task.cmd->cmnd,

	       task->ssp_task.cmd->cmd_len);



	scb->ssp_task.sister_scb = cpu_to_le16(0xFFFF);

	scb->ssp_task.conn_handle = cpu_to_le16(

drivers/scsi/isci/request.c

+2 −2
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ static void sci_io_request_build_ssp_command_iu(struct isci_request *ireq) 
	cmd_iu->task_attr = task->ssp_task.task_attr;

	cmd_iu->_r_c = 0;



	sci_swab32_cpy(&cmd_iu->cdb, task->ssp_task.cdb,

		       sizeof(task->ssp_task.cdb) / sizeof(u32));

	sci_swab32_cpy(&cmd_iu->cdb, task->ssp_task.cmd->cmnd,

		       task->ssp_task.cmd->cmd_len / sizeof(u32));

}



static void sci_task_request_build_ssp_task_iu(struct isci_request *ireq)

drivers/scsi/libsas/sas_scsi_host.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, 
	int_to_scsilun(cmd->device->lun, &lun);

	memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8);

	task->ssp_task.task_attr = TASK_ATTR_SIMPLE;

	memcpy(task->ssp_task.cdb, cmd->cmnd, 16);

	task->ssp_task.cmd = cmd;



	task->scatter = scsi_sglist(cmd);

	task->num_scatter = scsi_sg_count(cmd);

drivers/scsi/mvsas/mv_sas.c

+2 −1
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi, 
	if (ssp_hdr->frame_type != SSP_TASK) {

		buf_cmd[9] = fburst | task->ssp_task.task_attr |

				(task->ssp_task.task_prio << 3);

		memcpy(buf_cmd + 12, &task->ssp_task.cdb, 16);

		memcpy(buf_cmd + 12, task->ssp_task.cmd->cmnd,

		       task->ssp_task.cmd->cmd_len);

	} else{

		buf_cmd[10] = tmf->tmf;

		switch (tmf->tmf) {

drivers/scsi/pm8001/pm8001_hwi.c

+2 −1
Original line number Diff line number Diff line
@@ -4291,7 +4291,8 @@ static int pm8001_chip_ssp_io_req(struct pm8001_hba_info *pm8001_ha, 
		ssp_cmd.ssp_iu.efb_prio_attr |= 0x80;

	ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_prio << 3);

	ssp_cmd.ssp_iu.efb_prio_attr |= (task->ssp_task.task_attr & 7);

	memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cdb, 16);

	memcpy(ssp_cmd.ssp_iu.cdb, task->ssp_task.cmd->cmnd,

	       task->ssp_task.cmd->cmd_len);

	circularQ = &pm8001_ha->inbnd_q_tbl[0];



	/* fill in PRD (scatter/gather) table, if any */