mpt/fusion: Add scsi_cmd_get_serial() call

RFC In review Nicholas A. Bellinger 1 participant 1 message Sep 28, 2010

Subsystems (2)

SCSI LSI Logic MPT fusion drivers (FC/SAS/SPI)

lore

Share & tools

lore

Nicholas A. Bellinger

author

2010-09-28 02:07 UTC #0 lore raw

RFC v4 16/19 mpt/fusion: Add scsi_cmd_get_serial() call

From: Nicholas Bellinger <[email protected]>

This patch adds a scsi_cmd_get_serial() call in mptscsih_qcmd() to setup a valid struct scsi_cmnd->serial_number because mptscsih_abort() still depends upon this being set.

This also includes setting the SHT->unlocked_qcmd=1 for host_lock less MPT/Fusion operation for mptfc_driver_template, mptsas_driver_template and mptspi_driver_template.

Signed-off-by Nicholas A. Bellinger <[email protected]>

---
 drivers/message/fusion/mptfc.c    |    1 +
 drivers/message/fusion/mptsas.c   |    1 +
 drivers/message/fusion/mptscsih.c |    5 +++++
 drivers/message/fusion/mptspi.c   |    1 +
 4 files changed, 8 insertions(+), 0 deletions(-)

drivers/message/fusion/mptfc.c +1 -0

index e15220f..d92c3b0 100644
@@ -126,6 +126,7 @@ static struct scsi_host_template mptfc_driver_template = {
 	.eh_host_reset_handler		= mptfc_host_reset,
 	.bios_param			= mptscsih_bios_param,
 	.can_queue			= MPT_FC_CAN_QUEUE,
+	.unlocked_qcmd			= 1,
 	.this_id			= -1,
 	.sg_tablesize			= MPT_SCSI_SG_DEPTH,
 	.max_sectors			= 8192,

drivers/message/fusion/mptsas.c +1 -0

index 83a5115..5dc4277 100644
@@ -1975,6 +1975,7 @@ static struct scsi_host_template mptsas_driver_template = {
 	.eh_host_reset_handler		= mptscsih_host_reset,
 	.bios_param			= mptscsih_bios_param,
 	.can_queue			= MPT_SAS_CAN_QUEUE,
+	.unlocked_qcmd			= 1,
 	.this_id			= -1,
 	.sg_tablesize			= MPT_SCSI_SG_DEPTH,
 	.max_sectors			= 8192,

drivers/message/fusion/mptscsih.c +5 -0

index 59b8f53..6aaa553 100644
@@ -1411,6 +1411,11 @@ mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
 	hd = shost_priv(SCpnt->device->host);
 	ioc = hd->ioc;
 	SCpnt->scsi_done = done;
+	/*
+	 * Call scsi_cmd_get_serial() because we need a valid serial number
+	 * in mptscsih_abort()
+	 */
+	scsi_cmd_get_serial(SCpnt);
 
 	dmfprintk(ioc, printk(MYIOC_s_DEBUG_FMT "qcmd: SCpnt=%p, done()=%p\n",
 		ioc->name, SCpnt, done));

drivers/message/fusion/mptspi.c +1 -0

index 0e28031..e681e92 100644
@@ -845,6 +845,7 @@ static struct scsi_host_template mptspi_driver_template = {
 	.eh_host_reset_handler		= mptscsih_host_reset,
 	.bios_param			= mptscsih_bios_param,
 	.can_queue			= MPT_SCSI_CAN_QUEUE,
+	.unlocked_qcmd			= 1,
 	.this_id			= -1,
 	.sg_tablesize			= MPT_SCSI_SG_DEPTH,
 	.max_sectors			= 8192,

Signature · 1 line

1.7.3