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

Commit 3ed21525 authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes. 



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: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 34c2b712

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -3062,8 +3062,9 @@ _scsih_qcmd(struct scsi_cmnd *scmd, void (*done)(struct scsi_cmnd *)) 




	} else

	} else

		mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;

		mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ;



	/* Make sure Device is not raid volume */

	if (sas_is_tlr_enabled(scmd->device))

	if (!_scsih_is_raid(&scmd->device->sdev_gendev) &&

	    sas_is_tlr_enabled(scmd->device))

		mpi_control |= MPI2_SCSIIO_CONTROL_TLR_ON;

		mpi_control |= MPI2_SCSIIO_CONTROL_TLR_ON;





	smid = mpt2sas_base_get_smid_scsiio(ioc, ioc->scsi_io_cb_idx, scmd);

	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;

		    le32_to_cpu(mpi_reply->ResponseInfo) & 0xFF;

	if (!sas_device_priv_data->tlr_snoop_check) {

	if (!sas_device_priv_data->tlr_snoop_check) {

		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) {

		    response_code == MPI2_SCSITASKMGMT_RSP_INVALID_FRAME) {

			sas_disable_tlr(scmd->device);

			sas_disable_tlr(scmd->device);

			sdev_printk(KERN_INFO, scmd->device, "TLR disabled\n");

			sdev_printk(KERN_INFO, scmd->device, "TLR disabled\n");