aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSreekanth Reddy <Sreekanth.Reddy@lsi.com>2013-02-01 14:28:20 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-25 17:07:30 -0400
commit47c00d01fb222baaf8d248f855061da168b29c5d (patch)
treeba5be0cf36021ad0b53c57d73f66f20784877e3b
parent8f425c63ecda1bab9982892e7890041292e2d5ec (diff)
SCSI: mpt2sas: fix firmware failure with wrong task attribute
commit 48ba2efc382f94fae16ca8ca011e5961a81ad1ea upstream. When SCSI command is received with task attribute not set, set it to SIMPLE. Previously it is set to untagged. This causes the firmware to fail the commands. Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_scsih.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index c6bdc9267229..a49159561669 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -3994,11 +3994,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
3994 else 3994 else
3995 mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ; 3995 mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
3996 } else 3996 } else
3997/* MPI Revision I (UNIT = 0xA) - removed MPI2_SCSIIO_CONTROL_UNTAGGED */ 3997 mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
3998/* mpi_control |= MPI2_SCSIIO_CONTROL_UNTAGGED;
3999 */
4000 mpi_control |= (0x500);
4001
4002 } else 3998 } else
4003 mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ; 3999 mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
4004 /* Make sure Device is not raid volume. 4000 /* Make sure Device is not raid volume.