git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From d5573584429254a14708cf8375c47092b5edaf2c Mon Sep 17 00:00:00 2001
   2 From: Kashyap Desai <kashyap.desai@broadcom.com>
   3 Date: Fri, 21 Oct 2016 06:33:35 -0700
   4 Subject: scsi: megaraid_sas: Do not set MPI2_TYPE_CUDA for JBOD FP path for FW which does not support JBOD sequence map
   5
   6 From: Kashyap Desai <kashyap.desai@broadcom.com>
   7
   8 commit d5573584429254a14708cf8375c47092b5edaf2c upstream.
   9
  10 Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
  11 Reviewed-by: Hannes Reinecke <hare@suse.com>
  12 Reviewed-by: Tomas Henzl <thenzl@redhat.com>
  13 Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15
  16 ---
  17  drivers/scsi/megaraid/megaraid_sas_fusion.c |    8 ++++----
  18  1 file changed, 4 insertions(+), 4 deletions(-)
  19
  20 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
  21 +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
  22 @@ -1856,6 +1856,8 @@ megasas_build_syspd_fusion(struct megasa
  23                 io_request->DevHandle = pd_sync->seq[pd_index].devHandle;
  24                 pRAID_Context->regLockFlags |=
  25                         (MR_RL_FLAGS_SEQ_NUM_ENABLE|MR_RL_FLAGS_GRANT_DESTINATION_CUDA);
  26 +               pRAID_Context->Type = MPI2_TYPE_CUDA;
  27 +               pRAID_Context->nseg = 0x1;
  28         } else if (fusion->fast_path_io) {
  29                 pRAID_Context->VirtualDiskTgtId = cpu_to_le16(device_id);
  30                 pRAID_Context->configSeqNum = 0;
  31 @@ -1891,12 +1893,10 @@ megasas_build_syspd_fusion(struct megasa
  32                 pRAID_Context->timeoutValue =
  33                         cpu_to_le16((os_timeout_value > timeout_limit) ?
  34                         timeout_limit : os_timeout_value);
  35 -               if (fusion->adapter_type == INVADER_SERIES) {
  36 -                       pRAID_Context->Type = MPI2_TYPE_CUDA;
  37 -                       pRAID_Context->nseg = 0x1;
  38 +               if (fusion->adapter_type == INVADER_SERIES)
  39                         io_request->IoFlags |=
  40                                 cpu_to_le16(MPI25_SAS_DEVICE0_FLAGS_ENABLED_FAST_PATH);
  41 -               }
  42 +
  43                 cmd->request_desc->SCSIIO.RequestFlags =
  44                         (MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY <<
  45                                 MEGASAS_REQ_DESCRIPT_FLAGS_TYPE_SHIFT);