scsi: megaraid_sas: Do not set MPI2_TYPE_CUDA for JBOD FP path for FW which does...

BugLink: http://bugs.launchpad.net/bugs/1655041
commit d5573584429254a14708cf8375c47092b5edaf2c upstream.

Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 194292d9c510274a635c355bba5d722355e20967..27b339ab30f6ea28a3913957338f6d10115eb78d 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1997,6 +1997,8 @@ megasas_build_syspd_fusion(struct megasas_instance *instance,
                io_request->DevHandle = pd_sync->seq[pd_index].devHandle;
                pRAID_Context->regLockFlags |=
                        (MR_RL_FLAGS_SEQ_NUM_ENABLE|MR_RL_FLAGS_GRANT_DESTINATION_CUDA);
+               pRAID_Context->Type = MPI2_TYPE_CUDA;
+               pRAID_Context->nseg = 0x1;
        } else if (fusion->fast_path_io) {
                pRAID_Context->VirtualDiskTgtId = cpu_to_le16(device_id);
                pRAID_Context->configSeqNum = 0;
@@ -2032,12 +2034,10 @@ megasas_build_syspd_fusion(struct megasas_instance *instance,
                pRAID_Context->timeoutValue =
                        cpu_to_le16((os_timeout_value > timeout_limit) ?
                        timeout_limit : os_timeout_value);
-               if (fusion->adapter_type == INVADER_SERIES) {
-                       pRAID_Context->Type = MPI2_TYPE_CUDA;
-                       pRAID_Context->nseg = 0x1;
+               if (fusion->adapter_type == INVADER_SERIES)
                        io_request->IoFlags |=
                                cpu_to_le16(MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH);
-               }
+
                cmd->request_desc->SCSIIO.RequestFlags =
                        (MPI2_REQ_DESCRIPT_FLAGS_FP_IO <<
                                MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);