| Message ID | 1476699850-25083-8-git-send-email-sumit.saxena@broadcom.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On 10/17/2016 12:24 PM, Sumit Saxena wrote: > Do not set MPI2_TYPE_CUDA for JBOD fastpath IOs for firmware which does > not support JBOD sequence map. > > CC: stable@vger.kernel.org > Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com> > Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> > --- > drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c > index 8237580..25b7720 100644 > --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c > +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c > @@ -2003,6 +2003,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; > @@ -2038,12 +2040,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); > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
On 17.10.2016 12:24, Sumit Saxena wrote: > Do not set MPI2_TYPE_CUDA for JBOD fastpath IOs for firmware which does > not support JBOD sequence map. > > CC: stable@vger.kernel.org > Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com> > Signed-off-by: Kashyap Desai <kashyap.desai@broadcom.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Tomas -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 8237580..25b7720 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -2003,6 +2003,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; @@ -2038,12 +2040,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);