[SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes.
authorKashyap, Desai <kashyap.desai@lsi.com>
Wed, 17 Feb 2010 10:38:36 +0000 (16:08 +0530)
committerJames Bottomley <James.Bottomley@suse.de>
Wed, 17 Feb 2010 23:49:25 +0000 (17:49 -0600)
For RAID volume sas_is_tlr_enabled call will hit BUG at
scsi_transport_sas.c:163, since raid volume
is not visible to sas transport layer.
Now Added check to make sure arg pass in sas_is_tlr_enabled() is not a volume.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/mpt2sas/mpt2sas_scsih.c

index 344a22ad2f33d000a11fa83c2bf75f818db4eb2e..c7ec3f17478220e5637750a52fc5621a38390443 100644 (file)
@@ -3062,8 +3062,9 @@ _scsih_qcmd(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *))
 
        } else
                mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;
-
-       if (sas_is_tlr_enabled(scmd->device))
+       /* Make sure Device is not raid volume */
+       if (!_scsih_is_raid(&scmd->device->sdev_gendev) &&
+           sas_is_tlr_enabled(scmd->device))
                mpi_control |= MPI2_SCSIIO_CONTROL_TLR_ON;
 
        smid = mpt2sas_base_get_smid_scsiio(ioc, ioc->scsi_io_cb_idx, scmd);
@@ -3452,7 +3453,8 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
                    le32_to_cpu(mpi_reply->ResponseInfo) & 0xFF;
        if (!sas_device_priv_data->tlr_snoop_check) {
                sas_device_priv_data->tlr_snoop_check++;
-               if (sas_is_tlr_enabled(scmd->device) &&
+       if (!_scsih_is_raid(&scmd->device->sdev_gendev) &&
+               sas_is_tlr_enabled(scmd->device) &&
                    response_code == MPI2_SCSITASKMGMT_RSP_INVALID_FRAME) {
                        sas_disable_tlr(scmd->device);
                        sdev_printk(KERN_INFO, scmd->device, "TLR disabled\n");